aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--help/C/create-account.page83
-rw-r--r--help/C/import-account.page71
-rw-r--r--help/C/offline-contacts.page37
3 files changed, 79 insertions, 112 deletions
diff --git a/help/C/create-account.page b/help/C/create-account.page
index a81e72b2e..d273287e6 100644
--- a/help/C/create-account.page
+++ b/help/C/create-account.page
@@ -1,15 +1,16 @@
<page xmlns="http://projectmallard.org/1.0/"
- type="topic"
+ xmlns:e="http://projectmallard.org/experimental/"
+ type="topic" style="task"
id="create-account">
<info>
<link type="guide" xref="index#accounts"/>
<link type="seealso" xref="add-account"/>
- <desc>
- Register an account with one of the supported messaging services.
- </desc>
+ <desc>Register for an account with one of the supported messaging services.</desc>
<revision pkgversion="2.28" version="0.1" date="2009-06-21" status="draft"/>
- <revision pkgversion="2.28" version="0.2" date="2009-08-07" status="review"/>
+ <revision pkgversion="2.28" version="0.2" date="2009-08-07" status="review">
+ <e:review by="shaunm@gnome.org" date="2009-09-02" status="done"/>
+ </revision>
<credit type="author">
<name>Milo Casagrande</name>
<email>milo@ubuntu.com</email>
@@ -54,57 +55,60 @@
<section id="salut">
<title>People Nearby</title>
- <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>You do not need to create an account with a service provider 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">
- <title>Telephony Services</title>
+ <title>SIP</title>
- <p>
- These services will let you do voice call over the Internet with
- other people using the same service or even to normal phones.
- </p>
+ <p>SIP is an open system which allows users to have audio and video
+ conversations over the Internet. You need to create an account with
+ a SIP provider. You can communicate with all other SIP users,
+ regardless of which SIP provider they use.</p>
- <list>
- <item>
- <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>
- </item>
- </list>
+ <p>There are a number of popular free SIP account providers; one
+ popular provider is <link
+ href="https://signup.sipphone.com/new-users/app?class=NewUser;proc=start">Sipphone</link>.</p>
- <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.
- </p>
+ <note style="warning">
+ <p>Due to technical differences, the free <link
+ href="https://www.ekiga.net/index.php?page=register">Ekiga.net</link>
+ service does not currently work with <app>Empathy</app>.</p>
</note>
+
+ <p>Some SIP providers allow you to call normal phones from your computer.
+ Generally, you will need to subscribe to a paid service for this feature.</p>
</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>
+ <p>You do not need to register for an account to use IRC. Although you specify
+ a nickname when you add an IRC account to <app>Empathy</app>, this nickname is
+ only established each time you connect. If another user is using the nickname,
+ you will need to choose a new nickname.</p>
+
+ <p>Some IRC networks use a service called NickServ to allow users to protect
+ thier nicknames. See <link xref="irc-nick-password"/> for more information.</p>
+
+ <p>Some IRC servers are password protected. You will need to know the password
+ to connect to these servers. Generally, these are private IRC networks.</p>
</section>
<section id="proprietary-services">
<title>Proprietary Services</title>
+ <p>There are many proprietary instant messaging services that have been
+ developed by different companies or organizations. <app>Empathy</app>
+ allows you to connect to an existing account for most popular services.
+ To create a new account with one of these services, you will need to
+ visit the service’s web site and agree to its terms of use.</p>
+
<list>
<item>
<p>
@@ -113,11 +117,6 @@
</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>
diff --git a/help/C/import-account.page b/help/C/import-account.page
index 19b016a25..52c346200 100644
--- a/help/C/import-account.page
+++ b/help/C/import-account.page
@@ -1,14 +1,18 @@
<page xmlns="http://projectmallard.org/1.0/"
- type="topic"
- id="import-account">
+ xmlns:e="http://projectmallard.org/experimental/"
+ type="topic" style="task"
+ id="import-account">
<info>
<link type="guide" xref="index#accounts"/>
<link type="seealso" xref="add-account"/>
<link type="seealso" xref="remove-account"/>
- <desc>Import an existing account to <app>Empathy</app>.</desc>
+ <desc>Import an account from another instant messaging application.</desc>
<revision pkgversion="2.28" version="0.1" date="2009-08-22" status="draft"/>
<revision pkgversion="2.28" version="0.2" date="2009-08-22" status="review"/>
+ <revision pkgversion="2.28" version="0.3" date="2009-09-02" status="review">
+ <e:review by="shaunm@gnome.org" date="2009-09-02" status="done"/>
+ </revision>
<credit type="author">
<name>Peter Haslam</name>
<email>peter.haslam@freenet.de</email>
@@ -17,6 +21,10 @@
<name>Milo Casagrande</name>
<email>milo@ubuntu.com</email>
</credit>
+ <credit>
+ <name>Shaun McCance</name>
+ <email>shaunm@gnome.org</email>
+ </credit>
<copyright>
<year>2009</year>
<name>GNOME Documentation Project</name>
@@ -26,63 +34,30 @@
<title>Import an existing account</title>
+ <p>The first time you run <app>Empathy</app>, it will offer to import your
+ accounts from other instant messaging applications. Currently, the only
+ supported application is <app>Pidgin</app>.</p>
+
<steps>
<item>
- <p>
- From the <gui>Contact List</gui> window, do one of the following:
- </p>
- <list>
- <item>
- <p>
- Press <key>F4</key>.
- </p>
- </item>
- <item>
- <p>
- Choose <guiseq><gui>Edit</gui><gui>Accounts</gui></guiseq>.
- </p>
- </item>
- </list>
- </item>
- <item>
- <p>
- Click on <gui>Import Accounts...</gui>.
- </p>
+ <p>Run <app>Empathy</app> for the first time. An assistant will offer
+ you a number of options to create new accounts.</p>
</item>
<item>
- <p>
- From the <gui>Import Accounts</gui> dialog, select the <gui>Import</gui>
- check-box next to the accounts you want to import.
- </p>
+ <p>Select <gui>Yes, import my account details from</gui> and click
+ <gui>Forward</gui>.</p>
</item>
<item>
- <p>
- Click <gui>OK</gui> to import the accounts to <app>Empathy</app>.
- </p>
+ <p>Select the check box next to each account you wish to import.</p>
</item>
<item>
- <p>
- To enable the new account, select the
- <gui>Enabled</gui> check-box next to
- the name of the account in the box on the left of the dialog.
- </p>
+ <p>Click <gui>Apply</gui>.</p>
</item>
</steps>
- <note style="tip">
- <p>
- If you want to change the name that identifies the account in the <gui>Accounts</gui>
- dialog, double-click on the name of the account in the box on the left of the dialog
- and type the new name.
- </p>
- </note>
-
<note>
- <p>
- At the moment <app>Empathy</app> can import accounts only from the instant
- messaging program <app>Pidgin</app>. For more information about <app>Pidgin</app>,
- see the <link href="http://www.pidgin.im/">Pidgin website</link>.
- </p>
+ <p>It is not currently possible to import accounts after you have completed
+ the first-run assistant.</p>
</note>
</page>
diff --git a/help/C/offline-contacts.page b/help/C/offline-contacts.page
index b3f30f6cd..07c5c775c 100644
--- a/help/C/offline-contacts.page
+++ b/help/C/offline-contacts.page
@@ -1,14 +1,15 @@
<page xmlns="http://projectmallard.org/1.0/"
- type="topic"
- id="offline-contacts">
+ xmlns:e="http://projectmallard.org/experimental/"
+ type="topic" style="task"
+ id="offline-contacts">
<info>
<link type="guide" xref="index#accounts"/>
- <desc>
- How to see the contacts that are not online.
- </desc>
+ <desc>See all of your contacts, even those that are not online.</desc>
<revision pkgversion="2.28" version="0.1" date="2009-06-24" status="draft"/>
- <revision pkgversion="2.28" version="0.2" date="2009-07-21" status="review"/>
+ <revision pkgversion="2.28" version="0.2" date="2009-07-21" status="review">
+ <e:review by="shaunm@gnome.org" date="2009-09-01" status="done"/>
+ </revision>
<credit type="author">
<name>Milo Casagrande</name>
<email>milo@ubuntu.com</email>
@@ -20,25 +21,17 @@
<include href="legal.xml" xmlns="http://www.w3.org/2001/XInclude"/>
</info>
- <title>Display offline contacts</title>
+ <title>Show offline contacts</title>
+
+ <p>Normally, <app>Empathy</app> only shows your contacts that are currently
+ online. You can show all of your contacts instead, including those that
+ are offline.</p>
<steps>
<item>
- <p>
- 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>
+ <p>From the <gui>Contact List</gui> window, choose <guiseq><gui>View</gui>
+ <gui>Offline Contacts</gui></guiseq>, or press <keyseq><key>Ctrl</key>
+ <key>H</key></keyseq>.</p>
</item>
<item>
<p>