mirror of https://gitee.com/openkylin/wget.git
format patches
This commit is contained in:
parent
bb7bac2268
commit
2f697f9651
|
@ -1,5 +1,14 @@
|
|||
corrects the wgetrc path from /usr/local/etc/ to /etc/wgetrc in the sample wgetrc
|
||||
From: Ubuntu Developers <ubuntu-devel-discuss@lists.ubuntu.com>
|
||||
Date: Sat, 14 May 2022 03:18:29 +0800
|
||||
Subject: wget-doc-remove-usr-local-in-sample.wgetrc
|
||||
|
||||
corrects the wgetrc path from /usr/local/etc/ to /etc/wgetrc in the 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 @@
|
||||
|
@ -11,7 +20,7 @@ corrects the wgetrc path from /usr/local/etc/ to /etc/wgetrc in the sample wgetr
|
|||
## (global, for all users) or $HOME/.wgetrc (for a single user).
|
||||
##
|
||||
## To use the settings in this file, you will have to uncomment them,
|
||||
@@ -19,7 +19,7 @@
|
||||
@@ -22,7 +22,7 @@
|
||||
|
||||
|
||||
##
|
||||
|
|
|
@ -1,8 +1,17 @@
|
|||
corrects the wgetrc path from /usr/local/etc/ to /etc/wgetrc in the documentation
|
||||
From: Ubuntu Developers <ubuntu-devel-discuss@lists.ubuntu.com>
|
||||
Date: Sat, 14 May 2022 03:18:29 +0800
|
||||
Subject: wget-doc-remove-usr-local-in-wget.texi
|
||||
|
||||
--- a/doc/wget.texi 2011-08-06 12:22:58.000000000 +0200
|
||||
+++ b/doc/wget.texi 2011-08-12 14:13:35.000000000 +0200
|
||||
@@ -190,16 +190,16 @@
|
||||
corrects the wgetrc path from /usr/local/etc/ to /etc/wgetrc in the documentation
|
||||
---
|
||||
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
|
||||
|
@ -11,8 +20,7 @@ corrects the wgetrc path from /usr/local/etc/ to /etc/wgetrc in the documentatio
|
|||
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
|
||||
|
@ -21,7 +29,7 @@ corrects the wgetrc path from /usr/local/etc/ to /etc/wgetrc in the documentatio
|
|||
Default location of the @dfn{global} startup file.
|
||||
|
||||
@item .wgetrc
|
||||
@@ -2696,9 +2696,7 @@
|
||||
@@ -3166,9 +3166,7 @@ commands.
|
||||
@cindex location of wgetrc
|
||||
|
||||
When initializing, Wget will look for a @dfn{global} startup file,
|
||||
|
@ -32,7 +40,7 @@ corrects the wgetrc path from /usr/local/etc/ to /etc/wgetrc in the documentatio
|
|||
|
||||
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
|
||||
@@ -2708,7 +2706,7 @@
|
||||
@@ -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
|
||||
|
|
|
@ -1,8 +1,17 @@
|
|||
make passive-ftp the default
|
||||
From: Ubuntu Developers <ubuntu-devel-discuss@lists.ubuntu.com>
|
||||
Date: Sat, 14 May 2022 03:18:29 +0800
|
||||
Subject: wget-passive_ftp-default
|
||||
|
||||
make passive-ftp the 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
|
||||
@@ -43,6 +43,7 @@
|
||||
@@ -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
|
||||
|
|
Loading…
Reference in New Issue