8bdd1cba50
- drop passive-ftp patch, already in 1.10 - drop CVS patch - drop LFS patch, similar fix in 1.10 - drop protdir patch, similar fix in 1.10 - drop actime patch, already in 1.10
138 lines
5.6 KiB
Diff
138 lines
5.6 KiB
Diff
--- wget-1.10/doc/wget.texi.rhpath 2005-07-04 14:51:28.000000000 +0200
|
||
+++ wget-1.10/doc/wget.texi 2005-07-04 14:59:44.000000000 +0200
|
||
@@ -204,12 +204,12 @@
|
||
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.
|
||
+(@file{/etc/wgetrc} by default) for site settings.
|
||
|
||
@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
|
||
@@ -2411,9 +2411,7 @@
|
||
@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} 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
|
||
@@ -2423,7 +2421,7 @@
|
||
|
||
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
|
||
--- wget-1.10/README.rhpath 2005-07-04 14:55:43.000000000 +0200
|
||
+++ wget-1.10/README 2005-07-04 14:56:43.000000000 +0200
|
||
@@ -33,7 +33,7 @@
|
||
|
||
Most of the features are configurable, either through command-line
|
||
options, or via initialization file .wgetrc. Wget allows you to
|
||
-install a global startup file (/usr/local/etc/wgetrc by default) for
|
||
+install a global startup file (/etc/wgetrc by default) for
|
||
site settings.
|
||
|
||
Wget works under almost all Unix variants in use today and, unlike
|
||
--- wget-1.10/doc/sample.wgetrc.munged_for_texi_inclusion.rhpath 2005-07-04 14:53:58.000000000 +0200
|
||
+++ wget-1.10/doc/sample.wgetrc.munged_for_texi_inclusion 2005-07-04 14:54:14.000000000 +0200
|
||
@@ -7,7 +7,7 @@
|
||
## not contain a comprehensive list of commands -- look at the manual
|
||
## to find out what you can put into this 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,
|
||
@@ -16,7 +16,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:
|
||
##
|
||
--- wget-1.10/doc/sample.wgetrc.rhpath 2005-07-04 14:53:22.000000000 +0200
|
||
+++ wget-1.10/doc/sample.wgetrc 2005-07-04 14:53:42.000000000 +0200
|
||
@@ -7,7 +7,7 @@
|
||
## not contain a comprehensive list of commands -- look at the manual
|
||
## to find out what you can put into this 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,
|
||
@@ -16,7 +16,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:
|
||
##
|
||
--- wget-1.10/doc/wget.info.rhpath 2005-07-04 14:48:44.000000000 +0200
|
||
+++ wget-1.10/doc/wget.info 2005-07-04 14:50:51.000000000 +0200
|
||
@@ -121,7 +121,7 @@
|
||
* Most of the features are fully configurable, either through
|
||
command line options, or via the initialization file `.wgetrc'
|
||
(*note Startup File::). Wget allows you to define "global"
|
||
- startup files (`/usr/local/etc/wgetrc' by default) for site
|
||
+ startup files (`/etc/wgetrc' by default) for site
|
||
settings.
|
||
|
||
|
||
@@ -2116,9 +2116,7 @@
|
||
===================
|
||
|
||
When initializing, Wget will look for a "global" startup file,
|
||
-`/usr/local/etc/wgetrc' by default (or some prefix other than
|
||
-`/usr/local', if Wget was not installed there) and read commands from
|
||
-there, if it exists.
|
||
+`/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
|
||
`WGETRC' is set, Wget will try to load that file. Failing that, no
|
||
@@ -2128,7 +2126,7 @@
|
||
|
||
The fact that user's settings are loaded after the system-wide ones
|
||
means that in case of collision user's wgetrc _overrides_ the
|
||
-system-wide wgetrc (in `/usr/local/etc/wgetrc' by default). Fascist
|
||
+system-wide wgetrc (in `/etc/wgetrc' by default). Fascist
|
||
admins, away!
|
||
|
||
|
||
@@ -2593,7 +2591,7 @@
|
||
## not contain a comprehensive list of commands -- look at the manual
|
||
## to find out what you can put into this 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,
|
||
@@ -2602,7 +2600,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:
|
||
##
|