From: Karl Berry <karl@gnu.org>
Date: Mon, 24 Oct 2011 02:31:55 +0000 (+0700)
Subject: doc: modernize libtool.texi.
X-Git-Tag: v2.4.2.418~314
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=5db3dbc5b71d8b344a30010d00eb0f00a7af1b15;p=thirdparty%2Flibtool.git

doc: modernize libtool.texi.

* libtool.texi (@copying): Use this instead of @ifnottex; format for
Texinfo; eliminate obsolete paragraph about TeX; use @insertcopying
instead of duplicating text.
(@syncodeindex): Move all to the Texinfo header, where they belong.
(@dircategory): Use "Software development" instead of "GNU programming
tools", for consistency; and align individual entries to avoid
multiple lines; and move to after the copyright message.

Signed-off-by: Gary V. Vaughan <gary@gnu.org>
---

diff --git a/ChangeLog b/ChangeLog
index a3728f2e3..8fc910eb1 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,14 @@
+2011-10-24  Karl Berry  <karl@gnu.org>
+
+	doc: modernize libtool.texi.
+	* libtool.texi (@copying): Use this instead of @ifnottex; format for
+	Texinfo; eliminate obsolete paragraph about TeX; use @insertcopying
+	instead of duplicating text.
+	(@syncodeindex): Move all to the Texinfo header, where they belong.
+	(@dircategory): Use "Software development" instead of "GNU programming
+	tools", for consistency; and align individual entries to avoid
+	multiple lines; and move to after the copyright message.
+
 2011-10-19  Gary V. Vaughan  <gary@gnu.org>
 
 	maint: use gnulib's maintainer-makefile module.
diff --git a/doc/libtool.texi b/doc/libtool.texi
index d6fc53dd4..462efa5f1 100644
--- a/doc/libtool.texi
+++ b/doc/libtool.texi
@@ -4,6 +4,12 @@
 @settitle Libtool
 @c For double-sided printing, uncomment:
 @c @setchapternewpage odd
+@c Put everything in one index (arbitrarily chosen to be the concept index).
+
+@syncodeindex vr cp
+@syncodeindex fn cp
+@syncodeindex tp cp
+@synindex pg cp
 @c %**end of header
 
 @include version.texi
@@ -11,37 +17,29 @@
 @set MAILLIST the Libtool mailing list @email{libtool@@gnu.org}
 @set objdir .libs
 
-@dircategory GNU programming tools
-@direntry
-* Libtool: (libtool).           Generic shared library support script.
-@end direntry
-
-@dircategory Individual utilities
-@direntry
-* libtool-invocation: (libtool)Invoking libtool.
-                                                Running the @code{libtool} script.
-* libtoolize: (libtool)Invoking libtoolize.     Adding libtool support.
-@end direntry
+@copying
+This manual is for GNU Libtool (version @value{VERSION}, @value{UPDATED}).
 
-@ifnottex
-This file documents GNU Libtool @value{VERSION}
-
-Copyright (C) 1996-2011 Free Software Foundation, Inc.
+Copyright @copyright{} 1996--2011 Free Software Foundation, Inc.
 
 Permission is granted to copy, distribute and/or modify this document
 under the terms of the GNU Free Documentation License, Version 1.3
 or any later version published by the Free Software Foundation;
 with no Invariant Sections, with no Front-Cover Texts,
 and with no Back-Cover Texts.  A copy of the license is included in
-the section entitled "GNU Free Documentation License".
+the section entitled ``GNU Free Documentation License''.
+@end copying
 
-@ignore
-Permission is granted to process this file through TeX and print the
-results, provided the printed document carries copying permission notice
-identical to this one except for the removal of this paragraph
+@dircategory Software development
+@direntry
+* Libtool: (libtool).           Generic shared library support script.
+@end direntry
 
-@end ignore
-@end ifnottex
+@dircategory Individual utilities
+@direntry
+* libtool-invocation: (libtool)Invoking libtool. Running the @code{libtool} script.
+* libtoolize: (libtool)Invoking libtoolize.      Adding libtool support.
+@end direntry
 
 @titlepage
 @title GNU Libtool
@@ -53,23 +51,9 @@ identical to this one except for the removal of this paragraph
 
 @page
 @vskip 0pt plus 1filll
-Copyright @copyright{} 1996-2011 Free Software Foundation, Inc.
-
-Permission is granted to copy, distribute and/or modify this document
-under the terms of the GNU Free Documentation License, Version 1.3
-or any later version published by the Free Software Foundation;
-with no Invariant Sections, with no Front-Cover Texts,
-and with no Back-Cover Texts.  A copy of the license is included in
-the section entitled "GNU Free Documentation License".
-
+@insertcopying
 @end titlepage
 
-@c Put everything in one index (arbitrarily chosen to be the concept index).
-@syncodeindex vr cp
-@syncodeindex fn cp
-@syncodeindex tp cp
-@synindex pg cp
-
 @contents
 
 @ifnottex