Index: basicnet/netprogs/ncftp/ncftp-config.xml
===================================================================
--- basicnet/netprogs/ncftp/ncftp-config.xml	(revision e8c0cb1714ffbb49670bb411d49a281371dac501)
+++ basicnet/netprogs/ncftp/ncftp-config.xml	(revision 5bc2a0191289807e492acaa2ade873e966bd7c0e)
@@ -1,4 +1,4 @@
 <sect2>
-<title>Configuring ncftp</title>
+<title>Configuring <application>ncftp</application></title>
 
 <sect3><title>Config files</title>
@@ -9,14 +9,14 @@
 <sect3><title>Configuration Information</title>
 
-<para>Most ncftp configuration is done while in the program and the
-configuration files are dealt with automatically.  One exception to this
-is <filename>~/.ncftp/prefs_v3</filename>.  There are various options to
-alter in there, including:</para>
+<para>Most <application>ncftp</application> configuration is done while in the 
+program and the configuration files are dealt with automatically.  One 
+exception to this is <filename>~/.ncftp/prefs_v3</filename>.  There are various 
+options to alter in there, including:</para>
 
-<para><userinput>yes-i-know-about-NcFTPd=yes</userinput> : This disables
-the splash screen advertising the NcFTPd server.</para>
+<para><screen><userinput>yes-i-know-about-NcFTPd=yes</userinput></screen> : 
+This disables the splash screen advertising the
+<application>NcFTPd</application> server.</para>
 
-<para>There are other options in the <filename>prefs_v3</filename> file.  Most of these are
-self-explanatory.</para>
+<para>There are other options in the <filename>prefs_v3</filename> file.  Most of these are self-explanatory.</para>
 </sect3>
 
Index: basicnet/netprogs/ncftp/ncftp-desc.xml
===================================================================
--- basicnet/netprogs/ncftp/ncftp-desc.xml	(revision e8c0cb1714ffbb49670bb411d49a281371dac501)
+++ basicnet/netprogs/ncftp/ncftp-desc.xml	(revision 5bc2a0191289807e492acaa2ade873e966bd7c0e)
@@ -2,7 +2,8 @@
 <title>Contents</title>
 
-<para>The ncftp package contains <userinput>ncftp, ncftpbatch,
-ncftpbookmarks, ncftpget, ncftpls, ncftpput</userinput> 
-and <userinput>ncftpspooler</userinput>.</para>
+<para>The ncftp package contains <command>ncftp</command>, <command>ncftpbatch
+</command>, <command>ncftpbookmarks</command>,
+<command>ncftpget</command>, <command>ncftpls</command>,
+<command>ncftpput</command> and <command>ncftpspooler</command>.</para>
 </sect2>
 
@@ -13,8 +14,9 @@
 
 <sect3><title>ncftpbatch</title>
-<para>Individual batch FTP job processor.</para></sect3>
+<para>Individual batch <acronym>FTP</acronym> job processor.</para></sect3>
 
 <sect3><title>ncftpbookmarks</title>
-<para>NcFTP Bookmark Editor (NCurses-based).</para></sect3>
+<para><application>NcFTP</application> Bookmark Editor
+(<application>NCurses</application>-based).</para></sect3>
 
 <sect3><title>ncftpget</title>
@@ -28,5 +30,5 @@
 
 <sect3><title>ncftpspooler</title>
-<para>Global batch FTP job processor daemon.</para></sect3>
+<para>Global batch <acronym>FTP</acronym> job processor daemon.</para></sect3>
 
 </sect2>
Index: basicnet/netprogs/ncftp/ncftp-exp.xml
===================================================================
--- basicnet/netprogs/ncftp/ncftp-exp.xml	(revision e8c0cb1714ffbb49670bb411d49a281371dac501)
+++ basicnet/netprogs/ncftp/ncftp-exp.xml	(revision 5bc2a0191289807e492acaa2ade873e966bd7c0e)
@@ -2,7 +2,7 @@
 <title>Command explanations</title>
 
-<para><screen><userinput>cd libncftp &amp;&amp; 
+<para><screen><command>cd libncftp &amp;&amp; 
 make shared &amp;&amp; 
-make soinstall</userinput></screen>
+make soinstall</command></screen>
 These commands make and install the dynamic library libncftp which is then used to link against when compiling the main program.</para>
 
Index: basicnet/netprogs/ncftp/ncftp-inst.xml
===================================================================
--- basicnet/netprogs/ncftp/ncftp-inst.xml	(revision e8c0cb1714ffbb49670bb411d49a281371dac501)
+++ basicnet/netprogs/ncftp/ncftp-inst.xml	(revision 5bc2a0191289807e492acaa2ade873e966bd7c0e)
@@ -1,21 +1,22 @@
 <sect2>
-<title>Installation of ncftp</title>
+<title>Installation of <application>ncftp</application></title>
 
-<para>There are two ways to build ncftp.  The first (and optimal) way,
-builds most of the functionality as a shared library and then builds and
-installs the program linked against this library.  The second method
-simply links all of the functionality into the binary statically.  This
+<para>There are two ways to build <application>ncftp</application>.  The first 
+(and optimal) way, builds most of the functionality as a shared library and 
+then builds and installs the program linked against this library.  The second 
+method simply links all of the functionality into the binary statically.  This
 doesn't make the dynamic library available for linking by other
 applications.  You need to choose which method best suits you.  Note
 that the second method does <emphasis>not</emphasis> create an entirely
-statically linked binary; only the libncftp parts are statically linked
-in, in this case. Be aware that building and using the shared library is 
-covered by the Clarified Artistic License; however, developing applications 
-that utilize the shared library is subject to a different license.</para>
+statically linked binary; only the <filename>libncftp</filename> parts are 
+statically linked in, in this case. Be aware that building and using the shared 
+library is covered by the Clarified Artistic License; however, developing 
+applications that utilize the shared library is subject to a different license.
+</para>
 
-<para>To install ncftp using the first (and optimal) method, run the 
-following commands:</para>
+<para>To install <application>ncftp</application> using the first (and optimal) 
+method, run the following commands:</para>
 
-<para><screen><userinput>./configure --prefix=/usr &amp;&amp;
+<screen><userinput><command>./configure --prefix=/usr &amp;&amp;
 cd libncftp &amp;&amp;
 make shared &amp;&amp;
@@ -23,12 +24,13 @@
 cd .. &amp;&amp;
 make &amp;&amp;
-make install</userinput></screen></para>
+make install</command></userinput></screen>
 
-<para>To install ncftp using the second method (with the libncftp 
-functionality linked in statically) run the following commands:</para>
+<para>To install <application>ncftp</application> using the second method (with 
+the <filename>libncftp</filename> functionality linked in statically) run the 
+following commands:</para>
 
-<para><screen><userinput>./configure --prefix=/usr &amp;&amp;
+<screen><userinput><command>./configure --prefix=/usr &amp;&amp;
 make &amp;&amp;
-make install</userinput></screen></para>
+make install</command></userinput></screen>
 
 </sect2>
Index: basicnet/netprogs/ncftp/ncftp-intro.xml
===================================================================
--- basicnet/netprogs/ncftp/ncftp-intro.xml	(revision e8c0cb1714ffbb49670bb411d49a281371dac501)
+++ basicnet/netprogs/ncftp/ncftp-intro.xml	(revision 5bc2a0191289807e492acaa2ade873e966bd7c0e)
@@ -1,14 +1,24 @@
 <sect2>
-<title>Introduction to ncftp</title>
+<title>Introduction to <application>ncftp</application></title>
 
-<screen>Download location (HTTP):        <ulink url="&ncftp-download-http;"/>
-Download location (FTP):        <ulink url="&ncftp-download-ftp;"/>
-Version used:                   &ncftp-version;
-Package size:                   &ncftp-size;
-Estimated Disk space required:  &ncftp-buildsize;</screen>
+<para>The <application>ncftp</application> package contains a powerful and 
+flexible interface to the Internet standard File Transfer Protocol.  It is 
+intended to replace or supplement the stock <command>ftp</command> program.
+</para>
 
-<para>The ncftp package contains a powerful and flexible interface to 
-the Internet standard File Transfer Protocol.  It is intended to replace
-or supplement the stock ftp program.</para>
+<sect3><title>Package information</title>
+<itemizedlist spacing='compact'>
+<listitem><para>Download (HTTP): <ulink
+url="&ncftp-download-http;"/></para></listitem>
+<listitem><para>Download (FTP): <ulink
+url="&ncftp-download-ftp;"/></para></listitem>
+<listitem><para>Download size: &ncftp-size;</para></listitem>
+<listitem><para>Estimated Disk space required:
+&ncftp-buildsize;</para></listitem>
+<listitem><para>Estimated build time:
+&ncftp-time;</para></listitem></itemizedlist>
+</sect3>
+
+
 
 </sect2>
Index: basicnet/netprogs/ncftp/ncftp.ent
===================================================================
--- basicnet/netprogs/ncftp/ncftp.ent	(revision e8c0cb1714ffbb49670bb411d49a281371dac501)
+++ basicnet/netprogs/ncftp/ncftp.ent	(revision 5bc2a0191289807e492acaa2ade873e966bd7c0e)
@@ -5,7 +5,8 @@
 <!ENTITY ncftp-desc SYSTEM "ncftp-desc.xml">
 <!ENTITY ncftp-config SYSTEM "ncftp-config.xml">
-<!ENTITY ncftp-buildsize "4.8 MB">
-<!ENTITY ncftp-version "3.1.5">
+<!ENTITY ncftp-buildsize "5.2 MB">
+<!ENTITY ncftp-version "3.1.6">
 <!ENTITY ncftp-download-http "">
-<!ENTITY ncftp-download-ftp "ftp://ftp.ncftp.com/ncftp/ncftp-3.1.5-src.tar.bz2">
-<!ENTITY ncftp-size "392 KB">
+<!ENTITY ncftp-download-ftp "ftp://ftp.ncftp.com/ncftp/ncftp-3.1.6-src.tar.bz2">
+<!ENTITY ncftp-size "396 KB">
+<!ENTITY ncftp-time "0.26 SBU">
