added note about Ignore Host List in Network Proxy prefs, reformatted list

2 files changed, 48 insertions, 123 deletions

diff --git a/gnome2-user-guide/C/ChangeLog b/gnome2-user-guide/C/ChangeLog
index cb9b406..c8044df 100644
--- a/gnome2-user-guide/C/ChangeLog
+++ b/gnome2-user-guide/C/ChangeLog
@@ -1,3 +1,8 @@
+2006-04-01 Joachim Noreiko <jnoreiko@yahoo.com>
+
+	* goscustdesk.xml:
+	added note about Ignore Host List in Network Proxy prefs, reformatted list
+	
 2006-03-29 Joachim Noreiko <jnoreiko@yahoo.com>
 
 	* goscustdesk.xml:
diff --git a/gnome2-user-guide/C/goscustdesk.xml b/gnome2-user-guide/C/goscustdesk.xml
index 0309a47..6823589 100644
--- a/gnome2-user-guide/C/goscustdesk.xml
+++ b/gnome2-user-guide/C/goscustdesk.xml
@@ -1753,8 +1753,10 @@ action.</para>
     <title>Multimedia Systems Selector</title>
     <para>See the <ulink type="help" url="ghelp:gstreamer-properties">GStreamer Properties Manual</ulink>.</para>
   </sect1>
-  <sect1 id="goscustdesk-50">
+  <sect1 id="prefs-networkproxy">
     <title>Network Proxy Preferences</title>
+    <!-- preserve id for backwards compatibility: 2.12 -->
+    <anchor id="goscustdesk-50"/>       
     <indexterm>
       <primary>preference
 tools</primary>
@@ -1773,135 +1775,53 @@ tools</primary>
       <secondary>setting preferences</secondary>
     </indexterm>
     <para>The <application>Network Proxy</application>
-preference tool enables you to configure how your system connects to the Internet.
-You can configure the GNOME Desktop to connect to a <firstterm>proxy server</firstterm>, and specify the details of the proxy server. A proxy server
+preference tool enables you to configure how your system connects to the Internet.</para>
+    <para>You can configure the GNOME Desktop to connect to a <firstterm>proxy server</firstterm>, and specify the details of the proxy server. A proxy server
 is a server that intercepts requests to another server, and fulfills the request
 itself, if it can. You can enter the Domain Name Service (DNS) name or the
 Internet Protocol (IP) address of the proxy server. A <firstterm>DNS name</firstterm> is a unique alphabetic identifier for a computer on a network.
 An <firstterm>IP address</firstterm> is a unique numeric identifier for a
 computer on a network. </para>
-    <para><xref linkend="goscustdesk-TBL-52"/> lists the Internet connection preferences
-that you can modify.</para>
-    <table frame="topbot" id="goscustdesk-TBL-52">
-      <title>Internet Connection Preferences</title>
-      <tgroup cols="2" colsep="0" rowsep="0">
-        <colspec colname="colspec2" colwidth="35.09*"/>
-        <colspec colname="colspec3" colwidth="64.91*"/>
-        <thead>
-          <row rowsep="1">
-            <entry>
-              <para>Dialog Element</para>
-            </entry>
-            <entry>
-              <para>Description</para>
-            </entry>
-          </row>
-        </thead>
-        <tbody>
-          <row>
-            <entry colname="colspec2" valign="top">
-              <para>
-                <guilabel>Direct internet
-connection</guilabel>
-              </para>
-            </entry>
-            <entry colname="colspec3" valign="top">
-              <para>Select this option if you want to connect directly to the Internet, without
-a proxy server.</para>
-            </entry>
-          </row>
-          <row>
-            <entry colname="colspec2">
-              <para>
-                <guilabel>Manual proxy configuration</guilabel>
-              </para>
-            </entry>
-            <entry colname="colspec3" valign="top">
-              <para>Select
-this option if you want to connect to the Internet through a proxy server,
-and you want to configure the proxy server manually.</para>
-            </entry>
-          </row>
-          <row>
-            <entry colname="colspec2" valign="top">
-              <para>
-                <guilabel>HTTP proxy</guilabel>
-              </para>
-            </entry>
-            <entry colname="colspec3" valign="top">
-              <para>Enter the DNS name, or the IP
-address of the proxy server to use when you request a HTTP service. Enter
-the port number of the HTTP service on the proxy server in the <guilabel>Port</guilabel> spin box.</para>
-            </entry>
-          </row>
-          <row>
-            <entry colname="colspec2" valign="top">
-              <para>
-                <guilabel>Secure HTTP proxy</guilabel>
-              </para>
-            </entry>
-            <entry colname="colspec3" valign="top">
-              <para>Enter
-the DNS name, or the IP address of the proxy server to use when you request
-a Secure HTTP service. Enter the port number of the Secure HTTP service on
-the proxy server in the <guilabel>Port</guilabel> spin box.</para>
-            </entry>
-          </row>
-          <row>
-            <entry colname="colspec2" valign="top">
-              <para>
-                <guilabel>FTP proxy</guilabel>
-              </para>
-            </entry>
-            <entry colname="colspec3" valign="top">
-              <para>Enter the DNS name, or the IP
-address of the proxy server to use when you request a FTP service. Enter the
-port number of the FTP service on the proxy server in the <guilabel>Port</guilabel>
-spin box.</para>
-            </entry>
-          </row>
-          <row>
-            <entry colname="colspec2" valign="top">
-              <para>
-                <guilabel>Socks host</guilabel>
-              </para>
-            </entry>
-            <entry colname="colspec3" valign="top">
-              <para>Enter the DNS name, or the IP
-address of the Socks host to use. Enter the port number for the Socks protocol
-on the proxy server in the <guilabel>Port</guilabel> spin box.</para>
-            </entry>
-          </row>
-          <row>
-            <entry colname="colspec2" valign="top">
-              <para>
-                <guilabel>Automatic proxy
-configuration</guilabel>
-              </para>
-            </entry>
-            <entry colname="colspec3" valign="top">
-              <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>
-            </entry>
-          </row>
-          <row>
-            <entry colname="colspec2" valign="top">
-              <para>
-                <guilabel>Autoconfiguration
-URL</guilabel>
-              </para>
-            </entry>
-            <entry colname="colspec3" valign="top">
-              <para>Enter the URL that contains the information required to configure the proxy
-server automatically. </para>
-            </entry>
-          </row>
-        </tbody>
-      </tgroup>
-    </table>
+    
+    <variablelist>
+      <varlistentry><term><guilabel>Direct internet
+    connection</guilabel></term><listitem><para>Select this option if you want to connect to the Internet without
+    a proxy server.</para></listitem></varlistentry>
+      <varlistentry><term><guilabel>Manual 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 manually.</para>
+      <variablelist>
+        <varlistentry><term><guilabel>HTTP proxy</guilabel></term><listitem><para>Enter the DNS name, or the IP
+        address of the proxy server to use when you request a HTTP service. Enter
+        the port number of the HTTP service on the proxy server in the <guilabel>Port</guilabel> spin box.</para></listitem></varlistentry>
+        <varlistentry><term><guilabel>Secure HTTP proxy</guilabel></term><listitem><para>Enter
+        the DNS name, or the IP address of the proxy server to use when you request
+        a Secure HTTP service. Enter the port number of the Secure HTTP service on
+        the proxy server in the <guilabel>Port</guilabel> spin box.</para></listitem></varlistentry>
+        <varlistentry><term><guilabel>FTP proxy</guilabel></term><listitem><para>Enter the DNS name, or the IP
+        address of the proxy server to use when you request a FTP service. Enter the
+        port number of the FTP service on the proxy server in the <guilabel>Port</guilabel>
+        spin box.</para></listitem></varlistentry>
+        <varlistentry><term><guilabel>Socks host</guilabel></term><listitem><para>Enter the DNS name, or the IP
+        address of the Socks host to use. Enter the port number for the Socks protocol
+        on the proxy server in the <guilabel>Port</guilabel> spin box.</para></listitem></varlistentry>
+      </variablelist>
+      </listitem></varlistentry>
+      <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></listitem></varlistentry>
+      <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>
+    </variablelist>
+    
+    <para>Set which hosts should not use the proxy in the <guilabel>Ignore Host List</guilabel> in the <guilabel>Advanced Configuration</guilabel> tabbed section. When you access these hosts, you will connect to the Internet directly without a proxy.</para>
+    
   </sect1>
-  <sect1 id="goscustdoc-2">
+  <sect1 id="prefs-preferredapps">
     <title>Preferred Applications</title>
+    <!-- preserve id for backwards compatibility: 2.12 -->
+    <anchor id="goscustdesk-2"/>       
     <indexterm>
       <primary>preference tools</primary>
       <secondary>Preferred Applications</secondary>