From: Andrew Lewis <nerf@judo.za.org>
Date: Sun, 12 Jun 2016 13:05:27 +0000 (+0200)
Subject: [Doc] Clarify some rspamc arguments
X-Git-Tag: 1.3.0~366^2
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=refs%2Fpull%2F658%2Fhead;p=rspamd.git

[Doc] Clarify some rspamc arguments
---

diff --git a/doc/rspamc.1 b/doc/rspamc.1
index b29bbb20d..331bdada8 100644
--- a/doc/rspamc.1
+++ b/doc/rspamc.1
@@ -100,22 +100,22 @@ Emulate that message was received from specified ip address
 .RE
 .TP
 .B \-u \f[I]username\f[], \-\-user=\f[I]username\f[]
-Emulate that message was from specified user
+Emulate that message was received from specified authenticated user
 .RS
 .RE
 .TP
 .B \-d \f[I]user\@domain\f[], \-\-deliver=\f[I]user\@domain\f[]
-Emulate that message is delivered to specified user
+Emulate that message is delivered to specified user (for LDA/statistics)
 .RS
 .RE
 .TP
 .B \-F \f[I]user\@domain\f[], \-\-from=\f[I]user\@domain\f[]
-Emulate that message is from specified user
+Emulate that message has specified SMTP FROM address
 .RS
 .RE
 .TP
 .B \-r \f[I]user\@domain\f[], \-\-rcpt=\f[I]user\@domain\f[]
-Emulate that message is for specified user
+Emulate that message has specified SMTP RCPT address
 .RS
 .RE
 .TP
diff --git a/doc/rspamc.1.md b/doc/rspamc.1.md
index 8e76d01b2..fb0fa58c8 100644
--- a/doc/rspamc.1.md
+++ b/doc/rspamc.1.md
@@ -64,16 +64,16 @@ requires input.
 :	Emulate that message was received from specified ip address
 
 -u *username*, \--user=*username*
-:	Emulate that message was from specified user
+:	Emulate that message was received from specified authenticated user
 
 -d *user@domain*, \--deliver=*user@domain*
-:	Emulate that message is delivered to specified user
+:	Emulate that message is delivered to specified user (for LDA/statistics)
 
 -F *user@domain*, \--from=*user@domain*
-:	Emulate that message is from specified user
+:	Emulate that message has specified SMTP FROM address
 
 -r *user@domain*, \--rcpt=*user@domain*
-:	Emulate that message is for specified user
+:	Emulate that message has specified SMTP RCPT address
 
 \--helo=*helo_string*
 :	Imitate SMTP HELO passing from MTA
@@ -167,4 +167,4 @@ Add custom action's weight:
 Rspamd documentation and source codes may be downloaded from
 <https://rspamd.com/>.
 
-[rspamd-workers]: https://rspamd.com/doc/workers/
\ No newline at end of file
+[rspamd-workers]: https://rspamd.com/doc/workers/
diff --git a/src/client/rspamc.c b/src/client/rspamc.c
index 8001bb9cb..56cbeec16 100644
--- a/src/client/rspamc.c
+++ b/src/client/rspamc.c
@@ -93,13 +93,13 @@ static GOptionEntry entries[] =
 	  "Emulate that message was received from specified ip address",
 	  NULL },
 	{ "user", 'u', 0, G_OPTION_ARG_STRING, &user,
-	  "Emulate that message was from specified user", NULL },
+	  "Emulate that message was received from specified authenticated user", NULL },
 	{ "deliver", 'd', 0, G_OPTION_ARG_STRING, &deliver_to,
-	  "Emulate that message is delivered to specified user", NULL },
+	  "Emulate that message is delivered to specified user (for LDA/statistics)", NULL },
 	{ "from", 'F', 0, G_OPTION_ARG_STRING, &from,
-	  "Emulate that message is from specified user", NULL },
+	  "Emulate that message has specified SMTP FROM address", NULL },
 	{ "rcpt", 'r', 0, G_OPTION_ARG_STRING_ARRAY, &rcpts,
-	  "Emulate that message is for specified user", NULL },
+	  "Emulate that message has specified SMTP RCPT address", NULL },
 	{ "helo", 0, 0, G_OPTION_ARG_STRING, &helo,
 	  "Imitate SMTP HELO passing from MTA", NULL },
 	{ "hostname", 0, 0, G_OPTION_ARG_STRING, &hostname,