Merge changes from emacs-23 branch. Synch with No Gnus (201007120014).

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/auth-ja.texi b/auth-ja.texi
index bc88c24..ea190bd 100644 (file)
--- a/auth-ja.texi
+++ b/auth-ja.texi
@@ -47,7 +47,7 @@ license to the document, as described in section 6 of the license.
 
 @dircategory Emacs
 @direntry
-* Auth-source-ja: (auth-ja).   The Emacs auth-source library (Japanese).
+* Auth-source-ja: (auth-ja).    The Emacs auth-source library (Japanese).
 @end direntry
 
 @titlepage

diff --git a/emacs-mime-ja.texi b/emacs-mime-ja.texi
index 900b0f2..527d980 100644 (file)
--- a/emacs-mime-ja.texi
+++ b/emacs-mime-ja.texi
@@ -44,7 +44,9 @@ developing GNU and promoting software freedom.''
 @c
 @dircategory Emacs
 @direntry
-* Emacs MIME-ja: (emacs-mime-ja). Emacs MIME de/composition library (Japanese).
+* Emacs MIME-ja: (emacs-mime-ja).
+                                Emacs MIME de/composition library
+                                  (Japanese).
 @end direntry
 @iftex
 @finalout

diff --git a/gnus-coding-ja.texi b/gnus-coding-ja.texi
index f51f7b5..551c461 100644 (file)
--- a/gnus-coding-ja.texi
+++ b/gnus-coding-ja.texi
@@ -11,7 +11,8 @@
 
 @dircategory Emacs
 @direntry
-* Gnus Coding-ja: (gnus-coding-ja).  Gnus Coding Style and Maintainance Guide
+* Gnus Coding-ja: (gnus-coding-ja).
+                                Gnus Coding Style and Maintainance Guide.
 @end direntry
 
 @copying

diff --git a/gnus-faq-ja.texi b/gnus-faq-ja.texi
index 5e43ac4..18eaddf 100644 (file)
--- a/gnus-faq-ja.texi
+++ b/gnus-faq-ja.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 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/>.
@@ -1515,7 +1515,7 @@ flyspell.el} \e$B$rMQ0U$7$F$/$@$5$$!#\e(B@file{ispell.el} \e$B$O\e(B Emacs \e$B$H$H$b
 \e$B%9$rEPO?$7$F$*$/$3$H$,$G$-$^$9\e(B:
 
 @example
-alias al       "Al <al@@english-heritage.invalid>"
+alias al        "Al <al@@english-heritage.invalid>"
 @end example
 
 @noindent

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

diff --git a/pgg-ja.texi b/pgg-ja.texi
index f1985f5..a840875 100644 (file)
--- a/pgg-ja.texi
+++ b/pgg-ja.texi
@@ -12,8 +12,8 @@
 \e$B$3$N%U%!%$%k$OMM!9$J\e(B PGP \e$B$N<BAu$X$N\e(B Emacs \e$B%$%s%?!<%U%'!<%9$G$"$k\e(B PGG
 @value{VERSION} \e$B$r@bL@$7$^$9!#\e(B
 
-Copyright @copyright{} 2001, 2003, 2004, 2005, 2006, 2007, 2008, 2009
-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
@@ -41,7 +41,8 @@ developing GNU and promoting software freedom.''
 
 @dircategory Emacs
 @direntry
-* PGG-ja: (pgg-ja).        Emacs interface to various PGP implementations (Ja).
+* PGG-ja: (pgg-ja).             Emacs interface to various PGP
+                                  implementations (Japanese).
 @end direntry
 
 @titlepage
@@ -147,7 +148,7 @@ PGG \e$B$r;H$&$?$a$K$O!"%"%W%j%1!<%7%g%s%W%m%0%i%`$NKAF,$G<!$N\e(B S \e$B<0$rI>2A$7
 * User Commands::               
 * Selecting an implementation::  
 * Caching passphrase::          
-* Default user identity::      
+* Default user identity::       
 @end menu
 
 @node User Commands
@@ -391,7 +392,7 @@ PGG \e$B$O\e(B PGP \e$B$N5!G=$K%"%/%;%9$9$k$HF1;~$K$=$l$r3+H/$9$k$?$a$K@_7W$5$l$?$N
 (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
 
 \e$B4X?t$NL>A0$O\e(B @code{pgg-make-scheme-} \e$B$N8e$m$K%P%C%/%(%s%IL>$rIU2C$7$?$b\e(B

diff --git a/sieve-ja.texi b/sieve-ja.texi
index 767c8a1..c1a28c3 100644 (file)
--- a/sieve-ja.texi
+++ b/sieve-ja.texi
@@ -41,7 +41,8 @@ developing GNU and promoting software freedom.''
 
 @dircategory Emacs
 @direntry
-* Sieve-ja: (sieve-ja).         Managing Sieve scripts in Emacs (Japanese).
+* Sieve-ja: (sieve-ja).         Managing Sieve scripts in Emacs
+                                  (Japanese).
 @end direntry
 @iftex
 @finalout
@@ -237,7 +238,7 @@ Sieve \e$B$r=OCN$7$F$$$J$$$J$i!"$3$N>O$K$[$s$N>/$7$@$1$"$k%3!<%I$NCGJR$rMxMQ\e(B
 require "fileinto";
 
 if address "sender" "owner-w3-beta@@xemacs.org" @{
-       fileinto "INBOX.w3-beta";
+        fileinto "INBOX.w3-beta";
 @}
 @end example
 
@@ -247,7 +248,7 @@ if address "sender" "owner-w3-beta@@xemacs.org" @{
 
 @example
 if header :contains "Delivered-To" "auc-tex@@sunsite.dk" @{
-       fileinto "INBOX.auc-tex";
+        fileinto "INBOX.auc-tex";
 @}
 @end example
 
@@ -258,7 +259,7 @@ if header :contains "Delivered-To" "auc-tex@@sunsite.dk" @{
 
 @example
 if address ["to", "cc"] "kerberos@@mit.edu" @{
-       fileinto "INBOX.kerberos";
+        fileinto "INBOX.kerberos";
 @}
 @end example