From 1e19000ef22ebfadf394ef823d6562bbac3ecb57 Mon Sep 17 00:00:00 2001 From: Milo Casagrande Date: Mon, 17 Aug 2009 23:01:18 +0200 Subject: [help] Reworked two topics, added a new one * introduction: some wordings * group-conversations: moved from advanced to text conversations section reworked the topic * prev-conv: added stub topic for searching previous conversations --- help/C/group-conversations.page | 62 +++++++++++++++++++++++++++++++++++++---- help/C/introduction.page | 9 +++--- help/C/prev-conv.page | 24 ++++++++++++++++ 3 files changed, 86 insertions(+), 9 deletions(-) create mode 100644 help/C/prev-conv.page (limited to 'help') diff --git a/help/C/group-conversations.page b/help/C/group-conversations.page index dff7eb478..fcc0b4365 100644 --- a/help/C/group-conversations.page +++ b/help/C/group-conversations.page @@ -3,12 +3,13 @@ id="group-conversations"> - + - Start a group conversation with your contacts. + Start or join a group conversation with your contacts. + Milo Casagrande milo@ubuntu.com @@ -30,12 +31,18 @@ To have a group conversation you need to have a registered account with either Jabber or Google Talk, or a Salut account.

+

- You can have a group conversation with contacts that are using the same service - as yours. + You can have a group conversation only with the contacts that are using the + same service as yours.

+ +
+ + Start a group conversation +

@@ -48,6 +55,15 @@ for the group conversation.

+ +

+ In the Server text box, type the name of server in which the conversation + will be hosted. +

+

+ Leave it empty if it will be on the current server. +

+

In the Room text box, type the name you want to give to the conversation. @@ -74,7 +90,7 @@

- Choose EditContactInvite to chatroom. + Choose EditContactInvite to chatroom.

@@ -84,5 +100,41 @@

+ +
+ +
+ + Join a group conversation + + + +

+ From the Contact List window, choose + RoomJoin. +

+ + +

+ Expand the Room List section to see all the existing rooms. +

+ + +

+ Double-click on the name of a room to join it. +

+ + + +

+ It is not possible to join all existing rooms. Some of the rooms might require a + password, or might be invitation only. Empathy does not support these + kind of rooms. +

+ + + +
diff --git a/help/C/introduction.page b/help/C/introduction.page index 8305fab29..58311b17b 100644 --- a/help/C/introduction.page +++ b/help/C/introduction.page @@ -5,6 +5,7 @@ + Introduction to the Empathy instant messenger. @@ -23,22 +24,22 @@

Empathy is an instant messaging application for the GNOME Desktop. - It supports text messaging, voice & video call even using SIP, - file transfers and all the most used messaging systems such as MSN and Google Talk. + It supports text messaging, voice & video call, file transfers and all the + most used messaging systems such as MSN and Google Talk.

Empathy includes features that help you better collaborate while at work, and that let you easily keep in touch with your friends.

- You can group all the conversations on a single window, or have multiple windows for + You can group all the conversations in a single window, or have multiple windows for different kind of conversations; easily search through your previous conversations, and share your desktop in just two clicks.

- Empathy main window + Empathy main window.

diff --git a/help/C/prev-conv.page b/help/C/prev-conv.page new file mode 100644 index 000000000..ed59892be --- /dev/null +++ b/help/C/prev-conv.page @@ -0,0 +1,24 @@ + + + + + + Search your previous conversations. + + + + Milo Casagrande + milo@ubuntu.com + + + 2009 + GNOME Documentation Project + + + + + Previous conversations + + -- cgit v1.2.3