en-US/Desktop.xml en-US/Pino.xml

[John J. McDonough]

 en-US/Desktop.xml |   26 ++++++++++++++++++++++++++
 en-US/Pino.xml    |    9 ---------
 2 files changed, 26 insertions(+), 9 deletions(-)

New commits:
commit 6d7a8ff56e46713767247dd7954473271cf1f86a
Author: John J. McDonough <jjmcd at fedoraproject.org>
Date:   Fri Oct 15 09:44:59 2010 -0400

    Incorporate Pino text
    
    Added text from Pino.xml to Desktop.xml
    Removed Pino.xml
    Added appropriate index entries

diff --git a/en-US/Desktop.xml b/en-US/Desktop.xml
index abe976b..57b1cc0 100644
--- a/en-US/Desktop.xml
+++ b/en-US/Desktop.xml
@@ -68,6 +68,32 @@
 	header information in manual pages.
       </para>
     </section>
+
+
+    <section>
+      <title>Pino</title>
+      <indexterm><primary>pino</primary></indexterm>
+      <indexterm><primary>gwibber</primary></indexterm>
+      <indexterm><primary>Social Networking</primary></indexterm>
+      <indexterm><primary>twitter</primary></indexterm>
+      <indexterm><primary>identi.ca</primary></indexterm>
+      <para>
+	Due to changes in Twitter's authentication mechanisms Pino is
+	no longer able to utilize this service.  Due to this degraded
+	functionality, Pino has been removed as the default program
+	for social networking services such as identi.ca and Twitter.
+	Other programs, such as <package>gwibber</package>, are
+	available from the Fedora repositories that can utilized as a
+	replacement for Pino.  To install <package>gwibber</package>
+	or another such package, use the
+	<menuchoice><guimenu>System</guimenu><guisubmenu>Administration</guisubmenu><guimenuitem>Add/Remove
+	Software</guimenuitem></menuchoice> tool from the main menu.
+      </para>
+    </section>
+
+
+
+
   </section>
 
 	<section>
diff --git a/en-US/Pino.xml b/en-US/Pino.xml
deleted file mode 100644
index d907020..0000000
--- a/en-US/Pino.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE book PUBLIC "-//OASIS//DTD DocBook EBNF Module V1.1CR1//EN"
-"http://www.oasis-open.org/docbook/xml/mathml/1.1CR1/dbmathml.dtd">
-<section id="sect-Release_Notes-Pino">
-  <title>Pino</title>
-    <para>
-	Due to changes in Twitter's authentication mechanisms Pino is no longer able to utilize this service.  Due to this degraded functionality, Pino has been removed as the default program for social networking services such as identi.ca and Twitter.  Other programs, such as <package>gwibber</package>, are available from the Fedora repositories that can utilized as a replacement for Pino.  To install <package>gwibber</package> or another such package, use the <menuchoice><guimenu>System</guimenu><guisubmenu>Administration</guisubmenu><guimenuitem>Add/Remove Software</guimenuitem></menuchoice> tool from the main menu.
-    </para>
-</section>