aboutsummaryrefslogtreecommitdiffstats
path: root/help
diff options
context:
space:
mode:
authorAruna <aruna.evam@gmail.com>2012-11-28 16:39:48 +0800
committerEkaterina Gerasimova <kittykat3756@gmail.com>2012-12-02 03:15:49 +0800
commitc43eea2af4d1412e18ad58cef1dd6904e90840e8 (patch)
tree1980efa876f2f8f17387db7c1dc28cfa10c6652d /help
parentf1ab42c0c5332e47b33ecf905afd7fd6c2a344e8 (diff)
downloadgsoc2013-empathy-c43eea2af4d1412e18ad58cef1dd6904e90840e8.tar
gsoc2013-empathy-c43eea2af4d1412e18ad58cef1dd6904e90840e8.tar.gz
gsoc2013-empathy-c43eea2af4d1412e18ad58cef1dd6904e90840e8.tar.bz2
gsoc2013-empathy-c43eea2af4d1412e18ad58cef1dd6904e90840e8.tar.lz
gsoc2013-empathy-c43eea2af4d1412e18ad58cef1dd6904e90840e8.tar.xz
gsoc2013-empathy-c43eea2af4d1412e18ad58cef1dd6904e90840e8.tar.zst
gsoc2013-empathy-c43eea2af4d1412e18ad58cef1dd6904e90840e8.zip
Added an Overview help page to Empathy, bug 604975
Created an overview page which briefs a new user on IM and adds a few pictures.
Diffstat (limited to 'help')
-rw-r--r--help/C/figures/conf_overview.pngbin0 -> 605142 bytes
-rw-r--r--help/C/figures/croom_overview.pngbin0 -> 397448 bytes
-rw-r--r--help/C/figures/video_overview.pngbin0 -> 221887 bytes
-rw-r--r--help/C/overview.page59
-rw-r--r--help/Makefile.am6
5 files changed, 64 insertions, 1 deletions
diff --git a/help/C/figures/conf_overview.png b/help/C/figures/conf_overview.png
new file mode 100644
index 000000000..7b9c0d89f
--- /dev/null
+++ b/help/C/figures/conf_overview.png
Binary files differ
diff --git a/help/C/figures/croom_overview.png b/help/C/figures/croom_overview.png
new file mode 100644
index 000000000..74079630c
--- /dev/null
+++ b/help/C/figures/croom_overview.png
Binary files differ
diff --git a/help/C/figures/video_overview.png b/help/C/figures/video_overview.png
new file mode 100644
index 000000000..71332bf4f
--- /dev/null
+++ b/help/C/figures/video_overview.png
Binary files differ
diff --git a/help/C/overview.page b/help/C/overview.page
new file mode 100644
index 000000000..daa67b844
--- /dev/null
+++ b/help/C/overview.page
@@ -0,0 +1,59 @@
+<page xmlns="http://projectmallard.org/1.0/"
+ type="topic"
+ id="overview">
+
+ <info>
+ <link type="guide" xref="index"/>
+ <revision pkgversion="3.7" version="0.1" date="2012-11-30" status="draft"/>
+ <desc>
+ What instant messaging is and how you can use it.
+ </desc>
+ <credit type="author">
+ <name>Aruna S</name>
+ <email>aruna.evam@gmail.com</email>
+ </credit>
+ <credit type="editor">
+ <name>Ekaterina Gerasimova</name>
+ <email>kittykat3756@gmail.com</email>
+ </credit>
+ <license>
+ <p>Creative Commons Share Alike 3.0</p>
+ </license>
+ </info>
+
+ <title>Overview of instant messaging</title>
+
+ <p>
+ Instant messaging, sometimes abbreviated to IM, is a text-based means to
+ communicate instantly over the internet and the local network. While some
+ IM applications work with only one type of account, others, including
+ <link xref="introduction">Empathy</link>, provide IM facilities by using
+ <link xref="add-account">accounts</link> from different service providers.
+ Some of these even support audio and video calling.
+ </p>
+
+ <table frame="all" shade="cols">
+ <tr>
+ <td><p><media type="image" src="figures/video_overview.png" mime="image/png" style="right" width="150" height="150"></media></p></td>
+ <td><p><media type="image" src="figures/conf_overview.png" mime="image/png" style="right" width="150" height="150"></media></p></td>
+ <td><p><media type="image" src="figures/croom_overview.png" mime="image/png" style="right" width="150" height="150"></media></p></td>
+ </tr>
+ <tr>
+ <td><p>Video Conference</p></td>
+ <td><p>Group chats</p></td>
+ <td><p>Chat rooms</p></td>
+ </tr>
+ </table>
+
+ <p>
+ Some instant messaging applications can be used to connect to chat rooms,
+ online places where like-minded people meet to talk. One popular means to
+ connect to several chat rooms is the Internet Relay Chat, also known as
+ <link xref="irc-manage">IRC</link>. IRC provides
+ <link xref="irc-join-room">public</link> chat rooms, which are open to
+ anyone who creates an account on the IRC Server, and private chat rooms,
+ which are <link xref="irc-join-pwd">password protected</link>
+ and open only to a select few.
+ </p>
+
+</page>
diff --git a/help/Makefile.am b/help/Makefile.am
index 678ae6df9..60b9facab 100644
--- a/help/Makefile.am
+++ b/help/Makefile.am
@@ -12,7 +12,10 @@ HELP_MEDIA = \
figures/gtk-add.png \
figures/gtk-edit.png \
figures/gtk-remove.png \
- figures/offline.png
+ figures/offline.png \
+ figures/croom_overview.png \
+ figures/conf_overview.png \
+ figures/video_overview.png
HELP_FILES = \
account-irc.page \
@@ -46,6 +49,7 @@ HELP_FILES = \
irc-start-conversation.page \
license.page \
link-contacts.page \
+ overview.page \
prev-conv.page \
prob-conn-acctdisabled.page \
prob-conn-auth.page \