aboutsummaryrefslogtreecommitdiffstats
path: root/help
diff options
context:
space:
mode:
Diffstat (limited to 'help')
-rw-r--r--help/C/add-account.page12
-rw-r--r--help/C/add-contact.page10
-rw-r--r--help/C/audio-call.page2
-rw-r--r--help/C/create-account.page2
-rw-r--r--help/C/favorite-rooms.page135
-rw-r--r--help/C/geolocation-what-is.page2
-rw-r--r--help/C/import-account.page88
-rw-r--r--help/C/index.page1
-rw-r--r--help/C/introduction.page8
-rw-r--r--help/C/irc-account.page2
-rw-r--r--help/C/irc-join-room.page2
-rw-r--r--help/C/send-file.page36
-rw-r--r--help/C/set-custom-status.page2
-rw-r--r--help/C/share-desktop.page2
-rw-r--r--help/C/video-call.page2
-rw-r--r--help/Makefile.am2
16 files changed, 269 insertions, 39 deletions
diff --git a/help/C/add-account.page b/help/C/add-account.page
index 2fa344cfb..5821a856c 100644
--- a/help/C/add-account.page
+++ b/help/C/add-account.page
@@ -85,10 +85,12 @@
</item>
</steps>
- <p>
- If you want to change the name that identifies the account in the <gui>Accounts</gui>
- dialog, double-click on the name of the account in the box on the left of the dialog
- and type the new name.
- </p>
+ <note style="tip">
+ <p>
+ If you want to change the name that identifies the account in the <gui>Accounts</gui>
+ dialog, double-click on the name of the account in the box on the left of the dialog
+ and type the new name.
+ </p>
+ </note>
</page>
diff --git a/help/C/add-contact.page b/help/C/add-contact.page
index e435a9404..14d49a57a 100644
--- a/help/C/add-contact.page
+++ b/help/C/add-contact.page
@@ -30,14 +30,14 @@
<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.
+ 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.
+ or the username of the person you want to add to your
+ contacts list.
</p>
</item>
<item>
@@ -48,7 +48,7 @@
<item>
<p>
Click <gui>Add</gui> to add the person to your list of
- contacts.
+ contacts.
</p>
</item>
</steps>
@@ -56,7 +56,7 @@
<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/audio-call.page b/help/C/audio-call.page
index 575c6af1e..8c18b9453 100644
--- a/help/C/audio-call.page
+++ b/help/C/audio-call.page
@@ -56,7 +56,7 @@
</p>
</item>
</steps>
- <note>
+ <note style="tip">
<p>
To turn an audio conversation into a video one, from the call window select
<guiseq><gui>Call</gui><gui>Send video</gui></guiseq>,
diff --git a/help/C/create-account.page b/help/C/create-account.page
index 203818c7f..46f58395e 100644
--- a/help/C/create-account.page
+++ b/help/C/create-account.page
@@ -61,7 +61,7 @@
<p>
<link href="http://register.jabber.org/">Jabber</link>
</p>
- <note>
+ <note style="tip">
<p>
It is possible to use the automatic creation of accounts
with this service. Not all the service providers support it.
diff --git a/help/C/favorite-rooms.page b/help/C/favorite-rooms.page
new file mode 100644
index 000000000..747c09d66
--- /dev/null
+++ b/help/C/favorite-rooms.page
@@ -0,0 +1,135 @@
+<page xmlns="http://projectmallard.org/1.0/"
+ type="topic"
+ id="favorite-rooms">
+
+ <info>
+ <link type="guide" xref="index#text-conv"/>
+ <link type="guide" xref="irc-manage#manage"/>
+ <link type="seealso" xref="irc-join-room"/>
+ <link type="seealso" xref="group-conversations"/>
+ <desc>Set, join and manage favorite rooms.</desc>
+ <revision pkgversion="2.28" version="0.1" date="2009-08-21" status="draft"/>
+ <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>Favorite rooms</title>
+
+ <section id="set-favorite">
+ <title>Set a room as a favorite</title>
+ <steps>
+ <item>
+ <p>
+ Join a room.
+ </p>
+ <list>
+ <item>
+ <p>
+ See <link xref="irc-join-room"/> for more information on how to join
+ an IRC room.
+ </p>
+ </item>
+ <item>
+ <p>
+ See <link xref="group-conversations"/> for more information on how to
+ start or join a group conversation.
+ </p>
+ </item>
+ </list>
+ </item>
+ <item>
+ <p>
+ From the conversation window, choose
+ <guiseq><gui>Conversation</gui><gui>Favorite Chatroom</gui></guiseq>.
+ </p>
+ </item>
+ </steps>
+ </section>
+
+ <section id="join-favorite">
+ <title>Join favorite rooms</title>
+ <steps>
+ <item>
+ <p>
+ From the <gui>Contact List</gui> window, perform one of the following:
+ </p>
+ <list>
+ <item>
+ <p>
+ Press <key>F5</key>.
+ </p>
+ </item>
+ <item>
+ <p>
+ Choose <guiseq><gui>Room</gui><gui>Join Favorites</gui></guiseq>, to
+ join all your favorite rooms.
+ </p>
+ </item>
+ <item>
+ <p>
+ Choose <gui>Room</gui>, and select the favorite room you want to join.
+ </p>
+ </item>
+ </list>
+ </item>
+ </steps>
+ <note>
+ <p>
+ To join a favorite room, you need to be connected to the Internet and to
+ your account.
+ </p>
+ </note>
+ </section>
+
+ <section id="manage-favorite">
+ <title>Manage favorite rooms</title>
+ <steps>
+ <item>
+ <p>
+ From the <gui>Contact List</gui> window, choose
+ <guiseq><gui>Room</gui><gui>Manage Favorites</gui></guiseq>.
+ </p>
+ </item>
+ <item>
+ <p>
+ From the <gui>Account</gui> drop-down list, select the account you want to
+ manage the favorite rooms of.
+ </p>
+ <p>
+ Select <gui>All</gui> to see all you favorite rooms.
+ </p>
+ </item>
+ <item>
+ <p>
+ Select the favorite room you want to manage:
+ </p>
+ <list>
+ <item>
+ <p>
+ Select the <gui>Auto-Connect</gui> check-box in order to automatically
+ join that room when you connect to your account.
+ </p>
+ </item>
+ <item>
+ <p>
+ Click on <gui>Remove</gui> to remove the room from your favorites.
+ </p>
+ </item>
+ </list>
+ </item>
+ <item>
+ <p>
+ When done, click <gui>Close</gui>.
+ </p>
+ </item>
+ </steps>
+ </section>
+
+</page>
diff --git a/help/C/geolocation-what-is.page b/help/C/geolocation-what-is.page
index fdbf0adbd..77fcff8dd 100644
--- a/help/C/geolocation-what-is.page
+++ b/help/C/geolocation-what-is.page
@@ -48,7 +48,7 @@
</item>
</list>
- <note>
+ <note style="tip">
<p>
In order to see your contacts geographical position, they need to use a
service and an application that support geolocation.
diff --git a/help/C/import-account.page b/help/C/import-account.page
new file mode 100644
index 000000000..19b016a25
--- /dev/null
+++ b/help/C/import-account.page
@@ -0,0 +1,88 @@
+<page xmlns="http://projectmallard.org/1.0/"
+ type="topic"
+ id="import-account">
+
+ <info>
+ <link type="guide" xref="index#accounts"/>
+ <link type="seealso" xref="add-account"/>
+ <link type="seealso" xref="remove-account"/>
+ <desc>Import an existing account to <app>Empathy</app>.</desc>
+ <revision pkgversion="2.28" version="0.1" date="2009-08-22" status="draft"/>
+ <revision pkgversion="2.28" version="0.2" date="2009-08-22" status="review"/>
+ <credit type="author">
+ <name>Peter Haslam</name>
+ <email>peter.haslam@freenet.de</email>
+ </credit>
+ <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>Import an existing account</title>
+
+ <steps>
+ <item>
+ <p>
+ From the <gui>Contact List</gui> window, do 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>
+ </list>
+ </item>
+ <item>
+ <p>
+ Click on <gui>Import Accounts...</gui>.
+ </p>
+ </item>
+ <item>
+ <p>
+ From the <gui>Import Accounts</gui> dialog, select the <gui>Import</gui>
+ check-box next to the accounts you want to import.
+ </p>
+ </item>
+ <item>
+ <p>
+ Click <gui>OK</gui> to import the accounts to <app>Empathy</app>.
+ </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.
+ </p>
+ </item>
+ </steps>
+
+ <note style="tip">
+ <p>
+ If you want to change the name that identifies the account in the <gui>Accounts</gui>
+ dialog, double-click on the name of the account in the box on the left of the dialog
+ and type the new name.
+ </p>
+ </note>
+
+ <note>
+ <p>
+ At the moment <app>Empathy</app> can import accounts only from the instant
+ messaging program <app>Pidgin</app>. For more information about <app>Pidgin</app>,
+ see the <link href="http://www.pidgin.im/">Pidgin website</link>.
+ </p>
+ </note>
+
+</page>
diff --git a/help/C/index.page b/help/C/index.page
index 068226625..a57596560 100644
--- a/help/C/index.page
+++ b/help/C/index.page
@@ -1,5 +1,6 @@
<page xmlns="http://projectmallard.org/1.0/"
type="guide"
+ style="2column"
id="index">
<info>
diff --git a/help/C/introduction.page b/help/C/introduction.page
index 58311b17b..ab3a65298 100644
--- a/help/C/introduction.page
+++ b/help/C/introduction.page
@@ -37,10 +37,12 @@
share your desktop in just two clicks.
</p>
- <p>
- <media type="image" src="figures/empathy-main-window.png" mime="image/png">
+ <figure>
+ <title><gui>Contact List</gui> window</title>
+ <desc><app>Empathy</app> main window</desc>
+ <media type="image" src="figures/empathy-main-window.png" mime="image/png" style="right">
<app>Empathy</app> main window.
</media>
- </p>
+ </figure>
</page>
diff --git a/help/C/irc-account.page b/help/C/irc-account.page
index 1f81eb593..dd43fbb97 100644
--- a/help/C/irc-account.page
+++ b/help/C/irc-account.page
@@ -118,7 +118,7 @@
and type the new name.
</p>
- <note>
+ <note style="tip">
<p>
If you want to use different networks at the same time, you need to create an
account with each one of the networks you want to use.
diff --git a/help/C/irc-join-room.page b/help/C/irc-join-room.page
index c196f2055..8461b1de1 100644
--- a/help/C/irc-join-room.page
+++ b/help/C/irc-join-room.page
@@ -46,7 +46,7 @@
</item>
</steps>
- <note>
+ <note style="tip">
<p>
To join multiple rooms, you need to repeat the steps above for each room.
</p>
diff --git a/help/C/send-file.page b/help/C/send-file.page
index 65ac170d3..960d0cc46 100644
--- a/help/C/send-file.page
+++ b/help/C/send-file.page
@@ -51,19 +51,34 @@
</item>
<item>
<p>
- The <gui>File Transfers</gui> window will appear. Wait for your contact to accept the
- file transfer, or click <gui>Stop</gui> to halt the transfer.
+ The <gui>File Transfers</gui> window will appear.
+ </p>
+ <p>
+ Wait for your contact to accept the file transfer, or click
+ <gui>Stop</gui> to halt the transfer.
+ </p>
+ </item>
+ <item>
+ <p>
+ Once the transfer is finished, it is possible to close the <gui>File Transfers</gui>
+ window.
</p>
</item>
</steps>
+ <note style="tip">
+ <p>
+ If you have multiple finished transfers listed in the window, click on
+ <gui>Clear</gui> to empty the list. This will only remove the files from the
+ list and will not delete them from your computer.
+ </p>
+ </note>
<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>
-
<note>
<p>
In order to send a file to someone, you need to be connected to the Internet, or to
@@ -71,19 +86,4 @@
</p>
</note>
- <p>
- If your contact accepts the file transfer, you can watch the progress of the
- transfer and see the estimated amount of time remaining before it is complete.
- </p>
- <p>
- If they do not accept it, the status of the transfer will change to <gui>File
- transfer cancelled</gui>, and the file will not be sent.
- </p>
- <p>
- Once a transfer is finished, you can close the <gui>File Transfers</gui>
- window. If you have multiple finished transfers listed in the window, click on
- <gui>Clear</gui> to empty the list. This will only remove the files from the
- list and will not delete them from your computer.
- </p>
-
</page>
diff --git a/help/C/set-custom-status.page b/help/C/set-custom-status.page
index 2fe944085..6b9dabe50 100644
--- a/help/C/set-custom-status.page
+++ b/help/C/set-custom-status.page
@@ -154,7 +154,7 @@
</item>
</steps>
- <note>
+ <note style="tip">
<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.
diff --git a/help/C/share-desktop.page b/help/C/share-desktop.page
index b855a47f6..06a3d7c40 100644
--- a/help/C/share-desktop.page
+++ b/help/C/share-desktop.page
@@ -29,7 +29,7 @@
help your contacts resolve a problem.
</p>
- <note>
+ <note style="tip">
<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.
diff --git a/help/C/video-call.page b/help/C/video-call.page
index 412644b4f..6f918ee6e 100644
--- a/help/C/video-call.page
+++ b/help/C/video-call.page
@@ -55,7 +55,7 @@
</p>
</item>
</steps>
- <note>
+ <note style="tip">
<p>
To turn a video conversation into an audio one, from the call window deselect
<guiseq><gui>Call</gui><gui>Send video</gui></guiseq>,
diff --git a/help/Makefile.am b/help/Makefile.am
index be149cd04..95b218a47 100644
--- a/help/Makefile.am
+++ b/help/Makefile.am
@@ -18,6 +18,7 @@ DOC_PAGES = \
change-status.page \
create-account.page \
disable-account.page \
+ favorite-rooms.page \
geolocation.page \
geolocation-not-showing.page \
geolocation-privacy.page \
@@ -25,6 +26,7 @@ DOC_PAGES = \
geolocation-turn.page \
geolocation-what-is.page \
group-conversations.page \
+ import-account.page \
index.page \
introduction.page \
irc-account.page \
generated by cgit v1.2.3 (git 2.25.1) at 2025-05-09 14:13:59 +0800