projects / packages / wget.git / blame
| Commit | Line | Data |
|---|---|---|
| cd1931b0 | 1 | diff -uNr wget-1.8.2.orig/NEWS wget-1.8.2/NEWS |
| 2 | --- wget-1.8.2.orig/NEWS Thu Aug 28 21:45:31 2003 | |
| 3 | +++ wget-1.8.2/NEWS Thu Aug 28 21:45:31 2003 | |
| 4 | @@ -232,7 +232,7 @@ | |
| 5 | ||
| 6 | ** Compiles on pre-ANSI compilers. | |
| 7 | ||
| 8 | -** Global wgetrc now goes to /usr/local/etc (i.e. $sysconfdir). | |
| 9 | +** Global wgetrc now goes to /etc (i.e. $sysconfdir). | |
| 10 | ||
| 11 | ** Lots of bugfixes. | |
| 12 | \f | |
| 13 | @@ -295,9 +295,8 @@ | |
| 14 | ** Fixed a long-standing bug, so that Wget now works over SLIP | |
| 15 | connections. | |
| 16 | ||
| 17 | -** You can have a system-wide wgetrc (/usr/local/lib/wgetrc by | |
| 18 | -default). Settings in $HOME/.wgetrc override the global ones, of | |
| 19 | -course :-) | |
| 20 | +** You can have a system-wide wgetrc (/etc/wgetrc by default). Settings | |
| 21 | +in $HOME/.wgetrc override the global ones, of course :-) | |
| 22 | ||
| 23 | ** You can set up quota in .wgetrc to prevent sucking too much | |
| 24 | data. Try `quota = 5M' in .wgetrc (or quota = 100K if you want your | |
| 5ce934a3 | 25 | diff -Nur wget-1.10/doc.orig/sample.wgetrc wget-1.10/doc/sample.wgetrc |
| 26 | --- wget-1.10/doc.orig/sample.wgetrc 2001-11-30 08:32:17.000000000 +0100 | |
| 27 | +++ wget-1.10/doc/sample.wgetrc 2005-06-22 09:43:39.000000000 +0200 | |
| 28 | @@ -7,7 +7,7 @@ | |
| 29 | ## not contain a comprehensive list of commands -- look at the manual | |
| 30 | ## to find out what you can put into this file. | |
| 52d7144f | 31 | ## |
| 5ce934a3 | 32 | -## Wget initialization file can reside in /usr/local/etc/wgetrc |
| 33 | +## Wget initialization file can reside in /etc/wgetrc | |
| 34 | ## (global, for all users) or $HOME/.wgetrc (for a single user). | |
| 35 | ## | |
| 36 | ## To use the settings in this file, you will have to uncomment them, | |
| 37 | @@ -16,7 +16,7 @@ | |
| 38 | ||
| 39 | ||
| 40 | ## | |
| 41 | -## Global settings (useful for setting up in /usr/local/etc/wgetrc). | |
| 42 | +## Global settings (useful for setting up in /etc/wgetrc). | |
| 43 | ## Think well before you change them, since they may reduce wget's | |
| 44 | ## functionality, and make it behave contrary to the documentation: | |
| 45 | ## | |
| 46 | diff -Nur wget-1.10/doc.orig/wget.texi wget-1.10/doc/wget.texi | |
| 47 | --- wget-1.10/doc.orig/wget.texi 2005-06-22 09:42:36.000000000 +0200 | |
| 48 | +++ wget-1.10/doc/wget.texi 2005-06-22 09:44:02.000000000 +0200 | |
| 824511ec | 49 | @@ -191,7 +191,7 @@ gauge can be customized to your preferen |
| cd1931b0 | 50 | Most of the features are fully configurable, either through command line |
| 51 | options, or via the initialization file @file{.wgetrc} (@pxref{Startup | |
| 52 | File}). Wget allows you to define @dfn{global} startup files | |
| 7470d5b0 AM |
53 | -(@file{/usr/local/etc/wgetrc} by default) for site settings. You can also |
| 54 | +(@file{/etc/wgetrc} by default) for site settings. You can also | |
| 55 | specify the location of a startup file with the --config option. | |
| 824511ec AM |
56 | To disable the reading of config files, use --no-config. |
| 57 | If both --config and --no-config are given, --no-config is ignored. | |
| 58 | @@ -200,7 +200,7 @@ If both --config and --no-config are giv | |
| cd1931b0 | 59 | @ignore |
| 60 | @c man begin FILES | |
| 61 | @table @samp | |
| 62 | -@item /usr/local/etc/wgetrc | |
| 63 | +@item /etc/wgetrc | |
| 64 | Default location of the @dfn{global} startup file. | |
| 65 | ||
| 66 | @item .wgetrc | |
| 5ce934a3 | 67 | @@ -2411,9 +2411,7 @@ |
| cd1931b0 | 68 | @cindex location of wgetrc |
| 69 | ||
| 70 | When initializing, Wget will look for a @dfn{global} startup file, | |
| 71 | -@file{/usr/local/etc/wgetrc} by default (or some prefix other than | |
| 72 | -@file{/usr/local}, if Wget was not installed there) and read commands | |
| 73 | -from there, if it exists. | |
| 74 | +@file{/etc/wgetrc} by default and read commands from there, if it exists. | |
| 75 | ||
| 76 | Then it will look for the user's file. If the environmental variable | |
| 77 | @code{WGETRC} is set, Wget will try to load that file. Failing that, no | |
| 5ce934a3 | 78 | @@ -2423,7 +2421,7 @@ |
| cd1931b0 | 79 | |
| 80 | The fact that user's settings are loaded after the system-wide ones | |
| 81 | means that in case of collision user's wgetrc @emph{overrides} the | |
| 82 | -system-wide wgetrc (in @file{/usr/local/etc/wgetrc} by default). | |
| 83 | +system-wide wgetrc (in @file{/etc/wgetrc} by default). | |
| 84 | Fascist admins, away! | |
| 85 | ||
| 5ce934a3 | 86 | @node Wgetrc Syntax |