Index: gnome/core/core.xml
===================================================================
--- gnome/core/core.xml	(revision 9ca1654c5eccaccb50d901e5842ad417ea39180b)
+++ gnome/core/core.xml	(revision d32301b6ccb4344b22d5353e7d5fbb8f86ca5cf2)
@@ -59,5 +59,4 @@
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="dconf.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="evolution-data-server.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="glib-networking.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="gnome-bluetooth.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="gnome-control-center.xml"/>
Index: ome/core/glib-networking.xml
===================================================================
--- gnome/core/glib-networking.xml	(revision 9ca1654c5eccaccb50d901e5842ad417ea39180b)
+++ 	(revision )
@@ -1,179 +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 glib-networking-download-http "&gnome-download-http;/glib-networking/2.30/glib-networking-&glib-networking-version;.tar.xz">
-  <!ENTITY glib-networking-download-ftp "&gnome-download-ftp;/glib-networking/2.30/glib-networking-&glib-networking-version;.tar.xz">
-  <!ENTITY glib-networking-md5sum        "a93b7344daf6292ea66f7a6ec21f361d">
-  <!ENTITY glib-networking-size          "291 KB">
-  <!ENTITY glib-networking-buildsize     "7.4 MB">
-  <!ENTITY glib-networking-time          "0.2 SBU">
-]>
-
-<sect1 id="glib-networking" xreflabel="glib-networking-&glib-networking-version;">
-  <?dbhtml filename="glib-networking.html"?>
-
-  <sect1info>
-    <othername>$LastChangedBy$</othername>
-    <date>$Date$</date>
-  </sect1info>
-
-  <title>glib-networking-&glib-networking-version;</title>
-
-  <indexterm zone="glib-networking">
-    <primary sortas="a-glib-networking">glib-networking</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to glib-networking</title>
-
-    <para>The <application>glib-networking</application> package contains
-    Network-related giomodules for <application>GLib</application>.</para>
-
-    &lfs70_built;
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>Download (HTTP): <ulink url="&glib-networking-download-http;"/></para>
-      </listitem>
-      <listitem>
-        <para>Download (FTP): <ulink url="&glib-networking-download-ftp;"/></para>
-      </listitem>
-      <listitem>
-        <para>Download MD5 sum: &glib-networking-md5sum;</para>
-      </listitem>
-      <listitem>
-        <para>Download size: &glib-networking-size;</para>
-      </listitem>
-      <listitem>
-        <para>Estimated disk space required: &glib-networking-buildsize;</para>
-      </listitem>
-      <listitem>
-        <para>Estimated build time: &glib-networking-time;</para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect3">glib-networking Dependencies</bridgehead>
-
-    <bridgehead renderas="sect4">Required</bridgehead>
-    <para role="required"><xref linkend="gnutls"/>,
-    <xref linkend="gsettings-desktop-schemas"/>,
-    <xref linkend="intltool"/>, and
-    <xref linkend="pkgconfig"/></para>
-
-    <!-- Not sure if libproxy is a dep. -->
-    <bridgehead renderas="sect4">Optional</bridgehead>
-    <para role="optional"><xref linkend="libgcrypt"/> and
-    <xref linkend="libproxy"/></para>
-
-    <para condition="html" role="usernotes">User Notes:
-    <ulink url="&blfs-wiki;/glib-networking"/></para>
-
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of glib-networking</title>
-
-    <para>Install <application>glib-networking</application> by running the following
-    commands:</para>
-
-<screen><userinput>./configure --prefix=$GNOME_PREFIX \
-            --libexecdir $GNOME_PREFIX/lib/glib-networking \
-            --with-ca-certificates=/etc/ssl/ca-bundle.crt &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>
-
-    <para><parameter>--with-ca-certificates=/etc/ssl/ca-bundle.crt</parameter> :
-    This parameter specifies where the trusted root certificates are
-    located.</para>
-
-    <para><parameter>--libexecdir $GNOME_PREFIX/lib/glib-networking</parameter> :
-    if <application>libproxy</application> was installed, this will ensure
-    <command>glib-pacrunner</command> is installed in an appropriate location,
-    instead of in <filename class="directory">$GNOME_PREFIX/libexec</filename>.
-    </para>
-
-    <para><option>--enable-static=no</option>: This switch prevents the static
-    libraries being installed.</para>
-
-  </sect2>
-
-  <sect2 role="content">
-    <title>Contents</title>
-
-    <segmentedlist>
-      <segtitle>Installed Program</segtitle>
-      <segtitle>Installed Libraries</segtitle>
-      <segtitle>Installed Directories</segtitle>
-
-      <seglistitem>
-        <seg>glib-pacrunner</seg>
-        <seg>libgiognomeproxy.{so,a}, libgiognutls.{so,a}, and
-        libgiolibproxy.{so,a}</seg>
-        <seg>None</seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <!--<variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="glib-pacrunner">
-        <term><command>glib-pacrunner</command></term>
-        <listitem>
-          <para>does this .....</para>
-          <indexterm zone="glib-networking glib-pacrunner">
-            <primary sortas="b-glib-pacrunner">glib-pacrunner</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="libgiognomeproxy">
-        <term><filename class='libraryfile'>libgiognomeproxy.{so,a}</filename></term>
-        <listitem>
-          <para>contains functions that .....</para>
-          <indexterm zone="glib-networking libgiognomeproxy">
-            <primary sortas="c-libgiognomeproxy">libgiognomeproxy.{so,a}</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="libgiognutls">
-        <term><filename class='libraryfile'>libgiognutls.{so,a}</filename></term>
-        <listitem>
-          <para>contains functions that .....</para>
-          <indexterm zone="glib-networking libgiognutls">
-            <primary sortas="c-libgiognutls">libgiognutls.{so,a}</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="libgiolibproxy">
-        <term><filename class='libraryfile'>libgiolibproxy.{so,a}</filename></term>
-        <listitem>
-          <para>contains functions that .....</para>
-          <indexterm zone="glib-networking libgiolibproxy">
-            <primary sortas="c-libgiolibproxy">libgiolibproxy.{so,a}</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>-->
-
-  </sect2>
-
-</sect1>
Index: networking/netlibs/glib-networking.xml
===================================================================
--- networking/netlibs/glib-networking.xml	(revision d32301b6ccb4344b22d5353e7d5fbb8f86ca5cf2)
+++ networking/netlibs/glib-networking.xml	(revision d32301b6ccb4344b22d5353e7d5fbb8f86ca5cf2)
@@ -0,0 +1,178 @@
+<?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 glib-networking-download-http "&gnome-download-http;/glib-networking/2.30/glib-networking-&glib-networking-version;.tar.xz">
+  <!ENTITY glib-networking-download-ftp "&gnome-download-ftp;/glib-networking/2.30/glib-networking-&glib-networking-version;.tar.xz">
+  <!ENTITY glib-networking-md5sum        "a93b7344daf6292ea66f7a6ec21f361d">
+  <!ENTITY glib-networking-size          "291 KB">
+  <!ENTITY glib-networking-buildsize     "7.4 MB">
+  <!ENTITY glib-networking-time          "0.2 SBU">
+]>
+
+<sect1 id="glib-networking" xreflabel="glib-networking-&glib-networking-version;">
+  <?dbhtml filename="glib-networking.html"?>
+
+  <sect1info>
+    <othername>$LastChangedBy$</othername>
+    <date>$Date$</date>
+  </sect1info>
+
+  <title>glib-networking-&glib-networking-version;</title>
+
+  <indexterm zone="glib-networking">
+    <primary sortas="a-glib-networking">glib-networking</primary>
+  </indexterm>
+
+  <sect2 role="package">
+    <title>Introduction to glib-networking</title>
+
+    <para>The <application>glib-networking</application> package contains
+    Network-related gio modules for <application>GLib</application>.</para>
+
+    &lfs70_checked;
+
+    <bridgehead renderas="sect3">Package Information</bridgehead>
+    <itemizedlist spacing="compact">
+      <listitem>
+        <para>Download (HTTP): <ulink url="&glib-networking-download-http;"/></para>
+      </listitem>
+      <listitem>
+        <para>Download (FTP): <ulink url="&glib-networking-download-ftp;"/></para>
+      </listitem>
+      <listitem>
+        <para>Download MD5 sum: &glib-networking-md5sum;</para>
+      </listitem>
+      <listitem>
+        <para>Download size: &glib-networking-size;</para>
+      </listitem>
+      <listitem>
+        <para>Estimated disk space required: &glib-networking-buildsize;</para>
+      </listitem>
+      <listitem>
+        <para>Estimated build time: &glib-networking-time;</para>
+      </listitem>
+    </itemizedlist>
+
+    <bridgehead renderas="sect3">glib-networking Dependencies</bridgehead>
+
+    <bridgehead renderas="sect4">Required</bridgehead>
+    <para role="required"><xref linkend="gnutls"/>,
+    <xref linkend="gsettings-desktop-schemas"/>,
+    <xref linkend="intltool"/>, and
+    <xref linkend="pkgconfig"/></para>
+
+    <bridgehead renderas="sect4">Optional</bridgehead>
+    <para role="optional"><xref linkend="libgcrypt"/> and
+    <xref linkend="libproxy"/></para>
+
+    <para condition="html" role="usernotes">User Notes:
+    <ulink url="&blfs-wiki;/glib-networking"/></para>
+
+  </sect2>
+
+  <sect2 role="installation">
+    <title>Installation of glib-networking</title>
+
+    <para>Install <application>glib-networking</application> by running the following
+    commands:</para>
+
+<screen><userinput>./configure --prefix=$GNOME_PREFIX \
+            --libexecdir=$GNOME_PREFIX/lib/glib-networking \
+            --with-ca-certificates=/etc/ssl/ca-bundle.crt &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>
+
+    <para><parameter>--with-ca-certificates=/etc/ssl/ca-bundle.crt</parameter> :
+    This parameter specifies where the trusted root certificates are
+    located.</para>
+
+    <para><parameter>--libexecdir=$GNOME_PREFIX/lib/glib-networking</parameter> :
+    if <application>libproxy</application> was installed, this will ensure
+    <command>glib-pacrunner</command> is installed in an appropriate location,
+    instead of in <filename class="directory">$GNOME_PREFIX/libexec</filename>.
+    </para>
+
+    <para><option>--disable-static</option>: This switch prevents the static
+    libraries being installed.</para>
+
+  </sect2>
+
+  <sect2 role="content">
+    <title>Contents</title>
+
+    <segmentedlist>
+      <segtitle>Installed Program</segtitle>
+      <segtitle>Installed Libraries</segtitle>
+      <segtitle>Installed Directories</segtitle>
+
+      <seglistitem>
+        <seg>glib-pacrunner</seg>
+        <seg>libgiognomeproxy.{so,a}, libgiognutls.{so,a}, and
+        libgiolibproxy.{so,a}</seg>
+        <seg>None</seg>
+      </seglistitem>
+    </segmentedlist>
+
+    <!--<variablelist>
+      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
+      <?dbfo list-presentation="list"?>
+      <?dbhtml list-presentation="table"?>
+
+      <varlistentry id="glib-pacrunner">
+        <term><command>glib-pacrunner</command></term>
+        <listitem>
+          <para>does this .....</para>
+          <indexterm zone="glib-networking glib-pacrunner">
+            <primary sortas="b-glib-pacrunner">glib-pacrunner</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="libgiognomeproxy">
+        <term><filename class='libraryfile'>libgiognomeproxy.{so,a}</filename></term>
+        <listitem>
+          <para>contains functions that .....</para>
+          <indexterm zone="glib-networking libgiognomeproxy">
+            <primary sortas="c-libgiognomeproxy">libgiognomeproxy.{so,a}</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="libgiognutls">
+        <term><filename class='libraryfile'>libgiognutls.{so,a}</filename></term>
+        <listitem>
+          <para>contains functions that .....</para>
+          <indexterm zone="glib-networking libgiognutls">
+            <primary sortas="c-libgiognutls">libgiognutls.{so,a}</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="libgiolibproxy">
+        <term><filename class='libraryfile'>libgiolibproxy.{so,a}</filename></term>
+        <listitem>
+          <para>contains functions that .....</para>
+          <indexterm zone="glib-networking libgiolibproxy">
+            <primary sortas="c-libgiolibproxy">libgiolibproxy.{so,a}</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+    </variablelist>-->
+
+  </sect2>
+
+</sect1>
Index: networking/netlibs/netlibs.xml
===================================================================
--- networking/netlibs/netlibs.xml	(revision 9ca1654c5eccaccb50d901e5842ad417ea39180b)
+++ networking/netlibs/netlibs.xml	(revision d32301b6ccb4344b22d5353e7d5fbb8f86ca5cf2)
@@ -23,4 +23,5 @@
 
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="curl.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="glib-networking.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="libgdata.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="libnice.xml"/>
