aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--help/C/accounts-window.page1
-rw-r--r--help/C/add-account.page22
-rw-r--r--help/C/create-account.page145
-rw-r--r--help/C/irc-nick-password.page1
-rw-r--r--help/C/prob-conn-neterror.page7
5 files changed, 97 insertions, 79 deletions
diff --git a/help/C/accounts-window.page b/help/C/accounts-window.page
index 14e705641..f28032278 100644
--- a/help/C/accounts-window.page
+++ b/help/C/accounts-window.page
@@ -4,6 +4,7 @@
<info>
<link type="topic" xref="add-account"/>
+ <link type="topic" xref="create-account"/>
<link type="topic" xref="disable-account"/>
<link type="topic" xref="remove-account"/>
<desc>Add, modify, and delete accounts.</desc>
diff --git a/help/C/add-account.page b/help/C/add-account.page
index 53c9ea475..99a6d35dc 100644
--- a/help/C/add-account.page
+++ b/help/C/add-account.page
@@ -13,6 +13,10 @@
<name>Milo Casagrande</name>
<email>milo@ubuntu.com</email>
</credit>
+ <credit type="author">
+ <name>Shaun McCance</name>
+ <email>shaunm@gnome.org</email>
+ </credit>
<copyright>
<year>2009</year>
<name>GNOME Documentation Project</name>
@@ -22,8 +26,8 @@
<title>Add a new account</title>
- <p>You can add instant messaging accounts from any support service to communicate
- with all of your contacts in <app>Empathy</app>. For some service providers,
+ <p>You can add instant messaging accounts from any supported service to communicate
+ with all of your contacts in <app>Empathy</app>. For some account providers,
these steps will also allow you to register for a new account. For more details,
see <link xref="create-account"/>.</p>
@@ -36,10 +40,16 @@
<p>Click the <gui style="button">Add</gui> button.</p>
</item>
<item>
- <p>From the <gui>Add new</gui> drop-down list, choose the service you wish to add
- an account for. If you would like to <link xref="create-account">register for a
- new account</link> with the service provider, select <gui>Create a new account</gui>.
- Click <gui>Create</gui>.</p>
+ <p>From the <gui>Add new</gui> drop-down list, select the type of account you wish
+ to add.</p>
+ </item>
+ <item>
+ <p>If you do not already have a registered account, select <gui>Create a new account</gui>.
+ This feature is not available for all account types, and may not work with some account
+ providers. See <link xref="create-account"/> for more information.</p>
+ </item>
+ <item>
+ <p>Click <gui>Create</gui>.</p>
</item>
<item>
<p>Enter the required information. For most accounts, you will only need
diff --git a/help/C/create-account.page b/help/C/create-account.page
index 46f58395e..f1a0c4281 100644
--- a/help/C/create-account.page
+++ b/help/C/create-account.page
@@ -24,83 +24,43 @@
<title>Register for a new account</title>
- <p>
- 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>
- At the end of the registration process you should have a <em>user
- name</em> (or an <em>account ID</em>) and a <em>password</em>
- that you will use to add the account to <app>Empathy</app>.
- </p>
- <p>
- Click on the name of the service to visit its website.
- </p>
-
- <section id="im-services">
- <title>Instant Messaging Services</title>
+ <p>Most account types require you to create an account with a account provider
+ before you can connect using instant messaging applications like <app>Empathy</app>.
+ With some account providers, you can use <app>Empathy</app> to register for a new
+ account, using the same steps as you would to <link xref="add-account">add an
+ account</link>.</p>
- <list>
- <item>
- <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>
- </item>
- <item>
- <p>
- <link href="https://www.icq.com/register/">ICQ</link>
- </p>
- </item>
- <item>
- <p>
- <link href="http://register.jabber.org/">Jabber</link>
- </p>
- <note style="tip">
- <p>
- It is possible to use the automatic creation of accounts
- with this service. 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>
- </item>
- <item>
- <p>
- <link href="https://login.yahoo.com/config/login">Yahoo!</link>
- </p>
- </item>
- </list>
+ <p>This page provides information on creating a new account for various types of
+ accounts. Your account provider should give you a login ID and a password, as well
+ as any additional information you need to connect with <app>Empathy</app>.</p>
+
+ <section id="jabber">
+ <title>Jabber</title>
+
+ <p>Jabber is an open instant messaging system. Like email, Jabber allows
+ you to choose your account provider and communicate with all other Jabber
+ users, regardless of their account provider.</p>
+
+ <p>You will need to create a new account with a Jabber provider. There are
+ many free providers; one popular provider is
+ <link href="http://register.jabber.org/">Jabber.org</link>.</p>
+
+ <note>
+ <p>If you use Google Mail or Google Talk, you already have a Jabber account.
+ Google Talk is a Jabber service. Simply use your Google Mail address and
+ password in <app>Empathy</app> to connect.</p>
+ </note>
</section>
- <section id="local-service">
- <title>Local Instant Messaging Services</title>
- <p>
- This service works when you are connected to a local network,
- you do not need an Internet connection in order to use it.
- </p>
- <list>
- <item>
- <p>
- <em>Salut</em>
- </p>
- </item>
- </list>
+ <section id="salut">
+ <title>People Nearby</title>
- <p>
- For more information, see <link xref="salut-protocol" />.
- </p>
+ <p>You do not need to create an account to use this feature. This service works
+ whenever you are connected to a local network, such as a wireless hotspot. It
+ automatically finds all other users on the network who are also using this
+ service.</p>
+ <p>For more information, see <link xref="salut-protocol" />.</p>
</section>
<section id ="sip-services">
@@ -132,6 +92,47 @@
service you will use.
</p>
</note>
+ </section>
+
+ <section id="irc">
+ <title>IRC</title>
+
+ <comment>
+ <p>you don't need an account, but mention and cross-link nick registering
+ and server password stuff</p>
+ </comment>
+ </section>
+
+ <section id="proprietary-services">
+ <title>Proprietary Services</title>
+ <list>
+ <item>
+ <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>
+ </item>
+ <item>
+ <p>
+ <link href="https://www.icq.com/register/">ICQ</link>
+ </p>
+ </item>
+ <item>
+ <p>
+ <link href="https://accountservices.passport.net">MSN</link>
+ </p>
+ </item>
+ <item>
+ <p>
+ <link href="https://login.yahoo.com/config/login">Yahoo!</link>
+ </p>
+ </item>
+ </list>
</section>
+
</page>
diff --git a/help/C/irc-nick-password.page b/help/C/irc-nick-password.page
index 63cdd0965..8b55bf834 100644
--- a/help/C/irc-nick-password.page
+++ b/help/C/irc-nick-password.page
@@ -5,6 +5,7 @@
<info>
<link type="guide" xref="irc-manage#manage"/>
<link type="seealso" xref="prob-conn-name"/>
+ <link type="seealso" xref="account-irc"/>
<desc>How to set the password of a nickname.</desc>
<revision pkgversion="2.28" version="0.1" date="2009-07-26" status="draft"/>
<revision pkgversion="2.28" version="0.2" date="2009-08-10" status="review"/>
diff --git a/help/C/prob-conn-neterror.page b/help/C/prob-conn-neterror.page
index 8001ed49b..2a4de7540 100644
--- a/help/C/prob-conn-neterror.page
+++ b/help/C/prob-conn-neterror.page
@@ -4,7 +4,6 @@
<info>
<link type="guide" xref="prob-conn"/>
- <link type="guide" xref="irc-manage#problems" />
<desc>
An error message which says "<gui>Network error</gui>" appears in the main window.
</desc>
@@ -27,6 +26,12 @@
<title>I get a message that says "Network error"</title>
+ <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>
+
<p>
This kind of error happens when <app>Empathy</app> cannot communicate
with the instant messaging service for some reason.