mirror of
https://github.com/moparisthebest/wget
synced 2024-07-03 16:38:41 -04:00
Merge from mainline
This commit is contained in:
commit
6633b74930
@ -1,3 +1,13 @@
|
|||||||
|
2007-09-27 Micah Cowan <micah@cowan.name>
|
||||||
|
|
||||||
|
* wget.texi: Removed "for more details" from parenthesese
|
||||||
|
enclosing @pxref{}s, so that texi2pod.pl knows to remove the
|
||||||
|
whole reference. Made some gramattical improvements, and
|
||||||
|
strengthened the recommendation to use the info manual instead.
|
||||||
|
* texi2pod.pl: Brought in some updates from the GCC version. Not
|
||||||
|
an entire update, since a couple "fixes" there breaks stuff
|
||||||
|
here.
|
||||||
|
|
||||||
2007-09-12 Micah Cowan <micah@cowan.name>
|
2007-09-12 Micah Cowan <micah@cowan.name>
|
||||||
|
|
||||||
* wget.texi: Expanded the description of -O. Clarified the
|
* wget.texi: Expanded the description of -O. Clarified the
|
||||||
|
@ -228,11 +228,12 @@ while(<$inf>) {
|
|||||||
/^\@include\s+(.+)$/ and do {
|
/^\@include\s+(.+)$/ and do {
|
||||||
push @instack, $inf;
|
push @instack, $inf;
|
||||||
$inf = gensym();
|
$inf = gensym();
|
||||||
|
$file = postprocess($1);
|
||||||
|
|
||||||
# Try cwd and $ibase.
|
# Try cwd and $ibase.
|
||||||
open($inf, "<" . $1)
|
open($inf, "<" . $file)
|
||||||
or open($inf, "<" . $ibase . "/" . $1)
|
or open($inf, "<" . $ibase . "/" . $file)
|
||||||
or die "cannot open $1 or $ibase/$1: $!\n";
|
or die "cannot open $file or $ibase/$file: $!\n";
|
||||||
next;
|
next;
|
||||||
};
|
};
|
||||||
|
|
||||||
@ -275,7 +276,6 @@ while(<$inf>) {
|
|||||||
$ic =~ s/\@(?:code|kbd)/C/;
|
$ic =~ s/\@(?:code|kbd)/C/;
|
||||||
$ic =~ s/\@(?:dfn|var|emph|cite|i)/I/;
|
$ic =~ s/\@(?:dfn|var|emph|cite|i)/I/;
|
||||||
$ic =~ s/\@(?:file)/F/;
|
$ic =~ s/\@(?:file)/F/;
|
||||||
$ic =~ s/\@(?:asis)/S/; # punt
|
|
||||||
$_ = "\n=over 4\n";
|
$_ = "\n=over 4\n";
|
||||||
};
|
};
|
||||||
|
|
||||||
@ -309,7 +309,7 @@ die "No filename or title\n" unless defined $fn && defined $tl;
|
|||||||
$sects{NAME} = "$fn \- $tl\n";
|
$sects{NAME} = "$fn \- $tl\n";
|
||||||
$sects{FOOTNOTES} .= "=back\n" if exists $sects{FOOTNOTES};
|
$sects{FOOTNOTES} .= "=back\n" if exists $sects{FOOTNOTES};
|
||||||
|
|
||||||
for $sect (qw(NAME SYNOPSIS DESCRIPTION OPTIONS ENVIRONMENT EXAMPLES FILES
|
for $sect (qw(NAME SYNOPSIS DESCRIPTION OPTIONS ENVIRONMENT FILES
|
||||||
BUGS NOTES FOOTNOTES SEEALSO AUTHOR COPYRIGHT)) {
|
BUGS NOTES FOOTNOTES SEEALSO AUTHOR COPYRIGHT)) {
|
||||||
if(exists $sects{$sect}) {
|
if(exists $sects{$sect}) {
|
||||||
$head = $sect;
|
$head = $sect;
|
||||||
@ -351,6 +351,13 @@ sub postprocess
|
|||||||
s/\@w\{([^\}]*)\}/S<$1>/g;
|
s/\@w\{([^\}]*)\}/S<$1>/g;
|
||||||
s/\@(?:dmn|math)\{([^\}]*)\}/$1/g;
|
s/\@(?:dmn|math)\{([^\}]*)\}/$1/g;
|
||||||
|
|
||||||
|
# keep references of the form @ref{...}, print them bold
|
||||||
|
s/\@(?:ref)\{([^\}]*)\}/B<$1>/g;
|
||||||
|
|
||||||
|
# Change double single quotes to double quotes.
|
||||||
|
s/''/"/g;
|
||||||
|
s/``/"/g;
|
||||||
|
|
||||||
# Cross references are thrown away, as are @noindent and @refill.
|
# Cross references are thrown away, as are @noindent and @refill.
|
||||||
# (@noindent is impossible in .pod, and @refill is unnecessary.)
|
# (@noindent is impossible in .pod, and @refill is unnecessary.)
|
||||||
# @* is also impossible in .pod; we discard it and any newline that
|
# @* is also impossible in .pod; we discard it and any newline that
|
||||||
|
@ -64,7 +64,11 @@ Originally written by Hrvoje Niksic <hniksic@xemacs.org>.
|
|||||||
Currently maintained by Micah Cowan <micah@cowan.name>.
|
Currently maintained by Micah Cowan <micah@cowan.name>.
|
||||||
@c man end
|
@c man end
|
||||||
@c man begin SEEALSO
|
@c man begin SEEALSO
|
||||||
GNU Info entry for @file{wget}.
|
This is @strong{not} the complete manual for GNU Wget.
|
||||||
|
For more complete information, including more detailed explanations of
|
||||||
|
some of the options, and a number of commands available
|
||||||
|
for use with @file{.wgetrc} files and the @samp{-e} option, see the GNU
|
||||||
|
Info entry for @file{wget}.
|
||||||
@c man end
|
@c man end
|
||||||
@end ignore
|
@end ignore
|
||||||
|
|
||||||
@ -347,7 +351,7 @@ wget -r --tries=10 http://fly.srk.fer.hr/ -o log
|
|||||||
@end example
|
@end example
|
||||||
|
|
||||||
The space between the option accepting an argument and the argument may
|
The space between the option accepting an argument and the argument may
|
||||||
be omitted. Instead @samp{-o log} you can write @samp{-olog}.
|
be omitted. Instead of @samp{-o log} you can write @samp{-olog}.
|
||||||
|
|
||||||
You may put several options that do not require arguments together,
|
You may put several options that do not require arguments together,
|
||||||
like:
|
like:
|
||||||
@ -754,7 +758,7 @@ connect timeout, other than that implemented by system libraries.
|
|||||||
@cindex timeout, read
|
@cindex timeout, read
|
||||||
@item --read-timeout=@var{seconds}
|
@item --read-timeout=@var{seconds}
|
||||||
Set the read (and write) timeout to @var{seconds} seconds. The
|
Set the read (and write) timeout to @var{seconds} seconds. The
|
||||||
``time'' of this timeout refers @dfn{idle time}: if, at any point in
|
``time'' of this timeout refers to @dfn{idle time}: if, at any point in
|
||||||
the download, no data is received for more than the specified number
|
the download, no data is received for more than the specified number
|
||||||
of seconds, reading fails and the download is restarted. This option
|
of seconds, reading fails and the download is restarted. This option
|
||||||
does not directly affect the duration of the entire download.
|
does not directly affect the duration of the entire download.
|
||||||
@ -1087,8 +1091,8 @@ Retrieval Options}).
|
|||||||
@itemx --http-password=@var{password}
|
@itemx --http-password=@var{password}
|
||||||
Specify the username @var{user} and password @var{password} on an
|
Specify the username @var{user} and password @var{password} on an
|
||||||
@sc{http} server. According to the type of the challenge, Wget will
|
@sc{http} server. According to the type of the challenge, Wget will
|
||||||
encode them using either the @code{basic} (insecure) or the
|
encode them using either the @code{basic} (insecure),
|
||||||
@code{digest} authentication scheme.
|
the @code{digest}, or the Windows @code{NTLM} authentication scheme.
|
||||||
|
|
||||||
Another way to specify username and password is in the @sc{url} itself
|
Another way to specify username and password is in the @sc{url} itself
|
||||||
(@pxref{URL Format}). Either method reveals your password to anyone who
|
(@pxref{URL Format}). Either method reveals your password to anyone who
|
||||||
@ -1807,7 +1811,7 @@ option to turn it on.
|
|||||||
@item -A @var{acclist} --accept @var{acclist}
|
@item -A @var{acclist} --accept @var{acclist}
|
||||||
@itemx -R @var{rejlist} --reject @var{rejlist}
|
@itemx -R @var{rejlist} --reject @var{rejlist}
|
||||||
Specify comma-separated lists of file name suffixes or patterns to
|
Specify comma-separated lists of file name suffixes or patterns to
|
||||||
accept or reject (@pxref{Types of Files} for more details). Note that if
|
accept or reject (@pxref{Types of Files}). Note that if
|
||||||
any of the wildcard characters, @samp{*}, @samp{?}, @samp{[} or
|
any of the wildcard characters, @samp{*}, @samp{?}, @samp{[} or
|
||||||
@samp{]}, appear in an element of @var{acclist} or @var{rejlist},
|
@samp{]}, appear in an element of @var{acclist} or @var{rejlist},
|
||||||
it will be treated as a pattern, rather than a suffix.
|
it will be treated as a pattern, rather than a suffix.
|
||||||
@ -1876,13 +1880,13 @@ without any distractions, not even those from the same hosts
|
|||||||
@item -I @var{list}
|
@item -I @var{list}
|
||||||
@itemx --include-directories=@var{list}
|
@itemx --include-directories=@var{list}
|
||||||
Specify a comma-separated list of directories you wish to follow when
|
Specify a comma-separated list of directories you wish to follow when
|
||||||
downloading (@pxref{Directory-Based Limits} for more details.) Elements
|
downloading (@pxref{Directory-Based Limits}). Elements
|
||||||
of @var{list} may contain wildcards.
|
of @var{list} may contain wildcards.
|
||||||
|
|
||||||
@item -X @var{list}
|
@item -X @var{list}
|
||||||
@itemx --exclude-directories=@var{list}
|
@itemx --exclude-directories=@var{list}
|
||||||
Specify a comma-separated list of directories you wish to exclude from
|
Specify a comma-separated list of directories you wish to exclude from
|
||||||
download (@pxref{Directory-Based Limits} for more details.) Elements of
|
download (@pxref{Directory-Based Limits}). Elements of
|
||||||
@var{list} may contain wildcards.
|
@var{list} may contain wildcards.
|
||||||
|
|
||||||
@item -np
|
@item -np
|
||||||
|
Loading…
Reference in New Issue
Block a user