aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorShaun McCance <shaunm@gnome.org>2009-09-05 00:51:12 +0800
committerShaun McCance <shaunm@gnome.org>2009-09-05 00:51:34 +0800
commit5b1df78b245d1e603d2ffa333b11bd636c69f1b2 (patch)
tree5ea306decaf002f9fa7b90bfe488243614ab3914
parent539195fab693e734688827d70934df5ef983092c (diff)
downloadgsoc2013-empathy-5b1df78b245d1e603d2ffa333b11bd636c69f1b2.tar
gsoc2013-empathy-5b1df78b245d1e603d2ffa333b11bd636c69f1b2.tar.gz
gsoc2013-empathy-5b1df78b245d1e603d2ffa333b11bd636c69f1b2.tar.bz2
gsoc2013-empathy-5b1df78b245d1e603d2ffa333b11bd636c69f1b2.tar.lz
gsoc2013-empathy-5b1df78b245d1e603d2ffa333b11bd636c69f1b2.tar.xz
gsoc2013-empathy-5b1df78b245d1e603d2ffa333b11bd636c69f1b2.tar.zst
gsoc2013-empathy-5b1df78b245d1e603d2ffa333b11bd636c69f1b2.zip
[help] Updates to instructions for audio and video conversations
-rw-r--r--help/C/audio-call.page64
-rw-r--r--help/C/audio-video.page132
-rw-r--r--help/C/video-call.page57
3 files changed, 148 insertions, 105 deletions
diff --git a/help/C/audio-call.page b/help/C/audio-call.page
index c3e973d81..44fad75e9 100644
--- a/help/C/audio-call.page
+++ b/help/C/audio-call.page
@@ -1,15 +1,16 @@
<page xmlns="http://projectmallard.org/1.0/"
- type="topic"
- id="audio-call">
+ xmlns:e="http://projectmallard.org/experimental/"
+ type="topic" style="task"
+ id="audio-call">
<info>
<link type="guide" xref="index#audio-video"/>
<link type="seealso" xref="audio-video"/>
- <desc>
- Start an audio conversation with one of your contacts.
- </desc>
+ <desc>Call your contacts over the Internet.</desc>
<revision pkgversion="2.28" version="0.1" date="2009-08-02" status="stub"/>
- <revision pkgversion="2.28" version="0.2" date="2009-08-07" status="review"/>
+ <revision pkgversion="2.28" version="0.2" date="2009-08-07" status="review">
+ <e:review by="shaunm@gnome.org" date="2009-09-04" status="done"/>
+ </revision>
<credit type="author">
<name>Milo Casagrande</name>
<email>milo@ubuntu.com</email>
@@ -23,45 +24,36 @@
<title>Start an audio conversation</title>
+ <p>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.</p>
+
+ <comment>
+ <cite date="2009-09-02">Shaun McCance</cite>
+ <p>Link to A/V support matrix</p>
+ </comment>
+
<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 have a conversation with, and click
- on the audio call icon next to their name.
- </p>
- </item>
- <item>
- <p>
- Right-click on the name of the contact you want to have a conversation with, and
- choose <gui>Audio Call</gui>.
- </p>
- </item>
- </list>
+ <p>From the <gui>Contact List</gui> window, click the
+ <media type="image" mime="image/png" src="figures/audio-input-microphone.png">audio call</media>
+ icon next to the name of the contact you wish to call. Alternatively,
+ right click the contact and choose <gui>Audio Call</gui>.</p>
</item>
<item>
- <p>
- A new window will open. When the connection is established, you will
- see written, at the bottom of the window, <gui>Connected</gui> and the total
- conversation time.
- </p>
+ <p>A new window will open. When the connection is established, you will
+ see <gui>Connected</gui> at the bottom of the window, along with the
+ total conversation time.</p>
</item>
<item>
- <p>
- To close the conversation, click on <gui>Hang up</gui>.
- </p>
+ <p>To end the conversation, choose <guiseq><gui>Call</gui><gui>Hang up</gui></guiseq>.</p>
</item>
</steps>
<note style="tip">
- <p>
- To turn an audio conversation into a video one, from the call window choose
- <guiseq><gui>Call</gui><gui>Send video</gui></guiseq>,
- or click on the video call icon.
- </p>
+ <p>To turn an audio conversation into a video conversation, choose
+ <guiseq><gui>Call</gui><gui>Send video</gui></guiseq>, or click the
+ <media type="image" mime="image/png" src="figures/camera-web.png">video call</media>
+ toolbar button to select it.</p>
</note>
</page>
diff --git a/help/C/audio-video.page b/help/C/audio-video.page
index cef06e126..31f512836 100644
--- a/help/C/audio-video.page
+++ b/help/C/audio-video.page
@@ -1,14 +1,15 @@
<page xmlns="http://projectmallard.org/1.0/"
- type="topic"
- id="audio-video">
+ xmlns:e="http://projectmallard.org/experimental/"
+ type="topic"
+ id="audio-video">
<info>
<link type="guide" xref="index#audio-video"/>
- <desc>
- When it is possible to have an audio or video conversation.
- </desc>
+ <desc>Information on when it is possible to have an audio or video conversation.</desc>
<revision pkgversion="2.28" version="0.1" date="2009-08-02" status="draft"/>
- <revision pkgversion="2.28" version="0.1" date="2009-08-14" status="review"/>
+ <revision pkgversion="2.28" version="0.1" date="2009-08-14" status="review">
+ <e:review by="shaunm@gnome.org" date="2009-09-04" status="done"/>
+ </revision>
<credit type="author">
<name>Milo Casagrande</name>
<email>milo@ubuntu.com</email>
@@ -20,15 +21,14 @@
<include href="legal.xml" xmlns="http://www.w3.org/2001/XInclude"/>
</info>
- <title>Audio and video conversations</title>
+ <title>Audio and Video Support</title>
- <p>
- When your contacts support audio or video conversations, you will see, next to
- the contacts name in the <gui>Contact List</gui> window, one or two small icons that
- represent the different conversations you can have.
- </p>
+ <p>You can only have audio and video conversation with contacts who are using
+ an application which also supports this feature. When your contacts support
+ audio or video conversations, you will see the following icons next to their
+ names in the contact list:</p>
- <table frame="all" rules="cols" shade="rows">
+ <table frame="all" rules="cols rowgroups" shade="rows">
<thead>
<tr>
<td>
@@ -53,9 +53,7 @@
</p>
</td>
<td>
- <p>
- This is the icon that represents the possibility to have an audio conversation.
- </p>
+ <p>The contact is able to have an audio conversation.</p>
</td>
</tr>
<tr>
@@ -67,9 +65,7 @@
</p>
</td>
<td>
- <p>
- This is the icon that represents the possibility to have a video conversation.
- </p>
+ <p>The contact is able to have a video conversation.</p>
</td>
</tr>
</tbody>
@@ -77,31 +73,45 @@
<note>
<p>
- In order to have a video conversation, you need to have a web-cam that is
- supported by your operating system, and a working microphone.
+ In order to have an audio conversation, you need to have a sound card that is
+ supported by your operating system, and a working microphone.
</p>
<p>
- In order to have an audio conversation, you need to have a sound-card that is
- supported by your operating system, and a working microphone.
+ In order to have a video conversation, you need to have a webcam that is
+ supported by your operating system, and a working microphone.
</p>
</note>
+
+ <section id="services">
- <section id="supported-services">
-
- <title>Supported services</title>
+ <title>Supported Account Types</title>
+
+ <p>You can only have audio and video conversations using accounts on
+ certain supported services. The following table lists whether audio
+ and video is supported for each type of account.</p>
+
+ <note>
+ <p>Account types are provided by plugins. Your system may not have
+ all of the following types available, or it may have types not listed
+ here. Updated plugins may make audio or video conversations possible
+ on account types that are listed as unsupported here.</p>
+ </note>
+
+ <comment>
+ <cite date="2009-09-04">Shaun McCance</cite>
+ <p>I'd like to do tables like this using nothing for No and ✔ for Yes, but
+ we need to look at the accessibility impact. I've
+ <link href="http://mail.gnome.org/archives/gnome-doc-list/2009-September/msg00006.html">asked
+ the accessibility team</link> for input.</p>
+ </comment>
- <table frame="all" rules="cols" shade="rows">
+ <table frame="all" rules="rowgroups colgroups" shade="rows">
+ <col/><colgroup><col/><col/></colgroup>
<thead>
<tr>
- <td><p>
- Protocol / Service
- </p></td>
- <td><p>
- Video conversations
- </p></td>
- <td><p>
- Audio conversations
- </p></td>
+ <td><p>Service</p></td>
+ <td><p>Audio</p></td>
+ <td><p>Video</p></td>
</tr>
</thead>
<tbody>
@@ -111,16 +121,31 @@
<td><p>No</p></td>
</tr>
<tr>
+ <td><p>gadugadu</p></td>
+ <td><p>No</p></td>
+ <td><p>No</p></td>
+ </tr>
+ <tr>
<td><p>Google Talk</p></td>
<td><p>Yes</p></td>
<td><p>Yes</p></td>
</tr>
<tr>
+ <td><p>Groupwise</p></td>
+ <td><p>Yes</p></td>
+ <td><p>Yes</p></td>
+ </tr>
+ <tr>
<td><p>ICQ</p></td>
<td><p>No</p></td>
<td><p>No</p></td>
</tr>
<tr>
+ <td><p>IRC</p></td>
+ <td><p>No</p></td>
+ <td><p>No</p></td>
+ </tr>
+ <tr>
<td><p>Jabber</p></td>
<td><p>Yes</p></td>
<td><p>Yes</p></td>
@@ -131,15 +156,50 @@
<td><p>No</p></td>
</tr>
<tr>
+ <td><p>myspace</p></td>
+ <td><p>No</p></td>
+ <td><p>No</p></td>
+ </tr>
+ <tr>
+ <td><p>qq</p></td>
+ <td><p>No</p></td>
+ <td><p>No</p></td>
+ </tr>
+ <tr>
+ <td><p>People Nearby</p></td>
+ <td><p>No</p></td>
+ <td><p>No</p></td>
+ </tr>
+ <tr>
<td><p>Salut</p></td>
<td><p>No</p></td>
<td><p>No</p></td>
</tr>
<tr>
+ <td><p>sametime</p></td>
+ <td><p>No</p></td>
+ <td><p>No</p></td>
+ </tr>
+ <tr>
+ <td><p>silc</p></td>
+ <td><p>No</p></td>
+ <td><p>No</p></td>
+ </tr>
+ <tr>
+ <td><p>SIP</p></td>
+ <td><p>Yes</p></td>
+ <td><p>Yes</p></td>
+ </tr>
+ <tr>
<td><p>Yahoo!</p></td>
<td><p>No</p></td>
<td><p>No</p></td>
</tr>
+ <tr>
+ <td><p>zephyr</p></td>
+ <td><p>No</p></td>
+ <td><p>No</p></td>
+ </tr>
</tbody>
</table>
diff --git a/help/C/video-call.page b/help/C/video-call.page
index 018e2edeb..6e4e4732f 100644
--- a/help/C/video-call.page
+++ b/help/C/video-call.page
@@ -1,15 +1,19 @@
<page xmlns="http://projectmallard.org/1.0/"
- type="topic"
- id="video-call">
+ xmlns:e="http://projectmallard.org/experimental/"
+ type="topic" style="task"
+ id="video-call">
<info>
<link type="guide" xref="index#audio-video"/>
<link type="seealso" xref="audio-video"/>
+ <link type="seealso" xref="audio-call"/>
<desc>
Start a video conversation with one of 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-14" status="review"/>
+ <revision pkgversion="2.28" version="0.2" date="2009-08-14" status="review">
+ <e:review by="shaunm@gnome.org" date="2009-09-04" status="done"/>
+ </revision>
<credit type="author">
<name>Milo Casagrande</name>
<email>milo@ubuntu.com</email>
@@ -22,45 +26,32 @@
</info>
<title>Start a video conversation</title>
+ <p>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
+ accounts, and it requires the other person to have an application that
+ supports video calls.</p>
+
<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 have a conversation with, and click
- on the video call icon next to their name.
- </p>
- </item>
- <item>
- <p>
- Right-click on the name of the contact you want to have a conversation with, and
- choose <gui>Video Call</gui>.
- </p>
- </item>
- </list>
+ <p>From the <gui>Contact List</gui> window, click the
+ <media type="image" mime="image/png" src="figures/camera-web.png">video call</media>
+ icon next to the name of the contact you wish to call. Alternatively,
+ right click the contact and choose <gui>Video Call</gui>.</p>
</item>
<item>
- <p>
- A new window will open. When the connection is established, you will
- see written, at the bottom of the window, <gui>Connected</gui> and the total
- conversation time.
- </p>
+ <p>A new window will open. When the connection is established, you will
+ see <gui>Connected</gui> at the bottom of the window, along with the
+ total conversation time.</p>
</item>
<item>
- <p>
- To close the conversation, click on <gui>Hang up</gui>.
- </p>
+ <p>To end the conversation, choose <guiseq><gui>Call</gui><gui>Hang up</gui></guiseq>.</p>
</item>
</steps>
<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>,
- or click on the video call icon.
- </p>
+ <p>To turn a video conversation into an adio conversation, choose
+ <guiseq><gui>Call</gui><gui>Send video</gui></guiseq>, or click the
+ <media type="image" mime="image/png" src="figures/camera-web.png">video call</media>
+ toolbar button to deselect it.</p>
</note>