Take over some changes from mainline.

git-svn-id: https://svn.dealii.org/branches/Branch-5-1@9838 0785d39b-7218-0410-832d-ea1e28bc413d

diff --git a/deal.II/doc/readme.html b/deal.II/doc/readme.html
index 7075c83f7c19aa3c53a52621e6fb278e9f3f54de..875356c76f8daf7ff24005c2b7c7fbfdc02f010e 100644 (file)
--- a/deal.II/doc/readme.html
+++ b/deal.II/doc/readme.html
@@ -21,6 +21,7 @@
     <ul>
       <li> <a href="#prerequisites">System requirements</a>
       <li> <a href="#installation">Installation</a>
+      <li> <a href="#configuration-options">Configuration options</a>
       <li> <a href="#compiler-flags">Compiler flags</a>
       <li> <a href="#external-libs">Using third-party libraries and
              subroutines</a>
@@ -525,8 +526,8 @@
       <p>
       We used to support two different ways to achieve multi-threading in a
       cross-platform way, which were selected by the argument given to
-      <code>--with-multithreading=name</code>. Since after <acronym>deal.II--
-      3.4</code> we dropped support for 
+      <code>--with-multithreading=name</code>. Since after
+      <acronym>deal.II</acronym> version 3.4 we dropped support for 
       the <a href="http://www.cs.wustl.edu/~schmidt/ACE.html"
       target="_top">ACE (Adaptive Communications Environment)</a>
       library for cross-platform portability, there remains only one valid
@@ -636,6 +637,7 @@
     of the tecio library. If enabled, allows data output in TECPLOT format.
     </dd>
 
+    <a name="umfpack"></a>
     <dt>UMFPACK</dt>
     <dd>Enabled by <tt>--with-umfpack</tt>. Right now, only the included
     version in the contrib directory is supported, but pre-installed versions
@@ -666,7 +668,7 @@
     </dl>
 
     <a name="compiler-flags">
-    <h4>Compiler flags</h4>
+    <h3>Compiler flags</h3>
 
     <p>
     Since the ISO C++ standard is still quite new and compilers still
@@ -785,7 +787,7 @@
       <p>
       In order to generate partitionings of triangulations, we have functions
       that call <a href="http://www-users.cs.umn.edu/~karypis/metis/index.html"
-      target="_top">METIS</a> library. METIS is a function that provides
+      target="_top">METIS</a> library. METIS is a library that provides
       various methods to partition graphs, which we use to define which cell
       belongs to which part of a triangulation. The main point in using METIS
       is to generate partitions so that the interfaces between cell blocks are
@@ -935,6 +937,15 @@
     such publication. Your publication will then be listed on the
     project homepage.
 
+    <p>
+    
+    <acronym>deal.II</acronym> can interface with a number of <a
+    href="#external-libs">other packages</a> that you have to install
+    yourself. They are, of course, covered by their own licenses. In addition,
+    deal.II comes with a copy of <a
+    href="http://www.cise.ufl.edu/research/sparse/umfpack/">UMFPACK</a>,
+    courtesy of its author. UMFPACK is covered by its own license, linked to
+    <a href="#umfpack">above</a>.
 
     <hr>