Update the links to UMFPACK's web site.

diff --git a/doc/readme.html b/doc/readme.html
index d2daea06005eb6df403959fb6192a8f06129a516..668cf5858d97e7c1fd5a637b34bf8006ab762d57 100644 (file)
--- a/doc/readme.html
+++ b/doc/readme.html
@@ -712,18 +712,16 @@
       </dd>
 
 
-      <dt><a name="umfpack"></a><a href="http://www.cise.ufl.edu/research/sparse/umfpack/"
+      <dt><a name="umfpack"></a><a href="http://faculty.cse.tamu.edu/davis/suitesparse.html"
             target="_top">UMFPACK</a></dt>
       <dd>
        <p>
-         <a href="http://www.cise.ufl.edu/research/sparse/umfpack/"
-            target="_top">UMFPACK</a> is a sparse direct solver that we often
-         use in prototype codes where the goal is to simply get a linear
-          system solved robustly.
-         The interface will be enabled by default, either using a version
-         installed on your system of using a version that comes bundled
-         with <acronym>deal.II</acronym>.
-         It can be disabled explicitly by using the
+         <a href="http://faculty.cse.tamu.edu/davis/suitesparse.html">UMFPACK</a>,
+      which is part of SuiteSparse, is a sparse direct solver that we often use
+      in prototype codes where the goal is to simply get a linear system solved
+      robustly. The interface will be enabled by default, either using a version
+      installed on your system of using a version that comes bundled with
+      <acronym>deal.II</acronym>. It can be disabled explicitly by using the
          <code>-DDEAL_II_WITH_UMFPACK=OFF</code> argument.
          To use a self compiled version, pass the argument
          <code>-DUMFPACK_DIR=/path/to/umfpack</code> to the
@@ -731,12 +729,11 @@
        </p>
 
        <p>
-         UMFPACK has its own license. To use it with deal.II, please
-         read it and make sure that you agree with it. You can find
-         the license of UMFPACK
-          <a href="http://www.cise.ufl.edu/research/sparse/umfpack/">here</a>.
-         We include UMFPACK in the deal.II distributions courtesy of
-         its author, <a href="http://www.cise.ufl.edu/~davis/">Timothy
+         SuiteSparse has its own license. To use it with deal.II, please read it
+         and make sure that you agree with it. You can find the license of
+         SuiteSparse inside the SuiteSparse download at the link given above. We
+         include UMFPACK in the deal.II distributions courtesy of its
+         author, <a href="http://faculty.cse.tamu.edu/davis/welcome.html">Timothy
          A. Davis</a>.
        </p>
       </dd>
@@ -807,8 +804,8 @@
             href="#optional-software">other packages</a> that you either
           have to install yourself. They are, of course, covered by their
           own licenses. In addition, deal.II comes bundled with copies of
-          <a href="http://www.cise.ufl.edu/research/sparse/umfpack/"
-            target="_top">UMFPACK</a>,
+          <a href="http://faculty.cse.tamu.edu/davis/suitesparse.html">
+          UMFPACK</a>,
           <a href="http://threadingbuildingblocks.org/"
             target="_top">Threading Building Blocks</a>,
           <a href="http://www.boost.org/" target="_top">BOOST</a> and

diff --git a/include/deal.II/lac/sparse_direct.h b/include/deal.II/lac/sparse_direct.h
index 89b703ee1faa2e4d5385dd2a1310ca59e900ee98..4d2e09e070b3756601331854a6a07d29c9a27e13 100644 (file)
--- a/include/deal.II/lac/sparse_direct.h
+++ b/include/deal.II/lac/sparse_direct.h
@@ -36,8 +36,9 @@
 DEAL_II_NAMESPACE_OPEN
 
 /**
- * This class provides an interface to the sparse direct solver UMFPACK (see
- * <a href="http://www.cise.ufl.edu/research/sparse/umfpack">this link</a>).
+ * This class provides an interface to the sparse direct solver UMFPACK, which
+ * is part of the SuiteSparse library (see <a
+ * href="http://faculty.cse.tamu.edu/davis/suitesparse.html">this link</a>).
  * UMFPACK is a set of routines for solving non-symmetric sparse linear
  * systems, Ax=b, using the Unsymmetric-pattern MultiFrontal method and direct
  * sparse LU factorization. Matrices may have symmetric or unsymmetric
@@ -63,7 +64,8 @@ DEAL_II_NAMESPACE_OPEN
  * @note UMFPACK has its own license, independent of that of deal.II. If you
  * want to use the UMFPACK you have to accept that license. It is linked to
  * from the deal.II ReadMe file. UMFPACK is included courtesy of its author,
- * <a href="http://www.cise.ufl.edu/~davis/">Timothy A. Davis</a>.
+ * <a href="http://faculty.cse.tamu.edu/davis/welcome.html">Timothy
+ * A. Davis</a>.
  *
  *
  * <h4>Instantiations</h4>