procyberian/emacs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fix case of "GnuTLS" in docs.

Browse source 
* doc/misc/gnus.texi, doc/misc/smtpmail.texi:
* etc/NEWS:
* lisp/gnus/starttls.el, lisp/net/tls.el: Fix case of "GnuTLS".
This commit is contained in:
Glenn Morris 2011-11-23 23:44:51 -08:00
parent 420b63ad29
commit 321decc890
8 changed files with 32 additions and 22 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
doc/misc/ChangeLog
View file

@ -1,3 +1,7 @@
2011-11-24 Glenn Morris <rgm@gnu.org>
* gnus.texi, smtpmail.texi: Fix case of "GnuTLS".
2011-11-24 Juanma Barranquero <lekktu@gmail.com>
* makefile.w32-in: Update dependencies.

4
doc/misc/gnus.texi
View file

@ -13761,7 +13761,7 @@ The same as the above, but don't do automatic @acronym{STARTTLS} upgrades.
@findex nntp-open-tls-stream
@item nntp-open-tls-stream
Opens a connection to a server over a @dfn{secure} channel. To use
this you must have @uref{http://www.gnu.org/software/gnutls/, GNUTLS}
this you must have @uref{http://www.gnu.org/software/gnutls/, GnuTLS}
installed. You then define a server as follows:
@lisp
@ -27801,7 +27801,7 @@ The revised Gnus @acronym{FAQ} is included in the manual,
@acronym{TLS} wrapper shipped with Gnus
@acronym{TLS}/@acronym{SSL} is now supported in @acronym{IMAP} and
@acronym{NNTP} via @file{tls.el} and GNUTLS.
@acronym{NNTP} via @file{tls.el} and GnuTLS.
@item
Improved anti-spam features.

2
doc/misc/smtpmail.texi
View file

@ -233,7 +233,7 @@ least one of the following external tools are installed:
@enumerate
@item
The GNUTLS command line tool @samp{gnutls-cli}, you can get it from
The GnuTLS command line tool @samp{gnutls-cli}, you can get it from
@url{http://www.gnu.org/software/gnutls/}. This is the recommended
tool, mainly because it can verify the server certificates.

4
etc/NEWS.22
View file

@ -2558,10 +2558,10 @@ is nil).
*** Minor Improvements
**** The STARTTLS wrapper (starttls.el) can now use GNUTLS
**** The STARTTLS wrapper (starttls.el) can now use GnuTLS
instead of the OpenSSL based `starttls' tool. For backwards
compatibility, it prefers `starttls', but you can toggle
`starttls-use-gnutls' to switch to GNUTLS (or simply remove the
`starttls-use-gnutls' to switch to GnuTLS (or simply remove the
`starttls' tool).
**** Do not allow debugger output history variable to grow without bounds.

2
lisp/ChangeLog
View file

@ -1,5 +1,7 @@
2011-11-24 Glenn Morris <rgm@gnu.org>
* net/tls.el: Fix case of "GnuTLS".
* paths.el (rmail-file-name): Format doc-string for make-docfile.
* version.el (emacs-build-system): Give it a doc-string.

4
lisp/gnus/ChangeLog
View file

@ -1,3 +1,7 @@
2011-11-24 Glenn Morris <rgm@gnu.org>
* starttls.el: Fix case of "GnuTLS".
2011-11-24 Juanma Barranquero <lekktu@gmail.com>
* gnus-group.el (gnus-group-highlight): Fix typo.

30
lisp/gnus/starttls.el
View file

@ -5,7 +5,7 @@
;; Author: Daiki Ueno <ueno@unixuser.org>
;; Author: Simon Josefsson <simon@josefsson.org>
;; Created: 1999/11/20
;; Keywords: TLS, SSL, OpenSSL, GNUTLS, mail, news
;; Keywords: TLS, SSL, OpenSSL, GnuTLS, mail, news
;; This file is part of GNU Emacs.
@ -33,15 +33,15 @@
;; implementations both called "starttls.el". The first one is Daiki
;; Ueno's starttls.el which uses his own "starttls" command line tool,
;; and the second one is Simon Josefsson's starttls.el which uses
;; "gnutls-cli" from GNUTLS.
;; "gnutls-cli" from GnuTLS.
;;
;; If "starttls" is available, it is prefered by the code over
;; "gnutls-cli", for backwards compatibility. Use
;; `starttls-use-gnutls' to toggle between implementations if you have
;; both tools installed. It is recommended to use GNUTLS, though, as
;; both tools installed. It is recommended to use GnuTLS, though, as
;; it performs more verification of the certificates.
;; The GNUTLS support requires GNUTLS 0.9.90 (released 2003-10-08) or
;; The GnuTLS support requires GnuTLS 0.9.90 (released 2003-10-08) or
;; later, from <http://www.gnu.org/software/gnutls/>, or "starttls"
;; from <ftp://ftp.opaopa.org/pub/elisp/>.
@ -121,8 +121,8 @@
:group 'mail)
(defcustom starttls-gnutls-program "gnutls-cli"
"Name of GNUTLS command line tool.
This program is used when GNUTLS is used, i.e. when
"Name of GnuTLS command line tool.
This program is used when GnuTLS is used, i.e. when
`starttls-use-gnutls' is non-nil."
:version "22.1"
:type 'string
@ -136,7 +136,7 @@ i.e. when `starttls-use-gnutls' is nil."
:group 'starttls)
(defcustom starttls-use-gnutls (not (executable-find starttls-program))
"*Whether to use GNUTLS instead of the `starttls' command."
"*Whether to use GnuTLS instead of the `starttls' command."
:version "22.1"
:type 'boolean
:group 'starttls)
@ -150,7 +150,7 @@ These apply when the `starttls' command is used, i.e. when
(defcustom starttls-extra-arguments nil
"Extra arguments to `starttls-program'.
These apply when GNUTLS is used, i.e. when `starttls-use-gnutls' is non-nil.
These apply when GnuTLS is used, i.e. when `starttls-use-gnutls' is non-nil.
For example, non-TLS compliant servers may require
'(\"--protocols\" \"ssl3\"). Invoke \"gnutls-cli --help\" to
@ -167,8 +167,8 @@ find out which parameters are available."
(defcustom starttls-connect "- Simple Client Mode:\n\n"
"*Regular expression indicating successful connection.
The default is what GNUTLS's \"gnutls-cli\" outputs."
;; GNUTLS cli.c:main() prints this string when it is starting to run
The default is what GnuTLS's \"gnutls-cli\" outputs."
;; GnuTLS cli.c:main() prints this string when it is starting to run
;; in the application read/write phase. If the logic, or the string
;; itself, is modified, this must be updated.
:version "22.1"
@ -177,8 +177,8 @@ The default is what GNUTLS's \"gnutls-cli\" outputs."
(defcustom starttls-failure "\\*\\*\\* Handshake has failed"
"*Regular expression indicating failed TLS handshake.
The default is what GNUTLS's \"gnutls-cli\" outputs."
;; GNUTLS cli.c:do_handshake() prints this string on failure. If the
The default is what GnuTLS's \"gnutls-cli\" outputs."
;; GnuTLS cli.c:do_handshake() prints this string on failure. If the
;; logic, or the string itself, is modified, this must be updated.
:version "22.1"
:type 'regexp
@ -186,8 +186,8 @@ The default is what GNUTLS's \"gnutls-cli\" outputs."
(defcustom starttls-success "- Compression: "
"*Regular expression indicating completed TLS handshakes.
The default is what GNUTLS's \"gnutls-cli\" outputs."
;; GNUTLS cli.c:do_handshake() calls, on success,
The default is what GnuTLS's \"gnutls-cli\" outputs."
;; GnuTLS cli.c:do_handshake() calls, on success,
;; common.c:print_info(), that unconditionally print this string
;; last. If that logic, or the string itself, is modified, this
;; must be updated.
@ -283,7 +283,7 @@ BUFFER is the buffer (or `buffer-name') to associate with the process.
Third arg is name of the host to connect to, or its IP address.
Fourth arg PORT is an integer specifying a port to connect to.
If `starttls-use-gnutls' is nil, this may also be a service name, but
GNUTLS requires a port number."
GnuTLS requires a port number."
(if starttls-use-gnutls
(starttls-open-stream-gnutls name buffer host port)
(message "Opening STARTTLS connection to `%s:%s'" host (format "%s" port))

4
lisp/net/tls.el
View file

@ -123,7 +123,7 @@ successful negotiation."
(defcustom tls-success "- Handshake was completed\\|SSL handshake has read "
"Regular expression indicating completed TLS handshakes.
The default is what GNUTLS's \"gnutls-cli\" or OpenSSL's
The default is what GnuTLS's \"gnutls-cli\" or OpenSSL's
\"openssl s_client\" outputs."
:version "22.1"
:type 'regexp
@ -150,7 +150,7 @@ consider trustworthy, e.g.:
(defcustom tls-untrusted
"- Peer's certificate is NOT trusted\\|Verify return code: \\([^0] \\|.[^ ]\\)"
"Regular expression indicating failure of TLS certificate verification.
The default is what GNUTLS's \"gnutls-cli\" or OpenSSL's
The default is what GnuTLS's \"gnutls-cli\" or OpenSSL's
\"openssl s_client\" return in the event of unsuccessful
verification."
:type 'regexp