[PATCH] Option --smtp-server clarified. The argument can be of two kinds

[PATCH] Option --smtp-server clarified. The argument can be of two kinds

[Jari Aalto]

Signed-off-by: Jari Aalto <jari.aalto@cante.net>
---
 (1) eol whitespace removal

 (2) The first 3 lines are actual changes. The rest is due to formatting
 of the paragraph (fill).

 Documentation/git-send-email.txt |   16 ++++++++--------
 1 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/Documentation/git-send-email.txt b/Documentation/git-send-email.txt
index 795db87..070438d 100644
--- a/Documentation/git-send-email.txt
+++ b/Documentation/git-send-email.txt
@@ -54,7 +54,7 @@ The --cc option must be repeated for each user you want on the cc list.
 
 --in-reply-to::
 	Specify the contents of the first In-Reply-To header.
-	Subsequent emails will refer to the previous email 
+	Subsequent emails will refer to the previous email
 	instead of this if --chain-reply-to is set (the default)
 	Only necessary if --compose is also set.  If --compose
 	is not set, this will be prompted for.
@@ -68,13 +68,13 @@ The --cc option must be repeated for each user you want on the cc list.
 	all that is output.
 
 --smtp-server::
-	If set, specifies the outgoing SMTP server to use.  A full
-	pathname of a sendmail-like program can be specified instead;
-	the program must support the `-i` option.  Default value can
-	be specified by the 'sendemail.smtpserver' configuration
-	option; the built-in default is `/usr/sbin/sendmail` or
-	`/usr/lib/sendmail` if such program is available, or
-	`localhost` otherwise.
+	If set, specifies the outgoing SMTP server to use (like
+	smtp.example.com or raw IP address).  Alternatively the argument can
+	be a full pathname of a sendmail-like program.	The program must
+	support the `-i` option.  Default value can be specified by the
+	'sendemail.smtpserver' configuration option; the built-in default is
+	`/usr/sbin/sendmail` or `/usr/lib/sendmail` if such program is
+	available, or `localhost` otherwise.
 
 --subject::
    	Specify the initial subject of the email thread.
-- 
1.5.1.2.GIT

Re: [PATCH] Option --smtp-server clarified. The argument can be of two kinds

[Junio C Hamano]

Jari Aalto <jari.aalto@cante.net> writes:

> Signed-off-by: Jari Aalto <jari.aalto@cante.net>
> ---
>  (1) eol whitespace removal
>
>  (2) The first 3 lines are actual changes. The rest is due to formatting
>  of the paragraph (fill).

This patch itself is small enough so it is not a big deal, but
please do not mix whitespace fix and other patches if the
changes are involved.  Also please do not re-linewrap asciidoc
sources when not needed.