diff options
Diffstat (limited to 'doc')
| -rw-r--r-- | doc/misc/ChangeLog | 5 | ||||
| -rw-r--r-- | doc/misc/auth.texi | 7 |
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 @@ | |||
| 1 | 2011-02-17 Teodor Zlatanov <tzz@lifelogs.com> | ||
| 2 | |||
| 3 | * auth.texi (Help for users): Use :port instead of :protocol for all | ||
| 4 | auth-source docs. | ||
| 5 | |||
| 1 | 2011-02-16 Glenn Morris <rgm@gnu.org> | 6 | 2011-02-16 Glenn Morris <rgm@gnu.org> |
| 2 | 7 | ||
| 3 | * dired-x.texi: Use emacsver.texi to get Emacs version. | 8 | * 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 | |||
| 105 | can also use @code{host}. | 105 | can also use @code{host}. |
| 106 | 106 | ||
| 107 | The @code{port} is the connection port or protocol. It's known as | 107 | The @code{port} is the connection port or protocol. It's known as |
| 108 | @var{:port} in @code{auth-source-search} queries. You can also use | 108 | @var{:port} in @code{auth-source-search} queries. |
| 109 | @code{protocol}. | ||
| 110 | 109 | ||
| 111 | The @code{user} is the user name. It's known as @var{:user} in | 110 | The @code{user} is the user name. It's known as @var{:user} in |
| 112 | @code{auth-source-search} queries. You can also use @code{login} and | 111 | @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 | |||
| 155 | and simplest configuration is: | 154 | and simplest configuration is: |
| 156 | 155 | ||
| 157 | @lisp | 156 | @lisp |
| 158 | ;;; old default: required :host and :protocol, not needed anymore | 157 | ;;; old default: required :host and :port, not needed anymore |
| 159 | (setq auth-sources '((:source "~/.authinfo.gpg" :host t :protocol t))) | 158 | (setq auth-sources '((:source "~/.authinfo.gpg" :host t :port t))) |
| 160 | ;;; mostly equivalent (see below about fallbacks) but shorter: | 159 | ;;; mostly equivalent (see below about fallbacks) but shorter: |
| 161 | (setq auth-sources '((:source "~/.authinfo.gpg"))) | 160 | (setq auth-sources '((:source "~/.authinfo.gpg"))) |
| 162 | ;;; even shorter and the @emph{default}: | 161 | ;;; even shorter and the @emph{default}: |