Index: general.ent
===================================================================
--- general.ent	(revision 1663c2b5e449ed4db95cfc1323a31f7103c1ec56)
+++ general.ent	(revision a8ecf657aab127ad66cf93adc5260ca27af9f991)
@@ -1,7 +1,7 @@
-<!ENTITY day          "31">                   <!-- Always 2 digits -->
-<!ENTITY month        "03">                   <!-- Always 2 digits -->
+<!ENTITY day          "02">                   <!-- Always 2 digits -->
+<!ENTITY month        "04">                   <!-- Always 2 digits -->
 <!ENTITY year         "2006">
 <!ENTITY version      "svn-&year;&month;&day;">
-<!ENTITY releasedate  "March &day;st, &year;">
+<!ENTITY releasedate  "April &day;nd, &year;">
 <!ENTITY pubdate      "&year;-&month;-&day;"> <!-- metadata req. by TLDP -->
 <!ENTITY blfs-version "svn">                  <!-- svn|[release #] -->
@@ -283,5 +283,5 @@
 <!ENTITY portmap-version              "5beta">
 <!ENTITY rsync-version                "2.6.6">
-<!ENTITY samba3-version               "3.0.20b">
+<!ENTITY samba3-version               "3.0.22">
 <!ENTITY subversion-version           "1.2.3">
 <!ENTITY tcpwrappers-version          "7.6">
Index: introduction/welcome/changelog.xml
===================================================================
--- introduction/welcome/changelog.xml	(revision 1663c2b5e449ed4db95cfc1323a31f7103c1ec56)
+++ introduction/welcome/changelog.xml	(revision a8ecf657aab127ad66cf93adc5260ca27af9f991)
@@ -43,4 +43,13 @@
 
     <listitem>
+      <para>April 2nd, 2006</para>
+      <itemizedlist>
+        <listitem>
+          <para>[name] - Updated to Samba-3.0.22.</para>
+        </listitem>
+      </itemizedlist>
+    </listitem>
+
+    <listitem>
       <para>March 31st, 2006</para>
       <itemizedlist>
Index: server/major/samba3.xml
===================================================================
--- server/major/samba3.xml	(revision 1663c2b5e449ed4db95cfc1323a31f7103c1ec56)
+++ server/major/samba3.xml	(revision a8ecf657aab127ad66cf93adc5260ca27af9f991)
@@ -5,10 +5,10 @@
   %general-entities;
 
-  <!ENTITY samba3-download-http "http://us1.samba.org/samba/ftp/samba-&samba3-version;.tar.gz">
+  <!ENTITY samba3-download-http "http://us1.samba.org/samba/ftp/stable/samba-&samba3-version;.tar.gz">
   <!ENTITY samba3-download-ftp  "ftp://ftp.samba.org/pub/samba/samba-&samba3-version;.tar.gz">
-  <!ENTITY samba3-md5sum        "39c0cae08fe0224cb003aa0af97d3050">
-  <!ENTITY samba3-size          "17.1 MB">
-  <!ENTITY samba3-buildsize     "177.4 MB">
-  <!ENTITY samba3-time          "2.5 SBU">
+  <!ENTITY samba3-md5sum        "5c39505af17cf5caf3d6ed8bab135036">
+  <!ENTITY samba3-size          "17.5 MB">
+  <!ENTITY samba3-buildsize     "199 MB">
+  <!ENTITY samba3-time          "2.8 SBU">
 ]>
 
@@ -64,4 +64,5 @@
     </itemizedlist>
 
+    <!--
     <bridgehead renderas="sect3">Additional Downloads</bridgehead>
     <itemizedlist spacing="compact">
@@ -72,4 +73,5 @@
       </listitem>
     </itemizedlist>
+    -->
 
     <bridgehead renderas="sect3">Samba Dependencies</bridgehead>
@@ -80,10 +82,16 @@
     <xref linkend="openldap"/>,
     <xref linkend="cups"/>,
-    <xref linkend="heimdal"/> or <xref linkend="mitkrb"/>,
-    <xref linkend="libxml2"/>,
+    <xref linkend="heimdal"/> or <xref linkend="mitkrb"/>, and
+    <xref linkend="python"/> (to build Samba API bindings for the
+    <application>Python</application> installation)</para>
+    <!-- only used for the test suite which is not really functional
+     and
+    <ulink url="http://valgrind.kde.org/">Valgrind</ulink></para> -->
+
+    <bridgehead renderas="sect4">Optional
+    (To Build Experimental passdb Libraries</bridgehead>
+    <para><xref linkend="libxml2"/>,
     <xref linkend="mysql"/>,
-    <xref linkend="postgresql"/>,
-    <xref linkend="python"/> and
-    <ulink url="http://valgrind.kde.org/">Valgrind</ulink></para>
+    <xref linkend="postgresql"/></para>
 
   </sect2>
@@ -92,4 +100,5 @@
     <title>Installation of Samba</title>
 
+    <!--
     <para>A <application>Samba</application> <filename>include.h</filename>
     header now does checks for C++ reserved names. The package will not build
@@ -100,4 +109,5 @@
 
 <screen><userinput>patch -Np1 -i ../samba-&samba3-version;-heimdal-1.patch</userinput></screen>
+    -->
 
     <para>Install <application>Samba</application> by running the following
@@ -111,5 +121,4 @@
 
 <screen><userinput>cd source &amp;&amp;
-sed -i "60s/lib\[2/lib[1/" python/setup.py &amp;&amp;
 ./configure \
     --prefix=/usr \
@@ -121,5 +130,5 @@
 make</userinput></screen>
 
-    <para>This package does not come with a test suite.</para>
+    <para>This package does not come with a functional test suite.</para>
 
     <para>Now, as the <systemitem class="username">root</systemitem> user:</para>
@@ -136,5 +145,5 @@
 ln -v -sf libsmbclient.so /usr/lib/libsmbclient.so.0 &amp;&amp;
 
-chmod -v 644 /usr/include/libsmbclient.h &amp;&amp;
+chmod -v 644 /usr/include/lib{smbclient,msrpc}.h &amp;&amp;
 
 install -v -m755 nsswitch/libnss_win{s,bind}.so /lib &amp;&amp;
@@ -150,5 +159,5 @@
 install -v -m755 -d /usr/share/doc/samba-&samba3-version; &amp;&amp;
 install -v -m644 ../docs/*.pdf /usr/share/doc/samba-&samba3-version; &amp;&amp;
-ln -v -s ../../samba/swat  /usr/share/doc/samba-3.0.20b</userinput></screen>
+ln -v -s ../../samba/swat  /usr/share/doc/samba-&samba3-version;</userinput></screen>
 
   <para>If you passed the <option>--with-python</option> option to the
@@ -163,10 +172,4 @@
   <sect2 role="commands">
     <title>Command Explanations</title>
-
-    <para><command>sed -i "60s/lib\[2/lib[1/" python/setup.py</command>:
-    This command is necessary to build the
-    <application>Python</application> extensions. The
-    <filename>setup.py</filename> file has a bug which causes the build to
-    crash. This command fixes the bug.</para>
 
     <para><parameter>--sysconfdir=/etc</parameter>: Sets the configuration
@@ -532,5 +535,6 @@
 <literal>[swat]
 accept  = 901
-connect = 902</literal>
+connect = 902
+TIMEOUTclose = 1</literal>
 
 EOF</userinput></screen>
@@ -679,15 +683,18 @@
       <segtitle>Installed Directories</segtitle>
 
+<!--newprogs: eventlogadm smbget-->
+
       <seglistitem>
-        <seg>findsmb, mount.smbfs, net, nmbd, nmblookup, ntlm_auth, pdbedit,
-        profiles, rpcclient, smbcacls, smbclient, smbcontrol, smbcquotas, smbd,
-        smbmnt, smbmount, smbpasswd, smbspool, smbstatus, smbtar, smbtree,
-        smbumount, swat, tdbbackup, tdbdump, tdbtool, testparm, testprns,
-        wbinfo, and winbindd</seg>
-        <seg>libnss_winbind.so, libnss_wins.so, libsmbclient.so, the
-        pam_winbind.so PAM library and assorted character set,
-        filesystem and support modules.</seg>
-        <seg>/etc/samba, /usr/lib/samba, /usr/share/samba, /var/cache/samba,
-        and /var/lib/samba</seg>
+        <seg>eventlogadm, findsmb, mount.smbfs, net, nmbd, nmblookup,
+        ntlm_auth, pdbedit, profiles, rpcclient, smbcacls, smbclient,
+        smbcontrol, smbcquotas, smbd, smbget, smbmnt, smbmount, smbpasswd,
+        smbspool, smbstatus, smbtar, smbtree, smbumount, swat, tdbbackup,
+        tdbdump, tdbtool, testparm, testprns, wbinfo, and winbindd</seg>
+        <seg>libnss_winbind.so, libnss_wins.so, libsmbclient.so, libmsrpc.so,
+        the pam_winbind.so PAM library and assorted character set, filesystem
+        and support modules.</seg>
+        <seg>/etc/samba, /usr/lib/python2.4/site-packages/samba,
+        /usr/lib/samba, /usr/share/doc/samba-&samba3-version;,
+        /usr/share/samba, /var/lib/samba and /var/log/samba</seg>
       </seglistitem>
     </segmentedlist>
@@ -697,4 +704,16 @@
       <?dbfo list-presentation="list"?>
       <?dbhtml list-presentation="table"?>
+
+      <varlistentry id="eventlogadm">
+        <term><command>eventlogadm</command></term>
+        <listitem>
+          <para>is used to write records to eventlogs from STDIN, add the
+          specified source and DLL eventlog registry entries and display the
+          active eventlog names (from <filename>smb.conf</filename>).</para>
+          <indexterm zone="samba3 eventlogadm">
+            <primary sortas="b-eventlogadm">eventlogadm</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
 
       <varlistentry id="findsmb">
@@ -847,4 +866,16 @@
           <indexterm zone="samba3 smbd">
             <primary sortas="b-smbd">smbd</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="smbget">
+        <term><command>smbget</command></term>
+        <listitem>
+          <para>is a simple utility with <command>wget</command>-like
+          semantics, that can download files from SMB servers. You can specify
+          the files you would like to download on the command-line.</para>
+          <indexterm zone="samba3 smbget">
+            <primary sortas="b-smbget">smbget</primary>
           </indexterm>
         </listitem>
