diff options
| author | Matthias Clasen <matthiasc@src.gnome.org> | 2009-02-09 18:46:27 +0000 |
|---|---|---|
| committer | Matthias Clasen <matthiasc@src.gnome.org> | 2009-02-09 18:46:27 +0000 |
| commit | 754d6eee62597d90899e2ef442468da9fa6f0ec8 (patch) | |
| tree | 1863b36f4d2b12f0363cd017d7574ab0c40bf5cc /gnome2-user-guide | |
| parent | eb9850fcd218f839450c7e76f44162e0a9f57844 (diff) | |
| download | gnome-user-docs-754d6eee62597d90899e2ef442468da9fa6f0ec8.tar.gz gnome-user-docs-754d6eee62597d90899e2ef442468da9fa6f0ec8.tar.xz gnome-user-docs-754d6eee62597d90899e2ef442468da9fa6f0ec8.zip | |
Some more network proxy docs
svn path=/trunk/; revision=1081
Diffstat (limited to 'gnome2-user-guide')
| -rw-r--r-- | gnome2-user-guide/C/goscustdesk.xml | 6 | ||||
| -rw-r--r-- | gnome2-user-guide/ChangeLog | 7 |
2 files changed, 10 insertions, 3 deletions
diff --git a/gnome2-user-guide/C/goscustdesk.xml b/gnome2-user-guide/C/goscustdesk.xml index 669d6ad..694a11c 100644 --- a/gnome2-user-guide/C/goscustdesk.xml +++ b/gnome2-user-guide/C/goscustdesk.xml @@ -1914,10 +1914,12 @@ tools</primary> <varlistentry><term><guilabel>Automatic proxy configuration</guilabel></term><listitem><para>Select this option if you want to connect to the Internet through a proxy server, and you want to configure the proxy server automatically.</para> + <para>Automatic proxy configuration works by means of a so-called PAC file, which your browser downloads from a web server. If you don't specify the URL for a PAC file in the <guilabel>Autoconfiguration URL</guilabel> entry, your browser + will try to locate one automatically.</para> <variablelist> <varlistentry><term><guilabel>Autoconfiguration - URL</guilabel></term><listitem><para>Enter the URL that contains the information required to configure the proxy - server automatically. </para></listitem></varlistentry> + URL</guilabel></term><listitem><para>Enter the URL of a PAC file that contains the information required to configure the proxy + server automatically.</para></listitem></varlistentry> </variablelist></listitem></varlistentry> </variablelist> diff --git a/gnome2-user-guide/ChangeLog b/gnome2-user-guide/ChangeLog index 47673cc..32cba0d 100644 --- a/gnome2-user-guide/ChangeLog +++ b/gnome2-user-guide/ChangeLog @@ -1,8 +1,13 @@ +2009-02-09 Matthias Clasen <mclasen@redhat.com> + + * C/goscustdesk.xml: Some more explanation of automatic configuration + of Network Proxies. + 2009-02-08 Matthias Clasen <mclasen@redhat.com> Bug 570925 – Remove printing preferences section - * C/goscustdeskt.xml: Remove the section that describes a nonexisting + * C/goscustdesk.xml: Remove the section that describes a nonexisting printing tool. 2009-02-08 Shaun McCance <shaunm@gnome.org> |