[help] Removed the offline-contacts topic (bug 612448):

 * Created hide-contacts based on removed-contacts
 * Fixed the topic
 * Removed the old page from Makefile and added the new one

diff --git a/help/C/hide-contacts.page b/help/C/hide-contacts.page
new file mode 100644 (file)
index 0000000..f0609a6
--- /dev/null
+++ b/help/C/hide-contacts.page
@@ -0,0 +1,42 @@
+<page xmlns="http://projectmallard.org/1.0/"
+      xmlns:e="http://projectmallard.org/experimental/"
+      type="topic" style="task"
+      id="hide-contacts">
+
+  <info>
+    <link type="guide" xref="index#contacts"/>
+    <desc>Hide the offline contacts from your <gui>Contact List</gui>.</desc>
+    <revision pkgversion="2.30" version="0.1" date="2010-03-11" status="review"/>
+    <credit type="author">
+      <name>Milo Casagrande</name>
+      <email>milo@ubuntu.com</email>
+    </credit>
+    <license>
+      <p>Creative Commons Share Alike 3.0</p>
+    </license>    
+  </info>
+
+  <title>Hide offline contacts</title>
+
+  <p>
+    Normally, <app>Empathy</app> shows all your contacts: those that are online, 
+    with which you can have a conversation, and also those that are offline. 
+  </p>
+  <p>
+    To hide the contacts that are offline:
+  </p>
+
+  <steps>
+    <item>
+      <p>From the <gui>Contact List</gui> window, choose <guiseq><gui>View</gui>
+      <gui>Offline Contacts</gui></guiseq>, or press <keyseq><key>Ctrl</key>
+      <key>H</key></keyseq>.</p>
+    </item>
+    <item>
+      <p>
+        To show the offline contacts again, repeat the same procedure above.
+      </p>
+    </item>
+  </steps>
+
+</page>

diff --git a/help/C/offline-contacts.page b/help/C/offline-contacts.page
deleted file mode 100644 (file)
index 33e1de2..0000000
--- a/help/C/offline-contacts.page
+++ /dev/null
@@ -1,51 +0,0 @@
-<page xmlns="http://projectmallard.org/1.0/"
-      xmlns:e="http://projectmallard.org/experimental/"
-      type="topic" style="task"
-      id="offline-contacts">
-
-  <info>
-    <link type="guide" xref="index#contacts"/>
-    <desc>See all of your contacts, even those that are not online.</desc>
-    <revision pkgversion="2.28" version="0.1" date="2009-06-24" status="draft"/>
-    <revision pkgversion="2.28" version="0.2" date="2009-07-21" status="review">
-      <!--
-      <e:review by="shaunm@gnome.org" date="2009-09-01" status="done"/>
-      -->
-    </revision>
-    <revision pkgversion="2.28" version="0.3" date="2009-09-05" status="review"/>
-    <credit type="author">
-      <name>Milo Casagrande</name>
-      <email>milo@ubuntu.com</email>
-    </credit>
-    <license>
-      <p>Creative Commons Share Alike 3.0</p>
-    </license>    
-<!--
-    <copyright>
-       <year>2009</year>
-      <name>GNOME Documentation Project</name>
-    </copyright>
-    <include href="legal.xml" xmlns="http://www.w3.org/2001/XInclude"/>
--->
-  </info>
-
-  <title>Show offline contacts</title>
-
-  <p>Normally, <app>Empathy</app> only shows your contacts that are currently
-  online.  You can show all of your contacts instead, including those that
-  are offline.</p>
-
-  <steps>
-    <item>
-      <p>From the <gui>Contact List</gui> window, choose <guiseq><gui>View</gui>
-      <gui>Offline Contacts</gui></guiseq>, or press <keyseq><key>Ctrl</key>
-      <key>H</key></keyseq>.</p>
-    </item>
-    <item>
-      <p>
-        To hide the offline contacts again, repeat the same procedure above.
-      </p>
-    </item>
-  </steps>
-
-</page>

diff --git a/help/Makefile.am b/help/Makefile.am
index 76303c65f804fea0a5ad86499e29d863e8f4e466..feb0c210e7dd351ec0525b3306d7a037f80fde7a 100644 (file)
--- a/help/Makefile.am
+++ b/help/Makefile.am
@@ -33,6 +33,7 @@ DOC_PAGES = \
        geolocation-turn.page \
        geolocation-what-is.page \
        group-conversations.page \
+       hide-contacts.page \
        import-account.page \
        index.page \
        introduction.page \
@@ -44,7 +45,6 @@ DOC_PAGES = \
        irc-send-file.page \
        irc-start-conversation.page \
        license.page \
-       offline-contacts.page \
        prev-conv.page \
        prob-conn-acctdisabled.page \
        prob-conn-auth.page \