|
 |
194ca6f |
diff -up wget-1.16.1/doc/sample.wgetrc.munged_for_texi_inclusion.path wget-1.16.1/doc/sample.wgetrc.munged_for_texi_inclusion
|
|
|
194ca6f |
--- wget-1.16.1/doc/sample.wgetrc.munged_for_texi_inclusion.path 2014-12-08 11:25:08.000000000 +0100
|
|
|
194ca6f |
+++ wget-1.16.1/doc/sample.wgetrc.munged_for_texi_inclusion 2014-12-11 09:51:56.286769486 +0100
|
|
|
e64a33b |
@@ -10,7 +10,7 @@
|
|
|
e64a33b |
## Or online here:
|
|
|
e64a33b |
## https://www.gnu.org/software/wget/manual/wget.html#Startup-File
|
|
 |
239bd5a |
##
|
|
|
239bd5a |
-## Wget initialization file can reside in /usr/local/etc/wgetrc
|
|
|
239bd5a |
+## Wget initialization file can reside in /etc/wgetrc
|
|
|
239bd5a |
## (global, for all users) or $HOME/.wgetrc (for a single user).
|
|
|
239bd5a |
##
|
|
|
239bd5a |
## To use the settings in this file, you will have to uncomment them,
|
|
|
e64a33b |
@@ -19,7 +19,7 @@
|
|
|
239bd5a |
|
|
|
239bd5a |
|
|
|
239bd5a |
##
|
|
|
239bd5a |
-## Global settings (useful for setting up in /usr/local/etc/wgetrc).
|
|
|
239bd5a |
+## Global settings (useful for setting up in /etc/wgetrc).
|
|
|
239bd5a |
## Think well before you change them, since they may reduce wget's
|
|
|
239bd5a |
## functionality, and make it behave contrary to the documentation:
|
|
|
239bd5a |
##
|
|
|
194ca6f |
diff -up wget-1.16.1/doc/sample.wgetrc.path wget-1.16.1/doc/sample.wgetrc
|
|
|
194ca6f |
--- wget-1.16.1/doc/sample.wgetrc.path 2014-01-22 22:03:47.000000000 +0100
|
|
|
194ca6f |
+++ wget-1.16.1/doc/sample.wgetrc 2014-12-11 09:51:56.286769486 +0100
|
|
|
e64a33b |
@@ -10,7 +10,7 @@
|
|
|
e64a33b |
## Or online here:
|
|
|
e64a33b |
## https://www.gnu.org/software/wget/manual/wget.html#Startup-File
|
|
|
239bd5a |
##
|
|
|
239bd5a |
-## Wget initialization file can reside in /usr/local/etc/wgetrc
|
|
|
239bd5a |
+## Wget initialization file can reside in /etc/wgetrc
|
|
|
239bd5a |
## (global, for all users) or $HOME/.wgetrc (for a single user).
|
|
|
239bd5a |
##
|
|
|
239bd5a |
## To use the settings in this file, you will have to uncomment them,
|
|
|
e64a33b |
@@ -19,7 +19,7 @@
|
|
|
239bd5a |
|
|
|
239bd5a |
|
|
|
239bd5a |
##
|
|
|
239bd5a |
-## Global settings (useful for setting up in /usr/local/etc/wgetrc).
|
|
|
239bd5a |
+## Global settings (useful for setting up in /etc/wgetrc).
|
|
|
239bd5a |
## Think well before you change them, since they may reduce wget's
|
|
|
239bd5a |
## functionality, and make it behave contrary to the documentation:
|
|
|
239bd5a |
##
|
|
|
194ca6f |
diff -up wget-1.16.1/doc/wget.info.path wget-1.16.1/doc/wget.info
|
|
|
194ca6f |
--- wget-1.16.1/doc/wget.info.path 2014-12-08 11:25:09.000000000 +0100
|
|
|
194ca6f |
+++ wget-1.16.1/doc/wget.info 2014-12-11 09:51:56.287769488 +0100
|
|
|
e64a33b |
@@ -111,7 +111,7 @@ retrieval through HTTP proxies.
|
|
|
e64a33b |
* Most of the features are fully configurable, either through command
|
|
|
e64a33b |
line options, or via the initialization file '.wgetrc' (*note
|
|
|
e64a33b |
Startup File::). Wget allows you to define "global" startup files
|
|
|
e64a33b |
- ('/usr/local/etc/wgetrc' by default) for site settings. You can
|
|
|
e64a33b |
+ ('/etc/wgetrc' by default) for site settings. You can
|
|
|
e64a33b |
also specify the location of a startup file with the -config
|
|
|
e64a33b |
option.
|
|
|
e64a33b |
|
|
|
194ca6f |
@@ -2532,8 +2532,8 @@ File: wget.info, Node: Wgetrc Location,
|
|
|
239bd5a |
===================
|
|
|
239bd5a |
|
|
|
239bd5a |
When initializing, Wget will look for a "global" startup file,
|
|
|
e64a33b |
-'/usr/local/etc/wgetrc' by default (or some prefix other than
|
|
|
e64a33b |
-'/usr/local', if Wget was not installed there) and read commands from
|
|
|
e64a33b |
+'/etc/wgetrc' by default (or some prefix other than
|
|
|
e64a33b |
+'/etc', if Wget was not installed there) and read commands from
|
|
|
239bd5a |
there, if it exists.
|
|
|
239bd5a |
|
|
|
239bd5a |
Then it will look for the user's file. If the environmental variable
|
|
|
194ca6f |
@@ -2544,7 +2544,7 @@ further attempts will be made.
|
|
|
239bd5a |
|
|
|
239bd5a |
The fact that user's settings are loaded after the system-wide ones
|
|
|
239bd5a |
means that in case of collision user's wgetrc _overrides_ the
|
|
|
e64a33b |
-system-wide wgetrc (in '/usr/local/etc/wgetrc' by default). Fascist
|
|
|
e64a33b |
+system-wide wgetrc (in '/etc/wgetrc' by default). Fascist
|
|
|
239bd5a |
admins, away!
|
|
|
239bd5a |
|
|
|
239bd5a |
?
|
|
|
194ca6f |
@@ -3076,7 +3076,7 @@ its line.
|
|
|
e64a33b |
## Or online here:
|
|
|
e64a33b |
## https://www.gnu.org/software/wget/manual/wget.html#Startup-File
|
|
|
239bd5a |
##
|
|
|
239bd5a |
- ## Wget initialization file can reside in /usr/local/etc/wgetrc
|
|
|
239bd5a |
+ ## Wget initialization file can reside in /etc/wgetrc
|
|
|
239bd5a |
## (global, for all users) or $HOME/.wgetrc (for a single user).
|
|
|
239bd5a |
##
|
|
|
239bd5a |
## To use the settings in this file, you will have to uncomment them,
|
|
|
194ca6f |
diff -up wget-1.16.1/doc/wget.texi.path wget-1.16.1/doc/wget.texi
|
|
|
194ca6f |
--- wget-1.16.1/doc/wget.texi.path 2014-11-11 15:23:33.000000000 +0100
|
|
|
194ca6f |
+++ wget-1.16.1/doc/wget.texi 2014-12-11 09:51:56.288769489 +0100
|
|
|
e64a33b |
@@ -190,14 +190,14 @@ gauge can be customized to your preferen
|
|
|
e64a33b |
Most of the features are fully configurable, either through command line
|
|
|
e64a33b |
options, or via the initialization file @file{.wgetrc} (@pxref{Startup
|
|
|
e64a33b |
File}). Wget allows you to define @dfn{global} startup files
|
|
|
e64a33b |
-(@file{/usr/local/etc/wgetrc} by default) for site settings. You can also
|
|
|
e64a33b |
+(@file{/etc/wgetrc} by default) for site settings. You can also
|
|
|
e64a33b |
specify the location of a startup file with the --config option.
|
|
|
e64a33b |
|
|
|
239bd5a |
|
|
|
e64a33b |
@ignore
|
|
|
e64a33b |
@c man begin FILES
|
|
|
e64a33b |
@table @samp
|
|
|
e64a33b |
-@item /usr/local/etc/wgetrc
|
|
|
e64a33b |
+@item /etc/wgetrc
|
|
|
e64a33b |
Default location of the @dfn{global} startup file.
|
|
|
239bd5a |
|
|
|
e64a33b |
@item .wgetrc
|
|
|
194ca6f |
@@ -2869,8 +2869,8 @@ commands.
|
|
|
239bd5a |
@cindex location of wgetrc
|
|
|
239bd5a |
|
|
|
239bd5a |
When initializing, Wget will look for a @dfn{global} startup file,
|
|
|
239bd5a |
-@file{/usr/local/etc/wgetrc} by default (or some prefix other than
|
|
|
239bd5a |
-@file{/usr/local}, if Wget was not installed there) and read commands
|
|
|
239bd5a |
+@file{/etc/wgetrc} by default (or some prefix other than
|
|
|
239bd5a |
+@file{/etc}, if Wget was not installed there) and read commands
|
|
|
239bd5a |
from there, if it exists.
|
|
|
239bd5a |
|
|
|
239bd5a |
Then it will look for the user's file. If the environmental variable
|
|
|
194ca6f |
@@ -2881,7 +2881,7 @@ If @code{WGETRC} is not set, Wget will t
|
|
|
239bd5a |
|
|
|
239bd5a |
The fact that user's settings are loaded after the system-wide ones
|
|
|
239bd5a |
means that in case of collision user's wgetrc @emph{overrides} the
|
|
|
239bd5a |
-system-wide wgetrc (in @file{/usr/local/etc/wgetrc} by default).
|
|
|
239bd5a |
+system-wide wgetrc (in @file{/etc/wgetrc} by default).
|
|
|
239bd5a |
Fascist admins, away!
|
|
|
239bd5a |
|
|
|
239bd5a |
@node Wgetrc Syntax, Wgetrc Commands, Wgetrc Location, Startup File
|
|
|
194ca6f |
diff -up wget-1.16.1/NEWS.path wget-1.16.1/NEWS
|
|
|
194ca6f |
--- wget-1.16.1/NEWS.path 2014-12-08 11:30:12.000000000 +0100
|
|
|
194ca6f |
+++ wget-1.16.1/NEWS 2014-12-11 10:30:40.022160421 +0100
|
|
|
194ca6f |
@@ -741,7 +741,7 @@ distributed with Wget.
|
|
|
239bd5a |
|
|
|
239bd5a |
** Compiles on pre-ANSI compilers.
|
|
|
239bd5a |
|
|
|
239bd5a |
-** Global wgetrc now goes to /usr/local/etc (i.e. $sysconfdir).
|
|
|
239bd5a |
+** Global wgetrc now goes to /etc (i.e. $sysconfdir).
|
|
|
239bd5a |
|
|
|
239bd5a |
** Lots of bugfixes.
|
|
|
194ca6f |
|
|
|
194ca6f |
@@ -804,7 +804,7 @@ Emacs, standalone info, or converted to
|
|
|
239bd5a |
** Fixed a long-standing bug, so that Wget now works over SLIP
|
|
|
239bd5a |
connections.
|
|
|
239bd5a |
|
|
|
239bd5a |
-** You can have a system-wide wgetrc (/usr/local/lib/wgetrc by
|
|
|
239bd5a |
+** You can have a system-wide wgetrc (/etc/wgetrc by
|
|
|
239bd5a |
default). Settings in $HOME/.wgetrc override the global ones, of
|
|
|
239bd5a |
course :-)
|
|
|
239bd5a |
|
|
|
194ca6f |
diff -up wget-1.16.1/README.path wget-1.16.1/README
|
|
|
194ca6f |
--- wget-1.16.1/README.path 2013-10-21 16:50:12.000000000 +0200
|
|
|
194ca6f |
+++ wget-1.16.1/README 2014-12-11 09:51:56.288769489 +0100
|
|
|
e64a33b |
@@ -33,7 +33,7 @@ for socks.
|
|
|
239bd5a |
|
|
|
239bd5a |
Most of the features are configurable, either through command-line
|
|
|
239bd5a |
options, or via initialization file .wgetrc. Wget allows you to
|
|
|
239bd5a |
-install a global startup file (/usr/local/etc/wgetrc by default) for
|
|
|
239bd5a |
+install a global startup file (/etc/wgetrc by default) for
|
|
|
239bd5a |
site settings.
|
|
|
239bd5a |
|
|
|
239bd5a |
Wget works under almost all Unix variants in use today and, unlike
|