Index: gnome/add/add.xml
===================================================================
--- gnome/add/add.xml	(revision f5a6f5e971c500b75ffe724a83093011a49ba017)
+++ gnome/add/add.xml	(revision 4dc5fb39ed5a788372be74d1a2f7d44535a588e8)
@@ -24,4 +24,6 @@
 &gnome-media;
 &nautilus-media;
+&gnome-netstatus;
+&gcalctool;
 
 &at-spi;
Index: gnome/add/file-roller/file-roller-desc.xml
===================================================================
--- gnome/add/file-roller/file-roller-desc.xml	(revision f5a6f5e971c500b75ffe724a83093011a49ba017)
+++ gnome/add/file-roller/file-roller-desc.xml	(revision 4dc5fb39ed5a788372be74d1a2f7d44535a588e8)
@@ -9,6 +9,6 @@
 
 <sect3><title>file-roller</title>
-<para><command>file-roller</command> is an archive manager
-utility.</para></sect3>
+<para><command>file-roller</command> is an archiver
+for <acronym>GNOME</acronym>.</para></sect3>
 
 </sect2>
Index: gnome/add/file-roller/file-roller-intro.xml
===================================================================
--- gnome/add/file-roller/file-roller-intro.xml	(revision f5a6f5e971c500b75ffe724a83093011a49ba017)
+++ gnome/add/file-roller/file-roller-intro.xml	(revision 4dc5fb39ed5a788372be74d1a2f7d44535a588e8)
@@ -3,5 +3,6 @@
 
 <para>
-File Roller is an archive manager for the <acronym>GNOME</acronym> environment.
+File Roller is an archive manager for <acronym>GNOME</acronym> with
+support for tar, bzip2, gzip, zip, jar, compress and lzop archives.
 </para>
 
Index: gnome/add/gcalctool.xml
===================================================================
--- gnome/add/gcalctool.xml	(revision 4dc5fb39ed5a788372be74d1a2f7d44535a588e8)
+++ gnome/add/gcalctool.xml	(revision 4dc5fb39ed5a788372be74d1a2f7d44535a588e8)
@@ -0,0 +1,10 @@
+<sect1 id="gcalctool" xreflabel="gcalctool-&gcalctool-version;">
+<?dbhtml filename="gcalctool.html"?>
+<title>gcalctool-&gcalctool-version;</title>
+
+&gcalctool-intro;
+&gcalctool-inst;
+&gcalctool-exp;
+&gcalctool-desc;
+
+</sect1>
Index: gnome/add/gcalctool/gcalctool-desc.xml
===================================================================
--- gnome/add/gcalctool/gcalctool-desc.xml	(revision 4dc5fb39ed5a788372be74d1a2f7d44535a588e8)
+++ gnome/add/gcalctool/gcalctool-desc.xml	(revision 4dc5fb39ed5a788372be74d1a2f7d44535a588e8)
@@ -0,0 +1,16 @@
+<sect2>
+<title>Contents</title>
+
+<para>The <application>gcalctool</application> package contains
+<command>gcalctool</command> (a.k.a
+<command>gnome-calculator</command>).</para>
+
+</sect2>
+
+<sect2><title>Description</title>
+
+<sect3><title>gcalctool</title>
+<para><command>gcalctool</command> is a desktop calculator for
+<acronym>GNOME</acronym>.</para></sect3>
+
+</sect2>
Index: gnome/add/gcalctool/gcalctool-exp.xml
===================================================================
--- gnome/add/gcalctool/gcalctool-exp.xml	(revision 4dc5fb39ed5a788372be74d1a2f7d44535a588e8)
+++ gnome/add/gcalctool/gcalctool-exp.xml	(revision 4dc5fb39ed5a788372be74d1a2f7d44535a588e8)
@@ -0,0 +1,13 @@
+<sect2>
+<title>Command explanations</title>
+
+<para><parameter>--sysconfdir=/etc/gnome</parameter>: This switch puts
+configuration files in <filename class="directory">/etc/gnome</filename> instead of
+<filename class="directory">$GNOME_PREFIX/etc</filename>.</para>
+
+<para><parameter>--localstatedir=/var/lib</parameter>: This switch
+puts <application>ScrollKeeper</application> files in <filename
+class="directory">/var/lib/scrollkeeper</filename>
+instead of <filename class="directory">$GNOME_PREFIX/var/scrollkeeper</filename>.</para>
+
+</sect2>
Index: gnome/add/gcalctool/gcalctool-inst.xml
===================================================================
--- gnome/add/gcalctool/gcalctool-inst.xml	(revision 4dc5fb39ed5a788372be74d1a2f7d44535a588e8)
+++ gnome/add/gcalctool/gcalctool-inst.xml	(revision 4dc5fb39ed5a788372be74d1a2f7d44535a588e8)
@@ -0,0 +1,11 @@
+<sect2>
+<title>Installation of <application>gcalctool</application></title>
+
+<para>Install <application>gcalctool</application> by running the following commands:</para>
+
+<screen><userinput><command>./configure --prefix=`pkg-config --variable=prefix ORBit-2.0` \
+    --sysconfdir=/etc/gnome --localstatedir=/var/lib &amp;&amp;
+make &amp;&amp;
+make install</command></userinput></screen>
+
+</sect2>
Index: gnome/add/gcalctool/gcalctool-intro.xml
===================================================================
--- gnome/add/gcalctool/gcalctool-intro.xml	(revision 4dc5fb39ed5a788372be74d1a2f7d44535a588e8)
+++ gnome/add/gcalctool/gcalctool-intro.xml	(revision 4dc5fb39ed5a788372be74d1a2f7d44535a588e8)
@@ -0,0 +1,32 @@
+<sect2>
+<title>Introduction to <application>gcalctool</application></title>
+
+<para>
+<application>gcalctool</application> is a powerful graphical calculator
+with financial, logical and scientific modes. It uses a multiple
+precision package to do its arithmetic to give a high degree of
+accuracy.
+</para>
+
+<sect3><title>Package information</title>
+<itemizedlist spacing='compact'>
+<listitem><para>Download (HTTP): <ulink
+url="&gcalctool-download-http;"/></para></listitem>
+<listitem><para>Download (FTP): <ulink
+url="&gcalctool-download-ftp;"/></para></listitem>
+<listitem><para>Download size: &gcalctool-size;</para></listitem>
+<listitem><para>Estimated Disk space required:
+&gcalctool-buildsize;</para></listitem>
+<listitem><para>Estimated build time:
+&gcalctool-time;</para></listitem></itemizedlist>
+</sect3>
+                                                                                
+<sect3><title><application>gcalctool</application> dependencies</title>
+<sect4><title>Required</title>
+<para>
+<xref linkend="libgnomeui"/> and
+<xref linkend="scrollkeeper"/>
+</para></sect4>
+</sect3>
+
+</sect2>
Index: gnome/add/gcalctool/gcalctool.ent
===================================================================
--- gnome/add/gcalctool/gcalctool.ent	(revision 4dc5fb39ed5a788372be74d1a2f7d44535a588e8)
+++ gnome/add/gcalctool/gcalctool.ent	(revision 4dc5fb39ed5a788372be74d1a2f7d44535a588e8)
@@ -0,0 +1,11 @@
+<!ENTITY gcalctool SYSTEM "../gcalctool.xml">
+<!ENTITY gcalctool-intro SYSTEM "gcalctool-intro.xml">
+<!ENTITY gcalctool-inst SYSTEM "gcalctool-inst.xml">
+<!ENTITY gcalctool-exp SYSTEM "gcalctool-exp.xml">
+<!ENTITY gcalctool-desc SYSTEM "gcalctool-desc.xml">
+<!ENTITY gcalctool-version "4.3.51">
+<!ENTITY gcalctool-download-http "http://ftp.gnome.org/pub/GNOME/sources/gcalctool/4.3/gcalctool-&gcalctool-version;.tar.bz2">
+<!ENTITY gcalctool-download-ftp "ftp://ftp.gnome.org/pub/GNOME/sources/gcalctool/4.3/gcalctool-&gcalctool-version;.tar.bz2">
+<!ENTITY gcalctool-size "823 KB">
+<!ENTITY gcalctool-buildsize "12 MB">
+<!ENTITY gcalctool-time "0.15 SBU">
Index: gnome/add/gnome-netstatus.xml
===================================================================
--- gnome/add/gnome-netstatus.xml	(revision 4dc5fb39ed5a788372be74d1a2f7d44535a588e8)
+++ gnome/add/gnome-netstatus.xml	(revision 4dc5fb39ed5a788372be74d1a2f7d44535a588e8)
@@ -0,0 +1,10 @@
+<sect1 id="gnome-netstatus" xreflabel="GNOME Netstatus-&gnome-netstatus-version;">
+<?dbhtml filename="gnome-netstatus.html"?>
+<title>GNOME Netstatus-&gnome-netstatus-version;</title>
+
+&gnome-netstatus-intro;
+&gnome-netstatus-inst;
+&gnome-netstatus-exp;
+&gnome-netstatus-desc;
+
+</sect1>
Index: gnome/add/gnome-netstatus/gnome-netstatus-desc.xml
===================================================================
--- gnome/add/gnome-netstatus/gnome-netstatus-desc.xml	(revision 4dc5fb39ed5a788372be74d1a2f7d44535a588e8)
+++ gnome/add/gnome-netstatus/gnome-netstatus-desc.xml	(revision 4dc5fb39ed5a788372be74d1a2f7d44535a588e8)
@@ -0,0 +1,15 @@
+<sect2>
+<title>Contents</title>
+
+<para>The <application><acronym>GNOME</acronym> Netstatus</application>
+package contains <command>gnome-netstatus-applet</command>.</para>
+
+</sect2>
+
+<sect2><title>Description</title>
+
+<sect3><title>gnome-netstatus-applet</title>
+<para><command>gnome-netstatus-applet</command> provides information
+about a network interface on your panel.</para></sect3>
+
+</sect2>
Index: gnome/add/gnome-netstatus/gnome-netstatus-exp.xml
===================================================================
--- gnome/add/gnome-netstatus/gnome-netstatus-exp.xml	(revision 4dc5fb39ed5a788372be74d1a2f7d44535a588e8)
+++ gnome/add/gnome-netstatus/gnome-netstatus-exp.xml	(revision 4dc5fb39ed5a788372be74d1a2f7d44535a588e8)
@@ -0,0 +1,18 @@
+<sect2>
+<title>Command explanations</title>
+
+<para><parameter>--libexecdir=`pkg-config --variable=prefix
+ORBit-2.0`/sbin</parameter>: This switch puts libexec files in
+<filename class="directory">$GNOME_PREFIX/sbin</filename> instead of
+<filename class="directory">$GNOME_PREFIX/libexec</filename>.</para>
+
+<para><parameter>--sysconfdir=/etc/gnome</parameter>: This switch puts
+configuration files in <filename class="directory">/etc/gnome</filename> instead of
+<filename class="directory">$GNOME_PREFIX/etc</filename>.</para>
+
+<para><parameter>--localstatedir=/var/lib</parameter>: This switch
+puts <application>ScrollKeeper</application> files in <filename
+class="directory">/var/lib/scrollkeeper</filename>
+instead of <filename class="directory">$GNOME_PREFIX/var/scrollkeeper</filename>.</para>
+
+</sect2>
Index: gnome/add/gnome-netstatus/gnome-netstatus-inst.xml
===================================================================
--- gnome/add/gnome-netstatus/gnome-netstatus-inst.xml	(revision 4dc5fb39ed5a788372be74d1a2f7d44535a588e8)
+++ gnome/add/gnome-netstatus/gnome-netstatus-inst.xml	(revision 4dc5fb39ed5a788372be74d1a2f7d44535a588e8)
@@ -0,0 +1,12 @@
+<sect2>
+<title>Installation of <application><acronym>GNOME</acronym> Netstatus</application></title>
+
+<para>Install <application><acronym>GNOME</acronym> Netstatus</application> by running the following commands:</para>
+
+<screen><userinput><command>./configure --prefix=`pkg-config --variable=prefix ORBit-2.0` \
+    --libexecdir=`pkg-config --variable=prefix ORBit-2.0`/sbin \
+    --sysconfdir=/etc/gnome --localstatedir=/var/lib &amp;&amp;
+make &amp;&amp;
+make install</command></userinput></screen>
+
+</sect2>
Index: gnome/add/gnome-netstatus/gnome-netstatus-intro.xml
===================================================================
--- gnome/add/gnome-netstatus/gnome-netstatus-intro.xml	(revision 4dc5fb39ed5a788372be74d1a2f7d44535a588e8)
+++ gnome/add/gnome-netstatus/gnome-netstatus-intro.xml	(revision 4dc5fb39ed5a788372be74d1a2f7d44535a588e8)
@@ -0,0 +1,32 @@
+<sect2>
+<title>Introduction to <application><acronym>GNOME</acronym> Netstatus</application></title>
+
+<para>
+The <application><acronym>GNOME</acronym> Netstatus</application>
+package contains a panel applet that monitors network interfaces. It provides
+indicators for ingoing and outgoing data, packets received and
+transmitted, and information about the network interface itself such as
+<acronym>IP</acronym> information and Ethernet address.
+</para>
+
+<sect3><title>Package information</title>
+<itemizedlist spacing='compact'>
+<listitem><para>Download (HTTP): <ulink
+url="&gnome-netstatus-download-http;"/></para></listitem>
+<listitem><para>Download (FTP): <ulink
+url="&gnome-netstatus-download-ftp;"/></para></listitem>
+<listitem><para>Download size: &gnome-netstatus-size;</para></listitem>
+<listitem><para>Estimated Disk space required:
+&gnome-netstatus-buildsize;</para></listitem>
+<listitem><para>Estimated build time:
+&gnome-netstatus-time;</para></listitem></itemizedlist>
+</sect3>
+                                                                                
+<sect3><title><application><acronym>GNOME</acronym> Netstatus</application> dependencies</title>
+<sect4><title>Required</title>
+<para>
+<xref linkend="gnome-panel"/>
+</para></sect4>
+</sect3>
+
+</sect2>
Index: gnome/add/gnome-netstatus/gnome-netstatus.ent
===================================================================
--- gnome/add/gnome-netstatus/gnome-netstatus.ent	(revision 4dc5fb39ed5a788372be74d1a2f7d44535a588e8)
+++ gnome/add/gnome-netstatus/gnome-netstatus.ent	(revision 4dc5fb39ed5a788372be74d1a2f7d44535a588e8)
@@ -0,0 +1,11 @@
+<!ENTITY gnome-netstatus SYSTEM "../gnome-netstatus.xml">
+<!ENTITY gnome-netstatus-intro SYSTEM "gnome-netstatus-intro.xml">
+<!ENTITY gnome-netstatus-inst SYSTEM "gnome-netstatus-inst.xml">
+<!ENTITY gnome-netstatus-exp SYSTEM "gnome-netstatus-exp.xml">
+<!ENTITY gnome-netstatus-desc SYSTEM "gnome-netstatus-desc.xml">
+<!ENTITY gnome-netstatus-version "2.6.1">
+<!ENTITY gnome-netstatus-download-http "http://ftp.gnome.org/pub/GNOME/sources/gnome-netstatus/2.6/gnome-netstatus-&gnome-netstatus-version;.tar.bz2">
+<!ENTITY gnome-netstatus-download-ftp "ftp://ftp.gnome.org/pub/GNOME/sources/gnome-netstatus/2.6/gnome-netstatus-&gnome-netstatus-version;.tar.bz2">
+<!ENTITY gnome-netstatus-size "418 KB">
+<!ENTITY gnome-netstatus-buildsize "6.1 MB">
+<!ENTITY gnome-netstatus-time "0.12 SBU">
Index: gnome/gnome.ent
===================================================================
--- gnome/gnome.ent	(revision f5a6f5e971c500b75ffe724a83093011a49ba017)
+++ gnome/gnome.ent	(revision 4dc5fb39ed5a788372be74d1a2f7d44535a588e8)
@@ -116,4 +116,8 @@
 <!ENTITY % nautilus-media SYSTEM "add/nautilus-media/nautilus-media.ent">
 %nautilus-media;
+<!ENTITY % gnome-netstatus SYSTEM "add/gnome-netstatus/gnome-netstatus.ent">
+%gnome-netstatus;
+<!ENTITY % gcalctool SYSTEM "add/gcalctool/gcalctool.ent">
+%gcalctool;
 
 <!ENTITY % linc SYSTEM "lib/linc/linc.ent">
Index: gnome/lib/gal/gal2.ent
===================================================================
--- gnome/lib/gal/gal2.ent	(revision f5a6f5e971c500b75ffe724a83093011a49ba017)
+++ gnome/lib/gal/gal2.ent	(revision 4dc5fb39ed5a788372be74d1a2f7d44535a588e8)
@@ -4,6 +4,6 @@
 <!ENTITY gal2-desc SYSTEM "gal2-desc.xml">
 <!ENTITY gal2-version "2.1.8">
-<!ENTITY gal2-download-http "http://ftp.gnome.org/pub/gnome/sources/gal/1.99/gal-&gal2-version;.tar.bz2">
-<!ENTITY gal2-download-ftp "ftp://ftp.gnome.org/pub/gnome/sources/gal/1.99/gal-&gal2-version;.tar.bz2">
+<!ENTITY gal2-download-http "http://ftp.gnome.org/pub/gnome/sources/gal/2.1/gal-&gal2-version;.tar.bz2">
+<!ENTITY gal2-download-ftp "ftp://ftp.gnome.org/pub/gnome/sources/gal/2.1/gal-&gal2-version;.tar.bz2">
 <!ENTITY gal2-size "1.1 KB">
 <!ENTITY gal2-buildsize "142 MB">
Index: introduction/welcome/changelog.xml
===================================================================
--- introduction/welcome/changelog.xml	(revision f5a6f5e971c500b75ffe724a83093011a49ba017)
+++ introduction/welcome/changelog.xml	(revision 4dc5fb39ed5a788372be74d1a2f7d44535a588e8)
@@ -11,4 +11,7 @@
 
 <itemizedlist>
+
+<listitem><para>May 8th, 2004 [igor]: Added GNOME Netstatus-2.6.1
+and gcalctool-4.3.51.</para></listitem>
 
 <listitem><para>May 8th, 2004 [igor]: Updated to GAL-2.1.8 and GNOME
