1 diff -uNr wget-1.12/doc/sample.wgetrc wget-1.12-fixed/doc/sample.wgetrc
2 --- wget-1.12/doc/sample.wgetrc 2009-09-22 10:53:58.000000000 +0800
3 +++ wget-1.12-fixed/doc/sample.wgetrc 2009-10-12 17:47:45.000000000 +0800
5 ## not contain a comprehensive list of commands -- look at the manual
6 ## to find out what you can put into this file.
8 -## Wget initialization file can reside in /usr/local/etc/wgetrc
9 +## Wget initialization file can reside in /etc/wgetrc
10 ## (global, for all users) or $HOME/.wgetrc (for a single user).
12 ## To use the settings in this file, you will have to uncomment them,
17 -## Global settings (useful for setting up in /usr/local/etc/wgetrc).
18 +## Global settings (useful for setting up in /etc/wgetrc).
19 ## Think well before you change them, since they may reduce wget's
20 ## functionality, and make it behave contrary to the documentation:
22 diff -uNr wget-1.12/doc/wget.info wget-1.12-fixed/doc/wget.info
23 --- wget-1.12/doc/wget.info 2009-09-23 00:30:20.000000000 +0800
24 +++ wget-1.12-fixed/doc/wget.info 2009-10-12 17:46:11.000000000 +0800
26 * Most of the features are fully configurable, either through
27 command line options, or via the initialization file `.wgetrc'
28 (*note Startup File::). Wget allows you to define "global"
29 - startup files (`/usr/local/etc/wgetrc' by default) for site
30 + startup files (`/etc/wgetrc' by default) for site
33 * Finally, GNU Wget is free software. This means that everyone may
37 When initializing, Wget will look for a "global" startup file,
38 -`/usr/local/etc/wgetrc' by default (or some prefix other than
39 -`/usr/local', if Wget was not installed there) and read commands from
41 +`/etc/wgetrc' by default and read commands from there, if it exists.
43 Then it will look for the user's file. If the environmental variable
44 `WGETRC' is set, Wget will try to load that file. Failing that, no
47 The fact that user's settings are loaded after the system-wide ones
48 means that in case of collision user's wgetrc _overrides_ the
49 -system-wide wgetrc (in `/usr/local/etc/wgetrc' by default). Fascist
51 +system-wide wgetrc (in `/etc/wgetrc' by default).
54 File: wget.info, Node: Wgetrc Syntax, Next: Wgetrc Commands, Prev: Wgetrc Location, Up: Startup File
56 ## not contain a comprehensive list of commands -- look at the manual
57 ## to find out what you can put into this file.
59 - ## Wget initialization file can reside in /usr/local/etc/wgetrc
60 + ## Wget initialization file can reside in /etc/wgetrc
61 ## (global, for all users) or $HOME/.wgetrc (for a single user).
63 ## To use the settings in this file, you will have to uncomment them,
68 - ## Global settings (useful for setting up in /usr/local/etc/wgetrc).
69 + ## Global settings (useful for setting up in /etc/wgetrc).
70 ## Think well before you change them, since they may reduce wget's
71 ## functionality, and make it behave contrary to the documentation:
73 diff -uNr wget-1.12/doc/wget.texi wget-1.12-fixed/doc/wget.texi
74 --- wget-1.12/doc/wget.texi 2009-09-05 05:22:04.000000000 +0800
75 +++ wget-1.12-fixed/doc/wget.texi 2009-10-12 17:46:11.000000000 +0800
77 Most of the features are fully configurable, either through command line
78 options, or via the initialization file @file{.wgetrc} (@pxref{Startup
79 File}). Wget allows you to define @dfn{global} startup files
80 -(@file{/usr/local/etc/wgetrc} by default) for site settings.
81 +(@file{/etc/wgetrc} by default) for site settings.
86 -@item /usr/local/etc/wgetrc
88 Default location of the @dfn{global} startup file.
92 which case @samp{-d} will not work. Please note that compiling with
93 debug support is always safe---Wget compiled with the debug support will
94 @emph{not} print any debug info unless requested with @samp{-d}.
95 -@xref{Reporting Bugs}, for more information on how to use @samp{-d} for
101 @samp{>}, and the control characters in the ranges 0--31 and 128--159.
102 In addition to this, Wget in Windows mode uses @samp{+} instead of
103 @samp{:} to separate host and port in local file names, and uses
104 -@samp{@@} instead of @samp{?} to separate the query portion of the file
105 +@samp{ @@ } instead of @samp{ ? } to separate the query portion of the file
106 name from the rest. Therefore, a URL that would be saved as
107 @samp{www.xemacs.org:4300/search.pl?input=blah} in Unix mode would be
108 saved as @samp{www.xemacs.org+4300/search.pl@@input=blah} in Windows
109 @@ -1259,7 +1257,7 @@
110 would send in the same situation. Different browsers keep textual
111 cookie files in different locations:
116 The cookies are in @file{~/.netscape/cookies.txt}.
118 @@ -2670,9 +2668,7 @@
119 @cindex location of wgetrc
121 When initializing, Wget will look for a @dfn{global} startup file,
122 -@file{/usr/local/etc/wgetrc} by default (or some prefix other than
123 -@file{/usr/local}, if Wget was not installed there) and read commands
124 -from there, if it exists.
125 +@file{/etc/wgetrc} by default and read commands from there, if it exists.
127 Then it will look for the user's file. If the environmental variable
128 @code{WGETRC} is set, Wget will try to load that file. Failing that, no
129 @@ -2682,8 +2678,7 @@
131 The fact that user's settings are loaded after the system-wide ones
132 means that in case of collision user's wgetrc @emph{overrides} the
133 -system-wide wgetrc (in @file{/usr/local/etc/wgetrc} by default).
134 -Fascist admins, away!
135 +system-wide wgetrc (in @file{/etc/wgetrc} by default).
137 @node Wgetrc Syntax, Wgetrc Commands, Wgetrc Location, Startup File
138 @section Wgetrc Syntax
139 @@ -2729,7 +2724,7 @@
140 wgetrc command can be specified on the command line using the
141 @samp{--execute} switch (@pxref{Basic Startup Options}.)
145 @item accept/reject = @var{string}
146 Same as @samp{-A}/@samp{-R} (@pxref{Types of Files}).
148 diff -uNr wget-1.12/NEWS wget-1.12-fixed/NEWS
149 --- wget-1.12/NEWS 2009-09-22 10:53:35.000000000 +0800
150 +++ wget-1.12-fixed/NEWS 2009-10-12 17:46:11.000000000 +0800
153 ** Compiles on pre-ANSI compilers.
155 -** Global wgetrc now goes to /usr/local/etc (i.e. $sysconfdir).
156 +** Global wgetrc now goes to /etc (i.e. $sysconfdir).
161 ** Fixed a long-standing bug, so that Wget now works over SLIP
164 -** You can have a system-wide wgetrc (/usr/local/lib/wgetrc by
165 +** You can have a system-wide wgetrc (/etc/wgetrc by
166 default). Settings in $HOME/.wgetrc override the global ones, of
169 diff -uNr wget-1.12/README wget-1.12-fixed/README
170 --- wget-1.12/README 2009-09-21 06:59:32.000000000 +0800
171 +++ wget-1.12-fixed/README 2009-10-12 17:46:11.000000000 +0800
174 Most of the features are configurable, either through command-line
175 options, or via initialization file .wgetrc. Wget allows you to
176 -install a global startup file (/usr/local/etc/wgetrc by default) for
177 +install a global startup file (/etc/wgetrc by default) for
180 Wget works under almost all Unix variants in use today and, unlike