From 5e012314621d72cb652b1f146841a1d5514c6967 Mon Sep 17 00:00:00 2001 From: Ubuntu Developers Date: Sat, 14 May 2022 03:18:29 +0800 Subject: [PATCH 1/3] wget-doc-remove-usr-local-in-sample.wgetrc corrects the wgetrc path from /usr/local/etc/ to /etc/wgetrc in the sample wgetrc Gbp-Pq: Name wget-doc-remove-usr-local-in-sample.wgetrc --- doc/sample.wgetrc | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/doc/sample.wgetrc b/doc/sample.wgetrc index c0d0779..9a73ada 100644 --- a/doc/sample.wgetrc +++ b/doc/sample.wgetrc @@ -10,7 +10,7 @@ ## Or online here: ## https://www.gnu.org/software/wget/manual/wget.html#Startup-File ## -## Wget initialization file can reside in /usr/local/etc/wgetrc +## Wget initialization file can reside in /etc/wgetrc ## (global, for all users) or $HOME/.wgetrc (for a single user). ## ## To use the settings in this file, you will have to uncomment them, @@ -22,7 +22,7 @@ ## -## Global settings (useful for setting up in /usr/local/etc/wgetrc). +## Global settings (useful for setting up in /etc/wgetrc). ## Think well before you change them, since they may reduce wget's ## functionality, and make it behave contrary to the documentation: ## From 9d84e5af01c1cf64f9a9787ca9e3be1b3fb9503a Mon Sep 17 00:00:00 2001 From: Ubuntu Developers Date: Sat, 14 May 2022 03:18:29 +0800 Subject: [PATCH 2/3] wget-doc-remove-usr-local-in-wget.texi corrects the wgetrc path from /usr/local/etc/ to /etc/wgetrc in the documentation Gbp-Pq: Name wget-doc-remove-usr-local-in-wget.texi --- doc/wget.texi | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/doc/wget.texi b/doc/wget.texi index 5c1d305..5cd415f 100644 --- a/doc/wget.texi +++ b/doc/wget.texi @@ -190,7 +190,7 @@ gauge can be customized to your preferences. Most of the features are fully configurable, either through command line options, or via the initialization file @file{.wgetrc} (@pxref{Startup File}). Wget allows you to define @dfn{global} startup files -(@file{/usr/local/etc/wgetrc} by default) for site settings. You can also +(@file{/etc/wgetrc} by default) for site settings. You can also specify the location of a startup file with the --config option. To disable the reading of config files, use --no-config. If both --config and --no-config are given, --no-config is ignored. @@ -199,7 +199,7 @@ If both --config and --no-config are given, --no-config is ignored. @ignore @c man begin FILES @table @samp -@item /usr/local/etc/wgetrc +@item /etc/wgetrc Default location of the @dfn{global} startup file. @item .wgetrc @@ -3166,9 +3166,7 @@ commands. @cindex location of wgetrc When initializing, Wget will look for a @dfn{global} startup file, -@file{/usr/local/etc/wgetrc} by default (or some prefix other than -@file{/usr/local}, if Wget was not installed there) and read commands -from there, if it exists. +@file{/etc/wgetrc} by default and read commands from there, if it exists. Then it will look for the user's file. If the environmental variable @code{WGETRC} is set, Wget will try to load that file. Failing that, no @@ -3178,7 +3176,7 @@ If @code{WGETRC} is not set, Wget will try to load @file{$HOME/.wgetrc}. The fact that user's settings are loaded after the system-wide ones means that in case of collision user's wgetrc @emph{overrides} the -system-wide wgetrc (in @file{/usr/local/etc/wgetrc} by default). +system-wide wgetrc (in @file{//etc/wgetrc} by default). Fascist admins, away! @node Wgetrc Syntax, Wgetrc Commands, Wgetrc Location, Startup File From 31e37ab5f3dafaf5253791e2329c2de84a22b571 Mon Sep 17 00:00:00 2001 From: Ubuntu Developers Date: Sat, 14 May 2022 03:18:29 +0800 Subject: [PATCH 3/3] wget-passive_ftp-default make passive-ftp the default Gbp-Pq: Name wget-passive_ftp-default --- doc/sample.wgetrc | 1 + 1 file changed, 1 insertion(+) diff --git a/doc/sample.wgetrc b/doc/sample.wgetrc index 9a73ada..369e22c 100644 --- a/doc/sample.wgetrc +++ b/doc/sample.wgetrc @@ -49,6 +49,7 @@ # problems supporting passive transfer. If you are in such # environment, use "passive_ftp = off" to revert to active FTP. #passive_ftp = off +passive_ftp = on # The "wait" command below makes Wget wait between every connection. # If, instead, you want Wget to wait only between retries of failed