[gnome-user-docs] Add explanation to each proxy method



commit e66f58ab368e61251fa45533bcfccd585c803520
Author: Baptiste Mille-Mathias <baptistem gnome org>
Date:   Mon Feb 20 11:44:42 2012 +0100

    Add explanation to each proxy method

 gnome-help/C/net-proxy.page |   27 +++++++++++++++++++++------
 1 files changed, 21 insertions(+), 6 deletions(-)
---
diff --git a/gnome-help/C/net-proxy.page b/gnome-help/C/net-proxy.page
index f444425..6389e62 100644
--- a/gnome-help/C/net-proxy.page
+++ b/gnome-help/C/net-proxy.page
@@ -4,12 +4,16 @@
   <info>
     <link type="guide" xref="net-general"/>
 
-    <revision pkgversion="3.4.0" date="2012-02-19" status="outdated"/>
+    <revision pkgversion="3.4.0" date="2012-02-19" status="review"/>
 
     <credit type="author">
       <name>Phil Bull</name>
       <email>philbull gmail com</email>
     </credit>
+    <credit type="author">
+      <name>Baptiste Mille-Mathias</name>
+      <email>baptistem gnome org</email>
+    </credit>
 
     <desc>A proxy filters websites that you look at, usually for control or security purposes.</desc>
     <include href="legal.xml" xmlns="http://www.w3.org/2001/XInclude"/>
@@ -45,13 +49,24 @@
    </item>
    <item>
     <p>Choose which proxy method you want to use among the following methods.</p>
-    <list>
-     <item><p><gui>None</gui></p></item>
-     <item><p><gui>Manual</gui></p></item>
-     <item><p><gui>Automatic</gui></p></item>
-    </list>
+    <terms>
+     <item>
+      <title>None</title>
+      <p>The applications will use a direct connection to fetch the content on the web.</p>
+     </item>
+     <item>
+      <title>Manual</title>
+      <p>For each proxied protocol, define the address of a proxy and port for the protocols. 
+      The protocols are <gui>HTTP</gui>, <gui>HTTPS</gui>, <gui>FTP</gui> and <gui>SOCKS</gui>.</p>
+     </item>
+     <item>
+      <title>Automatic</title>
+      <p>An url points to a resource, which contains the appropriate configuration for your system.</p>
+     </item>
+    </terms>
    </item>
   </steps>
+  <p>The proxy settings will be applied to applications that use network connection to use the choosen configuration.</p>
 
  </section>
 



[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]