From 21b597cff6440b38142655e4ded5be4c78753055 Mon Sep 17 00:00:00 2001
From: guido <guido@0785d39b-7218-0410-832d-ea1e28bc413d>
Date: Fri, 11 Feb 2000 06:27:46 +0000
Subject: [PATCH] Texts straightened

git-svn-id: https://svn.dealii.org/trunk@2377 0785d39b-7218-0410-832d-ea1e28bc413d
---
 deal.II/doc/future.html  | 20 ++++++++++++++-----
 deal.II/doc/license.html | 24 ++++++++++++----------
 deal.II/doc/navbar.html  | 20 +++++++++----------
 deal.II/doc/readme.html  | 31 +++++++++++++++++++----------
 deal.II/doc/toc.html     | 43 ++++++++++++++++++----------------------
 5 files changed, 77 insertions(+), 61 deletions(-)

diff --git a/deal.II/doc/future.html b/deal.II/doc/future.html
index 5878d0c071..936bd4ce52 100644
--- a/deal.II/doc/future.html
+++ b/deal.II/doc/future.html
@@ -14,11 +14,12 @@
     <h2>Plans for the future of deal.II</h2>
 
     <p>
-    While we believe that <acronym>deal.II</acronym> is quite usable
+    While we consider <acronym>deal.II</acronym> quite useful
     in the present form, there are still many things that we would
-    implement for future versions. Among these are the following
+    like to implement in future versions. Among these are the following
     topics:
     <ul>
+<!--
     <li> <p>
          <strong>Multigrid:</strong> Guido Kanschat is working on an
          implementation of multigrid methods for
@@ -26,7 +27,7 @@
          refined grids, we are still having problems on locally
          refined grid. We hope to have them sorted out soon.
 	 </p>
-
+--!>
     <li> <p>
          <strong>Non-conforming elements:</strong> While
          <acronym>deal.II</acronym> is quite flexible with respect to
@@ -49,6 +50,13 @@
 	 code.
 	 </p>
 
+    <li> <p>
+         <strong>The <I>hp</I>-method of finite elements:</strong>
+	 This will need a major restructuring of the basic classes
+	 handling degrees of freedom and is therefore not planned for
+	 the immediate future.
+
+
     <li> <p>
          <strong>Linear solvers:</strong>
 	 We already have the most common linear solvers, such as CG,
@@ -82,10 +90,12 @@
 	 </p>
 
     <li> <p>
-         <strong>More example programs:</strong>
+         <strong>More example and test programs:</strong>
 	 There are still many aspects of the library that are not yet
          covered by the example programs. This is certainly something
-         that should be improved, but is time consuming.
+         that should be improved, but is time consuming. A complete
+	 test-suite for the library would be quite valuable for ports
+	 to new computer systems. 
 	 </p>
 
     <li> <p>
diff --git a/deal.II/doc/license.html b/deal.II/doc/license.html
index f88655a902..e332a08173 100644
--- a/deal.II/doc/license.html
+++ b/deal.II/doc/license.html
@@ -13,29 +13,31 @@
   <h1>License</h1>
 
   <ol>
-    <li><strong>When Qt Free Edition is Open Source, can I use it to make
+    <li><strong>When <acronym>deal.II</acronym> is Open Source, can I use it to make
                 commercial (proprietary) software?</strong>
         <p>
         <em>No.</em>
 	</p>
 
         <p>
-	You will still need to purchase the Professional Edition to make
-	commercial (proprietary) software with Qt (unless, as always, you
-	release software as free/Open Source software).
+	You will still need to obtain a profesional version of
+	<acronym>deal.II</acronym> from the authors to make commercial
+	(proprietary) software with <acronym>deal.II</acronym>
+	(unless, as always, you release software as free/Open Source
+	software).
         </p>
 
 
-    <li><strong>I want to put Qt, and applications that use it, on a
-                CD-ROM or on a web site. Can I do that with the Free
-                Edition?</strong>
+    <li><strong>I want to put <acronym>deal.II</acronym>, and
+                applications that use it, on a CD-ROM or on a web
+                site. Can I do that with the Free Edition?</strong>
 	<p>
         <em>Yes.</em>
 	</p>
 
 	<p>
-	You may copy and redistribute the Qt Free Edition, both at home and
-	at work, without restrictions.
+	You may copy and redistribute <acronym>deal.II</acronym>, both
+	at home and at work, without restrictions.
 	</p>
   </ol>
 The license is called the Q Public License (or
@@ -178,8 +180,8 @@ FOR A PARTICULAR PURPOSE.
 Choice of Law
 </h2>
 <p>
-This license is governed by the Laws of Norway. Disputes shall be settled
-by Oslo City Court.
+This license is governed by the Laws of Germany. Disputes shall be settled
+by Amtsgericht Heidelberg.
 
 </p>
 
diff --git a/deal.II/doc/navbar.html b/deal.II/doc/navbar.html
index 9b47bb35e4..008f5d0fc6 100644
--- a/deal.II/doc/navbar.html
+++ b/deal.II/doc/navbar.html
@@ -18,7 +18,7 @@
       <li>
 	<p>
 	  <a href="readme.html" target="body">
-	    The README file for <acronym>deal.II</acronym>
+	    <acronym>deal.II</acronym> README 
 	  </a>
 	</p>
       </li>
@@ -26,7 +26,7 @@
       <li>
 	<p>
 	  <a href="tutorial/index.html" target="_top">
-	    The <acronym>deal.II</acronym> tutorial
+	    Tutorial
 	  </a>
 	</p>
       </li>
@@ -34,49 +34,49 @@
       <li>
 	<p>
           <a href="auto/kdoc/base/index.html" target="_top">
-          /base library API</a>
+          /base API</a>
 	</p>  
       </li>
 
       <li>
 	<p>
           <a href="auto/kdoc/lac/index.html" target="_top">
-          /lac library API</a>
+          /lac API</a>
 	</p>  
       </li>
 
       <li>
 	<p>
           <a href="auto/kdoc/grid/index.html" target="_top">
-          /deal.II /grid API</a>
+          grid API</a>
 	</p>  
       </li>
 
       <li>
 	<p>
           <a href="auto/kdoc/dof/index.html" target="_top">
-          /deal.II /dofs API</a>
+          Dofs API</a>
 	</p>  
       </li>
 
       <li>
 	<p>
           <a href="auto/kdoc/numerics/index.html" target="_top">
-          /deal.II /numerics API</a>
+          Numerics API</a>
 	</p>  
       </li>
 
       <li>
 	<p>
           <a href="development/index.html" target="_top">
-	  Development information</a>
+	  Development</a>
 	</p>  
       </li>
 
       <li>
 	<p>
           <a href="future.html" target="body">
-	  Future directions</a>
+	  Future</a>
 	</p>  
       </li>
 
@@ -90,7 +90,7 @@
 
     <p>
       <a href="index.html" target="_top">
-        Back to the <acronym>deal.II</acronym> homepage
+        Home
       </a>
     </p>
     <hr>
diff --git a/deal.II/doc/readme.html b/deal.II/doc/readme.html
index e495f004fd..4a7132e21e 100644
--- a/deal.II/doc/readme.html
+++ b/deal.II/doc/readme.html
@@ -14,7 +14,7 @@
 	
     This document contains the following sections:
     <ul>
-      <li> <a href="#prerequisites">Prerequisites</a>
+      <li> <a href="#prerequisites">System requirements</a>
       <li> <a href="#installation">Installation</a>
       <li> <a href="#compiler">Compiler flags</a>
       <li> <a href="#problems">Problems, questions, further information</a>
@@ -24,10 +24,18 @@
 
     
     <a name="prerequisites">
-    <h2>Prerequisites</h2>
+    <h2>System requirements</h2>
 
-    In order to use the deal.II library (and its sub-libraries /base
-    and /lac) you need to have the following programs installed:
+    By this time (February 2000), <acronym>deal.II</acronym> has been
+    developed and tested on Unix systems only. It can be used positively on
+    <ul>
+      <li>Linux ELF with gcc 2.95.x
+      <li>Sun Solaris 2.5 / 2.6 with egcs 1.1.2 and gcc 2.95.x
+    </ul>
+
+    In order to compile and use the <acronym>deal.II</acronym> library
+    (and its sub-libraries /base and /lac) you need to have the
+    following programs installed:
     <ul>
       <li> A fairly complete C++ compiler. We use 
            <a href="http://gcc.gnu.org">egcs1.1.2 and
@@ -47,7 +55,7 @@
            <code>$(wildcard ...)</code> function which prevented us
            from compiling some parts of the library (most of our
            Makefiles use a workaround, though). Other make programs
-           (i.e. non-GNU flavors) are not standardized and will
+           (i.e. non-GNU) will
            probably fail to work.
 
       <li> In case you want to generate the documentation from the
@@ -75,13 +83,13 @@
            platforms. AVS is a commercial program available for most
            Unix flavors.
     </ul>
-
+<!--
     Note that we have only tested the library under Unix (extensively
     under SunOS and Linux). We believe that it should be possible with
     little effort to use it on other platforms as well. In that case
     it may be necessary to change some settings in the configure.in
     script or in the file common/Make.global_options.in.
-
+--!>
     <p>
 
     In case you didn't find your favorite graphics format above it
@@ -98,7 +106,7 @@
 
     The whole library usually comes as a .tar.gz file, that is a
     tarred file archive which is compressed with gzip. After unpacking
-    it with gunzip and tar (or tar -xzf if you use GNU tar), you will
+    it with gunzip and tar (or <tt>tar xzf</tt> if you use GNU tar), you will
     find several subdirectories. First run the script 
     <pre><code>
          ./configure
@@ -402,9 +410,10 @@
 
       <li>
         Scientific publications presenting results obtained with these
-        libraries shall state the names of the library and their
-        principle authors (at present Wolfgang Bangerth and Guido
-        Kanschat).
+        libraries should acknowledge the use of the library and name
+        its principle authors (at present Wolfgang Bangerth and Guido
+        Kanschat). Citation of the reports named on the homepage is
+        appreciated.
     </ul>
 
     Note that since our institute is evaluated at regular intervals,
diff --git a/deal.II/doc/toc.html b/deal.II/doc/toc.html
index 695c4dcbcc..a62e7b1c56 100644
--- a/deal.II/doc/toc.html
+++ b/deal.II/doc/toc.html
@@ -16,21 +16,21 @@
     <acronym>deal.II</acronym> has quite extensive online
     documentation, which falls into several categories:
     <ul>
-    <li> <p>The <a href="readme.html" target="body">README</a>
-         file of the library: this file explains installation,
-         required programs and some other topics.</p>
+    <li> <p>The <a href="readme.html" target="body">README</a> file of
+         the library. It gives information on system requirements,
+         installation, and copyright.</p>
 
     <li> <p>The <a href="tutorial/index.html" target="_top">tutorial</a>:
-         we have a tutorial for new users of the library which
+         for new users of the library. It
          explains the basic elements of finite element programs based
-         on the library, and provides some small example programs.</p>
+         on the library, and provides small example programs.</p>
 
-    <li> <p> In case you want to 
+    <li> <p> If you plan to
          <a href="development/index.html" target="_top">develop 
          your own applications</a>  using
          <acronym>deal.II</acronym>, it might be worth to take a look
 	 at <a href="development/index.html" target="_top">this
-         page</a> which has some information regarding that subject.
+         page</a>.
 	 </p>
 
     <li> <p>Programming interface documentation: the classes and methods
@@ -43,22 +43,23 @@
 
 	 <p>
 	 This API documentation is split into several parts, according
-	 to the sublibraries and the different directories of the main
+	 to the sub-libraries and the different directories of the main
 	 <acronym>deal.II</acronym> library:
 	 <ul>
 	   <li> <a href="auto/kdoc/base/index.html" target="_top">
-                 <code>/base</code> library</a>
+                 <code>/base</code> library</a>,
 	   <li> <a href="auto/kdoc/lac/index.html" target="_top">
-                 <code>/lac</code> library</a>
+                 <code>/lac</code> library</a>: <B>L</B>inear
+		  <B>A</B>lgebra <B>C</B>lasses,
 	   <li> <a href="auto/kdoc/grid/index.html" target="_top">
 	        Grid handling</a> in the 
-                 <code>/deal.II</code> library
+                 <code>/deal.II</code> library,
 	   <li> <a href="auto/kdoc/dof/index.html" target="_top">
 	        Degrees of freedom and finite elements</a> in the 
-                 <code>/deal.II</code> library
+                 <code>/deal.II</code> library,
 	   <li> <a href="auto/kdoc/numerics/index.html" target="_top">
 	        Numerical tools</a> in the 
-                 <code>/deal.II</code> library
+                 <code>/deal.II</code> library.
 	 </ul>
 	 </p>
 
@@ -93,17 +94,11 @@
     <a href="http://gaia.iwr.uni-heidelberg.de/~wolf/" target="_top">Wolfgang
     Bangerth</a>, starting in early 1998; he is still maintaining and
     managing the library, contributing code, and writing
-    documentation. However, over time 
-    other people have contributed as well, most notably 
+    documentation.
     <a href="http://gaia.iwr.uni-heidelberg.de/~kanschat/" target="_top">Guido
-    Kanschat</a>, who wrote much of the code linking several finite elements
-    together into one and above all the largest part of the multigrid
-    code. In addition, the first author owes him many thanks for
-    continuous advice in the early implementation stages on questions
-    of what is necessary to make up a good finite element code; only
-    this flow of advice made if possible to design from scratch a
-    library with the flexibility and stability of the interface of
-    <acronym>deal.II</acronym>.
+    Kanschat</a> started contributing advice in the early
+    implementation stages on questions of the design of object-oriented
+    finite element software and later joined into the coding.
 
     <p>
 
@@ -137,7 +132,7 @@
     <acronym>deal.II</acronym> is Open Source, in the
     sense advocated by the 
     <a href="http://www.opensource.org" target="_top">Open Source
-    Initiative</a>. You are free to use it in non-commercial ways,
+    Initiative</a>. You are free to use it for non-commercial purposes,
     i.e. in particular in research and education, and you are
     guaranteed full access to the source code. For the details, see
     the <a href="readme.html#license" target="body">ReadMe</a> file, and the
-- 
2.39.5