Index: basicnet/netlibs/curl/curl-config.xml
===================================================================
--- basicnet/netlibs/curl/curl-config.xml	(revision 67b459c2430151ae4d12845dcc89994290150b18)
+++ basicnet/netlibs/curl/curl-config.xml	(revision 0c0d4d63d7838822c218df3b1e7d178f418d4afa)
@@ -1,4 +1,4 @@
 <sect2>
-<title>Configuring curl</title>
+<title>Configuring <application>curl</application></title>
 
 <sect3><title>Configuration Information</title>
Index: basicnet/netlibs/curl/curl-desc.xml
===================================================================
--- basicnet/netlibs/curl/curl-desc.xml	(revision 67b459c2430151ae4d12845dcc89994290150b18)
+++ basicnet/netlibs/curl/curl-desc.xml	(revision 0c0d4d63d7838822c218df3b1e7d178f418d4afa)
@@ -2,6 +2,6 @@
 <title>Contents</title>
 
-<para>The curl package contains <userinput>curl</userinput>, <userinput>curl-config</userinput> and the
-<filename>libcurl</filename> libraries.</para>
+<para>The <application>curl</application> package contains <command>curl</command>, <command>curl-config</command> and the
+<filename class="libraryfile">libcurl</filename> libraries.</para>
 
 </sect2>
@@ -10,14 +10,17 @@
 
 <sect3><title>curl</title>
-<para>curl is a client that can get documents from or send documents to
-any of the following protocols: HTTP, HTTPS (needs openssl), FTP,
-GOPHER, DICT, TELNET, LDAP (needs openldap) or FILE.</para></sect3>
+<para><command>curl</command> is a client that can get documents from or send documents to
+any of the following protocols: <acronym>HTTP</acronym>,
+<acronym>HTTPS</acronym> (needs <xref linkend="openssl"/>),
+<acronym>FTP</acronym>, GOPHER, DICT, TELNET, <acronym>LDAP</acronym> (needs <xref
+linkend="openldap"/>) or FILE.</para></sect3>
 
 <sect3><title>curl-config</title>
-<para>curl-config prints information about the last compile, like
+<para><command>curl-config</command> prints information about the last compile, like
 libraries linked to and prefix setting.</para></sect3>
 
 <sect3><title>curl library</title>
-<para>libcurl provides the functionality of curl to other programs.</para></sect3>
+<para><filename class="libraryfile">libcurl</filename> provides the functionality of 
+curl to other programs.</para></sect3>
 
 </sect2>
Index: basicnet/netlibs/curl/curl-inst.xml
===================================================================
--- basicnet/netlibs/curl/curl-inst.xml	(revision 67b459c2430151ae4d12845dcc89994290150b18)
+++ basicnet/netlibs/curl/curl-inst.xml	(revision 0c0d4d63d7838822c218df3b1e7d178f418d4afa)
@@ -1,10 +1,10 @@
 <sect2>
-<title>Installation of curl</title>
+<title>Installation of <application>curl</application></title>
 
-<para>Install curl by running the following commands:</para>
+<para>Install <application>curl</application> by running 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/netlibs/curl/curl-intro.xml
===================================================================
--- basicnet/netlibs/curl/curl-intro.xml	(revision 67b459c2430151ae4d12845dcc89994290150b18)
+++ basicnet/netlibs/curl/curl-intro.xml	(revision 0c0d4d63d7838822c218df3b1e7d178f418d4afa)
@@ -1,22 +1,27 @@
 <sect2>
-<title>Introduction to curl</title>
+<title>Introduction to <application>curl</application></title>
 
-<screen>Download location (HTTP):       <ulink url="&curl-download-http;"/>
-Download location (FTP):        <ulink url="&curl-download-ftp;"/>
-Version used:                   &curl-version;
-Package size:                   &curl-size;
-Estimated Disk space required:  &curl-buildsize;
-Estimated build time:           &curl-time;</screen>
+<para>The <application>curl</application> package contains curl and its
+support library. This is useful for transferring files with
+<acronym>URL</acronym> syntax.
+For example, <command>curl http://curl.haxx.se/download/curl-&curl-version;.tar.gz &gt;
+curl-&curl-version;.tar.gz</command> would download this program's 
+tarball to the current directory. This ability to both download and 
+redirect files can be incorporated into other programs to support 
+functions like streaming media.</para>
 
-<para>The curl package contains curl and its support library. This is
-useful for transferring files with URL syntax. For example, <userinput>curl
-http://curl.haxx.se/download/curl-&curl-version;.tar.gz &gt;
-curl-&curl-version;.tar.gz</userinput>
-would download this program's tarball to the current directory. This
-ability to both download and redirect files can be incorporated
-into other programs to support functions like streaming media.</para>
+<sect3><title>Package information</title>
+<itemizedlist spacing='compact'>
+<listitem><para>Download (HTTP): <ulink url="&curl-download-http;"/></para></listitem>
+<listitem><para>Download (FTP): <ulink url="&curl-download-ftp;"/></para></listitem>
+<listitem><para>Download size: &curl-size;</para></listitem>
+<listitem><para>Estimated Disk space required: &curl-buildsize;</para></listitem>
+<listitem><para>Estimated build time: &curl-time;</para></listitem></itemizedlist>
+</sect3>
 
-<screen>curl will utilize:
-<xref linkend="openssl"/> and <xref linkend="openldap"/></screen>
+<sect3><title><application>curl</application> dependencies</title>
+<sect4><title>Optional</title>
+<para><xref linkend="openssl"/> and <xref linkend="openldap"/></para></sect4>
+</sect3>
 
 </sect2>
Index: basicnet/netlibs/curl/curl.ent
===================================================================
--- basicnet/netlibs/curl/curl.ent	(revision 67b459c2430151ae4d12845dcc89994290150b18)
+++ basicnet/netlibs/curl/curl.ent	(revision 0c0d4d63d7838822c218df3b1e7d178f418d4afa)
@@ -4,8 +4,9 @@
 <!ENTITY curl-desc SYSTEM "curl-desc.xml">
 <!ENTITY curl-config SYSTEM "curl-config.xml">
-<!ENTITY curl-buildsize "7.2 MB">
-<!ENTITY curl-version "7.10.4">
-<!ENTITY curl-download-http "http://curl.haxx.se/download/curl-7.10.4.tar.bz2">
-<!ENTITY curl-download-ftp "ftp://ftp.sunet.se/pub/www/utilities/curl/curl-7.10.4.tar.bz2">
-<!ENTITY curl-size "860 KB">
-<!ENTITY curl-time "0.65 SBU">
+<!ENTITY curl-buildsize "24.3 MB">
+<!ENTITY curl-version "7.10.7">
+<!ENTITY curl-download-http "http://curl.haxx.se/download/curl-&curl-version;.tar.bz2">
+<!ENTITY curl-download-ftp
+"ftp://ftp.sunet.se/pub/www/utilities/curl/curl-&curl-version;.tar.bz2">
+<!ENTITY curl-size "964 KB">
+<!ENTITY curl-time "0.43 SBU">
Index: basicnet/textweb/links/links.ent
===================================================================
--- basicnet/textweb/links/links.ent	(revision 67b459c2430151ae4d12845dcc89994290150b18)
+++ basicnet/textweb/links/links.ent	(revision 0c0d4d63d7838822c218df3b1e7d178f418d4afa)
@@ -8,7 +8,7 @@
 <!ENTITY Links-version "2.1pre11">
 <!ENTITY Links-download-http
-"http://atrey.karlin.mff.cuni.cz/~clock/twibright/Links/download/links-2.1pre11.tar.bz2">
+"http://atrey.karlin.mff.cuni.cz/~clock/twibright/Links/download/links-&Links-version;.tar.bz2">
 <!ENTITY Links-download-ftp
-"ftp://atrey.karlin.mff.cuni.cz/pub/local/clock/Links/links-2.1pre11.tar.bz2">
+"ftp://atrey.karlin.mff.cuni.cz/pub/local/clock/Links/links-&Links-version;.tar.bz2">
 <!ENTITY Links-size "3.6 MB">
 <!ENTITY Links-time "0.57 SBU">
