auth.texi (Help for users): Use :port instead of :protocol for all auth-source docs.

auth-source.el (auth-source-netrc-parse): Use :port instead of :protocol and accept a missing user, host, or port as a wildcard match.
 (auth-source-netrc-search, auth-source-netrc-create)
 (auth-source-secrets-search, auth-source-secrets-create)
 (auth-source-user-or-password, auth-source-backend, auth-sources)
 (auth-source-backend-parse-parameters, auth-source-search): Use :port instead of :protocol.
nnimap.el (nnimap-credentials): Pass a port default to `auth-source-search' in case an entry needs to be created.
 (nnimap-open-connection-1): Use :port instead of :protocol.

2 files changed, 8 insertions, 4 deletions

diff --git a/doc/misc/ChangeLog b/doc/misc/ChangeLog
index 4a03caee911..9a292c03c8d 100644
--- a/doc/misc/ChangeLog
+++ b/doc/misc/ChangeLog
@@ -1,3 +1,8 @@
+2011-02-17  Teodor Zlatanov  <tzz@lifelogs.com>
+
+        * auth.texi (Help for users): Use :port instead of :protocol for all
+        auth-source docs.
+
 2011-02-16  Glenn Morris  <rgm@gnu.org>
 
         * dired-x.texi: Use emacsver.texi to get Emacs version.
diff --git a/doc/misc/auth.texi b/doc/misc/auth.texi
index 020c582305c..0e19bce0b9f 100644
--- a/doc/misc/auth.texi
+++ b/doc/misc/auth.texi
@@ -105,8 +105,7 @@ It's known as @var{:host} in @code{auth-source-search} queries.  You
 can also use @code{host}.
 
 The @code{port} is the connection port or protocol.  It's known as
-@var{:port} in @code{auth-source-search} queries.  You can also use
-@code{protocol}.
+@var{:port} in @code{auth-source-search} queries.
 
 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
@@ -155,8 +154,8 @@ particular host and protocol.  While you can get fancy, the default
 and simplest configuration is:
 
 @lisp
-;;; old default: required :host and :protocol, not needed anymore
-(setq auth-sources '((:source "~/.authinfo.gpg" :host t :protocol t)))
+;;; old default: required :host and :port, not needed anymore
+(setq auth-sources '((:source "~/.authinfo.gpg" :host t :port t)))
 ;;; mostly equivalent (see below about fallbacks) but shorter:
 (setq auth-sources '((:source "~/.authinfo.gpg")))
 ;;; even shorter and the @emph{default}: