aboutsummaryrefslogtreecommitdiffstats
path: root/help
diff options
context:
space:
mode:
authorMilo Casagrande <milo@ubuntu.com>2009-07-24 02:55:35 +0800
committerFrédéric Péters <fpeters@0d.be>2009-08-13 00:13:52 +0800
commit036c51af56a5f2a7d9a65c132b5d7a28831c7eb5 (patch)
tree4b02d215c3b55c8e543db2de006b789a6185ecd9 /help
parent2a17a62f8634b95cebf3df6763cb064c9f749634 (diff)
downloadgsoc2013-empathy-036c51af56a5f2a7d9a65c132b5d7a28831c7eb5.tar
gsoc2013-empathy-036c51af56a5f2a7d9a65c132b5d7a28831c7eb5.tar.gz
gsoc2013-empathy-036c51af56a5f2a7d9a65c132b5d7a28831c7eb5.tar.bz2
gsoc2013-empathy-036c51af56a5f2a7d9a65c132b5d7a28831c7eb5.tar.lz
gsoc2013-empathy-036c51af56a5f2a7d9a65c132b5d7a28831c7eb5.tar.xz
gsoc2013-empathy-036c51af56a5f2a7d9a65c132b5d7a28831c7eb5.tar.zst
gsoc2013-empathy-036c51af56a5f2a7d9a65c132b5d7a28831c7eb5.zip
Reworked the topics, now whould be more consistent and coherent with each other Added a couple of seealso links
Diffstat (limited to 'help')
-rw-r--r--help/C/change-status.page2
-rw-r--r--help/C/create-account.page86
-rw-r--r--help/C/offline-contacts.page28
-rw-r--r--help/C/prob-conn-auth.page63
-rw-r--r--help/C/send-message.page29
-rw-r--r--help/C/status-icons.page6
6 files changed, 116 insertions, 98 deletions
diff --git a/help/C/change-status.page b/help/C/change-status.page
index 4bef6f2cc..c1abde839 100644
--- a/help/C/change-status.page
+++ b/help/C/change-status.page
@@ -29,7 +29,7 @@
<steps>
<item>
<p>
- Click on the drop-down list at the top of the main window of <app>Empathy</app>.
+ Click on the drop-down list at the top of the <gui>Contact List</gui> window.
</p>
</item>
<item>
diff --git a/help/C/create-account.page b/help/C/create-account.page
index b8c8b5140..2d3211d1a 100644
--- a/help/C/create-account.page
+++ b/help/C/create-account.page
@@ -32,8 +32,8 @@
<title>Register for a new account</title>
<p>
- You can freely create an account on any of the following
- services. Follow the instructions reported on each website on
+ You can freely create an account on any of the services listed below.
+ Follow the instructions reported on each website on
how to register your new account.
</p>
<p>
@@ -50,42 +50,42 @@
<list>
<item>
- <p>
- <link href="http://dashboard.aim.com/aim">AIM</link>
- </p>
+ <p>
+ <link href="http://dashboard.aim.com/aim">AIM</link>
+ </p>
</item>
<item>
- <p>
- <link href="http://www.google.com/talk/">Google Talk</link>
- </p>
+ <p>
+ <link href="http://www.google.com/talk/">Google Talk</link>
+ </p>
</item>
<item>
- <p>
- <link href="https://www.icq.com/register/">ICQ</link>
- </p>
+ <p>
+ <link href="https://www.icq.com/register/">ICQ</link>
+ </p>
</item>
<item>
- <p>
- <link href="http://register.jabber.org/">Jabber</link>
- </p>
- <note>
- <p>
- It is possible to use the automatic creation of accounts
- with this service and <app>Empathy</app>. Not all the
- service providers support it. One service provider known
- to work is <em>jabber.org</em>, the default one of the application.
- </p>
- </note>
+ <p>
+ <link href="http://register.jabber.org/">Jabber</link>
+ </p>
+ <note>
+ <p>
+ It is possible to use the automatic creation of accounts
+ with this service and <app>Empathy</app>. Not all the
+ service providers support it. One service provider known
+ to work is <em>jabber.org</em>, the default one of the application.
+ </p>
+ </note>
</item>
<item>
- <p>
- <link href="https://accountservices.passport.net">MSN</link>
- </p>
+ <p>
+ <link href="https://accountservices.passport.net">MSN</link>
+ </p>
</item>
<item>
- <p>
- <link href="https://login.yahoo.com/config/login">Yahoo!</link>
- </p>
+ <p>
+ <link href="https://login.yahoo.com/config/login">Yahoo!</link>
+ </p>
</item>
</list>
</section>
@@ -98,11 +98,12 @@
</p>
<list>
<item>
- <p>
- <em>Salut</em>
- </p>
+ <p>
+ <em>Salut</em>
+ </p>
</item>
</list>
+
<p>
For more information, see <link type="seealso"
xref="salut-protocol" />.
@@ -114,30 +115,31 @@
<title>Telephony Services</title>
<p>
- These services will let you do voice call over the Internet to
+ These services will let you do voice call over the Internet with
other people using the same service or even to normal phones.
</p>
<list>
<item>
- <p>
- <link href="https://www.ekiga.net/index.php?page=register">Ekiga</link>
- </p>
+ <p>
+ <link href="https://www.ekiga.net/index.php?page=register">Ekiga</link>
+ </p>
</item>
<item>
- <p>
- <link href="https://signup.sipphone.com/new-users/app?class=NewUser;proc=start">Sipphone</link>
- </p>
+ <p>
+ <link href="https://signup.sipphone.com/new-users/app?class=NewUser;proc=start">Sipphone</link>
+ </p>
</item>
</list>
<note>
<p>
- In order to call normal phones over the Internet, you may need
- to subscribe to a paid service. For more information, please
- refer to the instructions provided on the website of the
- service you will use.
+ In order to call normal phones over the Internet, you may need
+ to subscribe to a paid service. For more information, please
+ refer to the instructions provided on the website of the
+ service you will use.
</p>
</note>
+
</section>
</page>
diff --git a/help/C/offline-contacts.page b/help/C/offline-contacts.page
index 0924e7b21..2a8bea8ee 100644
--- a/help/C/offline-contacts.page
+++ b/help/C/offline-contacts.page
@@ -33,25 +33,29 @@
<title>Display offline contacts</title>
- <p>
- From the <gui>Contact List</gui> window, perform one of the following:
- </p>
-
- <list>
+ <steps>
<item>
<p>
- Choose <guiseq><gui>View</gui><gui>Offline Contacts</gui></guiseq>.
+ From the <gui>Contact List</gui> window, perform one of the following:
</p>
+ <list>
+ <item>
+ <p>
+ Choose <guiseq><gui>View</gui><gui>Offline Contacts</gui></guiseq>.
+ </p>
+ </item>
+ <item>
+ <p>
+ Press <keyseq><key>Ctrl</key><key>H</key></keyseq>.
+ </p>
+ </item>
+ </list>
</item>
<item>
<p>
- Press <keyseq><key>Ctrl</key><key>H</key></keyseq>.
+ To hide the offline contacts again, repeat the same procedure above.
</p>
</item>
- </list>
-
- <p>
- To hide the offline contacts again, repeat the same procedure above.
- </p>
+ </steps>
</page>
diff --git a/help/C/prob-conn-auth.page b/help/C/prob-conn-auth.page
index b09673d47..be0ec4389 100644
--- a/help/C/prob-conn-auth.page
+++ b/help/C/prob-conn-auth.page
@@ -4,48 +4,61 @@
<info>
<link type="guide" xref="prob-conn"/>
+ <link type="seealso" xref="create-account"/>
<desc>
An error message appears in the main window saying that
- <gui>Authentication failed</gui>.
+ "<gui>Authentication failed</gui>".
</desc>
+
<revision version="3.0" date="2009-06-17" status="draft"/>
+ <revision pkgversion="2.28" version="3.1" date="2009-07-23" status="draft"/>
+
<credit type="author">
<name>Phil Bull</name>
<email>philbull@gmail.com</email>
</credit>
+
<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 "Authentication failed"</title>
-
-<p>
-If you try to connect and an error message appears in the main Empathy
-window saying that <gui>Authentication failed</gui>, your instant messaging
-service is not allowing you to connect because it does not recognize your
-username or password for some reason.
-</p>
-
-<list>
-<item>
- <p>
- Make sure that you have registered for an account with the service you
- are trying to connect to. If you do not have an account, most services
- will not allow you to connect.
- </p>
-</item>
-<item>
+ <comment>
+ <cite date="2009-07-23"><name>Milo Casagrande</name></cite>
<p>
- Click the <gui>Edit Account</gui> button in the error message. Type
- your username and password again to make sure that they are correct.
- 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.
+ Could be useful to link here how to change your password or how to
+ recover it. Need to write that section.
</p>
-</item>
-</list>
+ </comment>
+
+ <title>I get a message that says "Authentication failed"</title>
+
+ <p>
+ If you try to connect and you get a message saying <gui>Authentication failed</gui>,
+ your instant messaging service is not allowing you to connect because it does not
+ recognize your username or password for some reason.
+ </p>
+ <list>
+ <item>
+ <p>
+ Make sure that you have registered for an account with the service you
+ are trying to connect to. If you do not have an account, most services
+ will not allow you to connect.
+ </p>
+ </item>
+ <item>
+ <p>
+ Click the <gui>Edit Account</gui> button in the error message. Type
+ your username and password again to make sure that they are correct.
+ Deselect the <gui>Enabled</gui> box next to the name of your account and
+ then select it to try to connect to the service again.
+ </p>
+ </item>
+ </list>
</page>
diff --git a/help/C/send-message.page b/help/C/send-message.page
index 0704a4e85..3fe0d4f83 100644
--- a/help/C/send-message.page
+++ b/help/C/send-message.page
@@ -26,27 +26,26 @@
<steps>
<item>
<p>
- From the main window of Empathy, perform one of the following:
+ From the <gui>Contact List</gui> window, perform one of the following:
</p>
<list>
- <item>
- <p>
- Double-click the name of the contact that you want to chat
- with
- </p>
- </item>
- <item>
- <p>
- Right-click their name and click <gui>Chat</gui>
- </p>
- </item>
+ <item>
+ <p>
+ Double-click the name of the contact that you want to chat
+ with.
+ </p>
+ </item>
+ <item>
+ <p>
+ Right-click on their name and select <gui>Chat</gui>
+ </p>
+ </item>
</list>
</item>
<item>
<p>
- A chat window will open. Type a message into the box at the
- bottom of the window and press <key>Enter</key> to send it to
- your contact.
+ A chat window will open. Type a message into the box at the
+ bottom of the window and press <key>Enter</key> to send it.
</p>
</item>
</steps>
diff --git a/help/C/status-icons.page b/help/C/status-icons.page
index a8d2649cb..c644d0f6e 100644
--- a/help/C/status-icons.page
+++ b/help/C/status-icons.page
@@ -65,7 +65,7 @@
This is the default icon for the <em>Available</em> status.
</p>
<p>
- This icon indicates that a contact is availble to have conversations with other
+ Use this icon when you are availble to have conversations with other
people.
</p>
</td>
@@ -83,7 +83,7 @@
This is the default icon for the <em>Busy</em> status.
</p>
<p>
- This icon idicates that a contact does not want to be disturbed.
+ Use this icon when you do not want to be disturbed.
</p>
</td>
</tr>
@@ -100,7 +100,7 @@
This is the default icon for the <em>Away</em> status.
</p>
<p>
- This icon indicates usally that a contact is not in front of the computer. This icon
+ Use this icon when you are going away from the computer. This icon
is used also when you leave the computer and the screensaver turns on.
</p>
</td>