Index: basicnet/basicnet.ent
===================================================================
--- basicnet/basicnet.ent	(revision 4d336946a515fcb1e2467164fdfda23f026db63d)
+++ basicnet/basicnet.ent	(revision d9d389b539dea63cd80107d6fd864aa27df423ec)
@@ -30,4 +30,5 @@
 <!ENTITY % inetutils SYSTEM "netprogs/inetutils/inetutils.ent">
 <!ENTITY % nfs-utils SYSTEM "netprogs/nfs-utils/nfs-utils.ent">
+<!ENTITY % ncpfs SYSTEM "netprogs/ncpfs/ncpfs.ent">
 %ncftp;
 %cvs;
@@ -37,4 +38,5 @@
 %inetutils;
 %nfs-utils;
+%ncpfs;
 
 <!-- Basic Networking Utilities -->
Index: basicnet/netprogs/ncpfs.xml
===================================================================
--- basicnet/netprogs/ncpfs.xml	(revision d9d389b539dea63cd80107d6fd864aa27df423ec)
+++ basicnet/netprogs/ncpfs.xml	(revision d9d389b539dea63cd80107d6fd864aa27df423ec)
@@ -0,0 +1,12 @@
+<sect1 id="ncpfs" xreflabel="ncpfs-&ncpfs-version;">
+<?dbhtml filename="ncpfs.html" dir="basicnet"?>
+<title>ncpfs-&ncpfs-version;</title>
+
+&ncpfs-intro;
+&ncpfs-inst;
+&ncpfs-exp;
+&ncpfs-config;
+&ncpfs-desc;
+
+</sect1>
+
Index: basicnet/netprogs/ncpfs/ncpfs-config.xml
===================================================================
--- basicnet/netprogs/ncpfs/ncpfs-config.xml	(revision d9d389b539dea63cd80107d6fd864aa27df423ec)
+++ basicnet/netprogs/ncpfs/ncpfs-config.xml	(revision d9d389b539dea63cd80107d6fd864aa27df423ec)
@@ -0,0 +1,83 @@
+<sect2>
+<title>Configuring nfs-utils</title>
+
+<sect3><title>Config files</title>
+<para><filename>~/.nwclient</filename></para>
+</sect3>
+
+<sect3><title>Configuration Information</title>
+
+<para>A config file <filename>~/.nwclient</filename> should be placed
+in each user's home directory that intends to use ncpfs.
+The permissions on this file should be set to 600, for obvious security
+reasons.  The configuration file should contain a sinlge line
+per server that the user will use.  Each line should contain
+the sever name, the user name, and optionally the password.  Below is a
+sample <filename>.nwclient</filename> file.</para>
+
+<para><screen># Begin example <filename>~/.nwclient</filename> config file
+
+Server1/User1 Password
+Server2/User1 
+Server2/Guest1 -
+
+# End example .nwclient config file</screen></para>
+
+<para>The syntax for the <filename>.nwclient</filename> file is simple,
+<userinput>server_name/user_name password</userinput>.  Be extremely
+careful when creating or editing this file as the client utilities are
+very picky about syntax.  There should always be a space immediately
+after the username.  If this space is substituted by a tab or multiple 
+spaces, you will not get the expected results when attempting to use 
+the ncpfs tools.  If no password is supplied, the client utilities will 
+ask for a password when it is needed.  If no password is needed, for 
+instance when using a guest account, a single '-' should be put in 
+place of a password.</para>
+
+<para>It should be noted that the ncpmount is not intended to mount
+individual volumes because each mountpoint creates a separate client
+connection to the Novell server.  Mounting each individual volume
+separately would be unwise, as mounting all volumes on a server 
+under one mount point, uses only one client connection.</para>
+
+<para>If you need to set up the IPX protocol at boot, you can create the 
+following scripts.  These scripts assume IPX will be set up on eth0  
+and the network frame type is 802.2.  You should confirm that these 
+are the correct settings and adjust as necessary.</para>
+
+<para><screen>cat &gt; /etc/sysconfig/network-devices/ifup-ipx0 &lt;&lt; "EOF"
+#!/bin/sh
+# Begin /etc/sysconfig/network-devices/ifup-ipx0
+
+source /etc/sysconfig/rc || exit
+source $rc_functions || exit
+
+echo "Setting up the IPX protocol on eth0..."
+/sbin/ipx_interface add eth0 802.2 &&
+/sbin/ipx_configure --auto_interface=on --auto_primary=on
+evaluate_retval
+
+# End /etc/sysconfig/network-devices/ifup-ipx0
+EOF
+cat &gt; /etc/sysconfig/network-devices/ifdown-ipx0 &lt;&lt; "EOF"
+#!/bin/sh
+# Begin /etc/sysconfig/network-devices/ifdown-ipx0
+
+source /etc/sysconfig/rc || exit
+source $rc_functions || exit
+
+echo "Stoping IPX on the eth0 interface..."
+/usr/bin/ipx_configure --auto_interface=off --auto_primary=off &&
+/usr/bin/ipx_interface del eth0 802.2
+evaluate_retval
+
+# End /etc/sysconfig/network-devices/ifdown-ipx0
+EOF
+echo "ONBOOT=yes" &gt; /etc/sysconfig/network-devices/ifconfig.ipx0
+chmod 755 /etc/sysconfig/network-devices/ifup-ipx0
+chmod 755 /etc/sysconfig/network-devices/ifdown-ipx0</screen></para>
+
+</sect3>
+
+</sect2>
+
Index: basicnet/netprogs/ncpfs/ncpfs-desc.xml
===================================================================
--- basicnet/netprogs/ncpfs/ncpfs-desc.xml	(revision d9d389b539dea63cd80107d6fd864aa27df423ec)
+++ basicnet/netprogs/ncpfs/ncpfs-desc.xml	(revision d9d389b539dea63cd80107d6fd864aa27df423ec)
@@ -0,0 +1,26 @@
+<sect2>
+<title>Contents</title>
+
+<itemizedlist>
+
+<listitem><para><emphasis>Client Utilities:</emphasis> <filename> 
+ncpmount, ncpumount, nprint, nsend, nwpasswd, nwsfind, pqlist, pqrm, 
+pqstat, and slist</filename>.</para></listitem>
+
+<listitem><para><emphasis>Server Admin Utilities:</emphasis> 
+<filename> ncopy, nwbocreate, nwbols, nwboprops, nwborm, nwbpadd, 
+nwbpcreate, nwbprm, nwbpset, nwbpvalues, nwdir, nwdpvalues, nwfsctrl, 
+nwfsinfo, nwfstime, nwgrant, nwpurge, nwrevoke, nwrights, nwtrustee, 
+nwtrustee2, nwuserlist, amd nwvolinfo</filename>.</para></listitem>
+
+<listitem><para><emphasis>IPX Interface Utilities:</emphasis> 
+<filename> ipx_cmd, ipx_configure, ipx_interface, ipx_internal_net, 
+and ipx_route</filename>.</para></listitem>
+
+<listitem><para><emphasis>Other Utilities:</emphasis> 
+<filename> ncpmap and nwauth</filename>.</para></listitem>
+
+</itemizedlist>
+
+</sect2>
+
Index: basicnet/netprogs/ncpfs/ncpfs-exp.xml
===================================================================
--- basicnet/netprogs/ncpfs/ncpfs-exp.xml	(revision d9d389b539dea63cd80107d6fd864aa27df423ec)
+++ basicnet/netprogs/ncpfs/ncpfs-exp.xml	(revision d9d389b539dea63cd80107d6fd864aa27df423ec)
@@ -0,0 +1,16 @@
+<sect2>
+<title>Command explanations</title>
+
+<para>
+<userinput>./configure --prefix=/usr --mandir=/usr/share/man</userinput>:
+installs the binaries and libs to the <filename>/usr</filename> directory 
+and places the man files in <filename>/usr/share/man</filename>.</para>
+<para><userinput>make install-dev</userinput>: Installs the header files
+to <filename>/usr/include</filename>.</para>
+<para>If you do not need to use the IPX protocol, or you use a different 
+IPX package, you can optionally pass <userinput> --disable-ipx </userinput> 
+and/or <userinput> --disable-ipx-tools </userinput> to the configure
+script to disable these options.</para>
+
+</sect2>
+
Index: basicnet/netprogs/ncpfs/ncpfs-inst.xml
===================================================================
--- basicnet/netprogs/ncpfs/ncpfs-inst.xml	(revision d9d389b539dea63cd80107d6fd864aa27df423ec)
+++ basicnet/netprogs/ncpfs/ncpfs-inst.xml	(revision d9d389b539dea63cd80107d6fd864aa27df423ec)
@@ -0,0 +1,12 @@
+<sect2>
+<title>Installation of ncpfs</title>
+
+<para>Install ncpfs by running the following commands:</para>
+
+<para><screen><userinput>./configure --prefix=/usr --mandir=/usr/share/man &&
+make &&
+make install &&
+make install-dev</userinput></screen></para>
+
+</sect2>
+
Index: basicnet/netprogs/ncpfs/ncpfs-intro.xml
===================================================================
--- basicnet/netprogs/ncpfs/ncpfs-intro.xml	(revision d9d389b539dea63cd80107d6fd864aa27df423ec)
+++ basicnet/netprogs/ncpfs/ncpfs-intro.xml	(revision d9d389b539dea63cd80107d6fd864aa27df423ec)
@@ -0,0 +1,13 @@
+<sect2>
+<title>Introduction to ncpfs</title>
+
+<para>The ncpfs package contains client and administration tools for 
+use with Novell networks.</para>
+
+<screen>Download location (HTTP):      <ulink url="&ncpfs-download-http;"/>
+Download location (FTP):       <ulink url="&ncpfs-download-ftp;"/>
+Version used:                  &ncpfs-version;
+Package size:                  &ncpfs-size;
+Estimated Disk space required: &ncpfs-buildsize;</screen>
+
+</sect2>
Index: basicnet/netprogs/ncpfs/ncpfs.ent
===================================================================
--- basicnet/netprogs/ncpfs/ncpfs.ent	(revision d9d389b539dea63cd80107d6fd864aa27df423ec)
+++ basicnet/netprogs/ncpfs/ncpfs.ent	(revision d9d389b539dea63cd80107d6fd864aa27df423ec)
@@ -0,0 +1,13 @@
+<!ENTITY ncpfs SYSTEM "../ncpfs.xml">
+<!ENTITY ncpfs-intro SYSTEM "ncpfs-intro.xml">
+<!ENTITY ncpfs-inst SYSTEM "ncpfs-inst.xml">
+<!ENTITY ncpfs-exp SYSTEM "ncpfs-exp.xml">
+<!ENTITY ncpfs-desc SYSTEM "ncpfs-desc.xml">
+<!ENTITY ncpfs-config SYSTEM "ncpfs-config.xml">
+<!ENTITY ncpfs-buildsize "18 MB">
+<!ENTITY ncpfs-version "2.2.3">
+<!ENTITY ncpfs-download-http 
+"http://platan.vc.cvut.cz/ftp/pub/linux/ncpfs/ncpfs-&ncpfs-version;.tar.gz">
+<!ENTITY ncpfs-download-ftp 
+"ftp://platan.vc.cvut.cz/pub/linux/ncpfs/ncpfs-&ncpfs-version;.tar.gz">
+<!ENTITY ncpfs-size "1.5 MB">
Index: basicnet/netprogs/netprogs.xml
===================================================================
--- basicnet/netprogs/netprogs.xml	(revision 4d336946a515fcb1e2467164fdfda23f026db63d)
+++ basicnet/netprogs/netprogs.xml	(revision d9d389b539dea63cd80107d6fd864aa27df423ec)
@@ -12,3 +12,4 @@
 <!-- &inetutils; -->
 &nfs-utils;
+&ncpfs;
 </chapter>
Index: gnome/core/desktop/gnome-desktop-config.xml
===================================================================
--- gnome/core/desktop/gnome-desktop-config.xml	(revision 4d336946a515fcb1e2467164fdfda23f026db63d)
+++ gnome/core/desktop/gnome-desktop-config.xml	(revision d9d389b539dea63cd80107d6fd864aa27df423ec)
@@ -1,4 +1,4 @@
 <sect2>
-<title>Configuring gnome-desktop</title>
+<title>Configuring <application>gnome-desktop</application></title>
 
 
Index: gnome/core/desktop/gnome-desktop-desc.xml
===================================================================
--- gnome/core/desktop/gnome-desktop-desc.xml	(revision 4d336946a515fcb1e2467164fdfda23f026db63d)
+++ gnome/core/desktop/gnome-desktop-desc.xml	(revision d9d389b539dea63cd80107d6fd864aa27df423ec)
@@ -2,6 +2,7 @@
 <title>Contents</title>
 
-<para>The gnome-desktop package contains
-<filename>libgnome-desktopi-2</filename> libraries and <userinput>gnome-about</userinput>.</para>
+<para>The <application>gnome-desktop</application> package contains
+<filename>libgnome-desktop-2</filename> libraries and
+<command>gnome-about</command>.</para>
 
 </sect2>
@@ -10,9 +11,10 @@
 
 <sect3><title>libgnome-desktop libraries</title>
-<para>libgnome-desktop libraries contain API's being tested for
+<para><filename>libgnome-desktop</filename> libraries contain
+<acronym>API</acronym>'s being tested for
 inclusion in libgnome or libgnomeui.</para></sect3>
 
 <sect3><title>gnome-about</title>
-<para>gnome-about produces the about screen.</para></sect3>
+<para><command>gnome-about</command> produces the about screen.</para></sect3>
 
 </sect2>
Index: gnome/core/desktop/gnome-desktop-exp.xml
===================================================================
--- gnome/core/desktop/gnome-desktop-exp.xml	(revision 4d336946a515fcb1e2467164fdfda23f026db63d)
+++ gnome/core/desktop/gnome-desktop-exp.xml	(revision d9d389b539dea63cd80107d6fd864aa27df423ec)
@@ -2,5 +2,5 @@
 <title>Command explanations</title>
 
-<para><userinput>--sysconfdir=/etc/gnome</userinput> : This switch
+<para><command>--sysconfdir=/etc/gnome</command> : This switch
 puts configuration files in <filename>/etc/gnome</filename> instead of
 <filename>$GNOME_PREFIX/etc</filename>.</para>
Index: gnome/core/desktop/gnome-desktop-inst.xml
===================================================================
--- gnome/core/desktop/gnome-desktop-inst.xml	(revision 4d336946a515fcb1e2467164fdfda23f026db63d)
+++ gnome/core/desktop/gnome-desktop-inst.xml	(revision d9d389b539dea63cd80107d6fd864aa27df423ec)
@@ -1,10 +1,10 @@
 <sect2>
-<title>Installation of gnome-desktop</title>
+<title>Installation of <application>gnome-desktop</application></title>
 
-<para>Install gnome-desktop by running the following commands:</para>
+<para>Install <application>gnome-desktop</application> by running the following commands:</para>
 
-<para><screen><userinput>./configure --prefix=$GNOME_PREFIX --sysconfdir=/etc/gnome &amp;&amp;
+<screen><userinput><command>./configure --prefix=$GNOME_PREFIX --sysconfdir=/etc/gnome &amp;&amp;
 make &amp;&amp;
-make install</userinput></screen></para>
+make install</command></userinput></screen>
 
 </sect2>
Index: gnome/core/desktop/gnome-desktop-intro.xml
===================================================================
--- gnome/core/desktop/gnome-desktop-intro.xml	(revision 4d336946a515fcb1e2467164fdfda23f026db63d)
+++ gnome/core/desktop/gnome-desktop-intro.xml	(revision d9d389b539dea63cd80107d6fd864aa27df423ec)
@@ -1,17 +1,26 @@
 <sect2>
-<title>Introduction to gnome-desktop</title>
+<title>Introduction to <application>gnome-desktop</application></title>
 
-<screen>Download location (HTTP):       <ulink url="&gnome-desktop-download-http;"/>
-Download location (FTP):        <ulink url="&gnome-desktop-download-ftp;"/>
-Version used:                   &gnome-desktop-version;
-Package size:                   &gnome-desktop-size;
-Estimated Disk space required:  &gnome-desktop-buildsize;
-Estimated build time:           &gnome-desktop-time;</screen>
+<para>The <application>gnome-desktop</application> package contains GNOME's 
+.desktop files, the gnome-about program, man pages and GNOME's core graphics 
+files and icons.</para>
 
-<para>The gnome-desktop package contains GNOME's .desktop files, the
-gnome-about program, man pages and GNOME's core graphics files and icons.</para>
+<sect3><title>Package information</title>
+<itemizedlist spacing='compact'>
+<listitem><para>Download (HTTP): <ulink
+url="&gnome-desktop-download-http;"/></para></listitem>
+<listitem><para>Download (FTP): <ulink
+url="&gnome-desktop-download-ftp;"/></para></listitem>
+<listitem><para>Download size: &gnome-desktop-size;</para></listitem>
+<listitem><para>Estimated Disk space required:
+&gnome-desktop-buildsize;</para></listitem>
+<listitem><para>Estimated build time:
+&gnome-desktop-time;</para></listitem></itemizedlist>
+</sect3>
 
-<screen>gnome-desktop depends on:
-<xref linkend="libgnomeui"/></screen>
+<sect3><title><application>gnome-desktop</application> dependencies</title>
+<sect4><title>Required</title>
+<para><xref linkend="libgnomeui"/> and <xref linkend="scrollkeeper"/></para></sect4>
+</sect3>
 
 </sect2>
Index: gnome/core/desktop/gnome-desktop.ent
===================================================================
--- gnome/core/desktop/gnome-desktop.ent	(revision 4d336946a515fcb1e2467164fdfda23f026db63d)
+++ gnome/core/desktop/gnome-desktop.ent	(revision d9d389b539dea63cd80107d6fd864aa27df423ec)
@@ -5,8 +5,8 @@
 <!ENTITY gnome-desktop-desc SYSTEM "gnome-desktop-desc.xml">
 <!ENTITY gnome-desktop-config SYSTEM "gnome-desktop-config.xml">
-<!ENTITY gnome-desktop-buildsize "6.9 MB">
-<!ENTITY gnome-desktop-version "2.2.1">
-<!ENTITY gnome-desktop-download-http "http://ftp.gnome.org/pub/GNOME/sources/gnome-desktop/2.2/gnome-desktop-2.2.1.tar.bz2">
-<!ENTITY gnome-desktop-download-ftp "ftp://ftp.gnome.org/pub/GNOME/sources/gnome-desktop/2.2/gnome-desktop-2.2.1.tar.bz2">
+<!ENTITY gnome-desktop-buildsize "11.5 MB">
+<!ENTITY gnome-desktop-version "2.2.2">
+<!ENTITY gnome-desktop-download-http "http://ftp.gnome.org/pub/GNOME/sources/gnome-desktop/2.2/gnome-desktop-2.2.2.tar.bz2">
+<!ENTITY gnome-desktop-download-ftp "ftp://ftp.gnome.org/pub/GNOME/sources/gnome-desktop/2.2/gnome-desktop-2.2.2.tar.bz2">
 <!ENTITY gnome-desktop-size "1 MB">
-<!ENTITY gnome-desktop-time "0.69 SBU">
+<!ENTITY gnome-desktop-time "0.19 SBU">
Index: gnome/core/panel/gnome-panel-config.xml
===================================================================
--- gnome/core/panel/gnome-panel-config.xml	(revision 4d336946a515fcb1e2467164fdfda23f026db63d)
+++ gnome/core/panel/gnome-panel-config.xml	(revision d9d389b539dea63cd80107d6fd864aa27df423ec)
@@ -1,4 +1,4 @@
 <sect2>
-<title>Configuring gnome-panel</title>
+<title>Configuring <application>gnome-panel</application></title>
 
 
Index: gnome/core/panel/gnome-panel-desc.xml
===================================================================
--- gnome/core/panel/gnome-panel-desc.xml	(revision 4d336946a515fcb1e2467164fdfda23f026db63d)
+++ gnome/core/panel/gnome-panel-desc.xml	(revision d9d389b539dea63cd80107d6fd864aa27df423ec)
@@ -2,5 +2,5 @@
 <title>Contents</title>
 
-<para>The gnome-panel package contains
+<para>The <application>gnome-panel</application> package contains
 <filename>libpanel-applet-2</filename> libraries and applets.</para>
 
@@ -10,6 +10,6 @@
 
 <sect3><title>libpanel-applet libraries</title>
-<para>libpanel-applet libraries allow development of small applications
-which may be embedded in the panel called applets.</para></sect3>
+<para><filename>libpanel-applet</filename> libraries allow development of small 
+applications which may be embedded in the panel called applets.</para></sect3>
 
 <sect3><title>applets</title>
Index: gnome/core/panel/gnome-panel-exp.xml
===================================================================
--- gnome/core/panel/gnome-panel-exp.xml	(revision 4d336946a515fcb1e2467164fdfda23f026db63d)
+++ gnome/core/panel/gnome-panel-exp.xml	(revision d9d389b539dea63cd80107d6fd864aa27df423ec)
@@ -2,17 +2,17 @@
 <title>Command explanations</title>
 
-<para><userinput>--libexecdir=$GNOME_PREFIX/sbin</userinput> : This switch puts
+<para><command>--libexecdir=$GNOME_PREFIX/sbin</command> : This switch puts
 libexec files in <filename>$GNOME_PREFIX/sbin</filename> instead of
 <filename>$GNOME_PREFIX/libexec</filename>.</para>
 
-<para><userinput>--localstatedir=/var/lib</userinput> : This switch
+<para><command>--localstatedir=/var/lib</command> : This switch
 puts scrollkeeper files in <filename>/var/lib/scrollkeeper</filename>
 instead of <filename>$GNOME_PREFIX/var/scrollkeeper</filename>.</para>
 
-<para><userinput>--sysconfdir=/etc/gnome</userinput> : This switch
+<para><command>--sysconfdir=/etc/gnome</command> : This switch
 puts configuration files in <filename>/etc/gnome</filename> instead of
 <filename>$GNOME_PREFIX/etc</filename>.</para>
 
-<para><userinput>--disable-gtk-doc</userinput> : This switch prevents
+<para><command>--disable-gtk-doc</command> : This switch prevents
 the rebuilding of documentation during the make command.</para>
 
Index: gnome/core/panel/gnome-panel-inst.xml
===================================================================
--- gnome/core/panel/gnome-panel-inst.xml	(revision 4d336946a515fcb1e2467164fdfda23f026db63d)
+++ gnome/core/panel/gnome-panel-inst.xml	(revision d9d389b539dea63cd80107d6fd864aa27df423ec)
@@ -1,11 +1,11 @@
 <sect2>
-<title>Installation of gnome-panel</title>
+<title>Installation of <application>gnome-panel</application></title>
 
-<para>Install gnome-panel by running the following commands:</para>
+<para>Install <application>gnome-panel</application> by running the following commands:</para>
 
-<para><screen><userinput>./configure --prefix=$GNOME_PREFIX --libexecdir=$GNOME_PREFIX/sbin \
+<screen><userinput><command>./configure --prefix=$GNOME_PREFIX --libexecdir=$GNOME_PREFIX/sbin \
 --localstatedir=/var/lib --sysconfdir=/etc/gnome --disable-gtk-doc &amp;&amp;
 make &amp;&amp;
-make install</userinput></screen></para>
+make install</command></userinput></screen>
 
 </sect2>
Index: gnome/core/panel/gnome-panel-intro.xml
===================================================================
--- gnome/core/panel/gnome-panel-intro.xml	(revision 4d336946a515fcb1e2467164fdfda23f026db63d)
+++ gnome/core/panel/gnome-panel-intro.xml	(revision d9d389b539dea63cd80107d6fd864aa27df423ec)
@@ -1,18 +1,28 @@
 <sect2>
-<title>Introduction to gnome-panel</title>
+<title>Introduction to <application>gnome-panel</application></title>
 
-<screen>Download location (HTTP):       <ulink url="&gnome-panel-download-http;"/>
-Download location (FTP):        <ulink url="&gnome-panel-download-ftp;"/>
-Version used:                   &gnome-panel-version;
-Package size:                   &gnome-panel-size;
-Estimated Disk space required:  &gnome-panel-buildsize;
-Estimated build time:           &gnome-panel-time;</screen>
+<para>The <application>gnome-panel</application> package contains the menu and 
+applet systems.</para>
 
-<para>The gnome-panel package contains the menu and applet systems.</para>
+<sect3><title>Package information</title>
+<itemizedlist spacing='compact'>
+<listitem><para>Download (HTTP): <ulink
+url="&gnome-panel-download-http;"/></para></listitem>
+<listitem><para>Download (FTP): <ulink
+url="&gnome-panel-download-ftp;"/></para></listitem>
+<listitem><para>Download size: &gnome-panel-size;</para></listitem>
+<listitem><para>Estimated Disk space required:
+&gnome-panel-buildsize;</para></listitem>
+<listitem><para>Estimated build time:
+&gnome-panel-time;</para></listitem></itemizedlist>
+</sect3>
 
-<screen>gnome-panel depends on:
-<xref linkend="libgnomeui"/> and <xref linkend="scrollkeeper"/>
-gnome-panel will utilize:
-<xref linkend="gtk-doc"/> and <xref linkend="sgml-dtd-3"/></screen>
+<sect3><title><application>gnome-panel</application> dependencies</title>
+<sect4><title>Required</title>
+<para><xref linkend="libgnomeui"/> and <xref linkend="scrollkeeper"/></para></sect4>
+<sect4><title>Optional</title>
+<para><xref linkend="gtk-doc"/> and <xref linkend="sgml-dtd-3"/></para></sect4>
+</sect3>
+
 
 </sect2>
Index: gnome/core/panel/gnome-panel.ent
===================================================================
--- gnome/core/panel/gnome-panel.ent	(revision 4d336946a515fcb1e2467164fdfda23f026db63d)
+++ gnome/core/panel/gnome-panel.ent	(revision d9d389b539dea63cd80107d6fd864aa27df423ec)
@@ -5,8 +5,10 @@
 <!ENTITY gnome-panel-desc SYSTEM "gnome-panel-desc.xml">
 <!ENTITY gnome-panel-config SYSTEM "gnome-panel-config.xml">
-<!ENTITY gnome-panel-buildsize "19.8 MB">
-<!ENTITY gnome-panel-version "2.2.1">
-<!ENTITY gnome-panel-download-http "http://ftp.gnome.org/pub/GNOME/sources/gnome-panel/2.2/gnome-panel-2.2.1.tar.bz2">
-<!ENTITY gnome-panel-download-ftp "ftp://ftp.gnome.org/pub/GNOME/sources/gnome-panel/2.2/gnome-panel-2.2.1.tar.bz2">
-<!ENTITY gnome-panel-size "1.8 MB">
-<!ENTITY gnome-panel-time "4.06 SBU">
+<!ENTITY gnome-panel-buildsize "67.3 MB">
+<!ENTITY gnome-panel-version "2.2.2.2">
+<!ENTITY gnome-panel-download-http
+"http://ftp.gnome.org/pub/GNOME/sources/gnome-panel/2.2/gnome-panel-2.2.2.2.tar.bz2">
+<!ENTITY gnome-panel-download-ftp
+"ftp://ftp.gnome.org/pub/GNOME/sources/gnome-panel/2.2/gnome-panel-2.2.2.2.tar.bz2">
+<!ENTITY gnome-panel-size "2.6 MB">
+<!ENTITY gnome-panel-time "1.14 SBU">
Index: introduction/welcome/changelog.xml
===================================================================
--- introduction/welcome/changelog.xml	(revision 4d336946a515fcb1e2467164fdfda23f026db63d)
+++ introduction/welcome/changelog.xml	(revision d9d389b539dea63cd80107d6fd864aa27df423ec)
@@ -12,5 +12,6 @@
 
 <listitem><para>September 3rd, 2003 [larry]: xsoft: updated to
-AbiWord-1.99.6 and gnumeric-1.1.20.</para></listitem>
+AbiWord-1.99.6, gnumeric-1.1.20, gnome-desktop-2.2.2 and
+gnome-panel-2.2.2.2.</para></listitem>
 
 <listitem><para>September 3rd, 2003 [larry]: postlfs: added
Index: introduction/welcome/credits.xml
===================================================================
--- introduction/welcome/credits.xml	(revision 4d336946a515fcb1e2467164fdfda23f026db63d)
+++ introduction/welcome/credits.xml	(revision d9d389b539dea63cd80107d6fd864aa27df423ec)
@@ -151,5 +151,5 @@
 Tushar Teredesai</emphasis></para></listitem>
 
-<listitem><para>RP-PPPoE: <emphasis> DJ Lucas
+<listitem><para>ncpfs and RP-PPPoE: <emphasis> DJ Lucas
 </emphasis></para></listitem>
 
Index: multimedia/libdriv/libmpeg3/libmpeg3-exp.xml
===================================================================
--- multimedia/libdriv/libmpeg3/libmpeg3-exp.xml	(revision 4d336946a515fcb1e2467164fdfda23f026db63d)
+++ multimedia/libdriv/libmpeg3/libmpeg3-exp.xml	(revision d9d389b539dea63cd80107d6fd864aa27df423ec)
@@ -2,5 +2,5 @@
 <title>Command explanations</title>
 
-<para><command>cp i686/libmpeg3.a /usr/lib && cp libmpeg3.h
+<para><command>cp i686/libmpeg3.a /usr/lib &amp;&amp; cp libmpeg3.h
 mpeg3private.h /usr/include</command> : Since make install 
 doesn't copy the library and header files to proper locations, 
