[svn] Merge of fix for bugs 20341 and 20410.

[wget] / doc / wget.texi

diff --git a/doc/wget.texi b/doc/wget.texi
index 5b80328dbe9f2bea531ec4a676fb7c5c81f12dcd..bd4c39164daa6681d7f8671db4eeccb97feff3f2 100644 (file)
--- a/doc/wget.texi
+++ b/doc/wget.texi
@@ -3,7 +3,7 @@
 @c %**start of header
 @setfilename wget.info
 @include version.texi
 @c %**start of header
 @setfilename wget.info
 @include version.texi

-@set UPDATED Apr 2005
+@set UPDATED Jul 2006

 @settitle GNU Wget @value{VERSION} Manual
 @c Disable the monstrous rectangles beside overfull hbox-es.
 @finalout
 @settitle GNU Wget @value{VERSION} Manual
 @c Disable the monstrous rectangles beside overfull hbox-es.
 @finalout


@@ -31,7 +31,7 @@ This file documents the the GNU Wget utility for downloading network
 data.
 
 @c man begin COPYRIGHT
 data.
 
 @c man begin COPYRIGHT

-Copyright @copyright{} 1996--2005 Free Software Foundation, Inc.
+Copyright @copyright{} 1996--2006 Free Software Foundation, Inc.

 
 Permission is granted to make and distribute verbatim copies of
 this manual provided the copyright notice and this permission notice
 
 Permission is granted to make and distribute verbatim copies of
 this manual provided the copyright notice and this permission notice


@@ -45,11 +45,10 @@ notice identical to this one except for the removal of this paragraph
 @end ignore
 Permission is granted to copy, distribute and/or modify this document
 under the terms of the GNU Free Documentation License, Version 1.2 or
 @end ignore
 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 the
-Invariant Sections being ``GNU General Public License'' and ``GNU Free
-Documentation License'', 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''.
+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''.

 @c man end
 @end ifnottex
 
 @c man end
 @end ifnottex
 


@@ -62,6 +61,7 @@ entitled ``GNU Free Documentation License''.
 @ignore
 @c man begin AUTHOR
 Originally written by Hrvoje Niksic <hniksic@xemacs.org>.
 @ignore
 @c man begin AUTHOR
 Originally written by Hrvoje Niksic <hniksic@xemacs.org>.

+Currently maintained by Micah Cowan <micah@cowan.name>.

 @c man end
 @c man begin SEEALSO
 GNU Info entry for @file{wget}.
 @c man end
 @c man begin SEEALSO
 GNU Info entry for @file{wget}.


@@ -70,15 +70,14 @@ GNU Info entry for @file{wget}.
 
 @page
 @vskip 0pt plus 1filll
 
 @page
 @vskip 0pt plus 1filll

-Copyright @copyright{} 1996--2005, Free Software Foundation, Inc.
+Copyright @copyright{} 1996--2006, 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
 
 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 the
-Invariant Sections being ``GNU General Public License'' and ``GNU Free
-Documentation License'', 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''.
+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''.

 @end titlepage
 
 @ifnottex
 @end titlepage
 
 @ifnottex


@@ -88,7 +87,7 @@ entitled ``GNU Free Documentation License''.
 This manual documents version @value{VERSION} of GNU Wget, the freely
 available utility for network downloads.
 
 This manual documents version @value{VERSION} of GNU Wget, the freely
 available utility for network downloads.
 

-Copyright @copyright{} 1996--2005 Free Software Foundation, Inc.
+Copyright @copyright{} 1996--2006 Free Software Foundation, Inc.

 
 @menu
 * Overview::            Features of Wget.
 
 @menu
 * Overview::            Features of Wget.


@@ -100,7 +99,7 @@ Copyright @copyright{} 1996--2005 Free Software Foundation, Inc.
 * Examples::            Examples of usage.
 * Various::             The stuff that doesn't fit anywhere else.
 * Appendices::          Some useful references.
 * Examples::            Examples of usage.
 * Various::             The stuff that doesn't fit anywhere else.
 * Appendices::          Some useful references.

-* Copying::             You may give out copies of Wget and of this manual.
+* 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
 * Concept Index::       Topics covered by this manual.
 @end menu
 @end ifnottex


@@ -213,8 +212,8 @@ User startup file.
 @item
 Finally, GNU Wget is free software.  This means that everyone may use
 it, redistribute it and/or modify it under the terms of the GNU General
 @item
 Finally, GNU Wget is free software.  This means that everyone may use
 it, redistribute it and/or modify it under the terms of the GNU General

-Public License, as published by the Free Software Foundation
-(@pxref{Copying}).
+Public License, as published by the Free Software Foundation (see the
+file @file{COPYING} that came with GNU Wget, for details).

 @end itemize
 
 @node Invoking
 @end itemize
 
 @node Invoking


@@ -832,7 +831,9 @@ actions of one.
 Don't use proxies, even if the appropriate @code{*_proxy} environment
 variable is defined.
 
 Don't use proxies, even if the appropriate @code{*_proxy} environment
 variable is defined.
 

+@c man end

 For more information about the use of proxies with Wget, @xref{Proxies}.
 For more information about the use of proxies with Wget, @xref{Proxies}.

+@c man begin OPTIONS

 
 @cindex quota
 @item -Q @var{quota}
 
 @cindex quota
 @item -Q @var{quota}


@@ -1834,6 +1835,15 @@ ignore @code{<LINK>}, because then stylesheets will not be downloaded.
 Now the best bet for downloading a single page and its requisites is the
 dedicated @samp{--page-requisites} option.
 
 Now the best bet for downloading a single page and its requisites is the
 dedicated @samp{--page-requisites} option.
 

+@cindex case fold
+@cindex ignore case
+@item --ignore-case
+Ignore case when matching files and directories.  This influences the
+behavior of -R, -A, -I, and -X options, as well as globbing
+implemented when downloading from FTP sites.  For example, with this
+option, @samp{-A *.txt} will match @samp{file1.txt}, but also
+@samp{file2.TXT}, @samp{file3.TxT}, and so on.
+

 @item -H
 @itemx --span-hosts
 Enable spanning across hosts when doing recursive retrieving
 @item -H
 @itemx --span-hosts
 Enable spanning across hosts when doing recursive retrieving


@@ -2644,6 +2654,10 @@ Set @sc{http} user to @var{string}, equivalent to
 Use @var{string} as @sc{https} proxy, instead of the one specified in
 environment.
 
 Use @var{string} as @sc{https} proxy, instead of the one specified in
 environment.
 

+@item ignore_case = on/off
+When set to on, match files and directories case insensitively; the
+same as @samp{--ignore-case}.
+

 @item ignore_length = on/off
 When set to on, ignore @code{Content-Length} header; the same as
 @samp{--ignore-length}.
 @item ignore_length = on/off
 When set to on, ignore @code{Content-Length} header; the same as
 @samp{--ignore-length}.


@@ -3503,21 +3517,20 @@ me).
 @cindex contributors
 
 @iftex
 @cindex contributors
 
 @iftex

-GNU Wget was written by Hrvoje Nik@v{s}i@'{c} @email{hniksic@@xemacs.org}.
+GNU Wget was written by Hrvoje Nik@v{s}i@'{c} @email{hniksic@@xemacs.org},

 @end iftex
 @ifnottex
 @end iftex
 @ifnottex

-GNU Wget was written by Hrvoje Niksic @email{hniksic@@xemacs.org}.
+GNU Wget was written by Hrvoje Niksic @email{hniksic@@xemacs.org},

 @end ifnottex
 @end ifnottex

-However, its development could never have gone as far as it has, were it
-not for the help of many people, either with bug reports, feature
-proposals, patches, or letters saying ``Thanks!''.
+and it is currently maintained by Micah Cowan @email{micah@@cowan.name}.
+
+However, the development of Wget could never have gone as far as it has, were
+it not for the help of many people, either with bug reports, feature proposals,
+patches, or letters saying ``Thanks!''.

 
 Special thanks goes to the following people (no particular order):
 
 @itemize @bullet
 
 Special thanks goes to the following people (no particular order):
 
 @itemize @bullet

-@item Mauro Tortonesi---contributed high-quality IPv6 code and many
-other fixes.
-

 @item Dan Harkless---contributed a lot of code and documentation of
 extremely high quality, as well as the @code{--page-requisites} and
 related options.  He was the principal maintainer for some time and
 @item Dan Harkless---contributed a lot of code and documentation of
 extremely high quality, as well as the @code{--page-requisites} and
 related options.  He was the principal maintainer for some time and


@@ -3799,80 +3812,16 @@ Kristijan Zimmer.
 Apologies to all who I accidentally left out, and many thanks to all the
 subscribers of the Wget mailing list.
 
 Apologies to all who I accidentally left out, and many thanks to all the
 subscribers of the Wget mailing list.
 

-@node Copying
-@chapter Copying
-@cindex copying
-@cindex GPL
-@cindex GFDL
-@cindex free software
-
-GNU Wget is licensed under the GNU General Public License (GNU GPL),
-which makes it @dfn{free software}.  Please note that ``free'' in ``free
-software'' refers to liberty, not price.  As some people like to point
-out, it's the ``free'' of ``free speech'', not the ``free'' of ``free
-beer''.
-
-The exact and legally binding distribution terms are spelled out below.
-The GPL guarantees that you have the right (freedom) to run and change
-GNU Wget and distribute it to others, and even---if you want---charge
-money for doing any of those things.  With these rights comes the
-obligation to distribute the source code along with the software and to
-grant your recipients the same rights and impose the same restrictions.
-
-This licensing model is also known as @dfn{open source} because it,
-among other things, makes sure that all recipients will receive the
-source code along with the program, and be able to improve it.  The GNU
-project prefers the term ``free software'' for reasons outlined at
-@url{http://www.gnu.org/philosophy/free-software-for-freedom.html}.
-
-The exact license terms are defined by this paragraph and the GNU
-General Public License it refers to:
-
-@quotation
-GNU Wget is free software; you can redistribute it and/or modify it
-under the terms of the GNU General Public License as published by the
-Free Software Foundation; either version 2 of the License, or (at your
-option) any later version.
-
-GNU Wget is distributed in the hope that it will be useful, but WITHOUT
-ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
-for more details.
-
-A copy of the GNU General Public License is included as part of this
-manual; if you did not receive it, write to the Free Software
-Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
-@end quotation
-
-In addition to this, this manual is free in the same sense:
-
-@quotation
-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 the
-Invariant Sections being ``GNU General Public License'' and ``GNU Free
-Documentation License'', 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''.
-@end quotation
-
-@c #### Maybe we should wrap these licenses in ifinfo?  Stallman says
-@c that the GFDL needs to be present in the manual, and to me it would
-@c suck to include the license for the manual and not the license for
-@c the program.
-
-The full texts of the GNU General Public License and of the GNU Free
-Documentation License are available below.
-
+@node Copying this manual
+@appendix Copying this manual
+  

 @menu
 @menu

-* GNU General Public License::
-* GNU Free Documentation License::
+* GNU Free Documentation License::  Licnse for copying this manual.

 @end menu
 
 @end menu
 

-@include gpl.texi
-

 @include fdl.texi
 
 @include fdl.texi
 

+

 @node Concept Index
 @unnumbered Concept Index
 @printindex cp
 @node Concept Index
 @unnumbered Concept Index
 @printindex cp