Index: basicnet/netutils/nmap/nmap-desc.xml
===================================================================
--- basicnet/netutils/nmap/nmap-desc.xml	(revision 028a29563f6c85580a4b5ffc031f98a001fa15a3)
+++ basicnet/netutils/nmap/nmap-desc.xml	(revision e0c7163b47daedb5d8c01b3492df796095d268cc)
@@ -2,5 +2,6 @@
 <title>Contents</title>
 
-<para>The nmap package contains <userinput>nmap</userinput>.</para>
+<para>The <application>nmap</application> package contains
+<command>nmap</command>.</para>
 
 </sect2>
@@ -9,7 +10,7 @@
 
 <sect3><title>nmap</title>
-<para>Nmap is a utility for network exploration and security auditing.
-It supports ping scanning, port scanning and TCP/IP
-fingerprinting.</para></sect3>
+<para><command>nmap</command> is a utility for network exploration and
+security auditing. It supports ping scanning, port scanning and
+<acronym>TCP</acronym>/<acronym>IP</acronym> fingerprinting.</para></sect3>
 
 </sect2>
Index: basicnet/netutils/nmap/nmap-inst.xml
===================================================================
--- basicnet/netutils/nmap/nmap-inst.xml	(revision 028a29563f6c85580a4b5ffc031f98a001fa15a3)
+++ basicnet/netutils/nmap/nmap-inst.xml	(revision e0c7163b47daedb5d8c01b3492df796095d268cc)
@@ -1,10 +1,10 @@
 <sect2>
-<title>Installation of nmap</title>
+<title>Installation of <application>nmap</application></title>
 
-<para>Install nmap by running the following commands:</para>
+<para>Install <application>nmap</application> by running the following commands:</para>
 
-<para><screen><userinput>./configure --prefix=/usr &amp;&amp;
+<para><screen><userinput><command>./configure --prefix=/usr &amp;&amp;
 make &amp;&amp;
-make install</userinput></screen></para>
+make install</command></userinput></screen></para>
 
 </sect2>
Index: basicnet/netutils/nmap/nmap-intro.xml
===================================================================
--- basicnet/netutils/nmap/nmap-intro.xml	(revision 028a29563f6c85580a4b5ffc031f98a001fa15a3)
+++ basicnet/netutils/nmap/nmap-intro.xml	(revision e0c7163b47daedb5d8c01b3492df796095d268cc)
@@ -1,12 +1,18 @@
 <sect2>
-<title>Introduction to nmap</title>
+<title>Introduction to <application>nmap</application></title>
 
-<screen>Download location (HTTP):       <ulink url="&nmap-download-http;"/>
-Download location (FTP):        <ulink url="&nmap-download-ftp;"/>
-Version used:                   &nmap-version;
-Package size:                   &nmap-size;
-Estimated Disk space required:  &nmap-buildsize;</screen>
+<para><application>nmap</application> is a utility for network exploration and security
+auditing. It supports ping scanning, port scanning and
+<acronym>TCP</acronym>/<acronym>IP</acronym>
+fingerprinting.</para>
 
-<para>Nmap is a utility for network exploration and security
-auditing. It supports ping scanning, port scanning and TCP/IP
-fingerprinting.</para></sect2>
+<sect3><title>Package information</title>
+<itemizedlist spacing='compact'>
+<listitem><para>Download (HTTP): <ulink url="&nmap-download-http;"/></para></listitem>
+<listitem><para>Download (FTP): <ulink url="&nmap-download-ftp;"/></para></listitem>
+<listitem><para>Download size: &nmap-size;</para></listitem>
+<listitem><para>Estimated Disk space required: &nmap-buildsize;</para></listitem>
+<listitem><para>Estimated build time: &nmap-time;</para></listitem></itemizedlist>
+</sect3>
+
+</sect2>
Index: basicnet/netutils/nmap/nmap.ent
===================================================================
--- basicnet/netutils/nmap/nmap.ent	(revision 028a29563f6c85580a4b5ffc031f98a001fa15a3)
+++ basicnet/netutils/nmap/nmap.ent	(revision e0c7163b47daedb5d8c01b3492df796095d268cc)
@@ -3,7 +3,8 @@
 <!ENTITY nmap-inst SYSTEM "nmap-inst.xml">
 <!ENTITY nmap-desc SYSTEM "nmap-desc.xml">
-<!ENTITY nmap-buildsize "8 MB">
-<!ENTITY nmap-version "3.20">
+<!ENTITY nmap-buildsize "7 MB">
+<!ENTITY nmap-version "3.30">
 <!ENTITY nmap-download-http "http://download.insecure.org/nmap/dist/nmap-&nmap-version;.tgz">
 <!ENTITY nmap-download-ftp "">
-<!ENTITY nmap-size "901 KB">
+<!ENTITY nmap-size "1108 KB">
+<!ENTITY nmap-time "">
Index: introduction/welcome/changelog.xml
===================================================================
--- introduction/welcome/changelog.xml	(revision 028a29563f6c85580a4b5ffc031f98a001fa15a3)
+++ introduction/welcome/changelog.xml	(revision e0c7163b47daedb5d8c01b3492df796095d268cc)
@@ -10,4 +10,7 @@
 
 <itemizedlist>
+
+<listitem><para>August 3rd, 2003 [larry]: basicnet: updated to
+nmap-3.30.</para></listitem>
 
 <listitem><para>August 3rd, 2003 [larry]: basicnet: modified intro to
