From 18d7cd5dfaeb8d1f99c308ede70cb46845425848 Mon Sep 17 00:00:00 2001
From: Timo Heister <timo.heister@gmail.com>
Date: Wed, 18 Dec 2013 20:22:34 +0000
Subject: [PATCH] take over 32054

git-svn-id: https://svn.dealii.org/branches/releases/Branch-8-1@32056 0785d39b-7218-0410-832d-ea1e28bc413d
---
 deal.II/doc/doxygen/options.dox.in         |  2 +-
 deal.II/doc/doxygen/tutorial/tutorial.h.in | 25 +++++++++++++++++++++-
 deal.II/doc/news/8.0.0-vs-8.1.0.h          |  9 ++++++++
 deal.II/doc/news/news.html                 | 11 ++++++++++
 4 files changed, 45 insertions(+), 2 deletions(-)

diff --git a/deal.II/doc/doxygen/options.dox.in b/deal.II/doc/doxygen/options.dox.in
index d4a33e0e23..851d8954c8 100644
--- a/deal.II/doc/doxygen/options.dox.in
+++ b/deal.II/doc/doxygen/options.dox.in
@@ -98,7 +98,7 @@ HTML_OUTPUT            = deal.II
 HTML_FILE_EXTENSION    = .html
 HTML_HEADER            = header.html
 HTML_FOOTER            = footer.html
-USE_MATHJAX            = YES
+USE_MATHJAX            = NO
 MATHJAX_RELPATH        = http://cdn.mathjax.org/mathjax/latest
 MATHJAX_EXTENSIONS     = TeX/AMSmath TeX/AMSsymbols
 HTML_COLORSTYLE_HUE    = 220
diff --git a/deal.II/doc/doxygen/tutorial/tutorial.h.in b/deal.II/doc/doxygen/tutorial/tutorial.h.in
index aafad4e83e..828ccc6d71 100644
--- a/deal.II/doc/doxygen/tutorial/tutorial.h.in
+++ b/deal.II/doc/doxygen/tutorial/tutorial.h.in
@@ -254,6 +254,12 @@
  *       </td></tr>
  *
  *   <tr valign="top">
+ *       <td>Step-26</td>
+ *       <td> The heat equation, solved on a mesh that is adapted
+ *       every few time steps.
+ *       </td></tr>
+ *
+ *   <tr valign="top">
  *       <td>Step-27</td>
  *       <td> hp finite element methods  </td></tr>
  *
@@ -424,7 +430,7 @@
  *
  *   <tr valign="top">
  *     <td> Adaptivity
- *     <td>Step-6</td>
+ *     <td>Step-6, step-26</td>
  *     </td>
  *   </tr>
  *
@@ -814,6 +820,14 @@
  *   </tr>
  *
  *   <tr valign="top">
+ *     <td> The heat equation
+ *     </td>
+ *     <td>
+ *       Step-26
+ *     </td>
+ *   </tr>
+ *
+ *   <tr valign="top">
  *     <td> The wave equation, in linear and nonlinear variants
  *     </td>
  *     <td>
@@ -911,10 +925,19 @@
  *   </tr>
  *
  * </table>
+ *
+ *
  * <h4><b>Time dependent problems</b></h4>
  * <table align="center" width="90%">
  *
  *   <tr valign="top">
+ *     <td> The heat equation
+ *     </td>
+ *     <td>Step-26
+ *     </td>
+ *   </tr>
+ *
+ *   <tr valign="top">
  *     <td width="400px"> Quasi-static elasticity
  *     </td>
  *     <td>
diff --git a/deal.II/doc/news/8.0.0-vs-8.1.0.h b/deal.II/doc/news/8.0.0-vs-8.1.0.h
index 7be343c267..7f3be0bb05 100644
--- a/deal.II/doc/news/8.0.0-vs-8.1.0.h
+++ b/deal.II/doc/news/8.0.0-vs-8.1.0.h
@@ -126,6 +126,15 @@ inconvenience this causes.
 
 
 <ol>
+  <li> New: step-26 fills a long-standing gap: There was no tutorial
+          program solving the heat equation. There was also no tutorial
+          showing in relatively easy terms how to do adaptive meshes
+          in time dependent problems. This program fills both of these
+          needs.
+  <br>
+  (Wolfgang Bangerth, 2013/12/18)
+  </li>
+
   <li> Improved: The build system now supports usage of the library
   out of the build directory without prior installation. This is done by
   exporting an additional project configuration just for the build directory.
diff --git a/deal.II/doc/news/news.html b/deal.II/doc/news/news.html
index f8c2111009..5e266297de 100644
--- a/deal.II/doc/news/news.html
+++ b/deal.II/doc/news/news.html
@@ -51,6 +51,17 @@
 	  target="_top">this site</a>.
       </dd>
 
+      <dt>
+          <strong>2013/12/18: step-26 for the heat equation </strong>
+      </dt>
+      <dd>
+          step-26 fills a long-standing gap: There was no tutorial
+          program solving the heat equation. There was also no tutorial
+          showing in relatively easy terms how to do adaptive meshes
+          in time dependent problems. This program fills both of these
+          needs.
+      </dd>
+
       <dt>
           <strong>2013/11/01: step-42 solves an elasto-plastic contact problem </strong>
       </dt>
-- 
2.39.5