2 files changed, 14 insertions, 5 deletions

diff --git a/doc/misc/ChangeLog b/doc/misc/ChangeLog
index 1ecc0a65741..36134cdc8d1 100644
--- a/doc/misc/ChangeLog
+++ b/doc/misc/ChangeLog
@@ -1,3 +1,7 @@
+2014-11-02  Teodor Zlatanov  <tzz@lifelogs.com>
+
+        * auth.texi (Help for users): Explain quoting rules better.
+
 2014-10-30  Glenn Morris  <rgm@gnu.org>
 
         * efaq.texi (Gnus does not work with NNTP): Remove; ancient.
diff --git a/doc/misc/auth.texi b/doc/misc/auth.texi
index 207ffc6d79b..976143e8e39 100644
--- a/doc/misc/auth.texi
+++ b/doc/misc/auth.texi
@@ -106,12 +106,17 @@ The @code{user} is the user name.  It's known as @var{:user} in
 @code{auth-source-search} queries.  You can also use @code{login} and
 @code{account}.
 
-Spaces are always OK as far as auth-source is concerned (but other
-programs may not like them).  Just put the data in quotes, escaping
-quotes as you'd expect with @samp{\}.
+You can use spaces inside a password or other token by surrounding the
+token with either single or double quotes.
 
-All these are optional.  You could just say (but we don't recommend
-it, we're just showing that it's possible)
+You can use single quotes inside a password or other token by
+surrounding it with double quotes, e.g. @code{"he'llo"}. Similarly you
+can use double quotes inside a password or other token by surrounding
+it with single quotes, e.g. @code{'he"llo'}. You can't mix both (so a
+password or other token can't have both single and double quotes).
+
+All this is optional. You could just say (but we don't recommend it,
+we're just showing that it's possible)
 
 @example
 password @var{mypassword}