Merge changes from emacs-23 branch.

2010-06-24  Glenn Morris  <rgm@gnu.org>
 * auth.texi, emacs-mime.texi, gnus.texi, message.texi, pgg.texi:
 * sasl.texi: Start direntry descriptions in column 32, per Texinfo
 convention.  Make them end with a period.

2010-06-23  Glenn Morris  <rgm@gnu.org>
 * gnus-faq.texi, pgg.texi, sasl.texi, sieve.texi: Untabify.

diff --git a/texi/ChangeLog b/texi/ChangeLog
index ec552fd..16c5bf5 100644 (file)
--- a/texi/ChangeLog
+++ b/texi/ChangeLog
@@ -1,3 +1,13 @@
+2010-06-24  Glenn Morris  <rgm@gnu.org>
+
+       * auth.texi, emacs-mime.texi, gnus.texi, message.texi, pgg.texi:
+       * sasl.texi: Start direntry descriptions in column 32, per Texinfo
+       convention.  Make them end with a period.
+
+2010-06-23  Glenn Morris  <rgm@gnu.org>
+
+       * gnus-faq.texi, pgg.texi, sasl.texi, sieve.texi: Untabify.
+
 2010-06-07  Teodor Zlatanov  <tzz@lifelogs.com>
 
        * gnus.texi (Interactive): Explain effect of gnus-expert-user better.

diff --git a/texi/auth.texi b/texi/auth.texi
index a662664..8572678 100644 (file)
--- a/texi/auth.texi
+++ b/texi/auth.texi
@@ -31,7 +31,7 @@ license to the document, as described in section 6 of the license.
 
 @dircategory Emacs
 @direntry
-* Auth-source: (auth).   The Emacs auth-source library.
+* Auth-source: (auth).          The Emacs auth-source library.
 @end direntry
 
 @titlepage

diff --git a/texi/emacs-mime.texi b/texi/emacs-mime.texi
index 0cfec5d..5063aef 100644 (file)
--- a/texi/emacs-mime.texi
+++ b/texi/emacs-mime.texi
@@ -31,7 +31,7 @@ developing GNU and promoting software freedom.''
 
 @dircategory Emacs
 @direntry
-* Emacs MIME: (emacs-mime).   Emacs MIME de/composition library.
+* Emacs MIME: (emacs-mime).     Emacs MIME de/composition library.
 @end direntry
 @iftex
 @finalout

diff --git a/texi/gnus-faq.texi b/texi/gnus-faq.texi
index 2b3c0aa..78a2274 100644 (file)
--- a/texi/gnus-faq.texi
+++ b/texi/gnus-faq.texi
@@ -1,8 +1,8 @@
 @c \input texinfo @c -*-texinfo-*-
 @c Uncomment 1st line before texing this file alone.
 @c %**start of header
-@c Copyright (C) 1995, 2001, 2002, 2003, 2004, 2005, 2006, 2007,
-@c   2008, 2009, 2010 Free Software Foundation, Inc.
+@c Copyright (C) 1995, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008,
+@c   2009, 2010 Free Software Foundation, Inc.
 @c
 @c Do not modify this file, it was generated from gnus-faq.xml, available from
 @c <URL:http://my.gnus.org/FAQ/>.
@@ -550,7 +550,7 @@ want something different, change the line above to something like this:
 @example
 (add-to-list 'gnus-secondary-select-methods
              '(nnspool ""
-                      (nnspool-directory "/usr/local/myspoolddir")))
+                       (nnspool-directory "/usr/local/myspoolddir")))
 @end example
 @noindent
 
@@ -635,8 +635,8 @@ mail, it's
 @example
 (eval-after-load "mail-source"
   '(add-to-list 'mail-sources
-               '(directory :path "/path/to/procmail-dir/"
-                           :suffix ".prcml")))
+                '(directory :path "/path/to/procmail-dir/"
+                            :suffix ".prcml")))
 @end example
 @noindent
 
@@ -691,10 +691,10 @@ about the server there.
 
 @example
 (add-to-list 'gnus-secondary-select-methods
-            '(nnimap "Give the baby a name"
-                     (nnimap-address "imap.yourProvider.net")
-                     (nnimap-port 143)
-                     (nnimap-list-pattern "archive.*")))
+             '(nnimap "Give the baby a name"
+                      (nnimap-address "imap.yourProvider.net")
+                      (nnimap-port 143)
+                      (nnimap-list-pattern "archive.*")))
 @end example
 @noindent
 
@@ -874,7 +874,7 @@ say this in ~/.gnus.el:
 @example
 (setq gnus-visible-headers
       '("^From" "^Subject" "^Date" "^Newsgroups" "^Followup-To"
-       "^User-Agent" "^X-Newsreader" "^X-Mailer"))
+        "^User-Agent" "^X-Newsreader" "^X-Mailer"))
 @end example
 @noindent
 
@@ -1099,18 +1099,18 @@ buffer top-right, article buffer bottom-right:
 (gnus-add-configuration
  '(article
    (horizontal 1.0
-              (vertical 25
-                        (group 1.0))
-              (vertical 1.0
-                        (summary 0.25 point)
-                        (article 1.0)))))
+               (vertical 25
+                         (group 1.0))
+               (vertical 1.0
+                         (summary 0.25 point)
+                         (article 1.0)))))
 (gnus-add-configuration
  '(summary
    (horizontal 1.0
-              (vertical 25
-                        (group 1.0))
-              (vertical 1.0
-                        (summary 1.0 point)))))
+               (vertical 25
+                         (group 1.0))
+               (vertical 1.0
+                         (summary 1.0 point)))))
 @end example
 @noindent
 
@@ -1480,7 +1480,7 @@ You can store your mail addresses in a ~/.mailrc file using a simple
 alias syntax:
 
 @example
-alias al       "Al <al@@english-heritage.invalid>"
+alias al        "Al <al@@english-heritage.invalid>"
 @end example
 @noindent
 
@@ -1644,9 +1644,9 @@ the group to use.
 
 @example
 (setq gnus-message-archive-group
-       '((if (message-news-p)
-             "nnml:Send-News"
-           "nnml:Send-Mail")))
+        '((if (message-news-p)
+              "nnml:Send-News"
+            "nnml:Send-Mail")))
 @end example
 @noindent
 

diff --git a/texi/gnus.texi b/texi/gnus.texi
index a921cc6..9b1fbf8 100644 (file)
--- a/texi/gnus.texi
+++ b/texi/gnus.texi
@@ -322,7 +322,7 @@ developing GNU and promoting software freedom.''
 
 @dircategory Emacs
 @direntry
-* Gnus: (gnus).         The newsreader Gnus.
+* Gnus: (gnus).                 The newsreader Gnus.
 @end direntry
 @iftex
 @finalout

diff --git a/texi/message.texi b/texi/message.texi
index fb0f9db..7b98b98 100644 (file)
--- a/texi/message.texi
+++ b/texi/message.texi
@@ -27,7 +27,8 @@ developing GNU and promoting software freedom.''
 
 @dircategory Emacs
 @direntry
-* Message: (message).   Mail and news composition mode that goes with Gnus.
+* Message: (message).           Mail and news composition mode that
+                                  goes with Gnus.
 @end direntry
 @iftex
 @finalout

diff --git a/texi/pgg.texi b/texi/pgg.texi
index 222023f..61e99bc 100644 (file)
--- a/texi/pgg.texi
+++ b/texi/pgg.texi
@@ -9,8 +9,8 @@
 This file describes PGG @value{VERSION}, an Emacs interface to various
 PGP implementations.
 
-Copyright @copyright{} 2001, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010
-Free Software Foundation, Inc.
+Copyright @copyright{} 2001, 2003, 2004, 2005, 2006, 2007, 2008, 2009,
+2010  Free Software Foundation, Inc.
 
 @quotation
 Permission is granted to copy, distribute and/or modify this document
@@ -28,7 +28,7 @@ developing GNU and promoting software freedom.''
 
 @dircategory Emacs
 @direntry
-* PGG: (pgg).   Emacs interface to various PGP implementations.
+* PGG: (pgg).                   Emacs interface to various PGP implementations.
 @end direntry
 
 @titlepage
@@ -134,7 +134,7 @@ list autoload setting for desired functions as follows.
 * User Commands::               
 * Selecting an implementation::  
 * Caching passphrase::          
-* Default user identity::      
+* Default user identity::       
 @end menu
 
 @node User Commands
@@ -377,7 +377,7 @@ variable @code{pgg-scheme-gpg-instance} and will be reused from now on.
 (defun pgg-make-scheme-gpg ()
   (or pgg-scheme-gpg-instance
       (setq pgg-scheme-gpg-instance
-           (luna-make-entity 'pgg-scheme-gpg))))
+            (luna-make-entity 'pgg-scheme-gpg))))
 @end lisp
 
 The name of the function must follow the

diff --git a/texi/sasl.texi b/texi/sasl.texi
index 53f5598..f4c0977 100644 (file)
--- a/texi/sasl.texi
+++ b/texi/sasl.texi
@@ -33,7 +33,7 @@ license to the document, as described in section 6 of the license.
 
 @dircategory Emacs
 @direntry
-* SASL: (sasl).   The Emacs SASL library.
+* SASL: (sasl).                 The Emacs SASL library.
 @end direntry
 
 
@@ -149,7 +149,7 @@ of authentication functions.
 
 @example
 (defconst sasl-anonymous-steps
-  '(identity                           ;no initial response
+  '(identity                            ;no initial response
     sasl-anonymous-response))
 
 (put 'sasl-anonymous 'sasl-mechanism
@@ -233,7 +233,7 @@ authentication protocol exchange.  For example,
 @example
 (process-send-string
  process
- (if (sasl-step-data step)             ;initial response
+ (if (sasl-step-data step)              ;initial response
      (format "AUTH %s %s\r\n" name (base64-encode-string (sasl-step-data step) t))
    (format "AUTH %s\r\n" name)))
 @end example

diff --git a/texi/sieve.texi b/texi/sieve.texi
index c4b4134..5fbab4c 100644 (file)
--- a/texi/sieve.texi
+++ b/texi/sieve.texi
@@ -9,8 +9,8 @@
 @copying
 This file documents the Emacs Sieve package, for server-side mail filtering.
 
-Copyright @copyright{} 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010
-Free Software Foundation, Inc.
+Copyright @copyright{} 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008,
+2009, 2010  Free Software Foundation, Inc.
 
 @quotation
 Permission is granted to copy, distribute and/or modify this document
@@ -228,7 +228,7 @@ the @code{fileinto} command.
 require "fileinto";
 
 if address "sender" "owner-w3-beta@@xemacs.org" @{
-       fileinto "INBOX.w3-beta";
+        fileinto "INBOX.w3-beta";
 @}
 @end example
 
@@ -239,7 +239,7 @@ required.
 
 @example
 if header :contains "Delivered-To" "auc-tex@@sunsite.dk" @{
-       fileinto "INBOX.auc-tex";
+        fileinto "INBOX.auc-tex";
 @}
 @end example
 
@@ -250,7 +250,7 @@ has been required.
 
 @example
 if address ["to", "cc"] "kerberos@@mit.edu" @{
-       fileinto "INBOX.kerberos";
+        fileinto "INBOX.kerberos";
 @}
 @end example