Index: gnome/gnome.ent
===================================================================
--- gnome/gnome.ent	(revision fed44ca98c8d43906e990525ed24737aaffb2ad2)
+++ gnome/gnome.ent	(revision a453c0877fc1d4e63144df48648a727de6874612)
@@ -7,8 +7,12 @@
 <!ENTITY % scrollkeeper SYSTEM "lib/scrollkeeper/scrollkeeper.ent">
 <!ENTITY % gdk SYSTEM "lib/gdk/gdk.ent">
+<!ENTITY % orbit SYSTEM "lib/orbit/orbit.ent">
+<!ENTITY % gnome-libs SYSTEM "lib/gnomelib/gnome-libs.ent">
 %libglade;
 %intltool;
 %scrollkeeper;
 %gdk;
+%orbit;
+%gnome-libs;
 
 <!-- Gnome Core -->
Index: gnome/lib/gnome-libs.xml
===================================================================
--- gnome/lib/gnome-libs.xml	(revision a453c0877fc1d4e63144df48648a727de6874612)
+++ gnome/lib/gnome-libs.xml	(revision a453c0877fc1d4e63144df48648a727de6874612)
@@ -0,0 +1,12 @@
+<sect1 id="gnome-libs" xreflabel="gnome-libs-&gnome-libs-version;">
+<?dbhtml filename="gnome-libs.html" dir="gnome"?>
+<title>gnome-libs-&gnome-libs-version;</title>
+
+&gnome-libs-intro;
+&gnome-libs-inst;
+&gnome-libs-exp;
+&gnome-libs-config;
+&gnome-libs-desc;
+
+</sect1>
+
Index: gnome/lib/gnomelib/gnome-libs-config.xml
===================================================================
--- gnome/lib/gnomelib/gnome-libs-config.xml	(revision a453c0877fc1d4e63144df48648a727de6874612)
+++ gnome/lib/gnomelib/gnome-libs-config.xml	(revision a453c0877fc1d4e63144df48648a727de6874612)
@@ -0,0 +1,15 @@
+<sect2>
+<title>Configuring gnome-libs</title>
+
+<sect3><title>Config files</title>
+<para><userinput>/etc/gnome/mime-magic, /etc/gnome/paper.config, /etc/gnome/sound/events/gnome.soundlist and /etc/gnome/sound/events/gtk-events.soundlist</userinput></para>
+</sect3>
+
+<sect3><title>Configuration Information</title>
+
+&library-config;
+
+</sect3>
+
+</sect2>
+
Index: gnome/lib/gnomelib/gnome-libs-desc.xml
===================================================================
--- gnome/lib/gnomelib/gnome-libs-desc.xml	(revision a453c0877fc1d4e63144df48648a727de6874612)
+++ gnome/lib/gnomelib/gnome-libs-desc.xml	(revision a453c0877fc1d4e63144df48648a727de6874612)
@@ -0,0 +1,38 @@
+<sect2>
+<title>Contents</title>
+
+<para>The gnome-libs package contains <userinput>libgnome</userinput>,
+<userinput>libgnomeui</userinput>,
+<userinput>libgnomesupport</userinput>,
+<userinput>libart_lgpl</userinput>,
+<userinput>libgtk-xmhtml</userinput>,
+<userinput>libgnorbagtk</userinput> and <userinput>libzvt</userinput>.</para>
+
+</sect2>
+
+<sect2><title>Description</title>
+
+<sect3><title>libgnome</title>
+<para>libgnome is the non-GUI part of the GNOME library.</para></sect3>
+
+<sect3><title>libgnomeui</title>
+<para>libgnomeui is the GUI part of the GNOME library.</para></sect3>
+
+<sect3><title>libgnomesupport</title>
+<para>No description available.</para></sect3>
+
+<sect3><title>libart_lgpl</title>
+<para>libart_lgpl is the LGPL'd component of libart.</para></sect3>
+
+<sect3><title>libgtk-xmhtml</title>
+<para>No description available.</para></sect3>
+
+<sect3><title>libgnorbaqtk</title>
+<para>libgnorbaqtk is the GNOME CORBA QTK framework.</para></sect3>
+
+<sect3><title>libzvt</title>
+<para>No description available.</para></sect3>
+
+
+</sect2>
+
Index: gnome/lib/gnomelib/gnome-libs-exp.xml
===================================================================
--- gnome/lib/gnomelib/gnome-libs-exp.xml	(revision a453c0877fc1d4e63144df48648a727de6874612)
+++ gnome/lib/gnomelib/gnome-libs-exp.xml	(revision a453c0877fc1d4e63144df48648a727de6874612)
@@ -0,0 +1,13 @@
+<sect2>
+<title>Command explanations</title>
+
+<para><userinput>--sysconfdir=/etc/gnome :</userinput> This command puts
+configuration files in <filename>/etc/gnome</filename> instead of
+<filename>/opt/gnome/etc</filename>.</para>
+
+<para><userinput>--localstatedir=/var :</userinput> This command puts
+state files in <filename>/var</filename> instead of
+<filename>/opt/gnome/var</filename>.</para>
+
+</sect2>
+
Index: gnome/lib/gnomelib/gnome-libs-inst.xml
===================================================================
--- gnome/lib/gnomelib/gnome-libs-inst.xml	(revision a453c0877fc1d4e63144df48648a727de6874612)
+++ gnome/lib/gnomelib/gnome-libs-inst.xml	(revision a453c0877fc1d4e63144df48648a727de6874612)
@@ -0,0 +1,11 @@
+<sect2>
+<title>Installation of gnome-libs</title>
+
+<para>Install gnome-libs by running the following commands:</para>
+
+<para><screen><userinput>./configure --prefix=/opt/gnome --localstatedir=/var --sysconfdir=/etc/gnome &amp;&amp;
+make &amp;&amp;
+make install</userinput></screen></para>
+
+</sect2>
+
Index: gnome/lib/gnomelib/gnome-libs-intro.xml
===================================================================
--- gnome/lib/gnomelib/gnome-libs-intro.xml	(revision a453c0877fc1d4e63144df48648a727de6874612)
+++ gnome/lib/gnomelib/gnome-libs-intro.xml	(revision a453c0877fc1d4e63144df48648a727de6874612)
@@ -0,0 +1,18 @@
+<sect2>
+<title>Introduction to gnome-libs</title>
+
+<screen>Download location (HTTP):       <ulink url="&gnome-libs-download-http;"/>
+Download location (FTP):        <ulink url="&gnome-libs-download-ftp;"/>
+Version used:                   &gnome-libs-version;
+Package size:                   &gnome-libs-size;
+Estimated Disk space required:  &gnome-libs-buildsize;</screen>
+
+<para>The gnome-libs package contains the gnome libraries. This is
+useful as a foundation for the GNOME desktop and applications.</para>
+
+<screen>gnome-libs depends on:
+<xref linkend="ORBit"/>, <xref linkend="GTK"/>, <xref linkend="imlib"/>, <xref linkend="db"/> and <xref linkend="zlib"/>
+gnome-libs will utilize:
+<xref linkend="audiofile"/>, <xref linkend="esound"/>, gtk-doc and <xref linkend="DocBook"/></screen>
+
+</sect2>
Index: gnome/lib/gnomelib/gnome-libs.ent
===================================================================
--- gnome/lib/gnomelib/gnome-libs.ent	(revision a453c0877fc1d4e63144df48648a727de6874612)
+++ gnome/lib/gnomelib/gnome-libs.ent	(revision a453c0877fc1d4e63144df48648a727de6874612)
@@ -0,0 +1,11 @@
+<!ENTITY gnome-libs SYSTEM "../gnome-libs.xml">
+<!ENTITY gnome-libs-intro SYSTEM "gnome-libs-intro.xml">
+<!ENTITY gnome-libs-inst SYSTEM "gnome-libs-inst.xml">
+<!ENTITY gnome-libs-exp SYSTEM "gnome-libs-exp.xml">
+<!ENTITY gnome-libs-desc SYSTEM "gnome-libs-desc.xml">
+<!ENTITY gnome-libs-config SYSTEM "gnome-libs-config.xml">
+<!ENTITY gnome-libs-buildsize "33 MB">
+<!ENTITY gnome-libs-version "1.4.2">
+<!ENTITY gnome-libs-download-http "http://ftp.gnome.org/pub/GNOME/stable/sources/gnome-libs/gnome-libs-1.4.2.tar.gz">
+<!ENTITY gnome-libs-download-ftp "ftp://ftp.gnome.org/pub/GNOME/stable/sources/gnome-libs/gnome-libs-1.4.2.tar.gz">
+<!ENTITY gnome-libs-size "3.7 MB">
Index: gnome/lib/lib.xml
===================================================================
--- gnome/lib/lib.xml	(revision fed44ca98c8d43906e990525ed24737aaffb2ad2)
+++ gnome/lib/lib.xml	(revision a453c0877fc1d4e63144df48648a727de6874612)
@@ -36,8 +36,6 @@
 List of needed packages from elsewhere in the book
 gtk-engine
-ORBit
 oaf
 GConf
-gnome-libs
 gnome-mime-data
 gnome-vfs
@@ -45,12 +43,12 @@
 xml-i18n-tools
 libghttp
-libglade
-gdk-pixbuf
-scrollkeeper</screen></para>
+</screen></para>
 
-&libglade;
 &intltool;
 &scrollkeeper;
+&ORBit;
+&gnome-libs;
 &gdk;
+&libglade;
 
 </chapter>
Index: gnome/lib/orbit.xml
===================================================================
--- gnome/lib/orbit.xml	(revision a453c0877fc1d4e63144df48648a727de6874612)
+++ gnome/lib/orbit.xml	(revision a453c0877fc1d4e63144df48648a727de6874612)
@@ -0,0 +1,11 @@
+<sect1 id="ORBit" xreflabel="ORBit-&ORBit-version;">
+<?dbhtml filename="ORBit.html" dir="gnome"?>
+<title>ORBit-&ORBit-version;</title>
+
+&ORBit-intro;
+&ORBit-inst;
+&ORBit-config;
+&ORBit-desc;
+
+</sect1>
+
Index: gnome/lib/orbit/orbit-config.xml
===================================================================
--- gnome/lib/orbit/orbit-config.xml	(revision a453c0877fc1d4e63144df48648a727de6874612)
+++ gnome/lib/orbit/orbit-config.xml	(revision a453c0877fc1d4e63144df48648a727de6874612)
@@ -0,0 +1,11 @@
+<sect2>
+<title>Configuring ORBit</title>
+
+<sect3><title>Configuration Information</title>
+
+&library-config;
+
+</sect3>
+
+</sect2>
+
Index: gnome/lib/orbit/orbit-desc.xml
===================================================================
--- gnome/lib/orbit/orbit-desc.xml	(revision a453c0877fc1d4e63144df48648a727de6874612)
+++ gnome/lib/orbit/orbit-desc.xml	(revision a453c0877fc1d4e63144df48648a727de6874612)
@@ -0,0 +1,30 @@
+<sect2>
+<title>Contents</title>
+
+<para>The ORBit package contains <userinput>libIDL</userinput>,
+<userinput>libIIOP</userinput>, <userinput>libORBit</userinput>,
+<userinput>libORBitCosNaming</userinput> and <userinput>libORBitutil
+libraries</userinput>.</para>
+
+</sect2>
+
+<sect2><title>Description</title>
+
+<sect3><title>libIDL</title>
+<para>libIDL is the Interface Definition Language mappings for CORBA.</para></sect3>
+
+<sect3><title>libIIOP</title>
+<para>libIIOP is for low level CORBA communications.</para></sect3>
+
+<sect3><title>libORBit</title>
+<para>libORBit is the CORBA API.</para></sect3>
+
+<sect3><title>libORBitCosNaming</title>
+<para>No description available.</para></sect3>
+
+<sect3><title>libORBitutil</title>
+<para>libORBitutil contains the convenience routines for ORBit.</para></sect3>
+
+
+</sect2>
+
Index: gnome/lib/orbit/orbit-inst.xml
===================================================================
--- gnome/lib/orbit/orbit-inst.xml	(revision a453c0877fc1d4e63144df48648a727de6874612)
+++ gnome/lib/orbit/orbit-inst.xml	(revision a453c0877fc1d4e63144df48648a727de6874612)
@@ -0,0 +1,11 @@
+<sect2>
+<title>Installation of ORBit</title>
+
+<para>Install ORBit by running the following commands:</para>
+
+<para><screen><userinput>./configure --prefix=/opt/gnome &amp;&amp;
+make &amp;&amp;
+make install</userinput></screen></para>
+
+</sect2>
+
Index: gnome/lib/orbit/orbit-intro.xml
===================================================================
--- gnome/lib/orbit/orbit-intro.xml	(revision a453c0877fc1d4e63144df48648a727de6874612)
+++ gnome/lib/orbit/orbit-intro.xml	(revision a453c0877fc1d4e63144df48648a727de6874612)
@@ -0,0 +1,17 @@
+<sect2>
+<title>Introduction to ORBit</title>
+
+<screen>Download location (HTTP):       <ulink url="&ORBit-download-http;"/>
+Download location (FTP):        <ulink url="&ORBit-download-ftp;"/>
+Version used:                   &ORBit-version;
+Package size:                   &ORBit-size;
+Estimated Disk space required:  &ORBit-buildsize;</screen>
+
+<para>The ORBit package contains a high-performance CORBA Object Request
+Broker. This allows programs to send requests and receive replies from
+other programs.</para>
+
+<screen>ORBit depends on:
+<xref linkend="popt"/> and <xref linkend="GLib"/></screen>
+
+</sect2>
Index: gnome/lib/orbit/orbit.ent
===================================================================
--- gnome/lib/orbit/orbit.ent	(revision a453c0877fc1d4e63144df48648a727de6874612)
+++ gnome/lib/orbit/orbit.ent	(revision a453c0877fc1d4e63144df48648a727de6874612)
@@ -0,0 +1,11 @@
+<!ENTITY ORBit SYSTEM "../orbit.xml">
+<!ENTITY ORBit-intro SYSTEM "orbit-intro.xml">
+<!ENTITY ORBit-inst SYSTEM "orbit-inst.xml">
+<!ENTITY ORBit-exp SYSTEM "orbit-exp.xml">
+<!ENTITY ORBit-desc SYSTEM "orbit-desc.xml">
+<!ENTITY ORBit-config SYSTEM "orbit-config.xml">
+<!ENTITY ORBit-buildsize "26 MB">
+<!ENTITY ORBit-version "0.5.17">
+<!ENTITY ORBit-download-http "http://ftp.gnome.org/pub/GNOME/stable/sources/ORBit/ORBit-0.5.17.tar.gz">
+<!ENTITY ORBit-download-ftp "ftp://ftp.gnome.org/pub/GNOME/stable/sources/ORBit/ORBit-0.5.17.tar.gz">
+<!ENTITY ORBit-size "1 MB">
Index: introduction/welcome/credits.xml
===================================================================
--- introduction/welcome/credits.xml	(revision fed44ca98c8d43906e990525ed24737aaffb2ad2)
+++ introduction/welcome/credits.xml	(revision a453c0877fc1d4e63144df48648a727de6874612)
@@ -76,8 +76,6 @@
 <listitem><para>ATK, audiofile, bc, cdrdao, cdrtools, cpio, curl, dhcp,
 DocBook, enlightenment, esound, fcron, fluxbox, FNLIB, gcc, gdbm, gmp, gnat,
-imlib, GLib2, GTK+2, intltool, j2sdk, libao, libglade, libogg, librep,
-lame, libvorbis, libxml2, libxslt, mutt, OpenSSH, Pango, pccts, pcre,
-pkgconfig, postfix, procmail, Python, QT, rep-gtk, ruby, sawfish,
-scrollkeeper, unzip, vorbis-tools, wget, XFce and zip: <emphasis>Larry Lawrence</emphasis></para></listitem>
+imlib, GLib2, gnome-libs, GTK+2, intltool, j2sdk, libao, libglade, libogg, librep, lame, libvorbis, libxml2, libxslt, mutt, OpenSSH, ORBit, Pango, pccts, pcre,
+pkgconfig, postfix, procmail, Python, QT, rep-gtk, ruby, sawfish, scrollkeeper, unzip, vorbis-tools, wget, XFce and zip: <emphasis>Larry Lawrence</emphasis></para></listitem>
 
 <listitem><para>CDParanoia, mpg123, SDL and XMMS: <emphasis>Jeroen
