From: bangerth <bangerth@0785d39b-7218-0410-832d-ea1e28bc413d>
Date: Tue, 23 Jul 2013 13:55:58 +0000 (+0000)
Subject: Take over r30131 from mainline.
X-Git-Url: https://gitweb.dealii.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=2b3ed60e9e93a60c88e8407a5a6036cf133699e3;p=dealii-svn.git

Take over r30131 from mainline.

git-svn-id: https://svn.dealii.org/branches/releases/Branch-8-0@30132 0785d39b-7218-0410-832d-ea1e28bc413d
---

diff --git a/deal.II/doc/development/cmake-internals.html b/deal.II/doc/development/cmake-internals.html
index cacc2e4bbe..e889a4ea82 100644
--- a/deal.II/doc/development/cmake-internals.html
+++ b/deal.II/doc/development/cmake-internals.html
@@ -672,7 +672,7 @@
     <hr>
 
     <address>
-      <a href="mail.html" target="body">The deal.II Group</a>
+      <a href="../mail.html" target="body">The deal.II Group</a>
       $Date$
     </address>
   </body>
diff --git a/deal.II/doc/development/cmake.html b/deal.II/doc/development/cmake.html
index 05fe95d6e9..65b39f8e58 100644
--- a/deal.II/doc/development/cmake.html
+++ b/deal.II/doc/development/cmake.html
@@ -796,7 +796,7 @@
     <hr>
 
     <address>
-      <a href="mail.html" target="body">The deal.II Group</a>
+      <a href="../mail.html" target="body">The deal.II Group</a>
       $Date$
     </address>
   </body>
diff --git a/deal.II/doc/development/cmakelists.html b/deal.II/doc/development/cmakelists.html
index 5ebc8bc15f..96f699ef46 100644
--- a/deal.II/doc/development/cmakelists.html
+++ b/deal.II/doc/development/cmakelists.html
@@ -508,7 +508,7 @@
     <hr>
 
     <address>
-      <a href="mail.html" target="body">The deal.II Group</a>
+      <a href="../mail.html" target="body">The deal.II Group</a>
       $Date$
     </address>
   </body>
diff --git a/deal.II/doc/development/porting.html b/deal.II/doc/development/porting.html
index ee4d340d90..07281a2316 100644
--- a/deal.II/doc/development/porting.html
+++ b/deal.II/doc/development/porting.html
@@ -5,7 +5,7 @@
     <title>Porting deal.II</title>
     <link href="../screen.css" rel="StyleSheet" media="screen">
     <meta name="author" content="the deal.II authors <authors@dealii.org>">
-    <meta name="copyright" content="Copyright (C) 2000, 2001, 2002, 2005, 2010, 2012 by the deal.II authors">
+    <meta name="copyright" content="Copyright (C) 2000, 2001, 2002, 2005, 2010, 2012, 2013 by the deal.II authors">
     <meta name="date" content="$Date$">
     <meta name="svn_id" content="$Id$">
     <meta name="keywords" content="deal.II porting">
@@ -23,7 +23,7 @@
 
       Consequently, there is a good chance that <acronym>deal.II</acronym>
       will run on a reasonably well behaved system besides the ones listed
-      in the <a href="readme.html" target="body">ReadMe</a>. Nevertheless,
+      in the <a href="../readme.html" target="body">ReadMe</a>. Nevertheless,
       there are cases where some adjustments are necessary.
     </p>
 
diff --git a/deal.II/doc/external-libs/arpack.html b/deal.II/doc/external-libs/arpack.html
index ef6593db09..7cc21a72b7 100644
--- a/deal.II/doc/external-libs/arpack.html
+++ b/deal.II/doc/external-libs/arpack.html
@@ -1,23 +1,23 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN"                  
-	  "http://www.w3.org/TR/html4/loose.dtd">                        
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN"
+	  "http://www.w3.org/TR/html4/loose.dtd">
 
-<html>                                                                          
-  <head>                            
+<html>
+  <head>
     <title>The deal.II Readme on interfacing to ARPACK</title>
     <link href="../screen.css" rel="StyleSheet">
-    <meta name="author" content="the deal.II authors <authors @ dealii.org>"> 
-    <meta name="copyright" content="Copyright (C) 2010 by the deal.II authors">
-    <meta name="date" content="$Date: 2010-05-05 (Thu, 05 May 2010) $">
+    <meta name="author" content="the deal.II authors <authors @ dealii.org>">
+    <meta name="copyright" content="Copyright (C) 2010, 2013 by the deal.II authors">
+    <meta name="date" content="$Date$">
     <meta name="svn_id" content="$Id: readme-arpack.html$">
-    <meta name="keywords" content="deal.II"> 
-  </head>                                                                      
-  <body> 
+    <meta name="keywords" content="deal.II">
+  </head>
+  <body>
+
 
-    
     <h2>Installation of <acronym>ARPACK</acronym></h2>
 
     <p>
-      <a href="http://www.caam.rice.edu/software/ARPACK/">ARPACK</a> 
+      <a href="http://www.caam.rice.edu/software/ARPACK/">ARPACK</a>
       is a collection of Fortran77 subroutines designed to solve large
       scale eigenvalue problems.
       <a href="http://www.caam.rice.edu/software/ARPACK/" target="_top">ARPACK</a>
@@ -47,11 +47,11 @@
       <li>edit <code>ARmake.inc</code></li>
       <ul>
         <li>change home to the correct directory</li>
-        <li>choose which <acronym>BLAS</acronym> and 
+        <li>choose which <acronym>BLAS</acronym> and
         <acronym>LAPACK</acronym> you would like to use</li>
       </ul>
       <li>change the file second.f in the UTIL directory</li>
-      <li>do <code>make lib</code> in the current directory 
+      <li>do <code>make lib</code> in the current directory
       to build the standard library <code>libarpack_$(PLAT).a</code>
       </li>
     </ul>
@@ -68,14 +68,14 @@
     </p>
 
     <p>
-    Try to run one of the examples and compare the output. 
-    How the output should look like is stated in the README 
+    Try to run one of the examples and compare the output.
+    How the output should look like is stated in the README
     that can be found in the <code>EXAMPLES</code> directory.
-    </p> 
+    </p>
 
     <p>
-    If that output you produced looks like it should you can 
-    proceed to comile <acronym>deal.II</acronym> with 
+    If that output you produced looks like it should you can
+    proceed to comile <acronym>deal.II</acronym> with
     <acronym>ARPACK</acronym>.
     </p>
 
@@ -103,7 +103,7 @@
 
     <hr>
     <address>
-      <a href="mail.html">The deal.II Group</a>
+      <a href="../mail.html">The deal.II Group</a>
 	$Date$
     </address>
   </body>
diff --git a/deal.II/doc/external-libs/mumps.html b/deal.II/doc/external-libs/mumps.html
index 6f26ade667..9459e54e4e 100644
--- a/deal.II/doc/external-libs/mumps.html
+++ b/deal.II/doc/external-libs/mumps.html
@@ -7,7 +7,7 @@
     <link href="../screen.css" rel="StyleSheet">
     <meta name="author" content="the deal.II authors <authors @ dealii.org>">
     <meta name="copyright" content="Copyright (C) 2010, 2011, 2012, 2013 by the deal.II authors">
-    <meta name="date" content="$Date: 2010-05-05 (Thu, 05 May 2010) $">
+    <meta name="date" content="$Date$">
     <meta name="svn_id" content="$Id: readme-mumps.html$">
     <meta name="keywords" content="deal.II">
   </head>
@@ -347,7 +347,7 @@
 
     <hr>
     <address>
-      <a href="mail.html">The deal.II Group</a>
+      <a href="../mail.html">The deal.II Group</a>
 	$Date$
     </address>
   </body>
diff --git a/deal.II/doc/external-libs/p4est.html b/deal.II/doc/external-libs/p4est.html
index 735d088210..5defb7fbc5 100644
--- a/deal.II/doc/external-libs/p4est.html
+++ b/deal.II/doc/external-libs/p4est.html
@@ -59,7 +59,7 @@
 
     <hr>
     <address>
-      <a href="mail.html">The deal.II Group</a>
+      <a href="../mail.html">The deal.II Group</a>
 	$Date$
     </address>
   </body>
diff --git a/deal.II/doc/license.html b/deal.II/doc/license.html
index 5470e7573f..17c97f7dcd 100644
--- a/deal.II/doc/license.html
+++ b/deal.II/doc/license.html
@@ -145,6 +145,7 @@
     </p>
 
 
+    <a name="license-text"></a>
     <h3>Full license text</h3>
 
     <pre>
diff --git a/deal.II/doc/news/2001/3.1.0-vs-3.2.0.html b/deal.II/doc/news/2001/3.1.0-vs-3.2.0.html
index 2bacdd45b2..cd0b779b75 100644
--- a/deal.II/doc/news/2001/3.1.0-vs-3.2.0.html
+++ b/deal.II/doc/news/2001/3.1.0-vs-3.2.0.html
@@ -144,9 +144,6 @@ documentation, etc</a>.
        New: There is now some support to include and use routines from the 
        <a href="http://www.cse.clrc.ac.uk/Activity/HSL" 
        target="_top">Harwell Subroutine Library</a>.
-       (See the <a href="../../readme.html#hsl" target="body">ReadMe</a>
-       file for more information on installation of HSL
-       subroutines.)
        <br>
        (WB 2001/01/30)
        </p>
@@ -156,9 +153,7 @@ documentation, etc</a>.
        existence of a Fortran 77 compiler, and sets its path, some
        compiler flags and the libraries to be linked in when mixing
        C++ and F77 in some variables in the file
-       <code>common/Make.global_options</code> (see also
-       <a href="../../development/makefiles.html" target="body">this
-       page</a>).
+       <code>common/Make.global_options</code>.
        <br>
        (WB 2000/12/30)
        </p>
@@ -602,9 +597,6 @@ documentation, etc</a>.
        <code class="class">SparseDirectMA27</code> and
        <code class="class">SparseDirectMA47</code>
        for the sparse direct solvers MA27 and MA47.
-       (See the <a href="../../readme.html#hsl" target="body">ReadMe</a>
-       file for more information on installation of HSL
-       subroutines.)
        <br>
        (WB 2001/01/30)
        </p>
diff --git a/deal.II/doc/news/6.3.0-vs-7.0.0.h b/deal.II/doc/news/6.3.0-vs-7.0.0.h
index 6dc8e87c4b..df23b1594f 100644
--- a/deal.II/doc/news/6.3.0-vs-7.0.0.h
+++ b/deal.II/doc/news/6.3.0-vs-7.0.0.h
@@ -51,8 +51,7 @@ more naturally preserves consistency.
 	<br>
 	As a consequence, if your makefile makes any assumption on the
 	location of deal.II include files or the name of the deal.II library
-	it will need to be changed. The <a
-	href="../../development/makefiles.html">sample Makefiles</a> have been
+	it will need to be changed. The sample Makefiles have been
 	updated for this.
 	<br>
 	(WB 2010/10/25)
diff --git a/deal.II/doc/news/news.html b/deal.II/doc/news/news.html
index bf482f2e17..343a1394c8 100644
--- a/deal.II/doc/news/news.html
+++ b/deal.II/doc/news/news.html
@@ -896,9 +896,6 @@
           library that, among much other functionality, offers some
           sparse direct solvers. We have added support for an
           interface to these solvers to the library.
-          (See the <a href="../readme.html#hsl" target="body">ReadMe</a>
-          file for more information on installation of HSL
-          subroutines.)
       </dd>
 
       <dt>