Index: general/genlib/fam.xml
===================================================================
--- general/genlib/fam.xml	(revision d227be5207610f43bab2ce074f804be50907ee2c)
+++ general/genlib/fam.xml	(revision 1f672c11335fde1e7968987cd35484d0ff9e7092)
@@ -116,10 +116,13 @@
     &gt;&gt; /etc/inetd.conf</command></userinput></screen>
 
-<para>If you use <application>xinetd</application>, add an entry to
-<filename>/etc/xinetd.conf</filename> with the following command (be
-sure the "nogroup" group exists):</para>
+<para>If you use <application>xinetd</application>, the following command will create 
+the <application><acronym>FAM</acronym></application> file as 
+<filename>/etc/xinetd.d/sgi_fam</filename>: 
+(be sure the "nogroup" group exists):</para>
 
-<screen><userinput><command>cat &gt;&gt; /etc/xinetd.conf &lt;&lt; "EOF"</command>
-    # description: FAM - file alteration monitor
+<screen><userinput><command>cat &gt;&gt; /etc/xinetd.d/sgi_fam &lt;&lt; "EOF"</command>
+# Begin /etc/xinetd.d/sgi_fam
+
+# description: FAM - file alteration monitor
     service sgi_fam
     {
@@ -134,4 +137,6 @@
         rpc_number      = 391002
     }
+
+# End /etc/xinetd.d/sgi_fam
 <command>EOF</command></userinput></screen>
 
Index: introduction/welcome/changelog.xml
===================================================================
--- introduction/welcome/changelog.xml	(revision d227be5207610f43bab2ce074f804be50907ee2c)
+++ introduction/welcome/changelog.xml	(revision 1f672c11335fde1e7968987cd35484d0ff9e7092)
@@ -22,4 +22,8 @@
 
 <itemizedlist>
+
+<listitem><para>March 31st, 2005 [bdubbs]: Updated the install instructions
+for xinetd to use /etc/xinetd.d/ directory structure. Patch by John Gnew.
+</para></listitem>
 
 <listitem><para>March 31st, 2005 [randy]: Updated to libxml2-2.6.18 and 
Index: server/mail/qpopper.xml
===================================================================
--- server/mail/qpopper.xml	(revision d227be5207610f43bab2ce074f804be50907ee2c)
+++ server/mail/qpopper.xml	(revision 1f672c11335fde1e7968987cd35484d0ff9e7092)
@@ -101,11 +101,12 @@
 <filename>inetd.conf</filename> file.</para>
 
-<para>If you use <command>xinetd</command>, the following command will add the 
-<application>Qpopper</application> entry to 
-<filename>/etc/xinetd.conf</filename>:</para>
+<para>If you use <command>xinetd</command>, the following command will create the 
+<application>Qpopper</application> file as <filename>/etc/xinetd.d/pop3</filename>:</para>
 <indexterm zone="qpopper qpopper-config">
-<primary sortas="e-etc-xinetd.conf">/etc/xinetd.conf</primary></indexterm>
+<primary sortas="e-etc-xinetd.conf">/etc/xinetd.d/pop3</primary></indexterm>
 
-<screen><userinput><command>cat &gt;&gt; /etc/xinetd.conf &lt;&lt; "EOF"</command>
+<screen><userinput><command>cat &gt;&gt; /etc/xinetd.d/pop3 &lt;&lt; "EOF"</command>
+# Begin /etc/xinetd.d/pop3
+
 service pop3
 {
@@ -117,4 +118,6 @@
     server          = /usr/sbin/popper
 }
+
+# End /etc/xinetd.d/pop3
 <command>EOF</command></userinput></screen>
 
Index: server/other/cvsserver.xml
===================================================================
--- server/other/cvsserver.xml	(revision d227be5207610f43bab2ce074f804be50907ee2c)
+++ server/other/cvsserver.xml	(revision 1f672c11335fde1e7968987cd35484d0ff9e7092)
@@ -89,5 +89,5 @@
 
 <para>If you use <command>inetd</command>, the following command will add the 
-pserver entry to <filename>/etc/inetd.conf</filename>:</para>
+<application><acronym>CVS</acronym></application> entry to <filename>/etc/inetd.conf</filename>:</para>
 
 <screen><userinput><command>echo "2401  stream  tcp  nowait  root  /usr/bin/cvs cvs -f \
@@ -97,8 +97,10 @@
 <filename>inetd.conf</filename> file.</para>
 
-<para>If you use <command>xinetd</command>, the following command will add the 
-pserver entry to <filename>/etc/xinetd.conf</filename>:</para>
+<para>If you use <command>xinetd</command>, the following command will create the 
+<acronym>CVS</acronym> file as <filename>/etc/xinetd.d/cvspserver</filename>:</para>
 
-<screen><userinput><command>cat &gt;&gt; /etc/xinetd.conf &lt;&lt; "EOF"</command>
+<screen><userinput><command>cat &gt;&gt; /etc/xinetd.d/cvspserver &lt;&lt; "EOF"</command>
+# Begin /etc/xinetd.d/cvspserver
+
      service cvspserver
      {
@@ -112,4 +114,6 @@
           server_args = -f --allow-root=/srv/cvsroot pserver
      }
+
+# End /etc/xinetd.d/cvspserver
 <command>EOF</command></userinput></screen>
 <para>Issue a <command>/etc/rc.d/init.d/xinetd reload</command> to reread the changed
Index: server/other/leafnode.xml
===================================================================
--- server/other/leafnode.xml	(revision d227be5207610f43bab2ce074f804be50907ee2c)
+++ server/other/leafnode.xml	(revision 1f672c11335fde1e7968987cd35484d0ff9e7092)
@@ -160,9 +160,10 @@
 changed <filename>inetd.conf</filename> file.</para>
 
-<para>Alternatively, <application>Leafnode</application> may be configured to 
-use <command>xinetd</command> by adding an entry to the 
-<filename>/etc/xinetd.conf</filename> file with the following command:</para>
-
-<screen><userinput><command>cat &gt;&gt; /etc/xinetd.conf &lt;&lt; "EOF"</command>
+<para>If you use <command>xinetd</command>, the following command will create the 
+<application>Leafnode</application> file as <filename>/etc/xinetd.d/nntp</filename>:</para>
+
+<screen><userinput><command>cat &gt;&gt; /etc/xinetd.d/nntp &lt;&lt; "EOF"</command>
+# Begin /etc/xinetd.d/nntp
+
         service nntp
         {
@@ -177,4 +178,6 @@
            per_source      = 3
         }
+
+# End /etc/xinetd.d/nntp
 <command>EOF</command></userinput></screen>
 
Index: server/other/samba3.xml
===================================================================
--- server/other/samba3.xml	(revision d227be5207610f43bab2ce074f804be50907ee2c)
+++ server/other/samba3.xml	(revision 1f672c11335fde1e7968987cd35484d0ff9e7092)
@@ -250,10 +250,12 @@
 changed <filename>inetd.conf</filename> file.</para>
 
-<para>If <command>xinetd</command> is used, the following command issued as 
-the root user will add the swat_tunnel entry to 
-<filename>/etc/xinetd.conf</filename> (you may need to modify or remove the 
+<para>If you use <command>xinetd</command>, the following command will create the 
+<application>Samba</application> file as <filename>/etc/xinetd.d/swat_tunnel</filename>: 
+(you may need to modify or remove the 
 <quote>only_from</quote> line to include the desired host[s]):</para>
 
-<screen><userinput role='root'><command>cat &gt;&gt; /etc/xinetd.conf &lt;&lt; "EOF"</command>
+<screen><userinput role='root'><command>cat &gt;&gt; /etc/xinetd.d/swat_tunnel &lt;&lt; "EOF"</command>
+# Begin /etc/xinetd.d/swat_tunnel
+
 service swat_tunnel
 {
@@ -266,4 +268,6 @@
     log_on_failure  += USERID
 }
+
+# End /etc/xinetd.d/swat_tunnel
 <command>EOF</command></userinput></screen>
 
Index: server/other/svnserver.xml
===================================================================
--- server/other/svnserver.xml	(revision d227be5207610f43bab2ce074f804be50907ee2c)
+++ server/other/svnserver.xml	(revision 1f672c11335fde1e7968987cd35484d0ff9e7092)
@@ -204,8 +204,10 @@
 <command>EOF</command></userinput></screen>
 
-<para>If you use <command>xinetd</command>, add the following
-lines to the <filename>/etc/xinetd.conf</filename> file:</para>
-
-<screen><userinput><command>cat &gt;&gt; /etc/xinetd.conf &lt;&lt; "EOF"</command>
+<para>If you use <command>xinetd</command>, the following command will create the 
+<application>Subversion server</application> file as <filename>/etc/xinetd.d/svn</filename>:</para>
+
+<screen><userinput><command>cat &gt;&gt; /etc/xinetd.d/svn &lt;&lt; "EOF"</command>
+# Begin /etc/xinetd.d/svn
+
 service svn
 {
@@ -218,4 +220,6 @@
         server_args             = -i -r /srv/svn/repositories
 }
+
+# End /etc/xinetd.d/svn
 <command>EOF</command></userinput></screen>
 
Index: server/other/xinetd.xml
===================================================================
--- server/other/xinetd.xml	(revision d227be5207610f43bab2ce074f804be50907ee2c)
+++ server/other/xinetd.xml	(revision 1f672c11335fde1e7968987cd35484d0ff9e7092)
@@ -80,8 +80,452 @@
 <filename class="directory">/usr/sbin</filename>, rather than the default path 
 of <filename class="directory">/usr/etc</filename>, and install the 
-<application>xinetd</application> configuration file by running the following
-command as the root user:</para>
-
-<screen><userinput role='root'><command>sed -e 's/etc/sbin/g' xinetd/sample.conf &gt; /etc/xinetd.conf</command>
+<application>xinetd</application> configuration files by running the following
+commands as the root user:</para>
+
+<screen><userinput role='root'><command>cat &gt; /etc/xinetd.conf &lt;&lt; "EOF"</command>
+# Begin /etc/xinetd
+# Configuration file for xinetd
+#
+
+defaults
+{
+      instances       = 60
+      log_type        = SYSLOG daemon
+      log_on_success  = HOST PID USERID
+      log_on_failure  = HOST USERID
+      cps             = 25 30
+}
+
+# All service files are stored in the /etc/xinetd.d directory
+#
+includedir /etc/xinetd.d
+# End /etc/xinetd
+<command>EOF</command></userinput></screen>
+<para>All of the following files have the statement, "disable = yes". To activate 
+any of the services, this statement will need to be changed to "disable = no".</para>
+
+<note><para>The following files are listed to demonstrate classic
+<application>xinetd</application> applications.  In many cases, these
+applications are not needed.  In some cases, the applications are 
+considered security risks.  For example, telnet, rlogin, rexec, and rsh
+transmit unencrypted usernames and passwords over the network and can be easily
+replaced with a more secure alternative: ssh.</para></note>
+
+<screen><userinput role='root'><command>install -d -m755 /etc/xinetd.d &amp;&amp;</command>
+<command>cat &gt; /etc/xinetd.d/login &lt;&lt; "EOF" &amp;&amp;</command>
+# Begin /etc/xinetd.d/login
+
+service login
+{
+   disable        = yes
+   socket_type    = stream
+   protocol       = tcp
+   wait           = no
+   user           = root
+   server         = /usr/sbin/in.rlogind
+   log_type       = SYSLOG local4 info
+}
+
+# End /etc/xinetd.d/login
+<command>EOF
+cat &gt; /etc/xinetd.d/shell &lt;&lt; "EOF" &amp;&amp;</command>
+# Begin /etc/xinetd.d/shell
+
+service shell
+{
+   disable        = yes
+   socket_type    = stream
+   wait           = no
+   user           = root
+   instances      = UNLIMITED
+   flags          = IDONLY
+   log_on_success += USERID
+   server         = /usr/sbin/in.rshd
+}
+
+# End /etc/xinetd.d/shell
+<command>EOF
+cat &gt; /etc/xinetd.d/exec &lt;&lt; "EOF" &amp;&amp;</command>
+# Begin /etc/xinetd.d/exec
+
+service exec
+{
+   disable        = yes
+   socket_type    = stream
+   wait           = no
+   user           = root
+   server         = /usr/sbin/in.rexecd
+}
+
+# End /etc/xinetd.d/exec
+<command>EOF
+cat &gt; /etc/xinetd.d/comsat &lt;&lt; "EOF" &amp;&amp;</command>
+# Begin /etc/xinetd.d/comsat
+
+service comsat
+{
+   disable        = yes
+   socket_type    = dgram
+   wait           = yes
+   user           = nobody
+   group          = tty
+   server         = /usr/sbin/in.comsat
+}
+
+# End /etc/xinetd.d/comsat
+<command>EOF
+cat &gt; /etc/xinetd.d/talk &lt;&lt; "EOF" &amp;&amp;</command>
+# Begin /etc/xinetd.d/talk
+
+service talk
+{
+   disable        = yes
+   socket_type    = dgram
+   wait           = yes
+   user           = root
+   server         = /usr/sbin/in.talkd
+}
+
+# End /etc/xinetd.d/talk
+<command>EOF
+cat &gt; /etc/xinetd.d/ntalk &lt;&lt; "EOF" &amp;&amp;</command>
+# Begin /etc/xinetd.d/ntalk
+
+service ntalk
+{
+   disable        = yes
+   socket_type    = dgram
+   wait           = yes
+   user           = root
+   server         = /usr/sbin/in.ntalkd
+}
+
+# End /etc/xinetd.d/ntalk
+<command>EOF
+cat &gt; /etc/xinetd.d/telnet &lt;&lt; "EOF" &amp;&amp;</command>
+# Begin /etc/xinetd.d/telnet
+
+service telnet
+{
+   disable        = yes
+   socket_type    = stream	
+   wait           = no
+   user           = root
+   server         = /usr/sbin/in.telnetd
+   bind           = 127.0.0.1
+   log_on_failure += USERID
+}
+
+service telnet
+{
+   disable        = yes
+   socket_type    = stream	
+   wait           = no
+   user           = root
+#  server         = /usr/sbin/in.telnetd
+   bind           = 192.231.139.175
+   redirect       = 128.138.202.20 23
+   log_on_failure += USERID
+}
+
+# End /etc/xinetd.d/telnet
+<command>EOF
+cat &gt; /etc/xinetd.d/ftp &lt;&lt; "EOF" &amp;&amp;</command>
+# Begin /etc/xinetd.d/ftp
+
+service ftp
+{
+   disable        = yes
+   socket_type    = stream
+   wait           = no
+   user           = root
+   server         = /usr/sbin/in.ftpd
+   server_args    = -l
+   instances      = 4
+   log_on_success += DURATION USERID
+   log_on_failure += USERID
+   access_times   = 2:00-8:59 12:00-23:59
+   nice           = 10
+}
+
+# End /etc/xinetd.d/ftp
+<command>EOF
+cat &gt; /etc/xinetd.d/tftp &lt;&lt; "EOF" &amp;&amp;</command>
+# Begin /etc/xinetd.d/tftp
+
+service tftp
+{
+   disable        = yes
+   socket_type    = dgram
+   wait           = yes
+   user           = root
+   server         = /usr/sbin/in.tftpd
+   server_args    = -s /tftpboot
+}
+
+# End /etc/xinetd.d/tftp
+<command>EOF
+cat &gt; /etc/xinetd.d/finger &lt;&lt; "EOF" &amp;&amp;</command>
+# Begin /etc/xinetd.d/finger
+
+service finger
+{
+   disable        = yes
+   socket_type    = stream
+   wait           = no
+   user           = nobody
+   server         = /usr/sbin/in.fingerd
+}
+
+# End /etc/xinetd.d/finger
+<command>EOF
+cat &gt; /etc/xinetd.d/systat &lt;&lt; "EOF" &amp;&amp;</command>
+# Begin /etc/xinetd.d/systat
+
+service systat
+{
+   disable           = yes
+   socket_type       = stream
+   wait              = no
+   user              = nobody
+   server            = /usr/bin/ps
+   server_args       = -auwwx
+   only_from         = 128.138.209.0
+   log_on_success    = HOST
+}
+
+# End /etc/xinetd.d/systat
+<command>EOF
+cat &gt; /etc/xinetd.d/netstat &lt;&lt; "EOF" &amp;&amp;</command>
+# Begin /etc/xinetd.d/netstat
+
+service netstat
+{
+   disable           = yes
+   socket_type       = stream
+   wait              = no
+   user              = nobody
+   server            = /usr/ucb/netstat
+   server_args       = -f inet
+   only_from         = 128.138.209.0
+   log_on_success    = HOST
+}
+
+# End /etc/xinetd.d/netstat
+<command>EOF
+cat &gt; /etc/xinetd.d/echo &lt;&lt; "EOF" &amp;&amp;</command>
+# Begin /etc/xinetd.d/echo
+
+service echo
+{
+   disable     = yes
+   type        = INTERNAL
+   id          = echo-stream
+   socket_type = stream
+   protocol    = tcp
+   user        = root
+   wait        = no
+}
+
+service echo
+{
+   disable     = yes
+   type        = INTERNAL
+   id          = echo-dgram
+   socket_type = dgram
+   protocol    = udp
+   user        = root
+   wait        = yes
+}
+
+# End /etc/xinetd.d/echo
+<command>EOF
+cat &gt; /etc/xinetd.d/chargen &lt;&lt; "EOF" &amp;&amp;</command>
+# Begin /etc/xinetd.d/chargen
+
+service chargen
+{
+   disable        = yes
+   type           = INTERNAL
+   id             = chargen-stream
+   socket_type    = stream
+   protocol       = tcp
+   user           = root
+   wait           = no
+}
+
+service chargen
+{
+   disable        = yes
+   type           = INTERNAL
+   id             = chargen-dgram
+   socket_type    = dgram
+   protocol       = udp
+   user           = root
+   wait           = yes
+}
+
+# End /etc/xinetd.d/chargen
+<command>EOF
+cat &gt; /etc/xinetd.d/daytime &lt;&lt; "EOF" &amp;&amp;</command>
+# Begin /etc/xinetd.d/daytime
+
+service daytime
+{
+   disable        = yes
+   type           = INTERNAL
+   id             = daytime-stream
+   socket_type    = stream
+   protocol       = tcp
+   user           = root
+   wait           = no
+}
+
+service daytime
+{
+   disable        = yes
+   type           = INTERNAL
+   id             = daytime-dgram
+   socket_type    = dgram
+   protocol       = udp
+   user           = root
+   wait           = yes
+}
+
+# End /etc/xinetd.d/daytime
+<command>EOF
+cat &gt; /etc/xinetd.d/time &lt;&lt; "EOF" &amp;&amp;</command>
+# Begin /etc/xinetd.d/time
+
+service time
+{
+   disable        = yes
+   type           = INTERNAL
+   id             = time-stream
+   socket_type    = stream
+   protocol       = tcp
+   user           = root
+   wait           = no
+}
+
+
+service time
+{
+   disable        = yes
+   type           = INTERNAL
+   id             = time-dgram
+   socket_type    = dgram
+   protocol       = udp
+   user           = root
+   wait           = yes
+}
+
+# End /etc/xinetd.d/time
+<command>EOF
+cat &gt; /etc/xinetd.d/rstatd &lt;&lt; "EOF" &amp;&amp;</command>
+# Begin /etc/xinetd.d/rstatd
+
+ervice rstatd
+{
+   disable     = yes
+   type        = RPC
+   flags       = INTERCEPT
+   rpc_version = 2-4
+   socket_type = dgram
+   protocol    = udp
+   server      = /usr/sbin/rpc.rstatd
+   wait        = yes
+   user        = root
+}
+
+# End /etc/xinetd.d/rstatd
+<command>EOF
+cat &gt; /etc/xinetd.d/rquotad &lt;&lt; "EOF" &amp;&amp;</command>
+# Begin /etc/xinetd.d/rquotad
+
+service rquotad
+{
+   disable     = yes
+   type        = RPC
+   rpc_version = 1
+   socket_type = dgram
+   protocol    = udp
+   wait        = yes
+   user        = root
+   server      = /usr/sbin/rpc.rstatd
+}
+
+# End /etc/xinetd.d/rquotad
+<command>EOF
+cat &gt; /etc/xinetd.d/rusersd &lt;&lt; "EOF" &amp;&amp;</command>
+# Begin /etc/xinetd.d/rusersd
+
+service rusersd
+{
+   disable     = yes
+   type        = RPC
+   rpc_version = 1-2
+   socket_type = dgram
+   protocol    = udp
+   wait        = yes
+   user        = root
+   server      = /usr/sbin/rpc.rusersd
+}
+
+# End /etc/xinetd.d/rusersd
+<command>EOF
+cat &gt; /etc/xinetd.d/sprayd &lt;&lt; "EOF" &amp;&amp;</command>
+# Begin /etc/xinetd.d/sprayd
+
+service sprayd
+{
+   disable      = yes
+   type         = RPC
+   rpc_version  = 1
+   socket_type  = dgram
+   protocol     = udp
+   wait         = yes
+   user         = root
+   server       = /usr/sbin/rpc.sprayd
+}
+
+# End /etc/xinetd.d/sprayd
+<command>EOF
+cat &gt; /etc/xinetd.d/walld &lt;&lt; "EOF" &amp;&amp;</command>
+# Begin /etc/xinetd.d/walld
+
+service walld
+{
+   disable      = yes
+   type         = RPC
+   rpc_version  = 1
+   socket_type  = dgram
+   protocol     = udp
+   wait         = yes
+   user         = nobody
+   group        = tty
+   server       = /usr/sbin/rpc.rwalld
+}
+
+# End /etc/xinetd.d/walld
+<command>EOF
+cat &gt; /etc/xinetd.d/irc &lt;&lt; "EOF"</command>
+# Begin /etc/xinetd.d/irc
+
+service irc
+{
+   disable      = yes
+   socket_type  = stream
+   wait         = no
+   user         = root
+   flags        = SENSOR
+   type         = INTERNAL
+   bind         = 192.168.1.30
+   deny_time    = 60
+}
+
+# End /etc/xinetd.d/irc
+<command>EOF</command>
+
 </userinput></screen>
 
