From 754b81f6e099e36784f17cfb6c9c90a646547731 Mon Sep 17 00:00:00 2001
From: Ken Moffat <ken@linuxfromscratch.org>
Date: Mon, 9 Sep 2013 15:57:23 +0000
Subject: [PATCH] Reinstate seahorse, recommend it for epiphany.

git-svn-id: svn://svn.linuxfromscratch.org/BLFS/trunk/BOOK@11804 af4574ff-66df-0310-9fd7-8a98e5e911e0
---
 general.ent                                        | 4 ++--
 gnome/applications/applications.xml                | 1 +
 gnome/applications/epiphany.xml                    | 3 ++-
 {archive/gnome => gnome/applications}/seahorse.xml | 0
 introduction/welcome/changelog.xml                 | 9 +++++++++
 5 files changed, 14 insertions(+), 3 deletions(-)
 rename {archive/gnome => gnome/applications}/seahorse.xml (100%)

diff --git a/general.ent b/general.ent
index c67bf6e83c..f67a84ddc4 100644
--- a/general.ent
+++ b/general.ent
@@ -1,12 +1,12 @@
 <!-- $LastChangedBy$ $Date$ -->
 
-<!ENTITY day          "08">                   <!-- Always 2 digits -->
+<!ENTITY day          "09">                   <!-- Always 2 digits -->
 <!ENTITY month        "09">                   <!-- Always 2 digits -->
 <!ENTITY year         "2013">
 <!ENTITY copyrightdate "2001-&year;">
 <!ENTITY copyholder   "The BLFS Development Team">
 <!ENTITY version      "&year;-&month;-&day;">
-<!ENTITY releasedate  "September 8th, &year;">
+<!ENTITY releasedate  "September 9th, &year;">
 <!ENTITY pubdate      "&year;-&month;-&day;"> <!-- metadata req. by TLDP -->
 <!ENTITY blfs-version "svn">                  <!-- svn|[release #] -->
 <!ENTITY lfs-version  "development">          <!-- version|testing|unstable|development] -->
diff --git a/gnome/applications/applications.xml b/gnome/applications/applications.xml
index 748a26beb5..70f79c6398 100644
--- a/gnome/applications/applications.xml
+++ b/gnome/applications/applications.xml
@@ -36,6 +36,7 @@ $Date$
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="gucharmap.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="nautilus.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="network-manager-applet.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="seahorse.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="totem.xml"/>
 
 </chapter>
diff --git a/gnome/applications/epiphany.xml b/gnome/applications/epiphany.xml
index 3a74101585..3767d94009 100644
--- a/gnome/applications/epiphany.xml
+++ b/gnome/applications/epiphany.xml
@@ -87,7 +87,8 @@
 
     <bridgehead renderas="sect4">Recommended</bridgehead>
     <para role="recommended">
-      <xref linkend="nss"/>
+      <xref linkend="nss"/>,
+      <xref linkend="seahorse"/> (at runtime, for managing stored passwords)
     </para>
 
     <para condition="html" role="usernotes">User Notes:
diff --git a/archive/gnome/seahorse.xml b/gnome/applications/seahorse.xml
similarity index 100%
rename from archive/gnome/seahorse.xml
rename to gnome/applications/seahorse.xml
diff --git a/introduction/welcome/changelog.xml b/introduction/welcome/changelog.xml
index a70a2ad20a..6bf928540d 100644
--- a/introduction/welcome/changelog.xml
+++ b/introduction/welcome/changelog.xml
@@ -43,6 +43,15 @@
     </listitem>
 
 -->
+    <listitem>
+      <para>September 9th, 2013</para>
+      <itemizedlist>
+        <listitem>
+          <para>[ken] - Reinstate seahorse, link to it from epiphany.</para>
+        </listitem>
+      </itemizedlist>
+    </listitem>
+
     <listitem>
       <para>September 8th, 2013</para>
       <itemizedlist>