Index: archive/gtksourceview2.xml
===================================================================
--- archive/gtksourceview2.xml	(revision 9d531873a177ca5114830b0ed2cbfdfc26264c8a)
+++ archive/gtksourceview2.xml	(revision 9d531873a177ca5114830b0ed2cbfdfc26264c8a)
@@ -0,0 +1,168 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
+   "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
+  <!ENTITY % general-entities SYSTEM "../../general.ent">
+  %general-entities;
+
+  <!ENTITY gtksourceview2-download-http
+           "&gnome-download-http;/gtksourceview/2.10/gtksourceview-&gtksourceview2-version;.tar.gz">
+  <!ENTITY gtksourceview2-download-ftp
+           "&gnome-download-ftp;/gtksourceview/2.10/gtksourceview-&gtksourceview2-version;.tar.gz">
+  <!ENTITY gtksourceview2-md5sum        "220db5518e3f7fa06c980f057b22ba62">
+  <!ENTITY gtksourceview2-size          "2.0 MB">
+  <!ENTITY gtksourceview2-buildsize     "31 MB">
+  <!ENTITY gtksourceview2-time          "0.3 SBU">
+]>
+
+<sect1 id="gtksourceview2" xreflabel="gtksourceview-&gtksourceview2-version;">
+  <?dbhtml filename="gtksourceview2.html"?>
+
+  <sect1info>
+    <othername>$LastChangedBy$</othername>
+    <date>$Date$</date>
+  </sect1info>
+
+  <title>gtksourceview-&gtksourceview2-version;</title>
+
+  <indexterm zone="gtksourceview2">
+    <primary sortas="a-gtksourceview">gtksourceview</primary>
+  </indexterm>
+
+  <sect2 role="package">
+    <title>Introduction to GtkSourceView</title>
+
+    <para>
+      The <application>GtkSourceView</application> package contains
+      libraries used for extending the <application>GTK+ 2</application>
+      text functions to include syntax highlighting.
+    </para>
+
+    &lfs77_checked; &gcc5_checked;
+
+    <bridgehead renderas="sect3">Package Information</bridgehead>
+    <itemizedlist spacing="compact">
+      <listitem>
+        <para>
+          Download (HTTP): <ulink url="&gtksourceview2-download-http;"/>
+        </para>
+      </listitem>
+      <listitem>
+        <para>
+          Download (FTP): <ulink url="&gtksourceview2-download-ftp;"/>
+        </para>
+      </listitem>
+      <listitem>
+        <para>
+          Download MD5 sum: &gtksourceview2-md5sum;
+        </para>
+      </listitem>
+      <listitem>
+        <para>
+          Download size: &gtksourceview2-size;
+        </para>
+      </listitem>
+      <listitem>
+        <para>
+          Estimated disk space required: &gtksourceview2-buildsize;
+        </para>
+      </listitem>
+      <listitem>
+        <para>
+          Estimated build time: &gtksourceview2-time;
+        </para>
+      </listitem>
+    </itemizedlist>
+
+    <bridgehead renderas="sect3">GtkSourceView Dependencies</bridgehead>
+
+    <bridgehead renderas="sect4">Required</bridgehead>
+    <para role="required">
+      <xref linkend="gtk2"/>
+    </para>
+
+    <bridgehead renderas="sect4">Optional</bridgehead>
+    <para role="optional">
+      <xref linkend="gtk-doc"/>
+    </para>
+
+    <para condition="html" role="usernotes">User Notes:
+      <ulink url="&blfs-wiki;/gtksourceview2"/>
+    </para>
+  </sect2>
+
+  <sect2 role="installation">
+    <title>Installation of GtkSourceView</title>
+
+    <para>
+      Install <application>GtkSourceView</application> by running the
+      following commands:
+    </para>
+
+<screen><userinput>./configure --prefix=/usr &amp;&amp;
+make</userinput></screen>
+
+    <para>
+      To test the results, issue <command>make check</command>.
+    </para>
+
+    <para>
+      Now, as the <systemitem class="username">root</systemitem> user:
+    </para>
+
+<screen role="root"><userinput>make install</userinput></screen>
+
+  </sect2>
+
+  <sect2 role="commands">
+    <title>Command Explanations</title>
+
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+      href="../../xincludes/gtk-doc-rebuild.xml"/>
+
+  </sect2>
+
+  <sect2 role="content">
+    <title>Contents</title>
+
+    <segmentedlist>
+      <segtitle>Installed Programs</segtitle>
+      <segtitle>Installed Library</segtitle>
+      <segtitle>Installed Directories</segtitle>
+
+      <seglistitem>
+        <seg>
+          None
+        </seg>
+        <seg>
+          libgtksourceview-2.0.so
+        </seg>
+        <seg>
+          /usr/include/gtksourceview-2.0,
+          /usr/share/gtk-doc/html/gtksourceview-2.0 and
+          /usr/share/gtksourceview-2.0
+        </seg>
+      </seglistitem>
+    </segmentedlist>
+
+    <variablelist>
+      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
+      <?dbfo list-presentation="list"?>
+      <?dbhtml list-presentation="table"?>
+
+      <varlistentry id="libgtksourceview-2">
+        <term><filename class="libraryfile">libgtksourceview-2.0.so</filename></term>
+        <listitem>
+          <para>
+            contains function extensions for the GtkTextView widget.
+          </para>
+          <indexterm zone="gtksourceview2 libgtksourceview-2">
+            <primary sortas="c-libgtksourceview-2">libgtksourceview-2.0.so</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+    </variablelist>
+
+  </sect2>
+
+</sect1>
Index: general.ent
===================================================================
--- general.ent	(revision 5044738ff3ab996f87756663c6f635175618a3b5)
+++ general.ent	(revision 9d531873a177ca5114830b0ed2cbfdfc26264c8a)
@@ -1,5 +1,5 @@
 <!-- $LastChangedBy$ $Date$ -->
 
-<!ENTITY day          "22">                   <!-- Always 2 digits -->
+<!ENTITY day          "23">                   <!-- Always 2 digits -->
 <!ENTITY month        "07">                   <!-- Always 2 digits -->
 <!ENTITY year         "2015">
@@ -7,5 +7,5 @@
 <!ENTITY copyholder   "The BLFS Development Team">
 <!ENTITY version      "&year;-&month;-&day;">
-<!ENTITY releasedate  "July 22nd &year;">
+<!ENTITY releasedate  "July 23rd &year;">
 <!ENTITY pubdate      "&year;-&month;-&day;"> <!-- metadata req. by TLDP -->
 <!ENTITY blfs-version "svn">                  <!-- svn|[release #] -->
Index: gnome.ent
===================================================================
--- gnome.ent	(revision 5044738ff3ab996f87756663c6f635175618a3b5)
+++ gnome.ent	(revision 9d531873a177ca5114830b0ed2cbfdfc26264c8a)
@@ -14,5 +14,4 @@
 <!ENTITY gnome-desktop-version        "3.16.2">
 <!ENTITY gnome-video-effects-version  "0.4.1">
-<!ENTITY gtksourceview-version        "3.16.1">
 <!ENTITY libgtop-version              "2.30.0">
 <!ENTITY libpeas-version              "1.14.0">
Index: ome/platform/gtksourceview.xml
===================================================================
--- gnome/platform/gtksourceview.xml	(revision 5044738ff3ab996f87756663c6f635175618a3b5)
+++ 	(revision )
@@ -1,177 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-   "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../../general.ent">
-  %general-entities;
-
-  <!ENTITY gtksourceview-download-http
-    "&gnome-download-http;/gtksourceview/&gnome-minor-16;/gtksourceview-&gtksourceview-version;.tar.xz">
-  <!ENTITY gtksourceview-download-ftp
-    "&gnome-download-ftp;/gtksourceview/&gnome-minor-16;/gtksourceview-&gtksourceview-version;.tar.xz">
-  <!ENTITY gtksourceview-md5sum        "e727db8202d23a54b54b69ebc66f5331">
-  <!ENTITY gtksourceview-size          "1.3 MB">
-  <!ENTITY gtksourceview-buildsize     "65 MB (additional 1 MB for the tests)">
-  <!ENTITY gtksourceview-time          "0.4 SBU (additional less than 0.1 SBU for the tests)">
-]>
-
-<sect1 id="gtksourceview" xreflabel="gtksourceview-&gtksourceview-version;">
-  <?dbhtml filename="gtksourceview.html"?>
-
-  <sect1info>
-    <othername>$LastChangedBy$</othername>
-    <date>$Date$</date>
-  </sect1info>
-
-  <title>gtksourceview-&gtksourceview-version;</title>
-
-  <indexterm zone="gtksourceview">
-    <primary sortas="a-gtksourceview">gtksourceview</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to GtkSourceView</title>
-
-    <para>
-      The <application>GtkSourceView</application> package contains
-      libraries used for extending the <application>GTK+</application>
-      text functions to include syntax highlighting.
-    </para>
-
-    &lfs77_checked;
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Download (HTTP): <ulink url="&gtksourceview-download-http;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download (FTP): <ulink url="&gtksourceview-download-ftp;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download MD5 sum: &gtksourceview-md5sum;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download size: &gtksourceview-size;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated disk space required: &gtksourceview-buildsize;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated build time: &gtksourceview-time;
-        </para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect3">GtkSourceView Dependencies</bridgehead>
-
-    <bridgehead renderas="sect4">Required</bridgehead>
-    <para role="required">
-      <xref linkend="gtk3"/>
-    </para>
-
-    <bridgehead renderas="sect4">Recommended</bridgehead>
-    <para role="recommended">
-      <xref linkend="gobject-introspection"/>
-    </para>
-
-    <bridgehead renderas="sect4">Optional</bridgehead>
-    <para role="optional">
-      <xref linkend="vala"/>
-      <ulink url="http://glade.gnome.org/">Glade</ulink> and
-      <xref linkend="gtk-doc"/>
-    </para>
-
-    <para condition="html" role="usernotes">User Notes:
-      <ulink url="&blfs-wiki;/gtksourceview"/>
-    </para>
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of GtkSourceView</title>
-
-    <para>
-      Install <application>GtkSourceView</application> by running the
-      following commands:
-    </para>
-
-<screen><userinput>./configure --prefix=/usr &amp;&amp;
-make</userinput></screen>
-
-
-    <para>
-      To test the results, issue <command>make check</command>. The tests need
-      to be run in a graphical environment. 
-    </para>
-
-    <para>
-      Now, as the <systemitem class="username">root</systemitem> user:
-    </para>
-
-<screen role="root"><userinput>make install</userinput></screen>
-
-  </sect2>
-
-  <sect2 role="commands">
-    <title>Command Explanations</title>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-      href="../../xincludes/gtk-doc-rebuild.xml"/>
-
-  </sect2>
-
-  <sect2 role="content">
-    <title>Contents</title>
-
-    <segmentedlist>
-      <segtitle>Installed Programs</segtitle>
-      <segtitle>Installed Library</segtitle>
-      <segtitle>Installed Directories</segtitle>
-
-      <seglistitem>
-        <seg>
-          None
-        </seg>
-        <seg>
-          libgtksourceview-3.0.so
-        </seg>
-        <seg>
-          /usr/include/gtksourceview-3.0,
-          /usr/share/gtk-doc/html/gtksourceview-3.0, and
-          /usr/share/gtksourceview-3.0
-        </seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="libgtksourceview-3">
-        <term><filename class="libraryfile">libgtksourceview-3.0.so</filename></term>
-        <listitem>
-          <para>
-            contains function extensions for the GtkTextView widget.
-          </para>
-          <indexterm zone="gtksourceview libgtksourceview-3">
-            <primary sortas="c-libgtksourceview-3">libgtksourceview-3.0.so</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
-
-  </sect2>
-
-</sect1>
Index: gnome/platform/platform.xml
===================================================================
--- gnome/platform/platform.xml	(revision 5044738ff3ab996f87756663c6f635175618a3b5)
+++ gnome/platform/platform.xml	(revision 9d531873a177ca5114830b0ed2cbfdfc26264c8a)
@@ -44,5 +44,4 @@
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="gnome-desktop.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="gnome-video-effects.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="gtksourceview.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="libgtop.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="libpeas.xml"/>
Index: introduction/welcome/changelog.xml
===================================================================
--- introduction/welcome/changelog.xml	(revision 5044738ff3ab996f87756663c6f635175618a3b5)
+++ introduction/welcome/changelog.xml	(revision 9d531873a177ca5114830b0ed2cbfdfc26264c8a)
@@ -44,4 +44,25 @@
 
 -->
+
+    <listitem>
+      <para>July 23rd, 2015</para>
+      <itemizedlist>
+        <listitem>
+          <para>[fernando] - Add Leafpad and Geany to
+          "6. Editors - Other Editors".</para>
+        </listitem>
+        <listitem>
+          <para>[fernando] - Archive gtksourceview-2.10.5.
+          Move gtksourceview-3.16.1 from
+          "33. GNOME Libraries and Utilities - Libraries" to
+          "25. X Libraries". Fixes
+          <ulink url="&blfs-ticket-root;6747">#6747</ulink>.</para>
+        </listitem>
+        <listitem>
+          <para>[fernando] - Update to sudo-1.8.14p3. Fixes
+          <ulink url="&blfs-ticket-root;6746">#6746</ulink>.</para>
+        </listitem>
+      </itemizedlist>
+    </listitem>
 
     <listitem>
Index: packages.ent
===================================================================
--- packages.ent	(revision 5044738ff3ab996f87756663c6f635175618a3b5)
+++ packages.ent	(revision 9d531873a177ca5114830b0ed2cbfdfc26264c8a)
@@ -37,5 +37,5 @@
 <!ENTITY ssh-askpass-version          "&openssh-version;">
 <!ENTITY stunnel-version              "5.20">
-<!ENTITY sudo-version                 "1.8.14p2">
+<!ENTITY sudo-version                 "1.8.14p3">
 <!ENTITY tripwire-version             "2.4.2.2">
 
@@ -477,4 +477,5 @@
 <!ENTITY gtkmm2-version               "2.24.4">
 <!ENTITY gtkmm3-version               "3.16.0">
+<!ENTITY gtksourceview-version        "3.16.1">
 <!ENTITY imlib2-version               "1.4.7">
 <!ENTITY keybinder2-version           "0.3.0">
@@ -557,5 +558,4 @@
 <!ENTITY midori-version               "0.5.10">
 <!ENTITY parole-version               "0.8.0">
-<!ENTITY gtksourceview2-version       "2.10.5">
 <!ENTITY mousepad-version             "0.4.0">
 <!ENTITY vte2-version                 "0.28.2">
Index: postlfs/editors/others.xml
===================================================================
--- postlfs/editors/others.xml	(revision 5044738ff3ab996f87756663c6f635175618a3b5)
+++ postlfs/editors/others.xml	(revision 9d531873a177ca5114830b0ed2cbfdfc26264c8a)
@@ -16,9 +16,34 @@
   <title>Other Editors</title>
 
-  <para><command>pico</command> is a text editor installed as a part
-  of <xref linkend="re-alpine"/>.</para>
-
-  <para><command>mcedit</command> is a text editor installed as part
-  of <xref linkend="mc"/>.</para>
+  <itemizedlist>
+    <listitem>
+      <para>
+        <ulink url="http://www.geany.org/">Geany</ulink> is a text editor using
+        the <application>GTK+2</application> toolkit with basic features of an
+        integrated development environment. It was developed to provide a small
+        and fast IDE, which has only a few dependencies from other packages. It
+        supports many filetypes and has some nice features.
+      </para>
+    </listitem>
+    <listitem>
+      <para>
+        <ulink url="http://tarot.freeshell.org/leafpad/">Leafpad</ulink> is a
+        very simple text editor using the <application>GTK+2</application>
+        toolkit.
+      </para>
+    </listitem>
+    <listitem>
+      <para>
+        <command>mcedit</command> is a text editor installed as part of <xref
+        linkend="mc"/>.
+      </para>
+    </listitem>
+    <listitem>
+      <para>
+        <command>pico</command> is a text editor installed as a part of <xref
+        linkend="re-alpine"/>.
+      </para>
+    </listitem>
+  </itemizedlist>
 
 </sect1>
Index: postlfs/security/sudo.xml
===================================================================
--- postlfs/security/sudo.xml	(revision 5044738ff3ab996f87756663c6f635175618a3b5)
+++ postlfs/security/sudo.xml	(revision 9d531873a177ca5114830b0ed2cbfdfc26264c8a)
@@ -7,5 +7,5 @@
   <!ENTITY sudo-download-http "http://www.sudo.ws/dist/sudo-&sudo-version;.tar.gz">
   <!ENTITY sudo-download-ftp  "ftp://ftp.sudo.ws/pub/sudo/sudo-&sudo-version;.tar.gz">
-  <!ENTITY sudo-md5sum        "150f6a2a53a5d29838bf75557543f151">
+  <!ENTITY sudo-md5sum        "93dbd1e47c136179ff1b01494c1c0e75">
   <!ENTITY sudo-size          "2.5 MB">
   <!ENTITY sudo-buildsize     "33 MB (with tests)">
@@ -271,5 +271,5 @@
     <segmentedlist>
       <segtitle>Installed Programs</segtitle>
-      <segtitle>Installed Libraries</segtitle> 
+      <segtitle>Installed Libraries</segtitle>
       <segtitle>Installed Directories</segtitle>
 
Index: x/lib/gtksourceview.xml
===================================================================
--- x/lib/gtksourceview.xml	(revision 9d531873a177ca5114830b0ed2cbfdfc26264c8a)
+++ x/lib/gtksourceview.xml	(revision 9d531873a177ca5114830b0ed2cbfdfc26264c8a)
@@ -0,0 +1,177 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
+   "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
+  <!ENTITY % general-entities SYSTEM "../../general.ent">
+  %general-entities;
+
+  <!ENTITY gtksourceview-download-http
+    "&gnome-download-http;/gtksourceview/&gnome-minor-16;/gtksourceview-&gtksourceview-version;.tar.xz">
+  <!ENTITY gtksourceview-download-ftp
+    "&gnome-download-ftp;/gtksourceview/&gnome-minor-16;/gtksourceview-&gtksourceview-version;.tar.xz">
+  <!ENTITY gtksourceview-md5sum        "e727db8202d23a54b54b69ebc66f5331">
+  <!ENTITY gtksourceview-size          "1.3 MB">
+  <!ENTITY gtksourceview-buildsize     "65 MB (additional 1 MB for the tests)">
+  <!ENTITY gtksourceview-time          "0.4 SBU (additional less than 0.1 SBU for the tests)">
+]>
+
+<sect1 id="gtksourceview" xreflabel="gtksourceview-&gtksourceview-version;">
+  <?dbhtml filename="gtksourceview.html"?>
+
+  <sect1info>
+    <othername>$LastChangedBy$</othername>
+    <date>$Date$</date>
+  </sect1info>
+
+  <title>gtksourceview-&gtksourceview-version;</title>
+
+  <indexterm zone="gtksourceview">
+    <primary sortas="a-gtksourceview">gtksourceview</primary>
+  </indexterm>
+
+  <sect2 role="package">
+    <title>Introduction to GtkSourceView</title>
+
+    <para>
+      The <application>GtkSourceView</application> package contains
+      libraries used for extending the <application>GTK+</application>
+      text functions to include syntax highlighting.
+    </para>
+
+    &lfs77_checked;
+
+    <bridgehead renderas="sect3">Package Information</bridgehead>
+    <itemizedlist spacing="compact">
+      <listitem>
+        <para>
+          Download (HTTP): <ulink url="&gtksourceview-download-http;"/>
+        </para>
+      </listitem>
+      <listitem>
+        <para>
+          Download (FTP): <ulink url="&gtksourceview-download-ftp;"/>
+        </para>
+      </listitem>
+      <listitem>
+        <para>
+          Download MD5 sum: &gtksourceview-md5sum;
+        </para>
+      </listitem>
+      <listitem>
+        <para>
+          Download size: &gtksourceview-size;
+        </para>
+      </listitem>
+      <listitem>
+        <para>
+          Estimated disk space required: &gtksourceview-buildsize;
+        </para>
+      </listitem>
+      <listitem>
+        <para>
+          Estimated build time: &gtksourceview-time;
+        </para>
+      </listitem>
+    </itemizedlist>
+
+    <bridgehead renderas="sect3">GtkSourceView Dependencies</bridgehead>
+
+    <bridgehead renderas="sect4">Required</bridgehead>
+    <para role="required">
+      <xref linkend="gtk3"/>
+    </para>
+
+    <bridgehead renderas="sect4">Recommended</bridgehead>
+    <para role="recommended">
+      <xref linkend="gobject-introspection"/>
+    </para>
+
+    <bridgehead renderas="sect4">Optional</bridgehead>
+    <para role="optional">
+      <xref linkend="vala"/>
+      <ulink url="http://glade.gnome.org/">Glade</ulink> and
+      <xref linkend="gtk-doc"/>
+    </para>
+
+    <para condition="html" role="usernotes">User Notes:
+      <ulink url="&blfs-wiki;/gtksourceview"/>
+    </para>
+  </sect2>
+
+  <sect2 role="installation">
+    <title>Installation of GtkSourceView</title>
+
+    <para>
+      Install <application>GtkSourceView</application> by running the
+      following commands:
+    </para>
+
+<screen><userinput>./configure --prefix=/usr &amp;&amp;
+make</userinput></screen>
+
+
+    <para>
+      To test the results, issue <command>make check</command>. The tests need
+      to be run in a graphical environment. 
+    </para>
+
+    <para>
+      Now, as the <systemitem class="username">root</systemitem> user:
+    </para>
+
+<screen role="root"><userinput>make install</userinput></screen>
+
+  </sect2>
+
+  <sect2 role="commands">
+    <title>Command Explanations</title>
+
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+      href="../../xincludes/gtk-doc-rebuild.xml"/>
+
+  </sect2>
+
+  <sect2 role="content">
+    <title>Contents</title>
+
+    <segmentedlist>
+      <segtitle>Installed Programs</segtitle>
+      <segtitle>Installed Library</segtitle>
+      <segtitle>Installed Directories</segtitle>
+
+      <seglistitem>
+        <seg>
+          None
+        </seg>
+        <seg>
+          libgtksourceview-3.0.so
+        </seg>
+        <seg>
+          /usr/include/gtksourceview-3.0,
+          /usr/share/gtk-doc/html/gtksourceview-3.0, and
+          /usr/share/gtksourceview-3.0
+        </seg>
+      </seglistitem>
+    </segmentedlist>
+
+    <variablelist>
+      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
+      <?dbfo list-presentation="list"?>
+      <?dbhtml list-presentation="table"?>
+
+      <varlistentry id="libgtksourceview-3">
+        <term><filename class="libraryfile">libgtksourceview-3.0.so</filename></term>
+        <listitem>
+          <para>
+            contains function extensions for the GtkTextView widget.
+          </para>
+          <indexterm zone="gtksourceview libgtksourceview-3">
+            <primary sortas="c-libgtksourceview-3">libgtksourceview-3.0.so</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+    </variablelist>
+
+  </sect2>
+
+</sect1>
Index: x/lib/lib.xml
===================================================================
--- x/lib/lib.xml	(revision 5044738ff3ab996f87756663c6f635175618a3b5)
+++ x/lib/lib.xml	(revision 9d531873a177ca5114830b0ed2cbfdfc26264c8a)
@@ -45,4 +45,5 @@
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="gtkmm2.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="gtkmm3.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="gtksourceview.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="imlib2.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="keybinder2.xml"/>
Index: xfce/apps/apps.xml
===================================================================
--- xfce/apps/apps.xml	(revision 5044738ff3ab996f87756663c6f635175618a3b5)
+++ xfce/apps/apps.xml	(revision 9d531873a177ca5114830b0ed2cbfdfc26264c8a)
@@ -23,5 +23,4 @@
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="midori.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="parole.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="gtksourceview2.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="mousepad.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="vte2.xml"/>
Index: ce/apps/gtksourceview2.xml
===================================================================
--- xfce/apps/gtksourceview2.xml	(revision 5044738ff3ab996f87756663c6f635175618a3b5)
+++ 	(revision )
@@ -1,168 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-   "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../../general.ent">
-  %general-entities;
-
-  <!ENTITY gtksourceview2-download-http
-           "&gnome-download-http;/gtksourceview/2.10/gtksourceview-&gtksourceview2-version;.tar.gz">
-  <!ENTITY gtksourceview2-download-ftp
-           "&gnome-download-ftp;/gtksourceview/2.10/gtksourceview-&gtksourceview2-version;.tar.gz">
-  <!ENTITY gtksourceview2-md5sum        "220db5518e3f7fa06c980f057b22ba62">
-  <!ENTITY gtksourceview2-size          "2.0 MB">
-  <!ENTITY gtksourceview2-buildsize     "31 MB">
-  <!ENTITY gtksourceview2-time          "0.3 SBU">
-]>
-
-<sect1 id="gtksourceview2" xreflabel="gtksourceview-&gtksourceview2-version;">
-  <?dbhtml filename="gtksourceview2.html"?>
-
-  <sect1info>
-    <othername>$LastChangedBy$</othername>
-    <date>$Date$</date>
-  </sect1info>
-
-  <title>gtksourceview-&gtksourceview2-version;</title>
-
-  <indexterm zone="gtksourceview2">
-    <primary sortas="a-gtksourceview">gtksourceview</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to GtkSourceView</title>
-
-    <para>
-      The <application>GtkSourceView</application> package contains
-      libraries used for extending the <application>GTK+ 2</application>
-      text functions to include syntax highlighting.
-    </para>
-
-    &lfs77_checked; &gcc5_checked;
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Download (HTTP): <ulink url="&gtksourceview2-download-http;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download (FTP): <ulink url="&gtksourceview2-download-ftp;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download MD5 sum: &gtksourceview2-md5sum;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download size: &gtksourceview2-size;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated disk space required: &gtksourceview2-buildsize;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated build time: &gtksourceview2-time;
-        </para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect3">GtkSourceView Dependencies</bridgehead>
-
-    <bridgehead renderas="sect4">Required</bridgehead>
-    <para role="required">
-      <xref linkend="gtk2"/>
-    </para>
-
-    <bridgehead renderas="sect4">Optional</bridgehead>
-    <para role="optional">
-      <xref linkend="gtk-doc"/>
-    </para>
-
-    <para condition="html" role="usernotes">User Notes:
-      <ulink url="&blfs-wiki;/gtksourceview2"/>
-    </para>
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of GtkSourceView</title>
-
-    <para>
-      Install <application>GtkSourceView</application> by running the
-      following commands:
-    </para>
-
-<screen><userinput>./configure --prefix=/usr &amp;&amp;
-make</userinput></screen>
-
-    <para>
-      To test the results, issue <command>make check</command>.
-    </para>
-
-    <para>
-      Now, as the <systemitem class="username">root</systemitem> user:
-    </para>
-
-<screen role="root"><userinput>make install</userinput></screen>
-
-  </sect2>
-
-  <sect2 role="commands">
-    <title>Command Explanations</title>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-      href="../../xincludes/gtk-doc-rebuild.xml"/>
-
-  </sect2>
-
-  <sect2 role="content">
-    <title>Contents</title>
-
-    <segmentedlist>
-      <segtitle>Installed Programs</segtitle>
-      <segtitle>Installed Library</segtitle>
-      <segtitle>Installed Directories</segtitle>
-
-      <seglistitem>
-        <seg>
-          None
-        </seg>
-        <seg>
-          libgtksourceview-2.0.so
-        </seg>
-        <seg>
-          /usr/include/gtksourceview-2.0,
-          /usr/share/gtk-doc/html/gtksourceview-2.0 and
-          /usr/share/gtksourceview-2.0
-        </seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="libgtksourceview-2">
-        <term><filename class="libraryfile">libgtksourceview-2.0.so</filename></term>
-        <listitem>
-          <para>
-            contains function extensions for the GtkTextView widget.
-          </para>
-          <indexterm zone="gtksourceview2 libgtksourceview-2">
-            <primary sortas="c-libgtksourceview-2">libgtksourceview-2.0.so</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
-
-  </sect2>
-
-</sect1>
Index: xfce/apps/mousepad.xml
===================================================================
--- xfce/apps/mousepad.xml	(revision 5044738ff3ab996f87756663c6f635175618a3b5)
+++ xfce/apps/mousepad.xml	(revision 9d531873a177ca5114830b0ed2cbfdfc26264c8a)
@@ -77,5 +77,4 @@
     <bridgehead renderas="sect4">Required</bridgehead>
     <para role="required">
-      <xref linkend="gtksourceview2"/> or 
       <xref linkend="gtksourceview"/>
     </para>
@@ -83,5 +82,6 @@
     <bridgehead renderas="sect4">Optional</bridgehead>
     <para role="optional">
-      <xref linkend="dbus-glib"/>
+      <xref linkend="dbus-glib"/> and
+      <ulink url="http://ftp.gnome.org/pub/gnome/sources/gtksourceview/2.10/">gtksourceview-2</ulink>
     </para>
 
