Index: introduction/welcome/changelog.xml
===================================================================
--- introduction/welcome/changelog.xml	(revision 15d7ac6bad199862c23ec22490caad4c498e787c)
+++ introduction/welcome/changelog.xml	(revision e61e34e290e7df2ded7e0e557e539a4ba5cb24dd)
@@ -10,4 +10,8 @@
 
 <itemizedlist>
+
+<listitem><para>September 28th, 2002 [larry]: Server: Billy expanded
+instuctions to include xinetd for samba and qmail. General: added extra
+installation for gdbm (Apache) and edited libfam.</para></listitem>
 
 <listitem><para>September 28th, 2002 [larry]: Basicnet: updated to
Index: multimedia/cdwriteutils/cdwriteutils.xml
===================================================================
--- multimedia/cdwriteutils/cdwriteutils.xml	(revision 15d7ac6bad199862c23ec22490caad4c498e787c)
+++ multimedia/cdwriteutils/cdwriteutils.xml	(revision e61e34e290e7df2ded7e0e557e539a4ba5cb24dd)
@@ -18,4 +18,7 @@
 FAQ</ulink></para></listitem>
 
+<listitem><para><ulink
+url="http://www.mandrakeuser.org/docs/utils/uiso.html">Handling CD-Images</ulink></para></listitem>
+
 </itemizedlist>
 
Index: server/mail/qmail/qmail-config.xml
===================================================================
--- server/mail/qmail/qmail-config.xml	(revision 15d7ac6bad199862c23ec22490caad4c498e787c)
+++ server/mail/qmail/qmail-config.xml	(revision e61e34e290e7df2ded7e0e557e539a4ba5cb24dd)
@@ -8,7 +8,32 @@
 <sect3><title>Configuration Information</title>
 
+<para>If inetd is used, the following command will add the qmaild
+entry to <filename>/etc/inetd.conf</filename>: </para>
+
 <para><screen><userinput>
 echo "smtp stream tcp nowait qmaild /var/qmail/bin/tcp-env \
 tcp-env /var/qmail/bin/qmail-smtpd" >> /etc/inetd.conf
+</userinput></screen></para>
+
+<para>If xinetd is used, the following command will add the qmaild
+entry to <filename>/etc/xinetd.conf</filename>: </para>
+
+<para><screen><userinput>
+cat &gt;&gt; /etc/xinetd.conf &lt;&lt; "EOF"
+service smtp
+{
+    disable = no
+    identifier              = smtp-local
+    socket_type             = stream
+    protocol                = tcp
+    wait                    = no
+    user                    = qmaild
+    server                  = /var/qmail/bin/tcp-env
+    server_args             = /var/qmail/bin/qmail-smtpd
+    env                     = RELAYCLIENT=
+    only_from               = 127.0.0.1
+    log_on_failture         += USERID
+}
+EOF     
 </userinput></screen></para>
 
Index: server/other/samba/samba-config.xml
===================================================================
--- server/other/samba/samba-config.xml	(revision 15d7ac6bad199862c23ec22490caad4c498e787c)
+++ server/other/samba/samba-config.xml	(revision e61e34e290e7df2ded7e0e557e539a4ba5cb24dd)
@@ -184,4 +184,35 @@
 </userinput></screen></para>
 
+<para>Add the swat entry to <filename>/etc/services</filename>with the
+following command: </para>
+
+<para><screen><userinput>
+echo "swat            901/tcp" &gt;&gt; /etc/services
+</userinput></screen></para>
+
+<para>If inetd is used, the following command will add the swat entry
+to <filename>/etc/inetd.conf</filename>: </para>
+<para><screen><userinput>
+echo "swat stream tcp nowait.400 root /usr/sbin/swat swat" \
+    &gt;&gt; /etc/inetd.conf
+</userinput></screen></para>
+
+<para>If xinetd is used, the following command will add the swat entry
+to <filename>/etc/xinetd.conf</filename>: </para>
+<para><screen><userinput>
+cat &gt;&gt; /etc/xinetd.conf &lt;&lt; "EOF"
+service swat
+{
+    port            = 901
+    socket_type     = stream
+    wait            = no
+    only_from       = 127.0.0.1
+    user            = root
+    server          = /usr/sbin/swat
+    log_on_failure  += USERID
+}
+EOF
+</userinput></screen></para>
+
 <para>The Samba Web Administration Tool, swat, can be launched with the
 following command on SAMBABOX: </para>
Index: server/other/samba/samba-inst.xml
===================================================================
--- server/other/samba/samba-inst.xml	(revision 15d7ac6bad199862c23ec22490caad4c498e787c)
+++ server/other/samba/samba-inst.xml	(revision e61e34e290e7df2ded7e0e557e539a4ba5cb24dd)
@@ -24,7 +24,4 @@
 mkdir /etc/samba &amp;&amp;
 mkdir /etc/samba/private &amp;&amp;
-echo "swat            901/tcp" &gt;&gt; /etc/services &amp;&amp;
-echo "swat stream tcp nowait.400 root /usr/sbin/swat swat" \
-    &gt;&gt; /etc/inetd.conf
 </userinput></screen></para>
 </sect2>
