aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--help/C/accounts-window.page5
-rw-r--r--help/C/add-account.page5
-rw-r--r--help/C/irc-join-pwd.page9
-rw-r--r--help/C/irc-join-room.page5
-rw-r--r--help/C/irc-manage.page25
-rw-r--r--help/C/irc-nick-password.page9
-rw-r--r--help/C/irc-send-file.page (renamed from help/C/irc-sending-file.page)9
-rw-r--r--help/C/irc-start-conversation.page39
-rw-r--r--help/Makefile.am2
9 files changed, 62 insertions, 46 deletions
diff --git a/help/C/accounts-window.page b/help/C/accounts-window.page
index f28032278..f5def209f 100644
--- a/help/C/accounts-window.page
+++ b/help/C/accounts-window.page
@@ -1,4 +1,5 @@
<page xmlns="http://projectmallard.org/1.0/"
+ xmlns:e="http://projectmallard.org/experimental/"
type="guide"
id="accounts-window">
@@ -8,7 +9,9 @@
<link type="topic" xref="disable-account"/>
<link type="topic" xref="remove-account"/>
<desc>Add, modify, and delete accounts.</desc>
- <revision pkgversion="2.28" version="0.1" date="2009-08-26" status="incomplete"/>
+ <revision pkgversion="2.28" version="0.1" date="2009-08-26" status="review">
+ <e:review by="shaunm@gnome.org" date="2009-08-31" status="done"/>
+ </revision>
<credit type="author">
<name>Shaun McCance</name>
<email>shaunm@gnome.org</email>
diff --git a/help/C/add-account.page b/help/C/add-account.page
index 99a6d35dc..2979626d9 100644
--- a/help/C/add-account.page
+++ b/help/C/add-account.page
@@ -1,4 +1,5 @@
<page xmlns="http://projectmallard.org/1.0/"
+ xmlns:e="http://projectmallard.org/experimental/"
type="topic" style="task"
id="add-account">
@@ -8,7 +9,9 @@
<desc>Add a new account to <app>Empathy</app>.</desc>
<revision pkgversion="2.28" version="0.1" date="2009-06-24" status="draft"/>
<revision pkgversion="2.28" version="0.1" date="2009-08-10" status="review"/>
- <revision pkgversion="2.28" version="0.2" date="2009-08-27" status="review"/>
+ <revision pkgversion="2.28" version="0.2" date="2009-08-27" status="review">
+ <e:review by="shaunm@gnome.org" date="2009-08-31" status="done"/>
+ </revision>
<credit type="author">
<name>Milo Casagrande</name>
<email>milo@ubuntu.com</email>
diff --git a/help/C/irc-join-pwd.page b/help/C/irc-join-pwd.page
index 2b7e8c358..2ca71c2e2 100644
--- a/help/C/irc-join-pwd.page
+++ b/help/C/irc-join-pwd.page
@@ -1,12 +1,15 @@
<page xmlns="http://projectmallard.org/1.0/"
- type="topic"
- id="irc-join-pwd">
+ xmlns:e="http://projectmallrd.org/experimental/"
+ type="topic" style="task nocando"
+ id="irc-join-pwd">
<info>
<link type="guide" xref="irc-manage#manage"/>
<link type="seealso" xref="irc-join-room"/>
<desc><app>Empathy</app> does not currently support password-protected IRC chat rooms.</desc>
- <revision pkgversion="2.28" version="0.1" date="2009-08-07" status="review"/>
+ <revision pkgversion="2.28" version="0.1" date="2009-08-07" status="review">
+ <e:review by="shaunm@gnome.org" date="2009-08-31" status="done"/>
+ </revision>
<credit type="author">
<name>Milo Casagrande</name>
<email>milo@ubuntu.com</email>
diff --git a/help/C/irc-join-room.page b/help/C/irc-join-room.page
index 53fe3bd74..f87cf54dd 100644
--- a/help/C/irc-join-room.page
+++ b/help/C/irc-join-room.page
@@ -1,4 +1,5 @@
<page xmlns="http://projectmallard.org/1.0/"
+ xmlns:e="http://projectmallrd.org/experimental/"
type="topic" style="task"
id="irc-join-room">
@@ -6,7 +7,9 @@
<link type="guide" xref="irc-manage#manage"/>
<desc>Join an IRC channel.</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.28" version="0.2" date="2009-08-14" status="review">
+ <e:review by="shaunm@gnome.org" date="2009-08-31" status="done"/>
+ </revision>
<credit type="author">
<name>Milo Casagrande</name>
<email>milo@ubuntu.com</email>
diff --git a/help/C/irc-manage.page b/help/C/irc-manage.page
index b35f12d39..9d9d6999b 100644
--- a/help/C/irc-manage.page
+++ b/help/C/irc-manage.page
@@ -1,14 +1,16 @@
<page xmlns="http://projectmallard.org/1.0/"
- type="guide"
- style="2column"
- id="irc-manage">
+ xmlns:e="http://projectmallard.org/experimental/"
+ type="guide" style="2column"
+ id="irc-manage">
<info>
<link type="guide" xref="index#text-conv"/>
<desc>How to use IRC with <app>Empathy</app>.</desc>
<revision pkgversion="2.28" version="0.1" date="2009-07-25" status="draft"/>
<revision pkgversion="2.28" version="0.2" date="2009-08-14" status="review"/>
- <revision pkgversion="2.28" version="0.2" date="2009-08-27" status="review"/>
+ <revision pkgversion="2.28" version="0.2" date="2009-08-27" status="review">
+ <e:review by="shaunm@gnome.org" date="2009-08-31" status="done"/>
+ </revision>
<credit type="author">
<name>Milo Casagrande</name>
<email>milo@ubuntu.com</email>
@@ -20,15 +22,20 @@
<include href="legal.xml" xmlns="http://www.w3.org/2001/XInclude"/>
</info>
- <title>Use IRC</title>
+ <title>Internet Relay Chat (IRC)</title>
<section id="manage" style="2column">
- <title>IRC rooms and conversations</title>
+ <info>
+ <title type="link">IRC Chat Rooms and Conversations</title>
+ </info>
+ <title>Chat Rooms and Conversations</title>
</section>
- <section id="problems" style="2column">
- <title>Fix common problems</title>
+ <section id="problems">
+ <info>
+ <title type="link">Common IRC Problems</title>
+ </info>
+ <title>Common Problems</title>
</section>
-
</page>
diff --git a/help/C/irc-nick-password.page b/help/C/irc-nick-password.page
index 90f9ff3ed..1a41aa5db 100644
--- a/help/C/irc-nick-password.page
+++ b/help/C/irc-nick-password.page
@@ -1,6 +1,7 @@
<page xmlns="http://projectmallard.org/1.0/"
- type="topic"
- id="irc-nick-password">
+ xmlns:e="http://projectmallard.org/experimental/"
+ type="topic" style="task nocando"
+ id="irc-nick-password">
<info>
<link type="guide" xref="irc-manage#manage"/>
@@ -8,7 +9,9 @@
<link type="seealso" xref="account-irc"/>
<desc>Protect your nickname to prevent other IRC users from using it.</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"/>
+ <revision pkgversion="2.28" version="0.2" date="2009-08-10" status="review">
+ <e:review by="shaunm@gnome.org" date="2009-08-31" status="done"/>
+ </revision>
<credit type="author">
<name>Milo Casagrande</name>
<email>milo@ubuntu.com</email>
diff --git a/help/C/irc-sending-file.page b/help/C/irc-send-file.page
index 242fbeabb..030ddf579 100644
--- a/help/C/irc-sending-file.page
+++ b/help/C/irc-send-file.page
@@ -1,12 +1,15 @@
<page xmlns="http://projectmallard.org/1.0/"
- type="topic"
- id="irc-send-file">
+ xmlns:e="http://projectmallrd.org/experimental/"
+ type="topic" style="task nocando"
+ id="irc-send-file">
<info>
<link type="guide" xref="irc-manage#manage"/>
<link type="seealso" xref="send-file"/>
<desc><app>Empathy</app> does not currently support sending files using IRC.</desc>
- <revision pkgversion="2.28" version="0.1" date="2009-08-14" status="review"/>
+ <revision pkgversion="2.28" version="0.1" date="2009-08-14" status="review">
+ <e:review by="shaunm@gnome.org" date="2009-08-31" status="done"/>
+ </revision>
<credit type="author">
<name>Milo Casagrande</name>
<email>milo@ubuntu.com</email>
diff --git a/help/C/irc-start-conversation.page b/help/C/irc-start-conversation.page
index 0f73bdad6..44dfa1915 100644
--- a/help/C/irc-start-conversation.page
+++ b/help/C/irc-start-conversation.page
@@ -1,11 +1,14 @@
<page xmlns="http://projectmallard.org/1.0/"
- type="topic"
- id="irc-start-conversation">
+ xmlns:e="http://projectmallrd.org/experimental/"
+ type="topic" style="task"
+ id="irc-start-conversation">
<info>
<link type="guide" xref="irc-manage#manage"/>
<desc>Start a conversation witn an IRC contact.</desc>
- <revision pkgversion="2.28" version="0.1" date="2009-08-14" status="review"/>
+ <revision pkgversion="2.28" version="0.1" date="2009-08-14" status="review">
+ <e:review by="shaunm@gnome.org" date="2009-08-31" status="done"/>
+ </revision>
<credit type="author">
<name>Milo Casagrande</name>
<email>milo@ubuntu.com</email>
@@ -17,36 +20,24 @@
<include href="legal.xml" xmlns="http://www.w3.org/2001/XInclude"/>
</info>
- <title>Start a conversation</title>
+ <title>Chat with somebody on IRC.</title>
+
+ <p>You can hold private conversations with other IRC users, outside of the
+ public IRC chat rooms. To start a conversation with another IRC user:</p>
<steps>
<item>
- <p>
- To start a private conversation with one of the IRC contacts that
- are in a room, after you joined a room, from the IRC room contact list perform
- one of the following:
- </p>
- <list>
- <item>
- <p>
- Double-click the name of contact you want to have a conversation with.
- </p>
- </item>
- <item>
- <p>
- Right-click on the name of the contact you want to have a conversation with,
- and select <gui>Chat</gui>.
- </p>
- </item>
- </list>
+ <p>In the contact list for an IRC chat room, double click the name of
+ the user you want to chat with. Alternatively, right click the name
+ of the user and select <gui>Chat</gui>.</p>
</item>
</steps>
<list>
<item>
<p>
- The IRC room contact list is not the same as <app>Empathy</app> <gui>Contact List</gui>,
- and is relative only to the IRC room you joined. Different rooms can have different
+ The IRC room contact list is not the same as <app>Empathy</app> contact list. It contains
+ a list of users in the IRC chat room you joined. Different rooms can have different
contacts listed.
</p>
</item>
diff --git a/help/Makefile.am b/help/Makefile.am
index 5b362393e..b0bf927f2 100644
--- a/help/Makefile.am
+++ b/help/Makefile.am
@@ -36,7 +36,7 @@ DOC_PAGES = \
irc-join-room.page \
irc-manage.page \
irc-nick-password.page \
- irc-sending-file.page \
+ irc-send-file.page \
irc-start-conversation.page \
offline-contacts.page \
prev-conv.page \
generated by cgit v1.2.3 (git 2.25.1) at 2024-12-29 07:37:35 +0800