|
 |
35df25 |
diff -urN wget-1.12/doc/sample.wgetrc wget-1.12.patched/doc/sample.wgetrc
|
|
|
35df25 |
--- wget-1.12/doc/sample.wgetrc 2009-09-22 04:53:58.000000000 +0200
|
|
|
35df25 |
+++ wget-1.12.patched/doc/sample.wgetrc 2009-11-17 12:29:18.000000000 +0100
|
|
|
35df25 |
@@ -7,7 +7,7 @@
|
|
|
35df25 |
## not contain a comprehensive list of commands -- look at the manual
|
|
|
35df25 |
## to find out what you can put into this file.
|
|
|
35df25 |
##
|
|
|
35df25 |
-## Wget initialization file can reside in /usr/local/etc/wgetrc
|
|
|
35df25 |
+## Wget initialization file can reside in /etc/wgetrc
|
|
|
35df25 |
## (global, for all users) or $HOME/.wgetrc (for a single user).
|
|
|
35df25 |
##
|
|
|
35df25 |
## To use the settings in this file, you will have to uncomment them,
|
|
|
35df25 |
@@ -16,7 +16,7 @@
|
|
|
35df25 |
|
|
|
35df25 |
|
|
|
35df25 |
##
|
|
|
35df25 |
-## Global settings (useful for setting up in /usr/local/etc/wgetrc).
|
|
|
35df25 |
+## Global settings (useful for setting up in /etc/wgetrc).
|
|
|
35df25 |
## Think well before you change them, since they may reduce wget's
|
|
|
35df25 |
## functionality, and make it behave contrary to the documentation:
|
|
|
35df25 |
##
|
|
|
35df25 |
diff -urN wget-1.12/doc/sample.wgetrc.munged_for_texi_inclusion wget-1.12.patched/doc/sample.wgetrc.munged_for_texi_inclusion
|
|
|
35df25 |
--- wget-1.12/doc/sample.wgetrc.munged_for_texi_inclusion 2009-09-22 06:08:52.000000000 +0200
|
|
|
35df25 |
+++ wget-1.12.patched/doc/sample.wgetrc.munged_for_texi_inclusion 2009-11-17 12:29:39.000000000 +0100
|
|
|
35df25 |
@@ -7,7 +7,7 @@
|
|
|
35df25 |
## not contain a comprehensive list of commands -- look at the manual
|
|
|
35df25 |
## to find out what you can put into this file.
|
|
|
35df25 |
##
|
|
|
35df25 |
-## Wget initialization file can reside in /usr/local/etc/wgetrc
|
|
|
35df25 |
+## Wget initialization file can reside in /etc/wgetrc
|
|
|
35df25 |
## (global, for all users) or $HOME/.wgetrc (for a single user).
|
|
|
35df25 |
##
|
|
|
35df25 |
## To use the settings in this file, you will have to uncomment them,
|
|
|
35df25 |
@@ -16,7 +16,7 @@
|
|
|
35df25 |
|
|
|
35df25 |
|
|
|
35df25 |
##
|
|
|
35df25 |
-## Global settings (useful for setting up in /usr/local/etc/wgetrc).
|
|
|
35df25 |
+## Global settings (useful for setting up in /etc/wgetrc).
|
|
|
35df25 |
## Think well before you change them, since they may reduce wget's
|
|
|
35df25 |
## functionality, and make it behave contrary to the documentation:
|
|
|
35df25 |
##
|
|
|
35df25 |
diff -urN wget-1.12/doc/wget.info wget-1.12.patched/doc/wget.info
|
|
|
35df25 |
--- wget-1.12/doc/wget.info 2009-09-22 18:30:20.000000000 +0200
|
|
|
35df25 |
+++ wget-1.12.patched/doc/wget.info 2009-11-17 12:28:40.000000000 +0100
|
|
|
35df25 |
@@ -2351,8 +2351,8 @@
|
|
|
35df25 |
===================
|
|
|
35df25 |
|
|
|
35df25 |
When initializing, Wget will look for a "global" startup file,
|
|
|
35df25 |
-`/usr/local/etc/wgetrc' by default (or some prefix other than
|
|
|
35df25 |
-`/usr/local', if Wget was not installed there) and read commands from
|
|
|
35df25 |
+`/etc/wgetrc' by default (or some prefix other than
|
|
|
35df25 |
+`/etc', if Wget was not installed there) and read commands from
|
|
|
35df25 |
there, if it exists.
|
|
|
35df25 |
|
|
|
35df25 |
Then it will look for the user's file. If the environmental variable
|
|
|
35df25 |
@@ -2363,7 +2363,7 @@
|
|
|
35df25 |
|
|
|
35df25 |
The fact that user's settings are loaded after the system-wide ones
|
|
|
35df25 |
means that in case of collision user's wgetrc _overrides_ the
|
|
|
35df25 |
-system-wide wgetrc (in `/usr/local/etc/wgetrc' by default). Fascist
|
|
|
35df25 |
+system-wide wgetrc (in `/etc/wgetrc' by default). Fascist
|
|
|
35df25 |
admins, away!
|
|
|
35df25 |
|
|
|
35df25 |
?
|
|
|
35df25 |
@@ -2876,7 +2876,7 @@
|
|
|
35df25 |
## not contain a comprehensive list of commands -- look at the manual
|
|
|
35df25 |
## to find out what you can put into this file.
|
|
|
35df25 |
##
|
|
|
35df25 |
- ## Wget initialization file can reside in /usr/local/etc/wgetrc
|
|
|
35df25 |
+ ## Wget initialization file can reside in /etc/wgetrc
|
|
|
35df25 |
## (global, for all users) or $HOME/.wgetrc (for a single user).
|
|
|
35df25 |
##
|
|
|
35df25 |
## To use the settings in this file, you will have to uncomment them,
|
|
|
35df25 |
@@ -2885,7 +2885,7 @@
|
|
|
35df25 |
|
|
|
35df25 |
|
|
|
35df25 |
##
|
|
|
35df25 |
- ## Global settings (useful for setting up in /usr/local/etc/wgetrc).
|
|
|
35df25 |
+ ## Global settings (useful for setting up in /etc/wgetrc).
|
|
|
35df25 |
## Think well before you change them, since they may reduce wget's
|
|
|
35df25 |
## functionality, and make it behave contrary to the documentation:
|
|
|
35df25 |
##
|
|
|
35df25 |
diff -urN wget-1.12/doc/wget.texi wget-1.12.patched/doc/wget.texi
|
|
|
35df25 |
--- wget-1.12/doc/wget.texi 2009-09-04 23:22:04.000000000 +0200
|
|
|
35df25 |
+++ wget-1.12.patched/doc/wget.texi 2009-11-17 12:29:03.000000000 +0100
|
|
|
35df25 |
@@ -2670,8 +2670,8 @@
|
|
|
35df25 |
@cindex location of wgetrc
|
|
|
35df25 |
|
|
|
35df25 |
When initializing, Wget will look for a @dfn{global} startup file,
|
|
|
35df25 |
-@file{/usr/local/etc/wgetrc} by default (or some prefix other than
|
|
|
35df25 |
-@file{/usr/local}, if Wget was not installed there) and read commands
|
|
|
35df25 |
+@file{/etc/wgetrc} by default (or some prefix other than
|
|
|
35df25 |
+@file{/etc}, if Wget was not installed there) and read commands
|
|
|
35df25 |
from there, if it exists.
|
|
|
35df25 |
|
|
|
35df25 |
Then it will look for the user's file. If the environmental variable
|
|
|
35df25 |
@@ -2682,7 +2682,7 @@
|
|
|
35df25 |
|
|
|
35df25 |
The fact that user's settings are loaded after the system-wide ones
|
|
|
35df25 |
means that in case of collision user's wgetrc @emph{overrides} the
|
|
|
35df25 |
-system-wide wgetrc (in @file{/usr/local/etc/wgetrc} by default).
|
|
|
35df25 |
+system-wide wgetrc (in @file{/etc/wgetrc} by default).
|
|
|
35df25 |
Fascist admins, away!
|
|
|
35df25 |
|
|
|
35df25 |
@node Wgetrc Syntax, Wgetrc Commands, Wgetrc Location, Startup File
|
|
|
35df25 |
diff -urN wget-1.12/NEWS wget-1.12.patched/NEWS
|
|
|
35df25 |
--- wget-1.12/NEWS 2009-09-22 04:53:35.000000000 +0200
|
|
|
35df25 |
+++ wget-1.12.patched/NEWS 2009-11-17 12:30:10.000000000 +0100
|
|
|
35df25 |
@@ -562,7 +562,7 @@
|
|
|
35df25 |
|
|
|
35df25 |
** Compiles on pre-ANSI compilers.
|
|
|
35df25 |
|
|
|
35df25 |
-** Global wgetrc now goes to /usr/local/etc (i.e. $sysconfdir).
|
|
|
35df25 |
+** Global wgetrc now goes to /etc (i.e. $sysconfdir).
|
|
|
35df25 |
|
|
|
35df25 |
** Lots of bugfixes.
|
|
|
35df25 |
|
|
|
35df25 |
@@ -625,7 +625,7 @@
|
|
|
35df25 |
** Fixed a long-standing bug, so that Wget now works over SLIP
|
|
|
35df25 |
connections.
|
|
|
35df25 |
|
|
|
35df25 |
-** You can have a system-wide wgetrc (/usr/local/lib/wgetrc by
|
|
|
35df25 |
+** You can have a system-wide wgetrc (/etc/wgetrc by
|
|
|
35df25 |
default). Settings in $HOME/.wgetrc override the global ones, of
|
|
|
35df25 |
course :-)
|
|
|
35df25 |
|
|
|
35df25 |
diff -urN wget-1.12/README wget-1.12.patched/README
|
|
|
35df25 |
--- wget-1.12/README 2009-09-21 00:59:32.000000000 +0200
|
|
|
35df25 |
+++ wget-1.12.patched/README 2009-11-17 12:30:27.000000000 +0100
|
|
|
35df25 |
@@ -33,7 +33,7 @@
|
|
|
35df25 |
|
|
|
35df25 |
Most of the features are configurable, either through command-line
|
|
|
35df25 |
options, or via initialization file .wgetrc. Wget allows you to
|
|
|
35df25 |
-install a global startup file (/usr/local/etc/wgetrc by default) for
|
|
|
35df25 |
+install a global startup file (/etc/wgetrc by default) for
|
|
|
35df25 |
site settings.
|
|
|
35df25 |
|
|
|
35df25 |
Wget works under almost all Unix variants in use today and, unlike
|
|
|
35df25 |
--- wget-1.12/doc/wget.info.start 2011-12-19 10:34:29.409272713 -0600
|
|
|
35df25 |
+++ wget-1.12/doc/wget.info 2011-12-19 10:34:51.760129197 -0600
|
|
|
35df25 |
@@ -113,7 +113,7 @@
|
|
|
35df25 |
* Most of the features are fully configurable, either through
|
|
|
35df25 |
command line options, or via the initialization file `.wgetrc'
|
|
|
35df25 |
(*note Startup File::). Wget allows you to define "global"
|
|
|
35df25 |
- startup files (`/usr/local/etc/wgetrc' by default) for site
|
|
|
35df25 |
+ startup files (`/etc/wgetrc' by default) for site
|
|
|
35df25 |
settings. You can also specify the location of a startup file with
|
|
|
35df25 |
the -config option.
|
|
|
35df25 |
|
|
|
35df25 |
--- wget-1.12/doc/wget.texi.start 2011-12-19 10:38:18.305730849 -0600
|
|
|
35df25 |
+++ wget-1.12/doc/wget.texi 2011-12-19 10:38:49.272615753 -0600
|
|
|
35df25 |
@@ -190,14 +190,14 @@
|
|
|
35df25 |
Most of the features are fully configurable, either through command line
|
|
|
35df25 |
options, or via the initialization file @file{.wgetrc} (@pxref{Startup
|
|
|
35df25 |
File}). Wget allows you to define @dfn{global} startup files
|
|
|
35df25 |
-(@file{/usr/local/etc/wgetrc} by default) for site settings. You can also
|
|
|
35df25 |
+(@file{/etc/wgetrc} by default) for site settings. You can also
|
|
|
35df25 |
specify the location of a startup file with the --config option.
|
|
|
35df25 |
|
|
|
35df25 |
|
|
|
35df25 |
@ignore
|
|
|
35df25 |
@c man begin FILES
|
|
|
35df25 |
@table @samp
|
|
|
35df25 |
-@item /usr/local/etc/wgetrc
|
|
|
35df25 |
+@item /etc/wgetrc
|
|
|
35df25 |
Default location of the @dfn{global} startup file.
|
|
|
35df25 |
|
|
|
35df25 |
@item .wgetrc
|