From: Glenn Morris Date: Thu, 24 Nov 2011 07:44:51 +0000 (-0800) Subject: Fix case of "GnuTLS" in docs. X-Git-Tag: emacs-pretest-24.0.92~57 X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=321decc890cabcf8b6ae8d1838fdf343eb899a55;p=emacs.git Fix case of "GnuTLS" in docs. * doc/misc/gnus.texi, doc/misc/smtpmail.texi: * etc/NEWS: * lisp/gnus/starttls.el, lisp/net/tls.el: Fix case of "GnuTLS". --- diff --git a/doc/misc/ChangeLog b/doc/misc/ChangeLog index a83d5817667..02befc69d4a 100644 --- a/doc/misc/ChangeLog +++ b/doc/misc/ChangeLog @@ -1,3 +1,7 @@ +2011-11-24 Glenn Morris + + * gnus.texi, smtpmail.texi: Fix case of "GnuTLS". + 2011-11-24 Juanma Barranquero * makefile.w32-in: Update dependencies. diff --git a/doc/misc/gnus.texi b/doc/misc/gnus.texi index f048e6f9742..38f46a3dd7b 100644 --- a/doc/misc/gnus.texi +++ b/doc/misc/gnus.texi @@ -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. diff --git a/doc/misc/smtpmail.texi b/doc/misc/smtpmail.texi index 1d4bbbff4ac..854be0d0012 100644 --- a/doc/misc/smtpmail.texi +++ b/doc/misc/smtpmail.texi @@ -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. diff --git a/etc/NEWS.22 b/etc/NEWS.22 index b96cdba98d3..c4aeda62c27 100644 --- a/etc/NEWS.22 +++ b/etc/NEWS.22 @@ -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. diff --git a/lisp/ChangeLog b/lisp/ChangeLog index ef5fdc60838..b4c1365c1d3 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,5 +1,7 @@ 2011-11-24 Glenn Morris + * 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. diff --git a/lisp/gnus/ChangeLog b/lisp/gnus/ChangeLog index 2b144529de1..eed5f921c57 100644 --- a/lisp/gnus/ChangeLog +++ b/lisp/gnus/ChangeLog @@ -1,3 +1,7 @@ +2011-11-24 Glenn Morris + + * starttls.el: Fix case of "GnuTLS". + 2011-11-24 Juanma Barranquero * gnus-group.el (gnus-group-highlight): Fix typo. diff --git a/lisp/gnus/starttls.el b/lisp/gnus/starttls.el index b995f7478ce..58dbebf4c5a 100644 --- a/lisp/gnus/starttls.el +++ b/lisp/gnus/starttls.el @@ -5,7 +5,7 @@ ;; Author: Daiki Ueno ;; Author: Simon Josefsson ;; 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 , or "starttls" ;; from . @@ -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)) diff --git a/lisp/net/tls.el b/lisp/net/tls.el index 42ae5920eee..6f66156a7e2 100644 --- a/lisp/net/tls.el +++ b/lisp/net/tls.el @@ -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