X-Git-Url: http://sjero.net/git/?a=blobdiff_plain;f=doc%2Fwget.texi;h=60634f15318e61703700aafdb789bb945540f742;hb=532aa2cb2d13b203024bbbfb9792aa3d907897ba;hp=657ec3cf63d965717773fe8dc2bae724006be186;hpb=289ff1c86acbd60e09cb15d22df62b8e19942c3e;p=wget diff --git a/doc/wget.texi b/doc/wget.texi index 657ec3cf..60634f15 100644 --- a/doc/wget.texi +++ b/doc/wget.texi @@ -396,8 +396,8 @@ the option name; negative options can be negated by omitting the @samp{--no-} prefix. This might seem superfluous---if the default for an affirmative option is to not do something, then why provide a way to explicitly turn it off? But the startup file may in fact change -the default. For instance, using @code{follow_ftp = off} in -@file{.wgetrc} makes Wget @emph{not} follow FTP links by default, and +the default. For instance, using @code{follow_ftp = on} in +@file{.wgetrc} makes Wget @emph{follow} FTP links by default, and using @samp{--no-follow-ftp} is the only way to restore the factory default from the command line. @@ -486,9 +486,8 @@ specified as @var{file}, @sc{url}s are read from the standard input. If this function is used, no @sc{url}s need be present on the command line. If there are @sc{url}s both on the command line and in an input file, those on the command lines will be the first ones to be -retrieved. The @var{file} need not be an @sc{html} document (but no -harm if it is)---it is enough if the @sc{url}s are just listed -sequentially. +retrieved. If @samp{--force-html} is not specified, then @var{file} +should consist of a series of URLs, one per line. However, if you specify @samp{--force-html}, the document will be regarded as @samp{html}. In that case you may have problems with @@ -513,8 +512,17 @@ option. @cindex base for relative links in input file @item -B @var{URL} @itemx --base=@var{URL} -Prepends @var{URL} to relative links read from the file specified with -the @samp{-i} option. +Resolves relative links using @var{URL} as the point of reference, +when reading links from an HTML file specified via the +@samp{-i}/@samp{--input-file} option (together with +@samp{--force-html}, or when the input file was fetched remotely from +a server describing it as @sc{html}). This is equivalent to the +presence of a @code{BASE} tag in the @sc{html} input file, with +@var{URL} as the value for the @code{href} attribute. + +For instance, if you specify @samp{http://foo/bar/a.html} for +@var{URL}, and Wget reads @samp{../baz/b.html} from the input file, it +would be resolved to @samp{http://foo/baz/b.html}. @end table @node Download Options, Directory Options, Logging and Input File Options, Invoking @@ -582,23 +590,24 @@ behavior depends on a few options, including @samp{-nc}. In certain cases, the local file will be @dfn{clobbered}, or overwritten, upon repeated download. In other cases it will be preserved. -When running Wget without @samp{-N}, @samp{-nc}, @samp{-r}, or @samp{p}, -downloading the same file in the same directory will result in the -original copy of @var{file} being preserved and the second copy being -named @samp{@var{file}.1}. If that file is downloaded yet again, the -third copy will be named @samp{@var{file}.2}, and so on. When -@samp{-nc} is specified, this behavior is suppressed, and Wget will -refuse to download newer copies of @samp{@var{file}}. Therefore, -``@code{no-clobber}'' is actually a misnomer in this mode---it's not -clobbering that's prevented (as the numeric suffixes were already -preventing clobbering), but rather the multiple version saving that's -prevented. - -When running Wget with @samp{-r} or @samp{-p}, but without @samp{-N} -or @samp{-nc}, re-downloading a file will result in the new copy -simply overwriting the old. Adding @samp{-nc} will prevent this -behavior, instead causing the original version to be preserved and any -newer copies on the server to be ignored. +When running Wget without @samp{-N}, @samp{-nc}, @samp{-r}, or +@samp{-p}, downloading the same file in the same directory will result +in the original copy of @var{file} being preserved and the second copy +being named @samp{@var{file}.1}. If that file is downloaded yet +again, the third copy will be named @samp{@var{file}.2}, and so on. +(This is also the behavior with @samp{-nd}, even if @samp{-r} or +@samp{-p} are in effect.) When @samp{-nc} is specified, this behavior +is suppressed, and Wget will refuse to download newer copies of +@samp{@var{file}}. Therefore, ``@code{no-clobber}'' is actually a +misnomer in this mode---it's not clobbering that's prevented (as the +numeric suffixes were already preventing clobbering), but rather the +multiple version saving that's prevented. + +When running Wget with @samp{-r} or @samp{-p}, but without @samp{-N}, +@samp{-nd}, or @samp{-nc}, re-downloading a file will result in the +new copy simply overwriting the old. Adding @samp{-nc} will prevent +this behavior, instead causing the original version to be preserved +and any newer copies on the server to be ignored. When running Wget with @samp{-N}, with or without @samp{-r} or @samp{-p}, the decision as to whether or not to download a newer copy @@ -678,7 +687,7 @@ servers that support the @code{Range} header. @cindex idn support @item --iri -Turn on internationalized URI (IRI) support. Use @samp{--iri=no} to +Turn on internationalized URI (IRI) support. Use @samp{--no-iri} to turn it off. IRI support is activated by default. You can set the default state of IRI support using @code{iri} command in @@ -861,10 +870,9 @@ use @dfn{linear backoff}, waiting 1 second after the first failure on a given file, then waiting 2 seconds after the second failure on that file, up to the maximum number of @var{seconds} you specify. Therefore, a value of 10 will actually make Wget wait up to (1 + 2 + ... + 10) = 55 -seconds per file. +seconds per file. -Note that this option is turned on by default in the global -@file{wgetrc} file. +By default, Wget will assume a value of 10 seconds. @cindex wait, random @cindex random wait @@ -2653,9 +2661,10 @@ Enable/disable saving pre-converted files with the suffix @c #### Document me! @c @item base = @var{string} -Consider relative @sc{url}s in @sc{url} input files forced to be -interpreted as @sc{html} as being relative to @var{string}---the same as -@samp{--base=@var{string}}. +Consider relative @sc{url}s in input files (specified via the +@samp{input} command or the @samp{--input-file}/@samp{-i} option, +together with @samp{force_html} or @samp{--force-html}) +as being relative to @var{string}---the same as @samp{--base=@var{string}}. @item bind_address = @var{address} Bind to @var{address}, like the @samp{--bind-address=@var{address}}. @@ -3863,6 +3872,9 @@ Gnulib getpasswd-gnu module. @item Ted Mielczarek---donated support for CSS. +@item +Saint Xavier---Support for IRIs (RFC 3987). + @item People who provided donations for development---including Brian Gough. @end itemize @@ -3974,6 +3986,7 @@ Fila Kolodny, Alexander Kourakos, Martin Kraemer, Sami Krank, +Jay Krell, @tex $\Sigma\acute{\iota}\mu o\varsigma\; \Xi\varepsilon\nu\iota\tau\acute{\epsilon}\lambda\lambda\eta\varsigma$ @@ -4004,6 +4017,7 @@ Aurelien Marchand, Matthew J.@: Mellon, Jordan Mendelson, Ted Mielczarek, +Robert Millan, Lin Zhe Min, Jan Minar, Tim Mooney, @@ -4079,6 +4093,8 @@ Charles G Waldman, Douglas E.@: Wegscheid, Ralf Wildenhues, Joshua David Williams, +Benjamin Wolsey, +Saint Xavier, YAMAZAKI Makoto, Jasmin Zainul, @iftex @@ -4087,7 +4103,8 @@ Bojan @v{Z}drnja, @ifnottex Bojan Zdrnja, @end ifnottex -Kristijan Zimmer. +Kristijan Zimmer, +Xin Zou. Apologies to all who I accidentally left out, and many thanks to all the subscribers of the Wget mailing list.