]> https://gitweb.dealii.org/ - dealii.git/commitdiff
Documentation: Remove bogus indentation.html file
authorMatthias Maier <tamiko@kyomu.43-1.org>
Mon, 21 Jul 2014 16:15:47 +0000 (18:15 +0200)
committerMatthias Maier <tamiko@kyomu.43-1.org>
Tue, 23 Dec 2014 10:19:38 +0000 (11:19 +0100)
Well, we already have a detailed doxygen file about indentation. So it is
better to add the three relevant lines about astyle there and remove this
additional documentation page completely

doc/developers/indentation.html [deleted file]
doc/developers/index.html
doc/developers/navbar.html
doc/developers/svn.html
doc/doxygen/headers/coding_conventions.h

diff --git a/doc/developers/indentation.html b/doc/developers/indentation.html
deleted file mode 100644 (file)
index a042f26..0000000
+++ /dev/null
@@ -1,53 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN"
-         "http://www.w3.org/TR/html4/loose.dtd">
-<html>
-  <head>
-    <title>deal.II indentation</title>
-    <link href="../screen.css" rel="StyleSheet">
-    <meta name="copyright" content="Copyright (C) 2012, 2013 by the deal.II Authors">
-    <meta name="date" content="$Date$">
-    <meta name="keywords" content="deal.II">
-  </head>
-
-  <body>
-    <h1>Notes on deal.II indentation</h1>
-    
-    <p>deal.II uses <code>astyle</code> to normalize indentation. A
-    style file is provided at
-      <code>
-       DEAL/contrib/utilities/astyle.rc
-      </code>
-      where DEAL is the path to you deal.II source directory.</p>
-    
-    <p>All header and source files in the SVN repository are supposed
-    to conform to this style file. It is very important that we adhere
-    to this indentation style in order to avoid false conflicts on svn
-    updates.</p>
-    
-    <p>Before every commit, you should run
-      <code>
-       astyle --options=DEAL/contrib/utilities/astyle.rc <file>
-      </code>
-      on each of your files. This will make sure indentation is
-      conforming to our style.</p>
-
-    <p>Upon commit, svn will output comments on the conformity of your files. If you see a line of the form
-      <code>
-       !! file style mismatch detected
-      </code>
-      please re-indent the file. SVN may reject those files soon!</p>
-
-    <hr />
-    <address>
-      <a href="http://www.dealii.org/authors.html" target="_top">The deal.II Authors</a>
-      $Date$
-    </address>
-    <div class="right">
-      <a href="http://validator.w3.org/check?uri=referer" target="_top">
-        <img style="border:0" src="http://www.w3.org/Icons/valid-html401" alt="Valid HTML 4.01!"></a>
-      <a href="http://jigsaw.w3.org/css-validator/check/referer" target="_top">
-        <img style="border:0;width:88px;height:31px" src="http://jigsaw.w3.org/css-validator/images/vcss" alt="Valid CSS!"></a>
-    </div>
-
-  </body>
-</html>
index 2f48408b0943807217f83eff6db5d3eea0c949ea..4c50ec497715715d5457ece33cd7f47c58f3b7f0 100644 (file)
@@ -6,7 +6,7 @@
   <title>deal.II Development Information</title>
   <link href="../screen.css" type="text/css" rel="StyleSheet">
   <link rel="SHORTCUT ICON" href="../deal.ico">
-  <meta name="copyright" content="Copyright (C) 1998, 1999, 2000, 2002, 2003, 2004, 2005, 2007, 2012 by the deal.II Authors">
+  <meta name="copyright" content="Copyright (C) 1998 - 2014 by the deal.II Authors">
   <meta name="date" content="$Date$">
   <meta http-equiv="content-language" content="en">
 </head>
index 9c270ad68a4d065432a3b1b2a05228f5b763503c..af077e9ed32273d4ac81cc1b2eb8bd160482703e 100644 (file)
@@ -5,7 +5,7 @@
   <meta http-equiv="Content-type" content="text/html;charset=UTF-8">
   <title>deal.II Development Navigation Bar</title>
   <link href="../screen.css" rel="StyleSheet">
-  <meta name="copyright" content="Copyright (C) 1998, 1999, 2000, 2002, 2003, 2004, 2005, 2006, 2007, 2009, 2010, 2012, 2013, 2014 by the deal.II Authors">
+  <meta name="copyright" content="Copyright (C) 1998 - 2014 by the deal.II Authors">
   <meta name="date" content="$Date$">
   <meta http-equiv="content-language" content="en">
   </head>
index 81b1463b0d98a617341b7af552f360d0580d6440..4a69f9b6da67258d5aedcd9cc468044b111ff03e 100644 (file)
@@ -5,7 +5,7 @@
     <meta http-equiv="Content-type" content="text/html;charset=UTF-8">
     <title>deal.II SVN Archive</title>
     <link href="../screen.css" rel="StyleSheet">
-    <meta name="copyright" content="Copyright (C) 1998, 1999, 2000, 2002, 2003, 2004, 2005, 2006, 2009, 2010, 2012, 2013 by the deal.II Authors">
+    <meta name="copyright" content="Copyright (C) 1998 - 2014 by the deal.II Authors">
     <meta name="date" content="$Date$">
     <meta name="keywords" content="deal dealii finite elements fem triangulation">
     <meta http-equiv="content-language" content="en">
index cf423e395fa834ff9c975b0f0984f7faef4900eb..57d96575d8ce0e94036a7765fd786d389a6175ec 100644 (file)
@@ -30,6 +30,25 @@ before output arguments of a function call. They also simplify reading code
 because some things become clear already by looking at the style a piece of
 code is written, without having to look up the exact definition of something.
 
+<h3>Notes on deal.II indentation</h3>
+
+<p>deal.II uses <code>astyle</code> to normalize indentation. A
+style file is provided at
+<code>
+<pre>
+  ./contrib/utilities/astyle.rc
+</pre>
+</code>
+
+<p>Before a commit, you should run
+<code>
+<pre>
+  astyle --options=&lt;SOURCE DIRECTORY&gt;/contrib/utilities/astyle.rc &lt;file&gt;
+</pre>
+</code>
+on each of your files. This will make sure indentation is conforming to the
+style guidelines outlined in this page.</p>
+
 <h3>Style issues</h3>
 
 <ol>

In the beginning the Universe was created. This has made a lot of people very angry and has been widely regarded as a bad move.

Douglas Adams


Typeset in Trocchi and Trocchi Bold Sans Serif.