Merge remote-tracking branch 'glassrose/add-All-service-selection-in-debug-window'

[empathy.git] / help / C / prob-conn-neterror.page

diff --git a/help/C/prob-conn-neterror.page b/help/C/prob-conn-neterror.page
index 2a4de754062ec0506cf0d96d133cdccb4c0047f8..91d48222281c8f2ebede1c5fa97a6df9267510a5 100644 (file)
--- a/help/C/prob-conn-neterror.page
+++ b/help/C/prob-conn-neterror.page
@@ -5,10 +5,12 @@
   <info>
     <link type="guide" xref="prob-conn"/>
     <desc>
-        An error message which says "<gui>Network error</gui>" appears in the main window.
+        An error message which says “<gui>Network error</gui>” appears in the main window.
     </desc>
     <revision pkgversion="2.28" version="0.1" date="2009-06-17" status="draft"/>
     <revision pkgversion="2.28" version="0.2" date="2009-08-14" status="review"/>
+    <revision pkgversion="2.28" version="0.3" date="2010-02-16" status="review"/>
+    <revision pkgversion="3.2" version="0.4" date="2011-12-18" status="review"/>
     <credit type="author">
       <name>Phil Bull</name>
       <email>philbull@gmail.com</email>
@@ -17,14 +19,19 @@
       <name>Milo Casagrande</name>
       <email>milo@ubuntu.com</email>
     </credit>
+    <license>
+      <p>Creative Commons Share Alike 3.0</p>
+    </license>
+<!--
     <copyright>
       <year>2009</year>
       <name>GNOME Documentation Project</name>
     </copyright>
     <include href="legal.xml" xmlns="http://www.w3.org/2001/XInclude" />
+-->
   </info>
 
-  <title>I get a message that says "Network error"</title>
+  <title>I get a message that says “Network error”</title>
 
   <comment>
     <cite date="2009-08-27">shaunm</cite>
@@ -44,36 +51,44 @@
   <steps>
     <item>
       <p>
-        Make sure that you are connected to the Internet, or to a local area network. 
+        Make sure that you are connected to the Internet, or to a local area network.
       </p>
     </item>
     <item>
       <p>
-        Click on the <gui>Edit Account</gui> button in the error message.
+        Click the <media type="image" mime="image/png" src="figures/gtk-edit.png">edit</media>
+        icon in the error message.
       </p>
     </item>
     <item>
-      <list>
-        <item>
-          <p>
-            Check in the <gui>Advanced</gui> section that all the details are correct.
-            You should be able to find these details from the website of the messaging service.
-          </p>
-        </item>
+      <p>
+        Check in the <gui>Advanced</gui> section that all the details are correct.
+        You should be able to find these details from the website of the messaging
+        service.
+      </p>
+<!--
         <item>
           <p>
             In the case of an IRC account, type your nickname in the <gui>Nickname</gui>
             text box.
           </p>
         </item>
-      </list>
+-->
     </item>
     <item>
       <p>
-        Deselect the <gui>Enabled</gui> check-box next to the name of your account, 
-        and then select it again to try to reconnect to the service.
+        Switch the account off, and then switch it on to try to reconnect to the
+        service.
       </p>
     </item>
   </steps>
 
+  <section id="prob-conn-neterror-proxy">
+    <title>Proxy support</title>
+    <p>
+      At the moment <app>Empathy</app> can not be configured to work with a
+      proxy.
+    </p>
+  </section>
+
 </page>