commit ad08c047c6fc6155d7a6ed007254725ee6a2eddb
from: witcher <witcher@wiredspace.de>
date: Sat Dec 17 20:42:08 2022 UTC

Be pedantic about E-Mail/email usage

commit - 0b00f842a93119c9db440d2c8b9d95863a804933
commit + ad08c047c6fc6155d7a6ed007254725ee6a2eddb
blob - a0e196a905d65bb01a094f6f4b9980fdfa6275a4
blob + bc1396f047d46e49f8ca7f7a06c3a32cbd13c993
--- docs/rss-email.1.scd
+++ docs/rss-email.1.scd
@@ -2,18 +2,20 @@ rss-email(1)
 
 # NAME
 
-rss-email - Fetch new RSS feed items and send them via E-Mail
+rss-email - Fetch new RSS feed items and send them via email
 
 # SYNOPSIS
 
-*rss-email* [--config <config-path>] [--database <database-path>] [--dry-run] [-h|--help] [--urls <urls-path>] [-V|--version]
+*rss-email* [--config <config-path>] [--database <database-path>] [--dry-run]
+[-h|--help] [--urls <urls-path>] [-V|--version]
 
 # DESCRIPTION
 
-*rss-email* fetches a list of RSS feeds, saves the items in a database and
-sends new feeds via E-Mail.
+*rss-email* fetches a list of RSS/Atom feeds, saves the items in a database and
+sends new feeds via email.
 
-A custom path for the configuration, database or urls file can be specified via the commandline.
+A custom path for the configuration, database or URLs file can be specified via
+the commandline.
 
 The database used is *sqlite3*.
 
@@ -30,7 +32,7 @@ The following options are recognized by *rss-email*:
 	*$XDG_CONFIG_HOME/rss-email/cache.db*
 
 *--dry-run*
-	Don't send any E-Mails, just fetch new feed items and mark them as read
+	Don't send any emails, just fetch new feed items and mark them as read
 
 *--urls* _urls-path_
 	Specifies a custom urls file to be used instead of the default one at
blob - ec6b70468754100e7acd479eefaf2770236cb2b8
blob + 2a4e546f5e90ce10c11acdc9c07b29c3e13daeec
--- src/cli.rs
+++ src/cli.rs
@@ -8,7 +8,7 @@ use super::{AUTHORS, VERSION};
 #[clap(name = "rss-email")]
 #[clap(author = AUTHORS)]
 #[clap(version = VERSION)]
-#[clap(about = "Fetch RSS Feeds and send them via E-Mail")]
+#[clap(about = "Fetch RSS Feeds and send them via email")]
 pub struct Cli {
     /// Custom path to database
     #[clap(long = "database", value_parser, default_value_t = database_path().into_os_string().into_string().unwrap())]
@@ -19,7 +19,7 @@ pub struct Cli {
     /// Custom path to URLs with RSS feeds being fetched
     #[clap(long = "urls", value_parser, default_value_t = urls_path().into_os_string().into_string().unwrap())]
     pub urls_path: String,
-    /// Don't send E-Mails
+    /// Don't send emails
     #[clap(long, value_parser)]
     pub dry_run: bool,
 }
blob - 69948f7fe6a4e1dd33ce2ce838b005b6803751ab
blob + 0b92dc1fc2f50b65ecb736d7acddf8b2400c3858
--- src/main.rs
+++ src/main.rs
@@ -87,7 +87,7 @@ async fn main() -> anyhow::Result<()> {
     while let Some(handle) = handles.join_next().await {
         // TODO: retry sending mail instead? user should specify number of retries in config
         if let Err(e) = handle? {
-            log::error!("An error occured while sending an E-Mail: {}", e);
+            log::error!("An error occured while sending an email: {}", e);
         }
     }