[svn] Update version and include minor doc fixes.

diff --git a/doc/ChangeLog b/doc/ChangeLog
index 28cc49e8be68b374558aeab90ac90eab9f89e273..01252096e1d8ca9a83191a483def519e366bfea3 100644 (file)
--- a/doc/ChangeLog
+++ b/doc/ChangeLog
@@ -1,3 +1,10 @@
+2005-04-25  Hrvoje Niksic  <hniksic@xemacs.org>
+
+       * Makefile.in (wget.info): Depend on version.texi as well.
+
+       * wget.texi: Simplify copyright.  Replace remaining instances of
+       --OPTION=off with --no-OPTION.
+
 2005-04-24  Hrvoje Niksic  <hniksic@xemacs.org>
 
        * wget.texi (Download Options): Document --prefer-family.

diff --git a/doc/Makefile.in b/doc/Makefile.in
index e684e17d25df7d065c7f236be7d413d755f298b1..9b4530ee0718093af0cfe4a3dcba46961d572d1c 100644 (file)
--- a/doc/Makefile.in
+++ b/doc/Makefile.in
@@ -65,14 +65,14 @@ everything: all wget_us.ps wget_a4.ps wget_toc.html
 $(SAMPLERCTEXI): $(srcdir)/sample.wgetrc
        sed s/@/@@/g $? > $@
 
-wget.info: $(srcdir)/wget.texi $(SAMPLERCTEXI)
+wget.info: $(srcdir)/wget.texi $(SAMPLERCTEXI) $(srcdir)/version.texi
        $(MAKEINFO) -I$(srcdir) $(srcdir)/wget.texi
 
 $(TEXI2POD): $(srcdir)/$(TEXI2POD).in
        sed 's,^#! /usr/bin/perl,#! @PERL@,' $? > $@
        chmod u+x $@
 
-wget.pod: $(srcdir)/wget.texi $(TEXI2POD)
+wget.pod: $(srcdir)/wget.texi $(TEXI2POD) $(srcdir)/version.texi
        ./$(TEXI2POD) $(srcdir)/wget.texi $@
 
 $(MAN): wget.pod

diff --git a/doc/version.texi b/doc/version.texi
index 9d6255e3eb5a42ea6ba1f79abf67f1adf8824ba9..1d968b2f5203330607fdd6cf588edbb75f05d630 100644 (file)
--- a/doc/version.texi
+++ b/doc/version.texi
@@ -1 +1 @@
-@set VERSION 1.9+cvs-dev
+@set VERSION 1.10-alpha2+cvs-dev

diff --git a/doc/wget.texi b/doc/wget.texi
index bb59b4d689993609e4f20521bba7e931edd8a7cc..71a546eec1c3b02685d1647216cc63b3bdbe8dc8 100644 (file)
--- a/doc/wget.texi
+++ b/doc/wget.texi
@@ -3,7 +3,7 @@
 @c %**start of header
 @setfilename wget.info
 @include version.texi
-@set UPDATED Jan 2005
+@set UPDATED Apr 2005
 @settitle GNU Wget @value{VERSION} Manual
 @c Disable the monstrous rectangles beside overfull hbox-es.
 @finalout
@@ -31,8 +31,7 @@ This file documents the the GNU Wget utility for downloading network
 data.
 
 @c man begin COPYRIGHT
-Copyright @copyright{} 1996, 1997, 1998, 2000, 2001, 2002, 2003, 2004, 2005
-Free Software Foundation, Inc.
+Copyright @copyright{} 1996--2005 Free Software Foundation, Inc.
 
 Permission is granted to make and distribute verbatim copies of
 this manual provided the copyright notice and this permission notice
@@ -71,8 +70,7 @@ GNU Info entry for @file{wget}.
 
 @page
 @vskip 0pt plus 1filll
-Copyright @copyright{} 1996, 1997, 1998, 2000, 2001, 2003, 2004, 2005,
-Free Software Foundation, Inc.
+Copyright @copyright{} 1996--2005, 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
@@ -90,8 +88,7 @@ entitled ``GNU Free Documentation License''.
 This manual documents version @value{VERSION} of GNU Wget, the freely
 available utility for network downloads.
 
-Copyright @copyright{} 1996, 1997, 1998, 2000, 2001, 2003, 2004, 2005
-Free Software Foundation, Inc.
+Copyright @copyright{} 1996--2005 Free Software Foundation, Inc.
 
 @menu
 * Overview::            Features of Wget.
@@ -798,7 +795,8 @@ actions of one.
 
 @cindex proxy
 @item -Y on/off
-@itemx --proxy=on/off
+@itemx --proxy
+@itemx --no-proxy
 Turn proxy support on or off.  The proxy is on by default if the
 appropriate environment variable is defined.
 
@@ -3019,7 +3017,8 @@ may be specified from within Wget itself.
 
 @table @samp
 @item -Y on/off
-@itemx --proxy=on/off
+@itemx --proxy
+@itemx --no-proxy
 @itemx proxy = on/off
 This option may be used to turn the proxy support on or off.  Proxy
 support is on by default, provided that the appropriate environment