aboutsummaryrefslogtreecommitdiffstats
path: root/help
diff options
context:
space:
mode:
Diffstat (limited to 'help')
-rw-r--r--help/C/add-account.page2
-rw-r--r--help/C/audio-video.page2
-rw-r--r--help/C/prob-conn-acctdisabled.page2
-rw-r--r--help/C/prob-conn-auth.page12
-rw-r--r--help/C/prob-conn-name.page4
-rw-r--r--help/C/prob-conn-neterror.page25
6 files changed, 32 insertions, 15 deletions
diff --git a/help/C/add-account.page b/help/C/add-account.page
index ddb1e4d3a..f9d7763ba 100644
--- a/help/C/add-account.page
+++ b/help/C/add-account.page
@@ -68,7 +68,7 @@
</item>
<item>
<p>
- Click <gui style="button">Save</gui>.
+ Click <gui style="button">Apply</gui>.
</p>
</item>
</steps>
diff --git a/help/C/audio-video.page b/help/C/audio-video.page
index f7589696f..d442db64e 100644
--- a/help/C/audio-video.page
+++ b/help/C/audio-video.page
@@ -29,7 +29,7 @@
-->
</info>
- <title>Audio and Video Support</title>
+ <title>Audio and video support</title>
<p>You can only have audio and video conversation with contacts who are using
an application which also supports this feature. When your contacts support
diff --git a/help/C/prob-conn-acctdisabled.page b/help/C/prob-conn-acctdisabled.page
index 775ef2930..cee5e0402 100644
--- a/help/C/prob-conn-acctdisabled.page
+++ b/help/C/prob-conn-acctdisabled.page
@@ -63,7 +63,7 @@
</item>
<item>
<p>
- Check that the <gui>Enabled</gui> check-box next to the name of your account is selected.
+ Check that the <gui style="checkbox">Enabled</gui> check-box is selected.
If it is not, select the check-box to enalbe the account.
</p>
</item>
diff --git a/help/C/prob-conn-auth.page b/help/C/prob-conn-auth.page
index 01d72fa9c..38ca57c43 100644
--- a/help/C/prob-conn-auth.page
+++ b/help/C/prob-conn-auth.page
@@ -6,12 +6,13 @@
<link type="guide" xref="prob-conn"/>
<link type="seealso" xref="create-account"/>
<desc>
- An error message which says "<gui>Authentication failed</gui>" appears
+ An error message which says “<gui>Authentication failed</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-07-23" status="draft"/>
<revision pkgversion="2.28" version="0.3" date="2009-08-14" status="review"/>
+ <revision pkgversion="2.30" version="0.4" date="2010-02-16" status="review"/>
<credit type="author">
<name>Phil Bull</name>
<email>philbull@gmail.com</email>
@@ -32,7 +33,7 @@
-->
</info>
- <title>I get a message that says "Authentication failed"</title>
+ <title>I get a message that says “Authentication failed”</title>
<p>
This kind of error happens when your instant messaging service is not allowing
@@ -54,7 +55,8 @@
</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>
@@ -64,8 +66,8 @@
</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.
+ Deselect the <gui>Enabled</gui>, and then select it again to try to
+ reconnect to the service.
</p>
</item>
</steps>
diff --git a/help/C/prob-conn-name.page b/help/C/prob-conn-name.page
index 810feffed..7ecda4993 100644
--- a/help/C/prob-conn-name.page
+++ b/help/C/prob-conn-name.page
@@ -12,6 +12,7 @@
</desc>
<revision pkgversion="2.28" version="0.1" date="2009-07-26" status="draft"/>
<revision pkgversion="2.28" version="0.2" date="2009-08-14" status="review"/>
+ <revision pkgversion="2.30" version="0.3" date="2010-02-16" status="review"/>
<credit type="author">
<name>Milo Casagrande</name>
<email>milo@ubuntu.com</email>
@@ -39,7 +40,8 @@
<steps>
<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>
diff --git a/help/C/prob-conn-neterror.page b/help/C/prob-conn-neterror.page
index 5e6b6b042..b5c1e1c26 100644
--- a/help/C/prob-conn-neterror.page
+++ b/help/C/prob-conn-neterror.page
@@ -5,10 +5,11 @@
<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"/>
<credit type="author">
<name>Phil Bull</name>
<email>philbull@gmail.com</email>
@@ -29,7 +30,7 @@
-->
</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>
@@ -54,7 +55,8 @@
</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>
@@ -62,23 +64,34 @@
<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.
+ You should be able to find these details from the website of the messaging
+ service.
</p>
</item>
+<!--
<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.
+ Deselect the <gui>Enabled</gui>, and then select it again 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>