Index: networking/netlibs/curl.xml
===================================================================
--- networking/netlibs/curl.xml	(revision eb65262f72317d734d4485afa0e755531de782a5)
+++ networking/netlibs/curl.xml	(revision 355495ce39eec9e968d4aec7eb691301a5c896e9)
@@ -5,12 +5,9 @@
   %general-entities;
 
-  <!ENTITY curl-download-http
-  "http://curl.haxx.se/download/curl-&curl-version;.tar.bz2">
-  <!--<!ENTITY curl-download-ftp
-  "ftp://gd.tuwien.ac.at/utils/archivers/curl/curl-&curl-version;.tar.bz2">-->
+  <!ENTITY curl-download-http "http://curl.haxx.se/download/curl-&curl-version;.tar.bz2">
   <!ENTITY curl-download-ftp  " ">
-  <!ENTITY curl-md5sum        "f0303d47d9d3e6e4f08c2863c6504823">
+  <!ENTITY curl-md5sum        "bfa80f01b3d300359cfb4d409b6136a3">
   <!ENTITY curl-size          "2.4 MB">
-  <!ENTITY curl-buildsize     "31 MB">
+  <!ENTITY curl-buildsize     "28 MB">
   <!ENTITY curl-time          "0.5 SBU">
 ]>
@@ -33,11 +30,14 @@
     <title>Introduction to cURL</title>
 
-    <para>The <application>cURL</application> package contains
-    <command>curl</command> and its support library
-    <filename class="libraryfile">libcurl</filename>. This is useful for
-    transferring files with URL syntax to any of the following protocols:
-    FTP, FTPS, HTTP, HTTPS, SCP, SFTP, TFTP, TELNET, DICT, LDAP, LDAPS and FILE.
-    This ability to both download and upload files can be incorporated into
-    other programs to support functions like streaming media.</para>
+    <para>
+      The <application>cURL</application> package contains
+      <command>curl</command> and its support library
+      <filename class="libraryfile">libcurl</filename>. This is useful for
+      transferring files with URL syntax to any of the following protocols:
+      FTP, FTPS, HTTP, HTTPS, SCP, SFTP, TFTP, TELNET, DICT, LDAP, LDAPS
+      and FILE.  This ability to both download and upload files can be
+      incorporated into other programs to support functions like streaming
+      media.
+    </para>
 
     &lfs71_checked;
@@ -46,20 +46,32 @@
     <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 MD5 sum: &curl-md5sum;</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>
+        <para>
+          Download (HTTP): <ulink url="&curl-download-http;"/>
+        </para>
+      </listitem>
+      <listitem>
+        <para>
+          Download (FTP): <ulink url="&curl-download-ftp;"/>
+        </para>
+      </listitem>
+      <listitem>
+        <para>
+          Download MD5 sum: &curl-md5sum;
+        </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>
@@ -67,24 +79,30 @@
     <bridgehead renderas="sect3">cURL Dependencies</bridgehead>
 
+    <bridgehead renderas="sect4">Recommended</bridgehead>
+    <para role="recommended">
+      <xref linkend="cacerts"/> and
+      <xref linkend="openssl"/> or <xref linkend="gnutls"/>
+    </para>
+
     <bridgehead renderas="sect4">Optional</bridgehead>
-    <para role="optional"><!-- <xref linkend="pkgconfig"/>, -->
-    <xref linkend="openssl"/> or <xref linkend="gnutls"/>,
-    <xref linkend="openldap"/>,
-    <xref linkend="libidn"/>,
-    <xref linkend="mitkrb"/>,
-    <ulink url="http://www.libssh2.org">libssh2</ulink>
-    (for secure transfers),
-    <ulink url="http://www.pdc.kth.se/kth-krb/">krb4</ulink>,
-    <ulink
-    url="http://www.vintela.com/resources/topics/spnego/">SPNEGO</ulink>, and
-    <ulink url="http://daniel.haxx.se/projects/c-ares/">c-ares</ulink></para>
-
-    <bridgehead renderas="sect4">Optional for Running the Test
-    Suite</bridgehead>
-    <para role="optional"><xref linkend="stunnel"/> (for the HTTPS and FTPS
-    tests)</para>
+    <para role="optional">
+      <ulink url="http://daniel.haxx.se/projects/c-ares/">c-ares</ulink>,
+      <ulink url="http://www.pdc.kth.se/kth-krb/">krb4</ulink>,
+      <xref linkend="libidn"/>,
+      <ulink url="http://www.libssh2.org">libssh2</ulink>,
+      <xref linkend="mitkrb"/>,
+      <xref linkend="openldap"/> and
+      <ulink url="http://www.vintela.com/resources/topics/spnego/">
+      SPNEGO</ulink>
+    </para>
+
+    <bridgehead renderas="sect4">Optional for Running the Test Suite</bridgehead>
+    <para role="optional">
+      <xref linkend="stunnel"/> (for the HTTPS and FTPS tests)
+    </para>
 
     <para condition="html" role="usernotes">User Notes:
-    <ulink url="&blfs-wiki;/curl"/></para>
+      <ulink url="&blfs-wiki;/curl"/>
+    </para>
   </sect2>
 
@@ -92,6 +110,8 @@
     <title>Installation of cURL</title>
 
-    <para>Install <application>cURL</application> by running the following
-    commands:</para>
+    <para>
+      Install <application>cURL</application> by running the following
+      commands:
+    </para>
 
 <screen><userinput>sed -i '/--static-libs)/{N;s#echo .*#echo #;}' curl-config.in &amp;&amp;
@@ -99,12 +119,16 @@
 make</userinput></screen>
 
-    <para>To test the results, issue: <command>make check</command>. Note that
-    if you have <application>Stunnel</application> and
-    <application>TCP Wrapper</application> installed and you wish to perform
-    the HTTPS tests, you'll need to have an unrestrictive
-    <filename>/etc/hosts.deny</filename> file.</para>
-
-    <para>Now, as the <systemitem class="username">root</systemitem>
-    user:</para>
+    <para>
+      To test the results, issue: <command>make check</command>. Note that
+      if you have <application>Stunnel</application> and
+      <application>TCP Wrapper</application> installed and you wish to perform
+      the HTTPS tests, you'll need to have an unrestrictive
+      <filename>/etc/hosts.deny</filename> file.
+    </para>
+
+    <para>
+      Now, as the <systemitem class="username">root</systemitem>
+      user:
+    </para>
 
 <screen role="root"><userinput>make install &amp;&amp;
@@ -118,5 +142,5 @@
 
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../../xincludes/static-libraries.xml"/>
+      href="../../xincludes/static-libraries.xml"/>
 
     <para>
@@ -127,26 +151,38 @@
     </para>
 
-    <para><option>--with-ca-path=/etc/ssl/certs</option>: This option sets the
-    directory to use as the path to the SSL certificates. If you've not
-    installed <xref linkend="openssl"/> or <xref linkend="gnutls"/> and
-    the <xref linkend="cacerts"/> you can remove this option.</para>
-
-    <para><option>--with-gssapi</option>:
-    This parameter adds <application>Kerberos 5</application> support to
-    <filename class="libraryfile">libcurl</filename>.</para>
-
-    <para><option>--with-libssh2</option>:
-    This parameter adds SSH2 protocol support to
-    <filename class="libraryfile">libcurl</filename>.</para>
-
-    <para><option>--without-ssl --with-gnutls</option>:
-    To build with <application>GnuTLS</application>
-    support instead of <application>OpenSSL</application> for SSL/TLS.</para>
-
-    <para><command>find docs \( -name "Makefile*" -o -name "*.1" -o -name "*.3"
-    \) -exec rm {} \;</command>: This command removes
-    <filename>Makefiles</filename> and man files from the documentation
-    directory that would otherwise be installed by the commands that
-    follow.</para>
+    <para>
+      <parameter>--with-ca-path=/etc/ssl/certs</parameter>: This parameter
+      sets the directory to use as the path to the SSL certificates.
+      If you've not installed <xref linkend="openssl"/> or
+      <xref linkend="gnutls"/> and the <xref linkend="cacerts"/> you can
+      remove this option.
+    </para>
+
+    <para>
+      <option>--with-gssapi</option>: This parameter adds
+      <application>Kerberos 5</application> support to
+      <filename class="libraryfile">libcurl</filename>.
+    </para>
+
+    <para>
+      <option>--with-libssh2</option>: This parameter adds
+      SSH2 protocol support to
+      <filename class="libraryfile">libcurl</filename>.
+    </para>
+
+    <para>
+      <option>--without-ssl --with-gnutls</option>: Use to
+      build with <application>GnuTLS</application> support
+      instead of <application>OpenSSL</application> for SSL/TLS.
+    </para>
+
+    <para>
+      <command>find docs \( -name "Makefile*" -o -name "*.1" -o -name "*.3"
+      \) -exec rm {} \;</command>: This command removes
+      <filename>Makefiles</filename> and man files from the documentation
+      directory that would otherwise be installed by the commands that
+      follow.
+    </para>
+
   </sect2>
 
@@ -160,7 +196,14 @@
 
       <seglistitem>
-        <seg>curl and curl-config</seg>
-        <seg>libcurl.so</seg>
-        <seg>/usr/include/curl and /usr/share/doc/curl-&curl-version;</seg>
+        <seg>
+           curl and curl-config
+        </seg>
+        <seg>
+           libcurl.so
+        </seg>
+        <seg>
+          /usr/include/curl and
+          /usr/share/doc/curl-&curl-version;
+        </seg>
       </seglistitem>
     </segmentedlist>
@@ -174,5 +217,6 @@
         <term><command>curl</command></term>
         <listitem>
-         <para>is a command line tool for transferring files with URL syntax.
+         <para>
+           is a command line tool for transferring files with URL syntax.
          </para>
           <indexterm zone="curl curl-prog">
@@ -185,6 +229,8 @@
         <term><command>curl-config</command></term>
         <listitem>
-          <para>prints information about the last compile, like libraries
-          linked to and prefix setting.</para>
+          <para>
+            prints information about the last compile, like libraries
+            linked to and prefix setting.
+          </para>
           <indexterm zone="curl curl-config">
             <primary sortas="b-curl-config">curl-config</primary>
@@ -196,6 +242,8 @@
         <term><filename class="libraryfile">libcurl.so</filename></term>
         <listitem>
-          <para>provides the API functions required by
-          <command>curl</command> and other programs.</para>
+          <para>
+            provides the API functions required by
+            <command>curl</command> and other programs.
+          </para>
           <indexterm zone="curl libcurl">
             <primary sortas="c-libcurl">libcurl.so</primary>
@@ -203,5 +251,8 @@
         </listitem>
       </varlistentry>
+
     </variablelist>
-  </sect2>
+
+  </sect2>
+
 </sect1>
