Index: general.ent
===================================================================
--- general.ent	(revision 7fcbbe8abbdc49b1deb6a0a9e8d3d7a9e6cc56b8)
+++ general.ent	(revision 61a7ee8528fc995cb3444c6f6b8ba846cda8e9c8)
@@ -79,5 +79,4 @@
 <!ENTITY aspell-version               "0.60.2">
 <!ENTITY ispell-version               "3.2.06.epa7">
-<!ENTITY guile-version                "1.6.6">
 <!ENTITY slib-version                 "3a1">
 <!ENTITY gwrap-version                "1.3.4">
@@ -183,4 +182,5 @@
 <!ENTITY NASM-version                 "0.98.39">
 <!ENTITY gcc3-version                 "3.3.4">                                     
+<!ENTITY guile-version                "1.6.7">
 <!ENTITY doxygen-version              "1.4.1">                                     
 <!-- Part IV -->                     
Index: general/genlib/genlib.xml
===================================================================
--- general/genlib/genlib.xml	(revision 7fcbbe8abbdc49b1deb6a0a9e8d3d7a9e6cc56b8)
+++ general/genlib/genlib.xml	(revision 61a7ee8528fc995cb3444c6f6b8ba846cda8e9c8)
@@ -57,5 +57,4 @@
 <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="aspell.xml"/>
 <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="ispell.xml"/>
-<xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="guile.xml"/>
 <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="slib.xml"/>
 <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="gwrap.xml"/>
Index: neral/genlib/guile.xml
===================================================================
--- general/genlib/guile.xml	(revision 7fcbbe8abbdc49b1deb6a0a9e8d3d7a9e6cc56b8)
+++ 	(revision )
@@ -1,108 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.4//EN"
-   "http://www.oasis-open.org/docbook/xml/4.4/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../../general.ent">
-  %general-entities;
-
-<!ENTITY guile-download-http "http://ftp.gnu.org/pub/gnu/guile/guile-&guile-version;.tar.gz">
-<!ENTITY guile-download-ftp "ftp://ftp.gnu.org/pub/gnu/guile/guile-&guile-version;.tar.gz">
-<!ENTITY guile-md5sum "99419494fbbcc257be41309c2a9284f0">
-<!ENTITY guile-size "3.0 MB">
-<!ENTITY guile-buildsize "36.5 MB">
-<!ENTITY guile-time "0.87 SBU">
-]>
-
-<sect1 id="guile" xreflabel="Guile-&guile-version;">
-<sect1info>
-<othername>$LastChangedBy$</othername>
-<date>$Date$</date>
-</sect1info>
-<?dbhtml filename="guile.html"?>
-<title>Guile-&guile-version;</title>
-
-<sect2>
-<title>Introduction to <application>Guile</application></title>
-
-<para>The <application>Guile</application> package contains the Project
-<acronym>GNU</acronym>'s extension language library. 
-<application>Guile</application> also contains a stand alone 
-<application>Scheme</application> interpreter.</para>
-
-<sect3><title>Package information</title>
-<itemizedlist spacing='compact'>
-<listitem><para>Download (HTTP): <ulink
-url="&guile-download-http;"/></para></listitem>
-<listitem><para>Download (FTP): <ulink
-url="&guile-download-ftp;"/></para></listitem>
-<listitem><para>Download MD5 sum: &guile-md5sum;</para></listitem>
-<listitem><para>Download size: &guile-size;</para></listitem>
-<listitem><para>Estimated disk space required:
-&guile-buildsize;</para></listitem>
-<listitem><para>Estimated build time:
-&guile-time;</para></listitem></itemizedlist>
-</sect3>
-
-</sect2>
-
-<sect2>
-<title>Installation of <application>Guile</application></title>
-
-<para>Install <application>Guile</application> by running the following
-commands:</para>
-
-<screen><userinput><command>./configure --prefix=/usr &amp;&amp;
-LD_LIBRARY_PATH="$PWD/libguile-ltdl/.libs" make &amp;&amp;
-make install</command></userinput></screen>
-
-</sect2>
-
-<sect2>
-<title>Command Explanations</title>
-
-<para><command>LD_LIBRARY_PATH="$PWD/libguile-ltdl/.libs" make</command>: 
-Something is broken in the Autotools chain. Passing this variable allows the 
-build to finish successfully.</para>
-
-</sect2>
-
-<sect2>
-<title>Contents</title>
-
-<para>In addition to the <filename class='libraryfile'>libguile</filename> 
-libraries, the <application>Guile</application> package contains
-<command>guile</command>,
-<command>guile-config</command>, 
-<command>guile-snarf</command>, 
-<command>guile-tools</command> and 
-numerous <application>Guile</application> scripts.
-</para>
-
-</sect2>
-
-<sect2><title>Description</title>
-
-<sect3><title>guile</title>
-<para><command>guile</command> is a stand-alone Scheme interpreter for
-<application>Guile</application>.</para></sect3>
-
-<sect3><title>guile-config</title>
-<para><command>guile-config</command> is a <application>Guile</application>
-script which provides the information necessary to link your programs against
-the <application>Guile</application> library, in much the same way 
-<xref linkend="pkgconfig"></xref> does.</para></sect3>
-
-<sect3><title>guile-snarf</title>
-<para><command>guile-snarf</command> is a script to parse declarations in
-your <application>C</application> code for <application>Scheme</application>
-visible <application>C</application> functions, 
-<application>Scheme</application> objects to be used by 
-<application>C</application> code, etc.</para></sect3>
-
-<sect3><title>guile-tools</title>
-<para><command>guile-tools</command> is a wrapper program installed along with 
-<command>guile</command> which knows where a particular module is installed and 
-calls it passing its args to a program.</para></sect3>
-
-</sect2>
-
-</sect1>
Index: general/prog/guile.xml
===================================================================
--- general/prog/guile.xml	(revision 61a7ee8528fc995cb3444c6f6b8ba846cda8e9c8)
+++ general/prog/guile.xml	(revision 61a7ee8528fc995cb3444c6f6b8ba846cda8e9c8)
@@ -0,0 +1,131 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.4//EN"
+   "http://www.oasis-open.org/docbook/xml/4.4/docbookx.dtd" [
+  <!ENTITY % general-entities SYSTEM "../../general.ent">
+  %general-entities;
+
+<!ENTITY guile-download-http "http://ftp.gnu.org/pub/gnu/guile/guile-&guile-version;.tar.gz">
+<!ENTITY guile-download-ftp "ftp://ftp.gnu.org/pub/gnu/guile/guile-&guile-version;.tar.gz">
+<!ENTITY guile-md5sum "c2ff2a2231f0cbb2e838dd8701a587c5">
+<!ENTITY guile-size "3.0 MB">
+<!ENTITY guile-buildsize "37.4 MB">
+<!ENTITY guile-time "0.86 SBU">
+]>
+
+<sect1 id="guile" xreflabel="Guile-&guile-version;">
+<sect1info>
+<othername>$LastChangedBy$</othername>
+<date>$Date$</date>
+</sect1info>
+<?dbhtml filename="guile.html"?>
+<title>Guile-&guile-version;</title>
+<indexterm zone="guile">
+<primary sortas="a-Guile">Guile</primary></indexterm>
+
+<sect2>
+<title>Introduction to <application>Guile</application></title>
+
+<para>The <application>Guile</application> package contains the Project
+<acronym>GNU</acronym>'s extension language library. 
+<application>Guile</application> also contains a stand alone 
+<application>Scheme</application> interpreter.</para>
+
+<sect3><title>Package information</title>
+<itemizedlist spacing='compact'>
+<listitem><para>Download (HTTP): <ulink
+url="&guile-download-http;"/></para></listitem>
+<listitem><para>Download (FTP): <ulink
+url="&guile-download-ftp;"/></para></listitem>
+<listitem><para>Download MD5 sum: &guile-md5sum;</para></listitem>
+<listitem><para>Download size: &guile-size;</para></listitem>
+<listitem><para>Estimated disk space required:
+&guile-buildsize;</para></listitem>
+<listitem><para>Estimated build time:
+&guile-time;</para></listitem></itemizedlist>
+</sect3>
+
+</sect2>
+
+<sect2>
+<title>Installation of <application>Guile</application></title>
+
+<para>Install <application>Guile</application> by running the following
+commands:</para>
+
+<screen><userinput><command>./configure --prefix=/usr &amp;&amp;
+make</command></userinput></screen>
+
+<para>Now, as the root user:</para>
+
+<screen><userinput role='root'><command>make install</command></userinput></screen>
+
+</sect2>
+
+<sect2>
+<title>Contents</title>
+
+<segmentedlist>
+<segtitle>Installed Programs</segtitle>
+<segtitle>Installed Libraries</segtitle>
+<segtitle>Installed Directories</segtitle>
+
+<seglistitem>
+<seg>guile, guile-config, guile-snarf and guile-tools</seg>
+<seg>libguile.[so,a], libguilereadline-v-12.[so,a], libguile-ltdl.[so,a], 
+libguile-srfi-srfi-13-14-v-1.[so,a], libguile-srfi-srfi-4-v-1.[so,a] and 
+optionally, libqthreads.[so,a]</seg>
+<seg>/usr/include/guile, /usr/include/guile-readline, /usr/include/libguile 
+and /usr/share/guile</seg>
+</seglistitem>
+</segmentedlist>
+
+<variablelist>
+<bridgehead renderas="sect3">Short Descriptions</bridgehead>
+<?dbfo list-presentation="list"?>
+
+<varlistentry id="guile-prog">
+<term><command>guile</command></term>
+<listitem><para>is a stand-alone Scheme interpreter for 
+<application>Guile</application>.</para>
+<indexterm zone="guile guile-prog">
+<primary sortas="b-guile">guile</primary>
+</indexterm></listitem>
+</varlistentry>
+
+<varlistentry id="guile-config">
+<term><command>guile-config</command></term>
+<listitem><para>is a <application>Guile</application> script which provides 
+the information necessary to link your programs against the 
+<application>Guile</application> library, in much the same way 
+<xref linkend="pkgconfig"></xref> does.</para>
+<indexterm zone="guile guile-config">
+<primary sortas="b-guile-config">guile-config</primary>
+</indexterm></listitem>
+</varlistentry>
+
+<varlistentry id="guile-snarf">
+<term><command>guile-snarf</command></term>
+<listitem><para>is a script to parse declarations in your 
+<application>C</application> code for <application>Scheme</application> 
+visible <application>C</application> functions, i
+<application>Scheme</application> objects to be used by 
+<application>C</application> code, etc.</para>
+<indexterm zone="guile guile-snarf">
+<primary sortas="b-guile-snarf">guile-snarf</primary>
+</indexterm></listitem>
+</varlistentry>
+
+<varlistentry id="guile-tools">
+<term><command>guile-tools</command></term>
+<listitem><para>is a wrapper program installed along with 
+<command>guile</command> which knows where a particular module is installed 
+and calls it passing its args to a program.</para>
+<indexterm zone="guile guile-tools">
+<primary sortas="b-guile-tools">guile-tools</primary>
+</indexterm></listitem>
+</varlistentry>
+</variablelist>
+
+</sect2>
+
+</sect1>
Index: general/prog/prog.xml
===================================================================
--- general/prog/prog.xml	(revision 7fcbbe8abbdc49b1deb6a0a9e8d3d7a9e6cc56b8)
+++ general/prog/prog.xml	(revision 61a7ee8528fc995cb3444c6f6b8ba846cda8e9c8)
@@ -28,7 +28,7 @@
 <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="dejagnu.xml"/>
 <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="gcc.xml"/>
-<!-- <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="gcc2.xml"/> -->
 <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="gcc3.xml"/>
 <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="nasm.xml"/>
+<xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="guile.xml"/>
 <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="doxygen.xml"/>
 
Index: introduction/welcome/changelog.xml
===================================================================
--- introduction/welcome/changelog.xml	(revision 7fcbbe8abbdc49b1deb6a0a9e8d3d7a9e6cc56b8)
+++ introduction/welcome/changelog.xml	(revision 61a7ee8528fc995cb3444c6f6b8ba846cda8e9c8)
@@ -26,6 +26,7 @@
 Configuration' page.</para></listitem>
 
-<listitem><para>April 11th, 2005 [randy]: Updated to 
-Nail-11.22.</para></listitem>
+<listitem><para>April 11th, 2005 [randy]: Updated to Nail-11.22 and 
+Guile-1.6.7; moved Guile instructions from 'Chapter 8 - General Libraries' 
+to 'Chapter 12 - Programming'.</para></listitem>
 
 <listitem><para>April 10th, 2005 [randy]: Updated to NASM-0.98.39 and 
