From: Micah Cowan Date: Thu, 13 Sep 2007 04:48:31 +0000 (-0700) Subject: Describe -p in relation to -nc X-Git-Tag: v1.13~548 X-Git-Url: http://sjero.net/git/?p=wget;a=commitdiff_plain;h=8d9625d4193bcf55e79353f27a2fba2e20f674f8 Describe -p in relation to -nc --- diff --git a/doc/ChangeLog b/doc/ChangeLog index 7d840f83..f40b7c87 100644 --- a/doc/ChangeLog +++ b/doc/ChangeLog @@ -1,7 +1,8 @@ 2007-09-12 Micah Cowan * wget.texi: Expanded the description of -O. Clarified the - detection of elements as "patterns" versus "suffixes" in -A, -R. + detection of elements as "patterns" versus "suffixes" in -A, + -R. Describe -p in relation to -nc. 2007-07-28 Micah Cowan diff --git a/doc/wget.texi b/doc/wget.texi index 62b346aa..c7aca61e 100644 --- a/doc/wget.texi +++ b/doc/wget.texi @@ -569,7 +569,7 @@ 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}, or @samp{-r}, +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 @@ -581,17 +581,17 @@ 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}, 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 with @samp{-N}, with or without @samp{-r}, the -decision as to whether or not to download a newer copy of a file depends -on the local and remote timestamp and size of the file -(@pxref{Time-Stamping}). @samp{-nc} may not be specified at the same -time as @samp{-N}. +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 with @samp{-N}, with or without @samp{-r} or +@samp{-p}, the decision as to whether or not to download a newer copy +of a file depends on the local and remote timestamp and size of the +file (@pxref{Time-Stamping}). @samp{-nc} may not be specified at the +same time as @samp{-N}. Note that when @samp{-nc} is specified, files with the suffixes @samp{.html} or @samp{.htm} will be loaded from the local disk and