2 wget with option --sysconfdir=/etc, so the default location of wgetrc is |
2 wget with option --sysconfdir=/etc, so the default location of wgetrc is |
3 in /etc. sample.wgetrc, sample.wgetrc.munged_for_texi_inclusion and |
3 in /etc. sample.wgetrc, sample.wgetrc.munged_for_texi_inclusion and |
4 wget.texi shall be updated with this change. As this is Solaris specific |
4 wget.texi shall be updated with this change. As this is Solaris specific |
5 patch it will not be pushed upstream. |
5 patch it will not be pushed upstream. |
6 |
6 |
7 --- wget-1.16.3/doc/sample.wgetrc.orig Fri Jun 5 07:33:36 2015 |
7 --- wget-1.17.1/doc/sample.wgetrc.orig Mon Nov 30 06:07:56 2015 |
8 +++ wget-1.16.3/doc/sample.wgetrc Fri Jun 5 07:36:22 2015 |
8 +++ wget-1.17.1/doc/sample.wgetrc Tue Jan 5 06:47:25 2016 |
9 @@ -10,7 +10,7 @@ |
9 @@ -10,7 +10,7 @@ |
10 ## Or online here: |
10 ## Or online here: |
11 ## https://www.gnu.org/software/wget/manual/wget.html#Startup-File |
11 ## https://www.gnu.org/software/wget/manual/wget.html#Startup-File |
12 ## |
12 ## |
13 -## Wget initialization file can reside in /usr/local/etc/wgetrc |
13 -## Wget initialization file can reside in /usr/local/etc/wgetrc |
22 -## Global settings (useful for setting up in /usr/local/etc/wgetrc). |
22 -## Global settings (useful for setting up in /usr/local/etc/wgetrc). |
23 +## Global settings (useful for setting up in /etc/wgetrc). |
23 +## Global settings (useful for setting up in /etc/wgetrc). |
24 ## Think well before you change them, since they may reduce wget's |
24 ## Think well before you change them, since they may reduce wget's |
25 ## functionality, and make it behave contrary to the documentation: |
25 ## functionality, and make it behave contrary to the documentation: |
26 ## |
26 ## |
27 --- wget-1.16.3/doc/wget.texi.orig Fri Jun 5 08:00:14 2015 |
27 --- wget-1.17.1/doc/sample.wgetrc.munged_for_texi_inclusion.orig Fri Dec 11 09:42:38 2015 |
28 +++ wget-1.16.3/doc/wget.texi Fri Jun 5 08:07:16 2015 |
28 +++ wget-1.17.1/doc/sample.wgetrc.munged_for_texi_inclusion Tue Jan 5 06:47:25 2016 |
29 @@ -190,7 +190,7 @@ |
|
30 Most of the features are fully configurable, either through command line |
|
31 options, or via the initialization file @file{.wgetrc} (@pxref{Startup |
|
32 File}). Wget allows you to define @dfn{global} startup files |
|
33 -(@file{/usr/local/etc/wgetrc} by default) for site settings. You can also |
|
34 +(@file{/etc/wgetrc} by default) for site settings. You can also |
|
35 specify the location of a startup file with the --config option. |
|
36 |
|
37 |
|
38 @@ -197,7 +197,7 @@ |
|
39 @ignore |
|
40 @c man begin FILES |
|
41 @table @samp |
|
42 -@item /usr/local/etc/wgetrc |
|
43 +@item /etc/wgetrc |
|
44 Default location of the @dfn{global} startup file. |
|
45 |
|
46 @item .wgetrc |
|
47 @@ -2872,8 +2872,7 @@ |
|
48 @cindex location of wgetrc |
|
49 |
|
50 When initializing, Wget will look for a @dfn{global} startup file, |
|
51 -@file{/usr/local/etc/wgetrc} by default (or some prefix other than |
|
52 -@file{/usr/local}, if Wget was not installed there) and read commands |
|
53 +@file{/etc/wgetrc} by default and read commands |
|
54 from there, if it exists. |
|
55 |
|
56 Then it will look for the user's file. If the environmental variable |
|
57 @@ -2884,7 +2883,7 @@ |
|
58 |
|
59 The fact that user's settings are loaded after the system-wide ones |
|
60 means that in case of collision user's wgetrc @emph{overrides} the |
|
61 -system-wide wgetrc (in @file{/usr/local/etc/wgetrc} by default). |
|
62 +system-wide wgetrc (in @file{/etc/wgetrc} by default). |
|
63 Fascist admins, away! |
|
64 |
|
65 @node Wgetrc Syntax, Wgetrc Commands, Wgetrc Location, Startup File |
|
66 --- wget-1.16.3/doc/sample.wgetrc.munged_for_texi_inclusion.orig Mon Jun 8 07:16:15 2015 |
|
67 +++ wget-1.16.3/doc/sample.wgetrc.munged_for_texi_inclusion Mon Jun 8 07:18:17 2015 |
|
68 @@ -10,7 +10,7 @@ |
29 @@ -10,7 +10,7 @@ |
69 ## Or online here: |
30 ## Or online here: |
70 ## https://www.gnu.org/software/wget/manual/wget.html#Startup-File |
31 ## https://www.gnu.org/software/wget/manual/wget.html#Startup-File |
71 ## |
32 ## |
72 -## Wget initialization file can reside in /usr/local/etc/wgetrc |
33 -## Wget initialization file can reside in /usr/local/etc/wgetrc |
81 -## Global settings (useful for setting up in /usr/local/etc/wgetrc). |
42 -## Global settings (useful for setting up in /usr/local/etc/wgetrc). |
82 +## Global settings (useful for setting up in /etc/wgetrc). |
43 +## Global settings (useful for setting up in /etc/wgetrc). |
83 ## Think well before you change them, since they may reduce wget's |
44 ## Think well before you change them, since they may reduce wget's |
84 ## functionality, and make it behave contrary to the documentation: |
45 ## functionality, and make it behave contrary to the documentation: |
85 ## |
46 ## |
|
47 --- wget-1.17.1/doc/wget.texi.orig Thu Dec 10 14:25:14 2015 |
|
48 +++ wget-1.17.1/doc/wget.texi Tue Jan 5 06:47:26 2016 |
|
49 @@ -191,7 +191,7 @@ |
|
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 |
|
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. |
|
56 |
|
57 |
|
58 @@ -198,7 +198,7 @@ |
|
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 |
|
67 @@ -3036,8 +3036,7 @@ |
|
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 +@file{/etc/wgetrc} by default and read commands |
|
74 from there, if it exists. |
|
75 |
|
76 Then it will look for the user's file. If the environmental variable |
|
77 @@ -3048,7 +3047,7 @@ |
|
78 |
|
79 The fact that user's settings are loaded after the system-wide ones |
|
80 means that in case of collision user's wgetrc @emph{overrides} the |
|
81 -system-wide wgetrc (in @file{/usr/local/etc/wgetrc} by default). |
|
82 +system-wide wgetrc (in @file{/etc/wgetrc} by default). |
|
83 Fascist admins, away! |
|
84 |
|
85 @node Wgetrc Syntax, Wgetrc Commands, Wgetrc Location, Startup File |