Ensure that FDL invocation appears in the info version of the manual.

diff --git a/doc/ChangeLog b/doc/ChangeLog
index 8f200b21ccbad335ca5c4134fd677b56040a3d20..cbbe19711baa175f68203d264e50762c063015df 100644 (file)
--- a/doc/ChangeLog
+++ b/doc/ChangeLog
@@ -1,5 +1,9 @@
-2008-01-25  Micah Cowan  <micah@cowan.name>
+2008-01-31  Micah Cowan  <micah@cowan.name>
+
+       * wget.texi: Ensure that license info appears in the info
+       version of the manual.
 
+2008-01-25  Micah Cowan  <micah@cowan.name>
        * Makefile.am, wget.texi: Updated copyright year.
 
 2007-12-10  Micah Cowan  <micah@cowan.name>

diff --git a/doc/wget.texi b/doc/wget.texi
index ec9ad91354232b836021152850b3d4ba19b4c579..b0ef808454c974cdb0e1dab841b281ae47c3e270 100644 (file)
--- a/doc/wget.texi
+++ b/doc/wget.texi
@@ -26,7 +26,7 @@
 * Wget: (wget).         The non-interactive network downloader.
 @end direntry
 
-@ifnottex
+@copying
 This file documents the GNU Wget utility for downloading network
 data.
 
@@ -34,9 +34,11 @@ data.
 Copyright @copyright{} 1996, 1997, 1998, 1999, 2000, 2001, 2002,
 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
 
+@iftex
 Permission is granted to make and distribute verbatim copies of
 this manual provided the copyright notice and this permission notice
 are preserved on all copies.
+@end iftex
 
 @ignore
 Permission is granted to process this file through TeX and print the
@@ -51,7 +53,7 @@ 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''.
 @c man end
-@end ifnottex
+@end copying
 
 @titlepage
 @title GNU Wget @value{VERSION}
@@ -75,26 +77,17 @@ Info entry for @file{wget}.
 
 @page
 @vskip 0pt plus 1filll
-Copyright @copyright{} 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-2003, 2004, 2005, 2006, 2007, 2008 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.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''.
+@insertcopying
 @end titlepage
 
+@contents
+
 @ifnottex
 @node Top
 @top Wget @value{VERSION}
 
-This manual documents version @value{VERSION} of GNU Wget, the freely
-available utility for network downloads.
-
-Copyright @copyright{} 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
+@insertcopying
+@end ifnottex
 
 @menu
 * Overview::            Features of Wget.
@@ -109,7 +102,6 @@ Copyright @copyright{} 1996, 1997, 1998, 1999, 2000, 2001, 2002,
 * Copying this manual:: You may give out copies of Wget and of this manual.
 * Concept Index::       Topics covered by this manual.
 @end menu
-@end ifnottex
 
 @node Overview
 @chapter Overview