diff --git a/ChangeLog b/ChangeLog index 19d640ac..f0997fae 100644 --- a/ChangeLog +++ b/ChangeLog @@ -2,7 +2,8 @@ * NEWS: Note that Wget now has a man page again. - * po/*.po*: Updated after changing --help's description of -N. + * po/*.po*: Updated after changing --help's description of -N and + moving -nr to a different category. 2001-02-22 Dan Harkless diff --git a/doc/ChangeLog b/doc/ChangeLog index 943701b9..af21cea9 100644 --- a/doc/ChangeLog +++ b/doc/ChangeLog @@ -1,7 +1,9 @@ 2001-02-23 Dan Harkless * wget.texi: Corrections, clarifications, and English fixes to - time-stamping documentation. + time-stamping documentation. Also moved -nr from "Recursive + Retrieval Options" to "FTP Options" and gave it a @cindex entry. + Alphabetized FTP options by long option name. 2001-02-22 Dan Harkless diff --git a/doc/wget.texi b/doc/wget.texi index 3ea58b6d..ddd0544e 100644 --- a/doc/wget.texi +++ b/doc/wget.texi @@ -914,24 +914,14 @@ discouraged, unless you really know what you are doing. @section FTP Options @table @samp -@cindex symbolic links, retrieving -@item --retr-symlinks -Usually, when retrieving @sc{ftp} directories recursively and a symbolic -link is encountered, the linked-to file is not downloaded. Instead, a -matching symbolic link is created on the local filesystem. The -pointed-to file will not be downloaded unless this recursive retrieval -would have encountered it separately and downloaded it anyway. - -When @samp{--retr-symlinks} is specified, however, symbolic links are -traversed and the pointed-to files are retrieved. At this time, this -option does not cause Wget to traverse symlinks to directories and -recurse through them, but in the future it should be enhanced to do -this. - -Note that when retrieving a file (not a directory) because it was -specified on the commandline, rather than because it was recursed to, -this option has no effect. Symbolic links are always traversed in this -case. +@cindex .listing files, removing +@item -nr +@itemx --dont-remove-listing +Don't remove the temporary @file{.listing} files generated by @sc{ftp} +retrievals. Normally, these files contain the raw directory listings +received from @sc{ftp} servers. Not removing them can be useful to +access the full remote file list when running a mirror, or for debugging +purposes. @cindex globbing, toggle @item -g on/off @@ -959,6 +949,25 @@ servers (and the ones emulating Unix @code{ls} output). Use the @dfn{passive} @sc{ftp} retrieval scheme, in which the client initiates the data connection. This is sometimes required for @sc{ftp} to work behind firewalls. + +@cindex symbolic links, retrieving +@item --retr-symlinks +Usually, when retrieving @sc{ftp} directories recursively and a symbolic +link is encountered, the linked-to file is not downloaded. Instead, a +matching symbolic link is created on the local filesystem. The +pointed-to file will not be downloaded unless this recursive retrieval +would have encountered it separately and downloaded it anyway. + +When @samp{--retr-symlinks} is specified, however, symbolic links are +traversed and the pointed-to files are retrieved. At this time, this +option does not cause Wget to traverse symlinks to directories and +recurse through them, but in the future it should be enhanced to do +this. + +Note that when retrieving a file (not a directory) because it was +specified on the commandline, rather than because it was recursed to, +this option has no effect. Symbolic links are always traversed in this +case. @end table @node Recursive Retrieval Options, Recursive Accept/Reject Options, FTP Options, Invoking @@ -1022,14 +1031,6 @@ and time-stamping, sets infinite recursion depth and keeps @sc{ftp} directory listings. It is currently equivalent to @samp{-r -N -l inf -nr}. -@item -nr -@itemx --dont-remove-listing -Don't remove the temporary @file{.listing} files generated by @sc{ftp} -retrievals. Normally, these files contain the raw directory listings -received from @sc{ftp} servers. Not removing them can be useful to -access the full remote file list when running a mirror, or for debugging -purposes. - @cindex page requisites @cindex required images, downloading @item -p @@ -1688,8 +1689,8 @@ Arguably, @sc{http} time-stamping should be implemented using the @cindex ftp time-stamping In theory, @sc{ftp} time-stamping works much the same as @sc{http}, only -@sc{ftp} has no headers---time-stamps must be received from the -directory listings. +@sc{ftp} has no headers---time-stamps must be ferreted out of directory +listings. If an @sc{ftp} download is recursive or uses globbing, Wget will use the @sc{ftp} @code{LIST} command to get a file listing for the directory diff --git a/src/ChangeLog b/src/ChangeLog index 61c3d917..0283864f 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -2,6 +2,9 @@ * main.c (print_help): --help documentation for -N said it would re-download files if they had the _same_ timestamp on server. + (print_help): -nr belongs in "FTP options" section of --help + output, not "Recursive retrieval" section. Alphabetized FTP + options by long option name. 2001-02-16 Dan Harkless diff --git a/src/main.c b/src/main.c index 8aa20754..ccfeffea 100644 --- a/src/main.c +++ b/src/main.c @@ -190,19 +190,19 @@ HTTP options:\n\ -U, --user-agent=AGENT identify as AGENT instead of Wget/VERSION.\n\ \n"), _("\ FTP options:\n\ - --retr-symlinks when recursing, retrieve linked-to files (not dirs).\n\ - -g, --glob=on/off turn file name globbing on or off.\n\ - --passive-ftp use the \"passive\" transfer mode.\n\ + -nr, --dont-remove-listing don\'t remove `.listing\' files.\n\ + -g, --glob=on/off turn file name globbing on or off.\n\ + --passive-ftp use the \"passive\" transfer mode.\n\ + --retr-symlinks when recursing, get linked-to files (not dirs).\n\ \n"), _("\ Recursive retrieval:\n\ - -r, --recursive recursive web-suck -- use with care!.\n\ - -l, --level=NUMBER maximum recursion depth (inf or 0 for infinite).\n\ - --delete-after delete files locally after downloading them.\n\ - -k, --convert-links convert non-relative links to relative.\n\ - -K, --backup-converted before converting file X, back up as X.orig.\n\ - -m, --mirror shortcut option equivalent to -r -N -l inf -nr.\n\ - -nr, --dont-remove-listing don\'t remove `.listing\' files.\n\ - -p, --page-requisites get all images, etc. needed to display HTML page.\n\ + -r, --recursive recursive web-suck -- use with care!\n\ + -l, --level=NUMBER maximum recursion depth (inf or 0 for infinite).\n\ + --delete-after delete files locally after downloading them.\n\ + -k, --convert-links convert non-relative links to relative.\n\ + -K, --backup-converted before converting file X, back up as X.orig.\n\ + -m, --mirror shortcut option equivalent to -r -N -l inf -nr.\n\ + -p, --page-requisites get all images, etc. needed to display HTML page.\n\ \n"), _("\ Recursive accept/reject:\n\ -A, --accept=LIST comma-separated list of accepted extensions.\n\