From 8103a1764926a892a748aa04697245509ba672cd Mon Sep 17 00:00:00 2001 From: Shaun McCance Date: Mon, 31 Aug 2009 15:46:51 -0500 Subject: [help] Completed review of some pages --- help/C/accounts-window.page | 5 ++++- help/C/add-account.page | 5 ++++- help/C/irc-join-pwd.page | 9 ++++++--- help/C/irc-join-room.page | 5 ++++- help/C/irc-manage.page | 25 +++++++++++++++--------- help/C/irc-nick-password.page | 9 ++++++--- help/C/irc-send-file.page | 28 +++++++++++++++++++++++++++ help/C/irc-sending-file.page | 25 ------------------------ help/C/irc-start-conversation.page | 39 +++++++++++++++----------------------- help/Makefile.am | 2 +- 10 files changed, 84 insertions(+), 68 deletions(-) create mode 100644 help/C/irc-send-file.page delete mode 100644 help/C/irc-sending-file.page 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 @@ @@ -8,7 +9,9 @@ Add, modify, and delete accounts. - + + + Shaun McCance shaunm@gnome.org 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 @@ @@ -8,7 +9,9 @@ Add a new account to Empathy. - + + + Milo Casagrande milo@ubuntu.com 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 @@ + xmlns:e="http://projectmallrd.org/experimental/" + type="topic" style="task nocando" + id="irc-join-pwd"> Empathy does not currently support password-protected IRC chat rooms. - + + + Milo Casagrande milo@ubuntu.com 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 @@ @@ -6,7 +7,9 @@ Join an IRC channel. - + + + Milo Casagrande milo@ubuntu.com 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 @@ + xmlns:e="http://projectmallard.org/experimental/" + type="guide" style="2column" + id="irc-manage"> How to use IRC with Empathy. - + + + Milo Casagrande milo@ubuntu.com @@ -20,15 +22,20 @@ - Use IRC + Internet Relay Chat (IRC)
- IRC rooms and conversations + + IRC Chat Rooms and Conversations + + Chat Rooms and Conversations
-
- Fix common problems +
+ + Common IRC Problems + + Common Problems
- 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 @@ + xmlns:e="http://projectmallard.org/experimental/" + type="topic" style="task nocando" + id="irc-nick-password"> @@ -8,7 +9,9 @@ Protect your nickname to prevent other IRC users from using it. - + + + Milo Casagrande milo@ubuntu.com diff --git a/help/C/irc-send-file.page b/help/C/irc-send-file.page new file mode 100644 index 000000000..030ddf579 --- /dev/null +++ b/help/C/irc-send-file.page @@ -0,0 +1,28 @@ + + + + + + Empathy does not currently support sending files using IRC. + + + + + Milo Casagrande + milo@ubuntu.com + + + 2009 + GNOME Documentation Project + + + + + Send files over IRC + +

It is not currently possible to send files using IRC.

+ + diff --git a/help/C/irc-sending-file.page b/help/C/irc-sending-file.page deleted file mode 100644 index 242fbeabb..000000000 --- a/help/C/irc-sending-file.page +++ /dev/null @@ -1,25 +0,0 @@ - - - - - - Empathy does not currently support sending files using IRC. - - - Milo Casagrande - milo@ubuntu.com - - - 2009 - GNOME Documentation Project - - - - - Send files over IRC - -

It is not currently possible to send files using IRC.

- - 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 @@ + xmlns:e="http://projectmallrd.org/experimental/" + type="topic" style="task" + id="irc-start-conversation"> Start a conversation witn an IRC contact. - + + + Milo Casagrande milo@ubuntu.com @@ -17,36 +20,24 @@ - Start a conversation + Chat with somebody on IRC. + +

You can hold private conversations with other IRC users, outside of the + public IRC chat rooms. To start a conversation with another IRC user:

-

- 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: -

- - -

- Double-click the name of contact you want to have a conversation with. -

- - -

- Right-click on the name of the contact you want to have a conversation with, - and select Chat. -

- - +

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 Chat.

- The IRC room contact list is not the same as Empathy Contact List, - 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 Empathy contact list. It contains + a list of users in the IRC chat room you joined. Different rooms can have different contacts listed.

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 \ -- cgit v1.2.3