From b00c9da7dec0f64eea08e158ca970b483d667d41 Mon Sep 17 00:00:00 2001 From: Milo Casagrande Date: Thu, 9 Sep 2010 22:53:58 +0200 Subject: [help] Added topic about linking contacts, fixed other topics to reflect the new feature --- help/C/audio-call.page | 58 ++++++++++++++++++------- help/C/link-contacts.page | 106 ++++++++++++++++++++++++++++++++++++++++++++++ help/C/send-message.page | 43 ++++++++++++------- help/C/video-call.page | 35 +++++++++++++-- help/Makefile.am | 1 + 5 files changed, 208 insertions(+), 35 deletions(-) create mode 100644 help/C/link-contacts.page diff --git a/help/C/audio-call.page b/help/C/audio-call.page index 9ed99c3e7..3f0fe06f3 100644 --- a/help/C/audio-call.page +++ b/help/C/audio-call.page @@ -13,7 +13,8 @@ --> - + + Milo Casagrande milo@ubuntu.com @@ -35,23 +36,19 @@

You can call your contacts and have an audio conversation with them. This features only works with certain types of accounts, and it requires the other person to have an application that supports audio calls.

-

From the Contact List window, click the audio call - icon next to the name of the contact you wish to call and choose Audio Call. - Alternatively, right click the contact and choose Audio Call.

+ icon next to the name of the contact you wish to call and + choose Audio Call. +

-

A new window will open. When the connection is established, you will - see Connected at the bottom of the window, along with the - total conversation time.

+

+ A new window will open. When the connection is established, you will + see Connected at the bottom of the window, along with the + total conversation time.

@@ -59,11 +56,40 @@

+ -

To turn an audio conversation into a video conversation, choose - VideoVideo On, or click the - video call - toolbar button to select it.

+

+ To turn an audio conversation into a video conversation, choose + Video + Video On, or click the + video call + toolbar button to select it. +

+ +
+ Start an audio conversation with a meta-contact + + +

+ From the Contact List window, right-click on the meta-contact. +

+ + +

+ Select the contact you want to have the conversation, and from the menu + select Audio Call. +

+ + + +

+ To recognize if a contact is a meta-contact, move your mouse on + a contact in the Contact List window, and stop over it for a + second: a small pop-up message will appear showing the number of the + contacts that form the meta-contact. +

+ +
diff --git a/help/C/link-contacts.page b/help/C/link-contacts.page new file mode 100644 index 000000000..48d683322 --- /dev/null +++ b/help/C/link-contacts.page @@ -0,0 +1,106 @@ + + + + + + + + Merge and separate different contacts into a single one. + + + + Milo Casagrande + milo@ubuntu.com + + +

+ Creative Commons Share Alike 3.0 +

+ + + + Combine and separate contacts +

+ If one, or more, of your contacts has multiple accounts with different + messaging services, you can combine these contacts into a single one. +

+

+ The resulting contact is called a meta-contact: a contact composed + from different single contacts. +

+

+ If you have a Jane Smith contact that is using three different messaging + services like: +

+ + +

+ janes@facebook +

+ + +

+ jane.smith@gmail +

+ + +

+ jane_smith@hotmail +

+ + +

+ You can combine these contacts into a single Jane Smith one. +

+ +
+ Combining contacts + + +

+ From the Contact List window, right-click one of the contact + that has different accounts, and select + Link Contacts.... +

+ + +

+ From the left pane in the Link Contacts window, + select the contacts you want to combine. +

+ + +

+ Click Link. +

+ + + +

+ When a meta-contact has been created, the default contact that will be used + to have a conversation with when you double-click on it, is the last contact + you select to link from the Link Contacts window. +

+ +
+ +
+ Separating contacts + + +

+ From the Contact List, right-click the contact + to separate, and select Unlink.... +

+ + +

+ Click on Unlink. +

+ + +
+ diff --git a/help/C/send-message.page b/help/C/send-message.page index fed39f56d..8751f23ef 100644 --- a/help/C/send-message.page +++ b/help/C/send-message.page @@ -12,6 +12,7 @@ --> + Phil Bull philbull@gmail.com @@ -33,22 +34,9 @@

- From the Contact List window, perform one of the following: + From the Contact List window, double-click the name of the + contact that you want to have a conversation with.

- - -

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

- - -

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

- -

@@ -57,5 +45,30 @@

+ +
+ Send a message to a meta-contact + + +

+ From the Contact List window, right-click on the meta-contact. +

+ + +

+ Select the contact you want to have the conversation, and from the menu + select Chat. +

+ + + +

+ To recognize if a contact is a meta-contact, move your mouse on + a contact in the Contact List window, and stop over it for a + second: a small pop-up message will appear showing the number of the + contacts that form the meta-contact. +

+ +
diff --git a/help/C/video-call.page b/help/C/video-call.page index 114346b2c..e0c8ef06d 100644 --- a/help/C/video-call.page +++ b/help/C/video-call.page @@ -34,8 +34,8 @@ Start a video conversation -

If you have a webcam, you can call your contacts and have an video - conversation with them. This features only works with certain types of +

If you have a webcam, you can call your contacts and have a video + conversation with them. This features only works with certain types of accounts, and it requires the other person to have an application that supports video calls.

@@ -43,8 +43,8 @@

From the Contact List window, click the video call - icon next to the name of the contact you wish to call and choose Video Call. - Alternatively, right click the contact and choose Video Call.

+ icon next to the name of the contact you wish to call and choose Video Call. +

A new window will open. When the connection is established, you will @@ -63,4 +63,31 @@ video call toolbar button to deselect it.

+ +
+ Start a video conversation with a meta-contact + + +

+ From the Contact List window, right-click on the meta-contact. +

+ + +

+ Select the contact you want to have the conversation, and from the menu + select Video Call. +

+ + + +

+ To recognize if a contact is a meta-contact, move your mouse on + a contact in the Contact List window, and stop over it for a + second: a small pop-up message will appear showing the number of the + contacts that form the meta-contact. +

+ +
+ + diff --git a/help/Makefile.am b/help/Makefile.am index ae09c3894..009d9c994 100644 --- a/help/Makefile.am +++ b/help/Makefile.am @@ -45,6 +45,7 @@ DOC_PAGES = \ irc-send-file.page \ irc-start-conversation.page \ license.page \ + link-contacts \ prev-conv.page \ prob-conn-acctdisabled.page \ prob-conn-auth.page \ -- cgit v1.2.3