doc: Document --accept-regex and --reject-regex.

diff --git a/doc/ChangeLog b/doc/ChangeLog
index 36c07bdaba064a624f0f2439a5e4649224cfacf0..a163bf34e18b6ceec26deae9df0af35e8bf46ff3 100644 (file)
--- a/doc/ChangeLog
+++ b/doc/ChangeLog
@@ -1,3 +1,8 @@
+2012-05-13  Giuseppe Scrivano  <gscrivano@gnu.org>
+
+       * wget.texi (Types of Files): Document --accept-regex and
+       --reject-regex.
+

 2011-10-02  Henrik Holst <henrik.holst@millistream.com> (tiny change)
 
        * wget.texi (HTTP Options): Document option --content-on-error.
 2011-10-02  Henrik Holst <henrik.holst@millistream.com> (tiny change)
 
        * wget.texi (HTTP Options): Document option --content-on-error.

diff --git a/doc/wget.texi b/doc/wget.texi
index 7a77a7b6f656125001e9f9a6bf3a579eac1e0ff0..cd379e97b807a6e2faf07f3c8e1dc9f2ea213933 100644 (file)
--- a/doc/wget.texi
+++ b/doc/wget.texi
@@ -2284,6 +2284,8 @@ in @file{.wgetrc}.
 @item -A @var{acclist}
 @itemx --accept @var{acclist}
 @itemx accept = @var{acclist}
 @item -A @var{acclist}
 @itemx --accept @var{acclist}
 @itemx accept = @var{acclist}

+@itemx --accept-regex @var{urlregex}
+@itemx accept-regex = @var{urlregex}

 The argument to @samp{--accept} option is a list of file suffixes or
 patterns that Wget will download during recursive retrieval.  A suffix
 is the ending part of a file, and consists of ``normal'' letters,
 The argument to @samp{--accept} option is a list of file suffixes or
 patterns that Wget will download during recursive retrieval.  A suffix
 is the ending part of a file, and consists of ``normal'' letters,


@@ -2300,6 +2302,9 @@ a description of how pattern matching works.
 Of course, any number of suffixes and patterns can be combined into a
 comma-separated list, and given as an argument to @samp{-A}.
 
 Of course, any number of suffixes and patterns can be combined into a
 comma-separated list, and given as an argument to @samp{-A}.
 

+The argument to @samp{--accept-regex} option is a regular expression which
+is matched against the complete URL.
+

 @cindex reject wildcards
 @cindex reject suffixes
 @cindex wildcards, reject
 @cindex reject wildcards
 @cindex reject suffixes
 @cindex wildcards, reject


@@ -2307,6 +2312,8 @@ comma-separated list, and given as an argument to @samp{-A}.
 @item -R @var{rejlist}
 @itemx --reject @var{rejlist}
 @itemx reject = @var{rejlist}
 @item -R @var{rejlist}
 @itemx --reject @var{rejlist}
 @itemx reject = @var{rejlist}

+@itemx --reject-regex @var{urlregex}
+@itemx reject-regex = @var{urlregex}

 The @samp{--reject} option works the same way as @samp{--accept}, only
 its logic is the reverse; Wget will download all files @emph{except} the
 ones matching the suffixes (or patterns) in the list.
 The @samp{--reject} option works the same way as @samp{--accept}, only
 its logic is the reverse; Wget will download all files @emph{except} the
 ones matching the suffixes (or patterns) in the list.


@@ -2318,6 +2325,9 @@ Analogously, to download all files except the ones beginning with
 expansion by the shell.
 @end table
 
 expansion by the shell.
 @end table
 

+The argument to @samp{--accept-regex} option is a regular expression which
+is matched against the complete URL.
+

 @noindent
 The @samp{-A} and @samp{-R} options may be combined to achieve even
 better fine-tuning of which files to retrieve.  E.g. @samp{wget -A
 @noindent
 The @samp{-A} and @samp{-R} options may be combined to achieve even
 better fine-tuning of which files to retrieve.  E.g. @samp{wget -A