From c852d79bb9e6aee1025265e8f47b5ae398e7e8ad Mon Sep 17 00:00:00 2001 From: yamaoka Date: Mon, 12 Jul 2010 01:23:28 +0000 Subject: [PATCH] Merge changes from emacs-23 branch. Synch with No Gnus (201007120014). 2010-06-24 Glenn Morris * 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 * gnus-faq.texi, pgg.texi, sasl.texi, sieve.texi: Untabify. --- auth-ja.texi | 2 +- emacs-mime-ja.texi | 4 +++- gnus-coding-ja.texi | 3 ++- gnus-faq-ja.texi | 6 +++--- message-ja.texi | 4 ++-- pgg-ja.texi | 11 ++++++----- sieve-ja.texi | 9 +++++---- 7 files changed, 22 insertions(+), 17 deletions(-) diff --git a/auth-ja.texi b/auth-ja.texi index bc88c24..ea190bd 100644 --- 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 --- 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 --- 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 --- 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 . @@ -1515,7 +1515,7 @@ flyspell.el} $B$rMQ0U$7$F$/$@$5$$!#(B@file{ispell.el} $B$O(B Emacs $B$H$H$b $B%9$rEPO?$7$F$*$/$3$H$,$G$-$^$9(B: @example -alias al "Al " +alias al "Al " @end example @noindent diff --git a/message-ja.texi b/message-ja.texi index c98c967..fc0cf10 100644 --- 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 --- a/pgg-ja.texi +++ b/pgg-ja.texi @@ -12,8 +12,8 @@ $B$3$N%U%!%$%k$OMM!9$J(B PGP $B$N2A$7 * User Commands:: * Selecting an implementation:: * Caching passphrase:: -* Default user identity:: +* Default user identity:: @end menu @node User Commands @@ -391,7 +392,7 @@ PGG $B$O(B PGP $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 $B4X?t$NL>A0$O(B @code{pgg-make-scheme-} $B$N8e$m$K%P%C%/%(%s%IL>$rIU2C$7$?$b(B diff --git a/sieve-ja.texi b/sieve-ja.texi index 767c8a1..c1a28c3 100644 --- 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 $B$r=OCN$7$F$$$J$$$J$i!"$3$N>O$K$[$s$N>/$7$@$1$"$k%3!<%I$NCGJR$rMxMQ(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 -- 1.7.10.4