Synch with No Gnus (200705022119).

diff --git a/ChangeLog b/ChangeLog
index b990c82..d470a18 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,9 @@
 2007-05-02  Katsumi Yamaoka  <yamaoka@jpl.org>
 
+       * infohack.el (infohack-texi-format): Revert.
+
+2007-05-02  Katsumi Yamaoka  <yamaoka@jpl.org>
+
        * Gnus-Doc-Ja: The version for No Gnus v0.6 is released.
 
        * infohack.el (infohack-texi-format): Remove duplicate @node in

diff --git a/README b/README
index b9a01b1..9013d76 100644 (file)
--- a/README
+++ b/README
@@ -1,5 +1,5 @@
 These are the complete Japanese translations of the Gnus Info manuals,
-corresponding to No Gnus v0.6.
+corresponding to No Gnus v0.7.
 
 Installation
 ============

diff --git a/README.ja b/README.ja
index c90c8f0..c1983e0 100644 (file)
--- a/README.ja
+++ b/README.ja
@@ -1,4 +1,4 @@
-Gnus \e$B$N\e(B Info \e$B%^%K%e%"%k$NA4Lu$G$9!#\e(BNo Gnus v0.6 \e$B$KBP1~$7$^$9!#\e(B
+Gnus \e$B$N\e(B Info \e$B%^%K%e%"%k$NA4Lu$G$9!#\e(BNo Gnus v0.7 \e$B$KBP1~$7$^$9!#\e(B
 
 \e$B%$%s%9%H!<%k\e(B
 ============
@@ -121,15 +121,15 @@ XEmacs \e$B$r;H$C$F$$$k>l9g$O!"!vI,$:!v\e(B "./configure && make EMACS=xemacs"
 \e$B2<$N$h$&$J$b$N$r\e(B .emacs \e$B%U%!%$%k$+!"$^$?$O$=$&$$$&$b$N$r<}$a$F$*$/>l=j\e(B
 \e$B$K=q$-9~$a$PNI$$$G$7$g$&!#\e(B
 
-   (setq load-path (cons (expand-file-name "~/ngnus-0.6/lisp") load-path))
+   (setq load-path (cons (expand-file-name "~/ngnus-0.7/lisp") load-path))
    (require 'gnus-load)
 
 Gnus \e$B$N%^%K%e%"%k$rFI$a$k$h$&$K$9$k$K$O!"$3$N$h$&$J$b$N$r;H$C$F2<$5$$!#\e(B
 
   (require 'info)
   (if (featurep 'xemacs)
-      (add-to-list 'Info-directory-list "~/ngnus-0.6/texi/")
-    (add-to-list 'Info-default-directory-list "~/ngnus-0.6/texi/"))
+      (add-to-list 'Info-directory-list "~/ngnus-0.7/texi/")
+    (add-to-list 'Info-default-directory-list "~/ngnus-0.7/texi/"))
 
 No Gnus \e$B$O\e(B Emacs 21.1 \e$B$+\e(B XEmacs 21.4 \e$B$h$j8E$$$b$N$G$OA4A3F0$-$^$;$s!#\e(B
 

diff --git a/doclicense.texi b/doclicense.texi
index 465bbbd..d23accd 100644 (file)
--- a/doclicense.texi
+++ b/doclicense.texi
@@ -1,7 +1,4 @@
 @c -*-texinfo-*-
-@node GNU Free Documentation License, Intro, Copying, Top
-
-@appendix GNU Free Documentation License
 @center Version 1.2, November 2002
 
 @display
@@ -24,7 +21,7 @@ Secondarily, this License preserves for the author and publisher a way
 to get credit for their work, while not being considered responsible
 for modifications made by others.
 
-This License is a kind of ``copyleft'', which means that derivative
+This License is a kind of ``copyleft,'' which means that derivative
 works of the document must themselves be free in the same sense.  It
 complements the GNU General Public License, which is a copyleft
 license designed for free software.
@@ -45,9 +42,9 @@ This License applies to any manual or other work, in any medium, that
 contains a notice placed by the copyright holder saying it can be
 distributed under the terms of this License.  Such a notice grants a
 world-wide, royalty-free license, unlimited in duration, to use that
-work under the conditions stated herein.  The ``Document'', below,
+work under the conditions stated herein.  The ``Document,'' below,
 refers to any such manual or work.  Any member of the public is a
-licensee, and is addressed as ``you''.  You accept the license if you
+licensee, and is addressed as ``you.''  You accept the license if you
 copy, modify or distribute the work in a way requiring permission
 under copyright law.
 
@@ -114,8 +111,8 @@ preceding the beginning of the body of the text.
 A section ``Entitled XYZ'' means a named subunit of the Document whose
 title either is precisely XYZ or contains XYZ in parentheses following
 text that translates XYZ in another language.  (Here XYZ stands for a
-specific section name mentioned below, such as ``Acknowledgements'',
-``Dedications'', ``Endorsements'', or ``History''.)  To ``Preserve the Title''
+specific section name mentioned below, such as ``Acknowledgements,''
+``Dedications,'' ``Endorsements,'' or ``History.'')  To ``Preserve the Title''
 of such a section when you modify the Document means that it remains a
 section ``Entitled XYZ'' according to this definition.
 
@@ -211,7 +208,7 @@ F. Include, immediately after the copyright notices, a license notice
 G. Preserve in that license notice the full lists of Invariant Sections
    and required Cover Texts given in the Document's license notice.@*
 H. Include an unaltered copy of this License.@*
-I. Preserve the section Entitled ``History'', Preserve its Title, and add
+I. Preserve the section Entitled ``History,'' Preserve its Title, and add
    to it an item stating at least the title, year, new authors, and
    publisher of the Modified Version as given on the Title Page.  If
    there is no section Entitled ``History'' in the Document, create one
@@ -225,7 +222,7 @@ J. Preserve the network location, if any, given in the Document for
    You may omit a network location for a work that was published at
    least four years before the Document itself, or if the original
    publisher of the version it refers to gives permission.@*
-K. For any section Entitled ``Acknowledgements'' or ``Dedications'',
+K. For any section Entitled ``Acknowledgements'' or ``Dedications,''
    Preserve the Title of the section, and preserve in the section all
    the substance and tone of each of the contributor acknowledgements
    and/or dedications given therein.@*
@@ -245,7 +242,7 @@ of these sections as invariant.  To do this, add their titles to the
 list of Invariant Sections in the Modified Version's license notice.
 These titles must be distinct from any other section titles.
 
-You may add a section Entitled ``Endorsements'', provided it contains
+You may add a section Entitled ``Endorsements,'' provided it contains
 nothing but endorsements of your Modified Version by various
 parties--for example, statements of peer review or that the text has
 been approved by an organization as the authoritative definition of a
@@ -286,7 +283,7 @@ Invariant Sections in the license notice of the combined work.
 
 In the combination, you must combine any sections Entitled ``History''
 in the various original documents, forming one section Entitled
-``History''; likewise combine any sections Entitled ``Acknowledgements'',
+``History''; likewise combine any sections Entitled ``Acknowledgements,''
 and any sections Entitled ``Dedications.''  You must delete all sections
 Entitled ``Endorsements.''
 @sp 1
@@ -340,8 +337,8 @@ of those notices and disclaimers.  In case of a disagreement between
 the translation and the original version of this License or a notice
 or disclaimer, the original version will prevail.
 
-If a section in the Document is Entitled ``Acknowledgements'',
-``Dedications'', or ``History'', the requirement (section 4) to Preserve
+If a section in the Document is Entitled ``Acknowledgements,''
+``Dedications,'' or ``History,'' the requirement (section 4) to Preserve
 its Title (section 1) will typically require changing the actual
 title.
 @sp 1
@@ -390,7 +387,7 @@ under the terms of the GNU Free Documentation License, Version 1.2
 or any later version published by the Free Software Foundation;
 with no Invariant Sections, no Front-Cover Texts, and no Back-Cover Texts.
 A copy of the license is included in the section entitled ``GNU
-Free Documentation License''.
+Free Documentation License.''
 @end group
 @end smallexample
 

diff --git a/gnus-ja.texi b/gnus-ja.texi
index 9ecf6b7..7a19237 100644 (file)
--- a/gnus-ja.texi
+++ b/gnus-ja.texi
@@ -69,7 +69,7 @@ license to the document, as described in section 6 of the license.
 \makeindex
 \begin{document}
 
-\newcommand{\gnusversionname}{No Gnus v0.6}
+\newcommand{\gnusversionname}{No Gnus v0.7}
 \newcommand{\gnuschaptername}{}
 \newcommand{\gnussectionname}{}
 
@@ -374,7 +374,7 @@ Gnus \e$B$r;H$&$3$H$K$h$C$F\e(B Emacs \e$B$G%K%e!<%9$r\e(B (\e$B$=$l$K%a!<%k$b\e(B) \e$
 \e$B$"$i$f$k6K0-$J<jCJ$r6n;H$7$F<j$KF~$l$k$3$H$,$G$-$^$9!#1?;n$7$r$7$F$_$h$&\e(B
 \e$B$H;W$&$J$i$P!"$9$Y$F$rF1;~$KMQ$$$k$3$H$b$G$-$^$9!#\e(B
 
-\e$B$3$N@bL@=q$O\e(B No Gnus v0.6 \e$B$KBP1~$7$^$9!#\e(B
+\e$B$3$N@bL@=q$O\e(B No Gnus v0.7 \e$B$KBP1~$7$^$9!#\e(B
 @end ifinfo
 @iftex
 

diff --git a/infohack.el b/infohack.el
index 71f3e02..2215304 100644 (file)
--- a/infohack.el
+++ b/infohack.el
@@ -164,14 +164,7 @@ Both characters must have the same length of multi-byte form."
                          (beginning-of-line)
                          (delete-region (point) (save-excursion
                                                   (forward-line 1)
-                                                  (point)))))
-                   (goto-char (point-min))
-                   ;; Remove `@node' line having appeared in parent file.
-                   (if (re-search-forward
-                        "^@node GNU Free Documentation License" nil t)
-                       (let ((start (match-beginning 0)))
-                         (forward-line 1)
-                         (delete-region start (point)))))))))
+                                                  (point))))))))))
          ;; Remove ignored areas.
          (goto-char (point-min))
          (while (re-search-forward "^@ignore[\t\r ]*$" nil t)

diff --git a/message-ja.texi b/message-ja.texi
index 48b80d6..9852930 100644 (file)
--- a/message-ja.texi
+++ b/message-ja.texi
@@ -93,7 +93,7 @@ Gnus \e$B$N$9$Y$F$N%a%C%;!<%8$N:n@.\e(B (\e$B%a!<%k$H%K%e!<%9$NN>J}\e(B) \e$B$O!"%a%C
 @end menu
 
 Message \e$B$O\e(B Gnus \e$B$H$H$b$KG[I[$5$l$^$9!#$3$N%^%K%e%"%k$KBP1~$9$k\e(B Gnus \e$B$NHG\e(B
-\e$B$O\e(B No Gnus v0.6 \e$B$G$9!#\e(B
+\e$B$O\e(B No Gnus v0.7 \e$B$G$9!#\e(B
 
 @node Interface
 @chapter \e$B%$%s%?!<%U%'!<%9\e(B