Index: general.ent
===================================================================
--- general.ent	(revision e8a29f699e1ed9c658b3c6f68a91b5f8878dcb36)
+++ general.ent	(revision 2bd903be5bfec3c1ce3ff8d13b734559bb7994cf)
@@ -430,5 +430,5 @@
 <!ENTITY libogg-version               "1.1.2">
 <!ENTITY libvorbis-version            "1.1.0">
-<!ENTITY nas-version                  "1.6">
+<!ENTITY nas-version                  "1.7">
 <!ENTITY libmpeg3-version             "1.5.4">
 <!ENTITY libmad-version               "0.15.1b">
Index: introduction/welcome/changelog.xml
===================================================================
--- introduction/welcome/changelog.xml	(revision e8a29f699e1ed9c658b3c6f68a91b5f8878dcb36)
+++ introduction/welcome/changelog.xml	(revision 2bd903be5bfec3c1ce3ff8d13b734559bb7994cf)
@@ -23,4 +23,7 @@
 <itemizedlist>
 
+<listitem><para>April 19th, 2005 [randy]: Updated to 
+NAS-1.7</para></listitem>
+
 <listitem><para>April 19th, 2005 [bdubbs]: Updated to qt-3.3.4; fixed
 some configuration problems with build method 1.</para></listitem>
@@ -28,7 +31,4 @@
 <listitem><para>April 18th, 2005 [randy]: Updated to shared-mime-info-0.16, 
 hicolor-icon-theme-0.8 and GnuPG-1.4.1.</para></listitem>
-
-<listitem><para>April 17th, 2005 [randy]: Updated to LessTif-0.94.4; added 
-an "Other Window Managers" section to Chapter 27".</para></listitem>
 
 <listitem><para>April 17th, 2005 [randy]: Updated to LessTif-0.94.4, 
Index: multimedia/libdriv/nas.xml
===================================================================
--- multimedia/libdriv/nas.xml	(revision e8a29f699e1ed9c658b3c6f68a91b5f8878dcb36)
+++ multimedia/libdriv/nas.xml	(revision 2bd903be5bfec3c1ce3ff8d13b734559bb7994cf)
@@ -6,8 +6,8 @@
   <!ENTITY nas-download-http "http://nas.codebrilliance.com/nas/nas-&nas-version;.src.tar.gz">
   <!ENTITY nas-download-ftp  "ftp://ftp.us.xemacs.org/pub/xemacs/aux/nas-&nas-version;.src.tar.gz">
-  <!ENTITY nas-md5sum        "08b54fbf3af8c2ffab39f6f84f2ab337">
-  <!ENTITY nas-size          "1.0 MB">
-  <!ENTITY nas-buildsize     "13 MB">
-  <!ENTITY nas-time          "0.30 SBU">
+  <!ENTITY nas-md5sum        "c9918e9c9c95d587a95b455bbabe3b49">
+  <!ENTITY nas-size          "1.2 MB">
+  <!ENTITY nas-buildsize     "17.1 MB">
+  <!ENTITY nas-time          "0.31 SBU">
 ]>
 
@@ -19,4 +19,6 @@
 <?dbhtml filename="nas.html"?>
 <title>NAS-&nas-version;</title>
+<indexterm zone="nas">
+<primary sortas="a-NAS">NAS</primary></indexterm>
 
 <sect2>
@@ -24,5 +26,9 @@
 
 <para>The Network Audio System is a network transparent, client/server audio
-transport system. It can be described as the audio equivalent of an
+transport system used to read , write and play audio files in many formats 
+including <filename>.au</filename>, <filename>.snd</filename>, 
+<filename>.voc</filename>, <filename>.wav</filename>, 
+<filename>.aiff</filename>, <filename>.aif</filename> and 
+<filename>.iff</filename>. It can be described as the audio equivalent of an 
 <application>X</application> server.</para>
 
@@ -62,9 +68,9 @@
 
 <screen><userinput><command>xmkmf &amp;&amp;
-make Makefiles &amp;&amp;
-make includes &amp;&amp;
-make depend &amp;&amp;
-make &amp;&amp;
-make install install.man</command></userinput></screen>
+make World</command></userinput></screen>
+
+<para>Now, as the root user:</para>
+
+<screen><userinput role='root'><command>make install install.man</command></userinput></screen>
 
 </sect2>
@@ -73,6 +79,7 @@
 <title>Command explanations</title>
 
-<para><command>xmkmf...</command>: These commands use the standard for 
-compiling <application>X</application> based applications.</para>
+<para><command>xmkmf</command>; <command>make World</command>: These commands 
+use the standard for compiling <application>X</application> based 
+applications.</para>
 
 </sect2>
@@ -81,22 +88,26 @@
 <title>Configuring <acronym>NAS</acronym></title>
 
-<sect3><title>Configuring <application>NAS</application></title>
-
-<sect4><title>Config Files</title>
+<sect3 id="nas-config"><title>Config files</title>
 <para><filename>/etc/nas/nasd.conf</filename></para>
-</sect4>
-
-<sect4><title>Configuration Information</title>
+<indexterm zone="nas nas-config">
+<primary sortas="e-etc-nas-nasd.conf">/etc/nas/nasd.conf</primary></indexterm>
+</sect3>
+
+<sect3><title>Configuration information</title>
 <para>Create the <application>NAS</application> configuration file using the
 following command:</para>
 
-<screen><userinput><command>cp /etc/nas/nasd.conf.eg /etc/nas/nasd.conf</command></userinput></screen>
+<screen><userinput><command>install -v -m644 /etc/nas/nasd.conf.eg /etc/nas/nasd.conf</command></userinput></screen>
 
 <para>Edit the new configuration file to suit your network and system 
 needs.</para>
-
+</sect3>
+
+<sect3 id="nas-init"><title>Boot script</title>
 <para>Install the <filename>/etc/rc.d/init.d/nas</filename> init script
 included in the <xref linkend="intro-important-bootscripts"/>
 package.</para>
+<indexterm zone="nas nas-init">
+<primary sortas="f-nas">nas</primary></indexterm>
 
 <screen><userinput><command>make install-nas</command></userinput></screen>
@@ -105,5 +116,4 @@
 the network. Review the <command>nasd</command> man page for other available
 parameters if you need to modify the script.</para>
-</sect4>
 </sect3>
 
@@ -113,50 +123,82 @@
 <title>Contents</title>
 
-<para>The <application><acronym>NAS</acronym></application> package contains 
-<command>auconvert</command>, <command>auctl</command>, 
-<command>audemo</command>, <command>audial</command>, 
-<command>auedit</command>, <command>auinfo</command>, 
-<command>aupanel</command>, <command>auplay</command>, 
-<command>aurecord</command>, <command>auscope</command>, 
-<command>autool</command>, <command>auwave</command>, 
-<command>auphone</command>, <command>checkmail</command>, 
-<command>nasd</command>, <command>issndfile</command>, 
-<command>playbucket</command>, <command>soundtoh</command> and the
-<filename class='libraryfile'>libaudio</filename> libraries.</para>
-
-</sect2>
-
-<sect2>
-<title>Description</title>
-
-<sect3><title>au{utilities}</title>
-<para>The <command>au{utilities}</command> are a collection of tools to 
-convert, play, edit, record, and manipulate sound files. See the respective 
-man page for each utility for a full description.</para>
-</sect3>
-
-<sect3><title>checkmail</title>
-<para><command>checkmail</command> plays a sound file when the user receives 
-mail.</para>
-</sect3>
-
-<sect3><title>nasd</title>
-<para><command>nasd</command> is the Network Audio System server daemon.</para>
-</sect3>
-
-<sect3><title>issndfile</title>
-<para><command>issndfile</command> checks if a file is in a recognized audio 
-file format.</para>
-</sect3>
-
-<sect3><title>playbucket</title>
-<para><command>playbucket</command> plays, or creates, the bucket 
-corresponding to the specified file.</para>
-</sect3>
-
-<sect3><title>soundtoh</title>
-<para><command>soundtoh</command> converts a sound file to a C language header 
-file.</para>
-</sect3>
+<segmentedlist>
+<segtitle>Installed Programs</segtitle>
+<segtitle>Installed Library</segtitle>
+<segtitle>Installed Directory</segtitle>
+
+<seglistitem>
+<seg>auconvert, auctl, audemo, audial, auedit, auinfo, aupanel, auphone, 
+auplay, aurecord, auscope, autool, auwave, checkmail, issndfile, nasd, 
+playbucket and soundtoh</seg>
+<seg>libaudio.[so,a]</seg>
+<seg>/etc/nas and /usr/X11R6/include/audio</seg>
+</seglistitem>
+</segmentedlist>
+
+<variablelist>
+<bridgehead renderas="sect3">Short Descriptions</bridgehead>
+<?dbfo list-presentation="list"?>
+
+<varlistentry id="au-utilities">
+<term><command>au[utilities]</command></term>
+<listitem><para>are a collection of tools to convert, play, edit, record, 
+and manipulate sound files. See the respective man page for each utility 
+for a full description of each one.</para>
+<indexterm zone="nas au-utilities">
+<primary sortas="b-au-utilities">au[utilities]</primary>
+</indexterm></listitem>
+</varlistentry>
+
+<varlistentry id="checkmail">
+<term><command>checkmail</command></term>
+<listitem><para>plays a sound file when the user receives mail.</para>
+<indexterm zone="nas checkmail">
+<primary sortas="b-checkmail">checkmail</primary>
+</indexterm></listitem>
+</varlistentry>
+
+<varlistentry id="issndfile">
+<term><command>issndfile</command></term>
+<listitem><para>checks if a file is in a recognized audio file format.</para>
+<indexterm zone="nas issndfile">
+<primary sortas="b-issndfile">issndfile</primary>
+</indexterm></listitem>
+</varlistentry>
+
+<varlistentry id="nasd">
+<term><command>nasd</command></term>
+<listitem><para>is the Network Audio System server daemon.</para>
+<indexterm zone="nas nasd">
+<primary sortas="b-nasd">nasd</primary>
+</indexterm></listitem>
+</varlistentry>
+
+<varlistentry id="playbucket">
+<term><command>playbucket</command></term>
+<listitem><para>plays, or creates, the bucket corresponding to the 
+specified file.</para>
+<indexterm zone="nas playbucket">
+<primary sortas="b-playbucket">playbucket</primary>
+</indexterm></listitem>
+</varlistentry>
+
+<varlistentry id="soundtoh">
+<term><command>soundtoh</command></term>
+<listitem><para>converts a sound file to a C language header file.</para>
+<indexterm zone="nas soundtoh">
+<primary sortas="b-soundtoh">soundtoh</primary>
+</indexterm></listitem>
+</varlistentry>
+
+<varlistentry id="libaudio">
+<term><filename class='libraryfile'>libaudio.[so,a]</filename></term>
+<listitem><para>contains API functions to read and write audio files.</para>
+<indexterm zone="nas libaudio">
+<primary sortas="c-libaudio">libaudio.[so,a]</primary>
+</indexterm></listitem>
+</varlistentry>
+
+</variablelist>
 
 </sect2>
