diff options
author | Milo Casagrande <milo@ubuntu.com> | 2009-08-10 21:32:30 +0200 |
---|---|---|
committer | Frédéric Péters <fpeters@0d.be> | 2009-08-12 18:15:09 +0200 |
commit | e236e08f5276ff4923f58b3fdcecc296137ac001 (patch) | |
tree | 106621ea04332ca31dc41eed743fc521fcba35da /help | |
parent | 2ca0f50c4917a7c5fd5ad8c91a92793f35f90baa (diff) |
* wrote share-desktop * rewrote set-custom-status * some rewrote here and there, mostly small fixes
Diffstat (limited to 'help')
-rw-r--r-- | help/C/add-account.page | 75 | ||||
-rw-r--r-- | help/C/add-contact.page | 34 | ||||
-rw-r--r-- | help/C/change-status.page | 9 | ||||
-rw-r--r-- | help/C/create-account.page | 20 | ||||
-rw-r--r-- | help/C/disable-account.page | 56 | ||||
-rw-r--r-- | help/C/irc-account.page | 7 | ||||
-rw-r--r-- | help/C/irc-join-pwd.page | 6 | ||||
-rw-r--r-- | help/C/irc-nick-password.page | 6 | ||||
-rw-r--r-- | help/C/remove-account.page | 58 | ||||
-rw-r--r-- | help/C/send-file.page | 8 | ||||
-rw-r--r-- | help/C/set-custom-status.page | 138 | ||||
-rw-r--r-- | help/C/share-desktop.page | 75 |
12 files changed, 320 insertions, 172 deletions
diff --git a/help/C/add-account.page b/help/C/add-account.page index 3d18b94a..4d8030b4 100644 --- a/help/C/add-account.page +++ b/help/C/add-account.page @@ -6,8 +6,8 @@ <link type="guide" xref="index#accounts"/> <link type="seealso" xref="remove-account"/> <desc>Add a new account to <app>Empathy</app>.</desc> - <revision version="3.0" date="2009-06-24" status="draft"/> - + <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"/> <credit type="author"> <name>Milo Casagrande</name> <email>milo@ubuntu.com</email> @@ -16,7 +16,6 @@ <year>2009</year> <name>GNOME Documentation Project</name> </copyright> - <include href="legal.xml" xmlns="http://www.w3.org/2001/XInclude"/> </info> @@ -28,16 +27,16 @@ From the <gui>Contact List</gui> window, perform 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> + <item> + <p> + Press <key>F4</key>. + </p> + </item> + <item> + <p> + Choose <guiseq><gui>Edit</gui><gui>Accounts</gui></guiseq>. + </p> + </item> </list> </item> <item> @@ -45,43 +44,43 @@ If it is the first time you launch <app>Empathy</app>: </p> <list> - <item> - <p> - From the <gui>Type</gui> drop-down list choose - the service you wish to add an account for, then click - on the <gui>Create</gui> button. - </p> - </item> + <item> + <p> + From the <gui>Type</gui> drop-down list choose + the service you wish to add an account for, then click + on the <gui>Create</gui> button. + </p> + </item> </list> <p> - Otherwise: + Otherwise: </p> <steps> - <item> - <p> - Click on the <gui>Add</gui> button. - </p> - </item> - <item> - <p> - From the <gui>Type</gui> drop-down list choose - the service you wish to add an account for, then click - on the <gui>Create</gui> button. - </p> - </item> + <item> + <p> + Click on the <gui>Add</gui> button. + </p> + </item> + <item> + <p> + From the <gui>Type</gui> drop-down list choose + the service you wish to add an account for, then click + on the <gui>Create</gui> button. + </p> + </item> </steps> </item> <item> <p> - Fill the required fields with your <em>user - name</em> and <em>password</em>. + Fill the required fields with your <em>user + name</em> and <em>password</em>. </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. + 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> </item> </steps> diff --git a/help/C/add-contact.page b/help/C/add-contact.page index 529ec07d..0227c17a 100644 --- a/help/C/add-contact.page +++ b/help/C/add-contact.page @@ -6,8 +6,8 @@ <link type="guide" xref="index#accounts"/> <link type="seealso" xref="offline-contacts"/> <desc>Add someone to the contact list.</desc> - <revision version="3.0" date="2009-06-15" status="draft"/> - + <revision pkgversion="2.28" version="0.1" date="2009-06-15" status="draft"/> + <revision pkgversion="2.28" version="0.2" date="2009-08-10" status="review"/> <credit type="author"> <name>Phil Bull</name> <email>philbull@gmail.com</email> @@ -16,10 +16,9 @@ <year>2009</year> <name>GNOME Documentation Project</name> </copyright> - <include href="legal.xml" xmlns="http://www.w3.org/2001/XInclude"/> </info> - + <comment> <cite date="2009-06-15"><name>Phil Bull</name></cite> <p>Instructions need review, didn't test with other IM services to confirm @@ -27,48 +26,43 @@ </comment> <title>Add someone to your list of contacts</title> - + <steps> <item> <p> - Choose <guiseq><gui>Chat</gui><gui>Add Contact</gui></guiseq> + Choose <guiseq><gui>Chat</gui><gui>Add Contact</gui></guiseq>. </p> </item> <item> <p> - From the <gui>Account</gui> drop-down list, select the type of - service the person you want to add to your contacts is using. + From the <gui>Account</gui> drop-down list, select the type of + service the person you want to add to your contacts is using. </p> </item> <item> <p> - In the <gui>Identifier</gui> text box, type the email address - or the username of the person you want to add to your - contacts list. + In the <gui>Identifier</gui> text box, type the email address + or the username of the person you want to add to your + contacts list. </p> </item> <item> <p> - In the <gui>Alias</gui> text box, type their name. + In the <gui>Alias</gui> text box, type their name. </p> </item> <item> <p> - Click <gui>Add</gui> to add the person to your list of - contacts. + Click <gui>Add</gui> to add the person to your list of + contacts. </p> </item> </steps> - <p> - You can view your list of contacts in the main window of - <app>Empathy</app>. - </p> - <note> <p> To add a new person to your list of contacts, you need to be - connected to the Internet and to your account. + connected to the Internet and to your account. </p> </note> diff --git a/help/C/change-status.page b/help/C/change-status.page index e2b47314..a2e687ff 100644 --- a/help/C/change-status.page +++ b/help/C/change-status.page @@ -8,8 +8,8 @@ <desc> Change your status, if you are going away from your computer for example. </desc> - <revision version="3.0" date="2009-06-14" status="draft"/> - + <revision pkgversion="2.28" version="0.1" date="2009-06-14" status="draft"/> + <revision pkgversion="2.28" version="0.2" date="2009-08-10" status="review"/> <credit type="author"> <name>Phil Bull</name> <email>philbull@gmail.com</email> @@ -18,7 +18,6 @@ <year>2009</year> <name>GNOME Documentation Project</name> </copyright> - <include href="legal.xml" xmlns="http://www.w3.org/2001/XInclude" /> </info> @@ -44,8 +43,8 @@ <note> <p> - If you do not use your computer for a while, or if the screen saver is turned on, Empathy will - automatically set your status to <gui>Away</gui>. + If you do not use your computer for a while, or if the screen saver is turned on, + the status will be automatically set to <gui>Away</gui>. </p> </note> diff --git a/help/C/create-account.page b/help/C/create-account.page index 01971e92..432a1d30 100644 --- a/help/C/create-account.page +++ b/help/C/create-account.page @@ -1,6 +1,7 @@ <page xmlns="http://projectmallard.org/1.0/" type="topic" id="create-account"> + <info> <link type="guide" xref="index#accounts"/> <link type="seealso" xref="add-account"/> @@ -10,7 +11,6 @@ </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"/> - <credit type="author"> <name>Milo Casagrande</name> <email>milo@ubuntu.com</email> @@ -19,17 +19,11 @@ <year>2009</year> <name>GNOME Documentation Project</name> </copyright> - <include href="legal.xml" xmlns="http://www.w3.org/2001/XInclude"/> </info> - <comment> - <cite date="2009-06-14"><name>Milo Casagrande</name></cite> - <p>Section about how to create an account.</p> - </comment> - <title>Register for a new account</title> - + <p> You can freely create an account on any of the services listed below. Follow the instructions reported on each website on @@ -43,7 +37,7 @@ <p> Click on the name of the service to visit its website. </p> - + <section id="im-services"> <title>Instant Messaging Services</title> @@ -70,9 +64,9 @@ <note> <p> It is possible to use the automatic creation of accounts - with this service and <app>Empathy</app>. Not all the - service providers support it. One service provider known - to work is <em>jabber.org</em>, the default one of the application. + with this service. Not all the service providers support it. + One service provider known to work is <em>jabber.org</em>, + the default one of the application. </p> </note> </item> @@ -117,7 +111,7 @@ These services will let you do voice call over the Internet with other people using the same service or even to normal phones. </p> - + <list> <item> <p> diff --git a/help/C/disable-account.page b/help/C/disable-account.page index aafd3a51..76878dc7 100644 --- a/help/C/disable-account.page +++ b/help/C/disable-account.page @@ -5,10 +5,12 @@ <info> <link type="guide" xref="index#accounts"/> <link type="seealso" xref="remove-account"/> - <desc>Prevent an account from logging-in automatically when you start - Empathy.</desc> - <revision version="3.0" date="2009-06-14" status="draft"/> - + <desc> + Prevent an account from logging-in automatically when you start + <app>Empathy</app>. + </desc> + <revision pkgversion="2.28" version="0.1" date="2009-06-14" status="draft"/> + <revision pkgversion="2.28" version="0.2" date="2009-08-10" status="review"/> <credit type="author"> <name>Milo Casagrande</name> <email>milo@ubuntu.com</email> @@ -17,60 +19,48 @@ <year>2009</year> <name>GNOME Documentation Project</name> </copyright> - <include href="legal.xml" xmlns="http://www.w3.org/2001/XInclude"/> </info> - - <comment> - <cite date="2009-06-14"><name>Milo Casagrande</name></cite> - <p>Section about how to disable an account from <app>Empathy</app>.</p> - </comment> - + <title>Disable an account</title> <p> Disabling an account means to deactivate it, temporarily or - permanently. All the conversations you had will be kept in your computer. + permanently. All the conversations you had will be kept in your computer. </p> <p> - After disabling an account, you will be able to enable it again. + After disabling an account, it is possible to enable it again. </p> <steps> <item> <p> - From the <gui>Contact List</gui> window, perform one of the following: + From the <gui>Contact List</gui> window, perform 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> + <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> - Select the account you wish to disable in the box on the - left of the dialog. + Select the account you wish to disable from the box on the + left of the dialog. </p> </item> <item> <p> - Deselect the <gui>Enabled</gui> check-box. + Deselect the <gui>Enabled</gui> check-box. </p> </item> </steps> - - <note> - <p> - If you want to remove an account, see <link xref="remove-account"/>. - </p> - </note> </page> diff --git a/help/C/irc-account.page b/help/C/irc-account.page index 3b58c96d..fb742edc 100644 --- a/help/C/irc-account.page +++ b/help/C/irc-account.page @@ -8,7 +8,7 @@ <link type="seealso" xref="prob-conn-name"/> <desc>Create an IRC account.</desc> <revision pkgversion="2.28" version="0.1" date="2009-07-25" status="draft"/> - + <revision pkgversion="2.28" version="0.1" date="2009-08-10" status="review"/> <credit type="author"> <name>Milo Casagrande</name> <email>milo@ubuntu.com</email> @@ -17,7 +17,6 @@ <year>2009</year> <name>GNOME Documentation Project</name> </copyright> - <include href="legal.xml" xmlns="http://www.w3.org/2001/XInclude"/> </info> @@ -31,12 +30,12 @@ <list> <item> <p> - Press <key>F4</key> + Press <key>F4</key>. </p> </item> <item> <p> - Choose <guiseq><gui>Edit</gui><gui>Accounts</gui></guiseq> + Choose <guiseq><gui>Edit</gui><gui>Accounts</gui></guiseq>. </p> </item> </list> diff --git a/help/C/irc-join-pwd.page b/help/C/irc-join-pwd.page index 7d1d8dd6..fdc5086d 100644 --- a/help/C/irc-join-pwd.page +++ b/help/C/irc-join-pwd.page @@ -6,7 +6,7 @@ <link type="guide" xref="irc-manage#manage"/> <link type="seealso" xref="irc-join-room"/> <desc>Join a password protected room.</desc> - <revision pkgversion="2.28" version="0.1" date="2009-08-07" status="draft"/> + <revision pkgversion="2.28" version="0.1" date="2009-08-07" status="review"/> <credit type="author"> <name>Milo Casagrande</name> @@ -21,5 +21,9 @@ </info> <title>Join a protected room</title> + + <p> + At the moment it is not possible to join a password protected room. + </p> </page> diff --git a/help/C/irc-nick-password.page b/help/C/irc-nick-password.page index bc7e565e..a4233f92 100644 --- a/help/C/irc-nick-password.page +++ b/help/C/irc-nick-password.page @@ -7,7 +7,7 @@ <link type="seealso" xref="prob-conn-name"/> <desc>How to set the password of a nickname.</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"/> <credit type="author"> <name>Milo Casagrande</name> <email>milo@ubuntu.com</email> @@ -42,12 +42,12 @@ <list> <item> <p> - Press <key>F4</key> + Press <key>F4</key>. </p> </item> <item> <p> - Choose <guiseq><gui>Edit</gui><gui>Accounts</gui></guiseq> + Choose <guiseq><gui>Edit</gui><gui>Accounts</gui></guiseq>. </p> </item> </list> diff --git a/help/C/remove-account.page b/help/C/remove-account.page index 355d4955..5728b40d 100644 --- a/help/C/remove-account.page +++ b/help/C/remove-account.page @@ -1,12 +1,12 @@ <page xmlns="http://projectmallard.org/1.0/" type="topic" id="remove-account"> - + <info> <link type="guide" xref="index#accounts"/> <desc>Completely remove an account from <app>Empathy</app>.</desc> - <revision version="3.0" date="2009-06-14" status="draft"/> - + <revision pkgversion="2.28" version="0.1" date="2009-06-14" status="draft"/> + <revision pkgversion="2.28" version="0.2" date="2009-08-10" status="review"/> <credit type="author"> <name>Milo Casagrande</name> <email>milo@ubuntu.com</email> @@ -15,15 +15,9 @@ <year>2009</year> <name>GNOME Documentation Project</name> </copyright> - <include href="legal.xml" xmlns="http://www.w3.org/2001/XInclude"/> </info> - - <comment> - <cite date="2009-06-14"><name>Milo Casagrande</name></cite> - <p>Section about how to remove an account from <app>Empathy</app>.</p> - </comment> - + <title>Remove an account</title> <p> @@ -31,52 +25,46 @@ the conversations you had with other people. </p> <p> - After removing an account you will not be able to recover it or - the conversations you had. + After removing an account you will not be able to recover it or to recover + the conversations you had. </p> <steps> <item> <p> - From the <gui>Contact List</gui> window, perform one of the following: + From the <gui>Contact List</gui> window, perform 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> + <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> - Select the account you wish to remove in the box on the - left of the dialog. + Select the account you wish to remove from the box on the + left of the dialog. </p> </item> <item> <p> - Click on the <gui>Remove</gui> button. + Click on the <gui>Remove</gui> button. </p> </item> <item> <p> - A dialog will be shown asking for confirmation. Click on - the <gui>Remove</gui> button to permanently remove the - account. + A dialog will be shown asking for confirmation. Click on + the <gui>Remove</gui> button to permanently remove the + account. </p> </item> </steps> - - <note> - <p> - If you only want to disable an account, see <link xref="disable-account"/>. - </p> - </note> </page> diff --git a/help/C/send-file.page b/help/C/send-file.page index 0768696b..8d3a15e8 100644 --- a/help/C/send-file.page +++ b/help/C/send-file.page @@ -7,6 +7,7 @@ <desc>Send a file from your computer to one of your contacts.</desc> <revision pkgversion="2.28" version="0.1" date="2009-06-14" status="draft"/> <revision pkgversion="2.28" version="0.2" date="2009-07-21" status="draft"/> + <revision pkgversion="2.28" version="0.2" date="2009-08-10" status="review"/> <credit type="author"> <name>Phil Bull</name> @@ -57,6 +58,13 @@ </p> </item> </steps> + + <note> + <p> + It is possible to send files only using the following services: <em>Jabber</em>, + <em>Google Talk</em> and <em>Salut</em>. + </p> + </note> <p> If your contact accepts the file transfer, you can watch the progress of the diff --git a/help/C/set-custom-status.page b/help/C/set-custom-status.page index 04e49e4a..3c705af2 100644 --- a/help/C/set-custom-status.page +++ b/help/C/set-custom-status.page @@ -7,10 +7,10 @@ <link type="seealso" xref="change-status"/> <link type="seealso" xref="status-icons"/> <desc> - Setting a custom status. + Set a personal message for your status. </desc> <revision pkgversion="2.28" version="0.1" date="2009-06-30" status="draft"/> - + <revision pkgversion="2.28" version="0.2" date="2009-08-10" status="review"/> <credit type="author"> <name>Jim Campbell</name> <email>jwcampbell@gmail.com</email> @@ -23,39 +23,141 @@ <include href="legal.xml" xmlns="http://www.w3.org/2001/XInclude" /> </info> - <title>Set a custom status</title> + <title>Set a custom message</title> + + <p> + Sometimes you may want to set a custom message for your status, for example to let + people know that you will be unavailable for a certain period of time. + </p> + <p> + It is possible to set a custom message based on the different statuses available. + </p> + + <steps> + <item> <p> - Sometimes you may want to set a custom status, for example to let people know that you will be unavailable for a certain period of time. - </p> - - <steps> + From the <gui>Contact List</gui> window, click on the drop-down list at + the top. + </p> + </item> <item> <p> - Click on the drop-down list at the top of the main window of - <app>Empathy</app>. + Select the status you want to add a custom message to. You have to select the one + identified with the label <gui>Custom Message</gui>. </p> </item> <item> <p> - Enter your custom status message into the "Add New Preset" box. + Enter your custom message in the text box at the top of the window, and + press <key>Enter</key> to set the message. </p> </item> <item> <p> - Select a generic status type from the drop-down menu. + If you want to set the custom message as a favorite, saving it in order to use it + again, click on the little star on the right of the text box where you wrote your + custom message. + </p> + <p> + If you do not do it, the custom message will not be available the next time you + use <app>Empathy</app>. It will be saved only for the current session. + </p> + </item> + </steps> + + <section id="edit-custom"> + + <title>Edit, remove and add a custom message</title> + + <steps> + <item> + <p> + From the <gui>Contact List</gui> window, click on the drop-down list at + the top. </p> - </item> - <item> + </item> + <item> <p> - Click on the +Add button to add the custom status to - your list of possible status indicators. + Select <gui>Edit Custom Message</gui>. </p> </item> - <item> + <item> + <list> + <item> + <p> + To edit a custom message: + </p> + <steps> + <item> + <p> + From the <gui>Saved Presets</gui> box, select the status message + you want to edit and double-click on it. + </p> + </item> + <item> + <p> + Type the new custom message and press <key>Enter</key> to modify it. + </p> + </item> + </steps> + </item> + <item> + <p> + To remove a custom message: + </p> + <steps> + <item> + <p> + From the <gui>Saved Presets</gui> box, select the status message you want + to remove. + </p> + </item> + <item> + <p> + Click on the <gui>Remove</gui> button. + </p> + </item> + </steps> + </item> + <item> + <p> + To add a new custom message, from the <gui>Add New Preset</gui> section: + </p> + <steps> + <item> + <p> + Click on the drop-down list to select the status you want to set a custom + message to. + </p> + </item> + <item> + <p> + Click on the text box, and type the new custom message. + </p> + </item> + <item> + <p> + Click on <gui>Add</gui> to add the new message to the presets ones. + </p> + </item> + </steps> + </item> + </list> + </item> + <item> <p> - Click "Close" and then select your newly-created status from - the drop-down menu at the top of the application. + When finished, click on <gui>Close</gui>. </p> </item> </steps> + + <note> + <p> + When you edit or add a new custom message, it will not be set as the current + status message. You will need to select it from the <gui>Contact List</gui> window. + </p> + </note> + + </section> + </page> diff --git a/help/C/share-desktop.page b/help/C/share-desktop.page index 776ee487..1987a83d 100644 --- a/help/C/share-desktop.page +++ b/help/C/share-desktop.page @@ -5,11 +5,82 @@ <info> <link type="guide" xref="index#advanced"/> <desc> - Share your desktop with one of your contacts. + Share the desktop with your contacts. </desc> <revision pkgversion="2.28" version="0.1" date="2009-08-02" status="stub"/> + <revision pkgversion="2.28" version="0.2" date="2009-08-10" status="review"/> + <credit type="author"> + <name>Milo Casagrande</name> + <email>milo@ubuntu.com</email> + </credit> + <copyright> + <year>2009</year> + <name>GNOME Documentation Project</name> + </copyright> + <include href="legal.xml" xmlns="http://www.w3.org/2001/XInclude"/> </info> - <title>Share the desktop</title> + + <title>Share your desktop</title> + + <p> + It is possible, with some of your contacts, to share your desktop with them, or to start + using your contacts desktop. You can use + this functionality to show your desktop to your contacts, to ask for help or to + help your contacts resolve a problem. + </p> + + <note> + <p> + In order to be able to share your desktop or to remotely use your contacts desktop, + it is necessary to have a remote desktop viewer application installed in your system. + </p> + </note> + + <steps> + <item> + <p> + From the <gui>Contact List</gui> window, perform one of the following: + </p> + <list> + <item> + <p> + Select the contact you want to share your desktop with, and choose + <guiseq><gui>Edit</gui><gui>Contact</gui><gui>Share my desktop</gui></guiseq>. + </p> + </item> + <item> + <p> + Right-click on the name of the contact you want to share your desktop with, + and select <gui>Share my desktop</gui>. + </p> + </item> + </list> + </item> + <item> + <p> + A request will be sent to the contact you want to share your desktop with. + If they accept, the default remote desktop viewer application will be launched in + order to permit you to disconnect the user that is controlling your desktop. + </p> + <p> + For more information about how to use the remote desktop viewer application, + refer to its help. + </p> + </item> + </steps> + + <p> + When you share your desktop with someone else, it is possible to experience + system performance slowdown and low Internet speed. + </p> + + <note> + <p> + Not all your contacts might be able to support this functionality. It is necessary + for them to have at least the 2.28 version of <app>Empathy</app> and a remote desktop + viewer application installed in their system. + </p> + </note> </page> |