Merge branch 'gnome-3-8'

[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 90b389dc8a3b15da5ccc1c2b52ec282b46693212..91d48222281c8f2ebede1c5fa97a6df9267510a5 100644 (file)
--- a/help/C/prob-conn-neterror.page
+++ b/help/C/prob-conn-neterror.page
@@ -5,58 +5,90 @@
   <info>
     <link type="guide" xref="prob-conn"/>
     <desc>
-        An error message appears in the main Empathy window which says 
-        <gui>Network error</gui>.
+        An error message which says “<gui>Network error</gui>” appears in the main window.
     </desc>
-    <revision version="3.0" date="2009-06-17" status="stub"/>
+    <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>
     </credit>
+    <credit type="author">
+      <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>
-    <license>Creative Commons Share Alike 3.0</license>
     <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>
 
-<p>
-If you try to connect and an error message appears in the main Empathy 
-window which says <gui>Network error</gui>, Empathy cannot communicate with 
-the instant messaging service for some reason.
-</p>
+  <comment>
+    <cite date="2009-08-27">shaunm</cite>
+    <p>Empathy no longer allows you to create an IRC account without a valid
+    nick.  I've removed the guide link.  Remove the text.</p>
+  </comment>
 
-<list>
-<item>
-    <p>
-    Check that you are connected to the Internet or network.
-    </p>
-</item>
-<item>
-    <steps>
-        <item>
-        <p>
-        Click the <gui>Edit Account</gui> button in the error message.
-        </p>
-        </item>
-        <item>
-        <p>
-        Expand the <gui>Advanced</gui> section and make sure that the details 
-        such as server address and port are correct. You should be able to find 
-        these details from the website of the messaging service.
-        </p>
-        </item>
+  <p>
+    This kind of error happens when <app>Empathy</app> cannot communicate
+    with the instant messaging service for some reason.
+  </p>
+  <p>
+    Also, this kind of error happens when you try to use an IRC account without
+    setting a nickname.
+  </p>
+
+  <steps>
+    <item>
+      <p>
+        Make sure that you are connected to the Internet, or to a local area network.
+      </p>
+    </item>
+    <item>
+      <p>
+        Click the <media type="image" mime="image/png" src="figures/gtk-edit.png">edit</media>
+        icon in the error message.
+      </p>
+    </item>
+    <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>
-        Uncheck the <gui>Enabled</gui> box next to the name of your account and 
-        then check it again to try to connect to the service again.
-        </p>
+          <p>
+            In the case of an IRC account, type your nickname in the <gui>Nickname</gui>
+            text box.
+          </p>
         </item>
-    </steps>
-</item>
-</list>
+-->
+    </item>
+    <item>
+      <p>
+        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>