diff --git a/applications/solvers/multiphase/interPhaseChangeFoam/phaseChangeTwoPhaseMixtures/Kunz/Kunz.H b/applications/solvers/multiphase/interPhaseChangeFoam/phaseChangeTwoPhaseMixtures/Kunz/Kunz.H
index 03652fd9a770876a081ac48415a54929445aa6fe..2bb0db8e24f8c2868a76cbf5c72973765be61c9d 100644
--- a/applications/solvers/multiphase/interPhaseChangeFoam/phaseChangeTwoPhaseMixtures/Kunz/Kunz.H
+++ b/applications/solvers/multiphase/interPhaseChangeFoam/phaseChangeTwoPhaseMixtures/Kunz/Kunz.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2004-2010 OpenCFD Ltd.
+    \\  /    A nd           | Copyright (C) 2004-2011 OpenCFD Ltd.
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -39,7 +39,7 @@ Description
          to Cavitation Prediction,”
         Computers and Fluids,
         29(8):849-875, 2000.
-    @verbatim
+    @endverbatim
 
 SourceFiles
     Kunz.C
diff --git a/applications/solvers/multiphase/interPhaseChangeFoam/phaseChangeTwoPhaseMixtures/Merkle/Merkle.H b/applications/solvers/multiphase/interPhaseChangeFoam/phaseChangeTwoPhaseMixtures/Merkle/Merkle.H
index d77447d540966c6f742dd4b7bc78c03d164ed925..68e9c2871dc1fa115b6e78e9d22448957c861bec 100644
--- a/applications/solvers/multiphase/interPhaseChangeFoam/phaseChangeTwoPhaseMixtures/Merkle/Merkle.H
+++ b/applications/solvers/multiphase/interPhaseChangeFoam/phaseChangeTwoPhaseMixtures/Merkle/Merkle.H
@@ -2,7 +2,7 @@
   ========Merkle=                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2004-2010 OpenCFD Ltd.
+    \\  /    A nd           | Copyright (C) 2004-2011 OpenCFD Ltd.
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -33,7 +33,7 @@ Description
         "Computational modeling of the dynamics of sheet cavitation",
         in Proceedings Third International Symposium on Cavitation
         Grenoble, France 1998.
-   @verbatim
+   @endverbatim
 
 SourceFiles
     Merkle.C
diff --git a/applications/solvers/multiphase/interPhaseChangeFoam/phaseChangeTwoPhaseMixtures/SchnerrSauer/SchnerrSauer.H b/applications/solvers/multiphase/interPhaseChangeFoam/phaseChangeTwoPhaseMixtures/SchnerrSauer/SchnerrSauer.H
index 87ac7e232d97dc9772e0492ba16d7b1b06c461b4..98d5d69a2c8667cb6e6ce227d2ef3e33a216aa0c 100644
--- a/applications/solvers/multiphase/interPhaseChangeFoam/phaseChangeTwoPhaseMixtures/SchnerrSauer/SchnerrSauer.H
+++ b/applications/solvers/multiphase/interPhaseChangeFoam/phaseChangeTwoPhaseMixtures/SchnerrSauer/SchnerrSauer.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2004-2010 OpenCFD Ltd.
+    \\  /    A nd           | Copyright (C) 2004-2011 OpenCFD Ltd.
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -33,7 +33,7 @@ Description
         "Physical and Numerical Modeling of Unsteady Cavitation Dynamics",
         Proc. 4th International Conference on Multiphase Flow,
         New Orleans, U.S.A., 2001.
-    @verbatim
+    @endverbatim
 
 SourceFiles
     SchnerrSauer.C
diff --git a/applications/utilities/mesh/generation/extrude/extrudeToRegionMesh/extrudeToRegionMesh.C b/applications/utilities/mesh/generation/extrude/extrudeToRegionMesh/extrudeToRegionMesh.C
index bd068c5b48b3315d1147f1a4f9ffa685829e451e..e0f86f3f91b3195a8ddccb082d21abebcb4528ef 100644
--- a/applications/utilities/mesh/generation/extrude/extrudeToRegionMesh/extrudeToRegionMesh.C
+++ b/applications/utilities/mesh/generation/extrude/extrudeToRegionMesh/extrudeToRegionMesh.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2004-2010 OpenCFD Ltd.
+    \\  /    A nd           | Copyright (C) 2004-2011 OpenCFD Ltd.
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -30,9 +30,9 @@ Description
         - create baffles in original mesh with directMappedWall patches
     - if extruding boundary faces:
         - convert boundary faces to directMappedWall patches
-    - extrude edges of faceZone as a <zone>_sidePatch
+    - extrude edges of faceZone as a \<zone\>_sidePatch
     - extrude edges inbetween different faceZones as a
-      (nonuniformTransform)cyclic <zoneA>_<zoneB>
+      (nonuniformTransform)cyclic \<zoneA\>_\<zoneB\>
     - extrudes into master direction (i.e. away from the owner cell
       if flipMap is false)
     - not parallel
@@ -106,7 +106,7 @@ becomes
 
 Usage
 
-    - extrudeToRegionMesh <regionName> <faceZones> <thickness>
+    - extrudeToRegionMesh \<regionName\> \<faceZones\> \<thickness\>
 
     @param \<regionName\> \n
     Name of mesh to create.
diff --git a/bin/tools/doxyFilter b/bin/tools/doxyFilter
index af122f9c87f21a569a89c0bb902befe799a0ce21..4b1e35223eb87d84c03e3fd03633fe60112cc617 100755
--- a/bin/tools/doxyFilter
+++ b/bin/tools/doxyFilter
@@ -3,7 +3,7 @@
 # =========                 |
 # \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
 #  \\    /   O peration     |
-#   \\  /    A nd           | Copyright (C) 2004-2010 OpenCFD Ltd.
+#   \\  /    A nd           | Copyright (C) 2004-2011 OpenCFD Ltd.
 #    \\/     M anipulation  |
 #-------------------------------------------------------------------------------
 # License
@@ -52,7 +52,7 @@ then
 #    */applications/solvers/*.H | */applications/utilities/*.H )
 #        awkScript=$WM_PROJECT_DIR/bin/tools/doxyFilter-ignore.awk
 #        ;;
-   esac
+    esac
 
     awk -f $awkScript $1 | \
     sed -f $WM_PROJECT_DIR/bin/tools/doxyFilter.sed \
diff --git a/bin/tools/doxyFilter.awk b/bin/tools/doxyFilter.awk
index 85e57c75ec0fc7693d6f2109d380964f06bc3863..aebfbbaf31b797c35614a3c8b2ca5427914d7ebc 100644
--- a/bin/tools/doxyFilter.awk
+++ b/bin/tools/doxyFilter.awk
@@ -2,7 +2,7 @@
 # =========                 |
 # \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
 #  \\    /   O peration     |
-#   \\  /    A nd           | Copyright (C) 2004-2010 OpenCFD Ltd.
+#   \\  /    A nd           | Copyright (C) 2004-2011 OpenCFD Ltd.
 #    \\/     M anipulation  |
 # -----------------------------------------------------------------------------
 # License
@@ -57,7 +57,7 @@ BEGIN {
     # start comment block
     if (state == 1)
     {
-        printf "/*!\n"
+        printf "/*! "
         state = 2
     }
 
@@ -79,7 +79,7 @@ BEGIN {
     # end comment block
     if (state == 2)
     {
-        printf "*/\n"
+        printf "*/ "
     }
     state = 0
     print
diff --git a/bin/tools/doxyFilter.sed b/bin/tools/doxyFilter.sed
index 45a15019e132f41d41b84452bd47e5c46528debc..681929a90472c6483150ee532e3542ed81c3af9b 100644
--- a/bin/tools/doxyFilter.sed
+++ b/bin/tools/doxyFilter.sed
@@ -11,147 +11,140 @@
 /^License/,/\*\//{
 /^License/,\%http://www.gnu.org/licenses%{
 s?^License.*?\*\/\
-\/\*! @file %filePath%\
+\/\*! \\file %filePath%\
 <b>Original source file</b> <a href="%filePath%">%fileName%</a>\
+\
+\
+\
+\
+\
+\
+\
+\
 ?
 /^    /d
 }
 
-# old FSF address
-/^License/,/MA 0211.-130. USA/{
-s?^License.*?\*\/\
-\/\*! @file %filePath%\
-<b>Original source file</b> <a href="%filePath%">%fileName%</a>\
-?
-/^    /d
-}
 
 # remove entry
-/^Primitive *$/{
+/^Application *$/{
 N
 N
 d
 }
 
-# remove entry
-/^Implementation *$/{
-N
-N
-d
-}
 
 # remove entry
-/^Application *$/{
+/^Global *$/{
 N
 N
 d
 }
 
-# remove entry
-/^Type *$/{
-N
-N
-d
-}
 
-# remove entry
-/^Global *$/{
-N
-N
-d
+# Primitive
+#     typename
+# =>
+# \\relates typename
+#
+/^Primitive *$/,/^[^ ]/{
+s/^Primitive *$//
+s/^    /\\relates /
 }
 
 
 # Class
 #     Foam::className
 # =>
-# @class Foam::className
+# \\class Foam::className
 #
 /^Class *$/,/^[^ ]/{
-/^Class/d
-s/^    /@class /
+s/^Class *$//
+s/^    /\\class /
 }
 
 
 # Namespace
 #     namespaceName
 # =>
-# @namespace namespaceName
+# \namespace namespaceName
 #
 /^Namespace *$/,/^[^ ]/{
-/^Namespace/d
-s/^    /@namespace /
+s/^Namespace//
+s/^    /\\namespace /
 }
 
 
 # Typedef
 #     Foam::def
 # =>
-# @class Foam::def
-# This is not strictly correct, but makes it easier to find the typedefs
+# \typedef Foam::def
 /^Typedef *$/,/^[^ ]/{
-/^Typedef/d
-s/^    /@class /
+s/^Typedef//
+s/^    /\\typedef /
 }
 
 
-# add anchor and use @brief
+# add anchor and use \brief
 # the first paragraph will be 'brief' and the others 'detail'
 /^Description *$/,/^[^ ]/{
 /^Description/c\
-<a class="anchor" name="Description"></a>\
-@brief
+<a class="anchor" name="Description"></a> \\brief
 s/^    //
 }
 
 /^Usage *$/,/^[^ ]/{
 /^Usage/c\
-@par Usage
+\\par Usage
 s/^    //
 }
 
 
 /^See *Also *$/,/^[^ ]/{
 /^See *Also/c\
-@see
-s/^    //
-}
-
-/^Author *$/,/^[^ ]/{
-/^Author/c\
-@author
+\\see
 s/^    //
 }
 
 /^Note *$/,/^[^ ]/{
 /^Note/c\
-@note
+\\note
 s/^    //
 }
 
 
 # remove ToDo paragraph to avoid them showing on related pages
-/^To[Dd]o *$/,/^ *$/d
+/^To[Dd]o *$/,/^[^ ]/{
+s/^To[Dd]o *$//
+s/^    .*//
+}
 
 
 /^Warning *$/,/^[^ ]/{
 /^Warning/c\
-@warning
+\\warning
 s/^    //
 }
 
+
 /^Deprecated *$/,/^[^ ]/{
 /^Deprecated/c\
-@deprecated
+\\deprecated
 s/^    //
 }
 
-/SourceFiles/,/^[ ]*$/{
-s?SourceFiles?@par Source files\
-<ul>\
-  <li><a href="%filePath%">%fileName%</a></li>?
-s?^[ ]*$?</ul>\
-?
+
+/^SourceFiles *$/,/^$/{
+s?SourceFiles?\\par Source files\
+<ul><li><a href="%filePath%">%fileName%</a></li>?
+s? *\([a-zA-Z0-9]*\.[a-zA-Z]*\)?  <li><a href="%dirName%/\1">\1</a></li>?
+s?^$?</ul>?
+}
+
+/fileName%<\/a><\/li>$/{
+N
+s?\n$?</ul>?g
+s/<\/li>\n/<\/li> /
 s? *\([a-zA-Z0-9]*\.[a-zA-Z]*\)?  <li><a href="%dirName%/\1">\1</a></li>?
 }
 
diff --git a/doc/Doxygen/Doxyfile b/doc/Doxygen/Doxyfile
index 79bc3b71cf63254707d46d8c7b5221b48e177ebf..3ef243ee83b0f2d31a32c3c3bf554e2751335afa 100644
--- a/doc/Doxygen/Doxyfile
+++ b/doc/Doxygen/Doxyfile
@@ -1104,7 +1104,7 @@ TAGFILES               =
 # When a file name is specified after GENERATE_TAGFILE, doxygen will create
 # a tag file that is based on the input files it reads.
 
-GENERATE_TAGFILE       =
+GENERATE_TAGFILE       = DTAGS
 
 # If the ALLEXTERNALS tag is set to YES all external classes will be listed
 # in the class index. If set to NO only the inherited external classes
@@ -1254,7 +1254,7 @@ DOTFILE_DIRS           =
 # MAX_DOT_GRAPH_NOTES then the graph will not be shown at all. Also note
 # that the size of a graph can be further restricted by MAX_DOT_GRAPH_DEPTH.
 
-DOT_GRAPH_MAX_NODES    = 50
+DOT_GRAPH_MAX_NODES    = 10
 
 # The MAX_DOT_GRAPH_DEPTH tag can be used to set the maximum depth of the
 # graphs generated by dot. A depth value of 3 means that only nodes reachable
@@ -1264,7 +1264,7 @@ DOT_GRAPH_MAX_NODES    = 50
 # code bases. Also note that the size of a graph can be further restricted by
 # DOT_GRAPH_MAX_NODES. Using a depth of 0 means no depth restriction.
 
-MAX_DOT_GRAPH_DEPTH    = 3
+MAX_DOT_GRAPH_DEPTH    = 1
 
 # Set the DOT_TRANSPARENT tag to YES to generate images with a transparent
 # background. This is disabled by default, which results in a white background.
diff --git a/doc/doxygen/Doxyfile b/doc/doxygen/Doxyfile
index a1c4e6a5fcf8c4e26618747bb1e2df14ab3e8f89..0c076b4fc240957577abe8f14d4c3f0984f2e043 100644
--- a/doc/doxygen/Doxyfile
+++ b/doc/doxygen/Doxyfile
@@ -581,7 +581,8 @@ WARN_LOGFILE           =
 # limit input for testing purposes
 INPUT                  = $(WM_PROJECT_DIR)/src/OpenFOAM/global \
                          $(WM_PROJECT_DIR)/src/OpenFOAM/containers \
-                         $(WM_PROJECT_DIR)/src/OpenFOAM/primitives
+                         $(WM_PROJECT_DIR)/src/OpenFOAM/primitives \
+                         $(WM_PROJECT_DIR)/src/finiteVolume/fvMesh
 
 # This tag can be used to specify the character encoding of the source files
 # that doxygen parses. Internally doxygen uses the UTF-8 encoding, which is
@@ -1353,7 +1354,7 @@ TAGFILES               =
 # When a file name is specified after GENERATE_TAGFILE, doxygen will create
 # a tag file that is based on the input files it reads.
 
-GENERATE_TAGFILE       =
+GENERATE_TAGFILE       = DTAGS
 
 # If the ALLEXTERNALS tag is set to YES all external classes will be listed
 # in the class index. If set to NO only the inherited external classes
diff --git a/src/OSspecific/POSIX/fileMonitor.C b/src/OSspecific/POSIX/fileMonitor.C
index 8abbf768eacd176abbcf7af0c61e5458c8dfe5b4..cb0e8be4d758c544261ab193731b22e530d51bc9 100644
--- a/src/OSspecific/POSIX/fileMonitor.C
+++ b/src/OSspecific/POSIX/fileMonitor.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2010-2010 OpenCFD Ltd.
+    \\  /    A nd           | Copyright (C) 2010-2011 OpenCFD Ltd.
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -109,8 +109,7 @@ namespace Foam
 
 
 
-    //! @cond internalClass
-    //- Internal tracking via stat(3p) or inotify(7)
+    //-  Internal tracking via stat(3p) or inotify(7)
     class fileMonitorWatcher
     {
     public:
@@ -140,7 +139,7 @@ namespace Foam
         {
             if (useInotify_)
             {
-#ifdef FOAM_USE_INOTIFY
+                #ifdef FOAM_USE_INOTIFY
                 inotifyFd_ = inotify_init();
                 dirWatches_.setCapacity(sz);
                 dirFiles_.setCapacity(sz);
@@ -167,13 +166,13 @@ namespace Foam
                             << endl;
                     }
                 }
-#else
+                #else
                     FatalErrorIn("fileMonitorWatcher(const bool, const label)")
                         << "You selected inotify but this file was compiled"
                         << " without FOAM_USE_INOTIFY"
                         << "Please select another fileModification test method"
                         << exit(FatalError);
-#endif
+                #endif
             }
             else
             {
@@ -184,7 +183,7 @@ namespace Foam
         //- remove all watches
         inline ~fileMonitorWatcher()
         {
-#ifdef FOAM_USE_INOTIFY
+            #ifdef FOAM_USE_INOTIFY
             if (useInotify_ && inotifyFd_ >= 0)
             {
                 forAll(dirWatches_, i)
@@ -200,7 +199,7 @@ namespace Foam
                     }
                 }
             }
-#endif
+            #endif
         }
 
         inline bool addWatch(const label watchFd, const fileName& fName)
@@ -212,7 +211,7 @@ namespace Foam
                     return false;
                 }
 
-#ifdef FOAM_USE_INOTIFY
+                #ifdef FOAM_USE_INOTIFY
                 // Add/retrieve watch on directory containing file.
                 // Note that fName might be non-existing in special situations
                 // (master-only reading for IODictionaries)
@@ -250,7 +249,7 @@ namespace Foam
 
                 dirWatches_(watchFd) = dirWatchID;
                 dirFiles_(watchFd) = fName.name();
-#endif
+                #endif
             }
             else
             {
@@ -288,7 +287,6 @@ namespace Foam
         }
 
     };
-    //! @endcond
 }
 
 
@@ -298,7 +296,7 @@ void Foam::fileMonitor::checkFiles() const
 {
     if (useInotify_)
     {
-#ifdef FOAM_USE_INOTIFY
+        #ifdef FOAM_USE_INOTIFY
         // Large buffer for lots of events
         char buffer[EVENT_BUF_LEN];
 
@@ -392,7 +390,7 @@ void Foam::fileMonitor::checkFiles() const
                 return;
             }
         }
-#endif
+        #endif
     }
     else
     {
diff --git a/src/OpenFOAM/db/runTimeSelection/globalFunctions/addToGlobalFunctionSelectionTable.H b/src/OpenFOAM/db/runTimeSelection/globalFunctions/addToGlobalFunctionSelectionTable.H
index e5c676b8be56688ee54408c76c44b9f480462a70..827723fe5c35ebb81bf367c55162a851ea81ab95 100644
--- a/src/OpenFOAM/db/runTimeSelection/globalFunctions/addToGlobalFunctionSelectionTable.H
+++ b/src/OpenFOAM/db/runTimeSelection/globalFunctions/addToGlobalFunctionSelectionTable.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2010-2010 OpenCFD Ltd.
+    \\  /    A nd           | Copyright (C) 2010-2011 OpenCFD Ltd.
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -21,7 +21,8 @@ License
     You should have received a copy of the GNU General Public License
     along with OpenFOAM.  If not, see <http://www.gnu.org/licenses/>.
 
-@file Foam::addToGlobalFunctionSelectionTable
+Global
+    Foam::addToGlobalFunctionSelectionTable
 
 Description
     Macros for easy insertion into global function selection tables
@@ -33,20 +34,18 @@ Description
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-
 // add to hash-table of functions with 'lookup' as the key
 #define addNamedToGlobalFunctionSelectionTable\
 (memberFunction,argNames,lookup,functionPtr)                                  \
                                                                               \
     /* Add to the table, find by lookup name */                               \
     add##memberFunction##argNames##GlobalMemberFunctionToTable                \
-    add_##lookup##_##memberFunction##argNames##GlobalMemberFunctionTo##Table_\
+    add_##lookup##_##memberFunction##argNames##GlobalMemberFunctionTo##Table_ \
     (#lookup, functionPtr)
 
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-
 #endif
 
 // ************************************************************************* //
diff --git a/src/OpenFOAM/db/runTimeSelection/globalFunctions/globalFunctionSelectionTables.H b/src/OpenFOAM/db/runTimeSelection/globalFunctions/globalFunctionSelectionTables.H
index 581d2cb8f5c88a6b18340b1d3f1ac8988728eda1..76481db2798d63ece0855aae94589d7734f6af9b 100644
--- a/src/OpenFOAM/db/runTimeSelection/globalFunctions/globalFunctionSelectionTables.H
+++ b/src/OpenFOAM/db/runTimeSelection/globalFunctions/globalFunctionSelectionTables.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2010-2010 OpenCFD Ltd.
+    \\  /    A nd           | Copyright (C) 2010-2011 OpenCFD Ltd.
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -21,7 +21,8 @@ License
     You should have received a copy of the GNU General Public License
     along with OpenFOAM.  If not, see <http://www.gnu.org/licenses/>.
 
-@file Foam::globalFunctionSelectionTables
+Global
+    Foam::globalFunctionSelectionTables
 
 Description
     Macros to enable the easy declaration of global function selection tables.
@@ -35,7 +36,6 @@ Description
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-
 // external use:
 // ~~~~~~~~~~~~~
 // declare a run-time selection:
@@ -138,7 +138,6 @@ Description
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-
 #endif
 
 // ************************************************************************* //
diff --git a/src/OpenFOAM/db/runTimeSelection/staticMemberFunctions/addToStaticMemberFunctionSelectionTable.H b/src/OpenFOAM/db/runTimeSelection/staticMemberFunctions/addToStaticMemberFunctionSelectionTable.H
index 24550d46416e6dc4a6a07cf3b3e9c57c8b4ad071..171ee131f697c099ee2f6fcf423d1cb48b2d5665 100644
--- a/src/OpenFOAM/db/runTimeSelection/staticMemberFunctions/addToStaticMemberFunctionSelectionTable.H
+++ b/src/OpenFOAM/db/runTimeSelection/staticMemberFunctions/addToStaticMemberFunctionSelectionTable.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2010-2010 OpenCFD Ltd.
+    \\  /    A nd           | Copyright (C) 2010-2011 OpenCFD Ltd.
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -21,7 +21,8 @@ License
     You should have received a copy of the GNU General Public License
     along with OpenFOAM.  If not, see <http://www.gnu.org/licenses/>.
 
-@file Foam::addToStaticMemberFunctionSelectionTable
+Global
+    Foam::addToStaticMemberFunctionSelectionTable
 
 Description
     Macros for easy insertion into member function selection tables
@@ -47,7 +48,6 @@ Description
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-
 #endif
 
 // ************************************************************************* //
diff --git a/src/OpenFOAM/db/runTimeSelection/staticMemberFunctions/staticMemberFunctionSelectionTables.H b/src/OpenFOAM/db/runTimeSelection/staticMemberFunctions/staticMemberFunctionSelectionTables.H
index b3bcee84c2ea0db5a87951ccf35be01b5b139db3..392250477b01b32646aaabe039ac1e03e506e415 100644
--- a/src/OpenFOAM/db/runTimeSelection/staticMemberFunctions/staticMemberFunctionSelectionTables.H
+++ b/src/OpenFOAM/db/runTimeSelection/staticMemberFunctions/staticMemberFunctionSelectionTables.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2010-2010 OpenCFD Ltd.
+    \\  /    A nd           | Copyright (C) 2010-2011 OpenCFD Ltd.
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -21,7 +21,8 @@ License
     You should have received a copy of the GNU General Public License
     along with OpenFOAM.  If not, see <http://www.gnu.org/licenses/>.
 
-@file Foam::staticMemberFunctionSelectionTables
+Global
+    Foam::staticMemberFunctionSelectionTables
 
 Description
     Macros to enable the easy declaration of member function selection tables.
@@ -35,7 +36,6 @@ Description
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-
 // external use:
 // ~~~~~~~~~~~~~
 // declare a run-time selection:
@@ -140,7 +140,6 @@ Description
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-
 #endif
 
 // ************************************************************************* //
diff --git a/src/OpenFOAM/interpolations/interpolationTable/interpolationTable.H b/src/OpenFOAM/interpolations/interpolationTable/interpolationTable.H
index a409f01c7940f011c8f9d44ec01eeffeca560636..405fb69ecf3b9a00fdfdb32cc50eeaf3a15c2efd 100644
--- a/src/OpenFOAM/interpolations/interpolationTable/interpolationTable.H
+++ b/src/OpenFOAM/interpolations/interpolationTable/interpolationTable.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2004-2010 OpenCFD Ltd.
+    \\  /    A nd           | Copyright (C) 2004-2011 OpenCFD Ltd.
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -25,7 +25,7 @@ Class
     Foam::interpolationTable
 
 Description
-    An interpolation/look-up table of scalar vs <Type> values.
+    An interpolation/look-up table of scalar vs \<Type\> values.
     The reference scalar values must be monotonically increasing.
 
     The handling of out-of-bounds values depends on the current setting
diff --git a/src/OpenFOAM/matrices/DiagonalMatrix/DiagonalMatrix.H b/src/OpenFOAM/matrices/DiagonalMatrix/DiagonalMatrix.H
index b038452515f39c109adffe1e4ec7ef92bdab9930..af8f693f0a498f800925ff9285042f74d421aaab 100644
--- a/src/OpenFOAM/matrices/DiagonalMatrix/DiagonalMatrix.H
+++ b/src/OpenFOAM/matrices/DiagonalMatrix/DiagonalMatrix.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2004-2010 OpenCFD Ltd.
+    \\  /    A nd           | Copyright (C) 2004-2011 OpenCFD Ltd.
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -22,7 +22,7 @@ License
     along with OpenFOAM.  If not, see <http://www.gnu.org/licenses/>.
 
 Class
-    Foam::DiagonalMatrix<Type>
+    Foam::DiagonalMatrix
 
 Description
     DiagonalMatrix<Type> is a 2D diagonal matrix of objects
diff --git a/src/OpenFOAM/primitives/functions/DataEntry/Constant/Constant.H b/src/OpenFOAM/primitives/functions/DataEntry/Constant/Constant.H
index f7a1bb902e89fb57046849828cc5928bb9722d0c..ffa5f71173611a8acdcfed3c895e5908aec79831 100644
--- a/src/OpenFOAM/primitives/functions/DataEntry/Constant/Constant.H
+++ b/src/OpenFOAM/primitives/functions/DataEntry/Constant/Constant.H
@@ -27,7 +27,7 @@ Class
 Description
     Templated basic entry that holds a constant value.
 
-    Usage - for entry <entryName> having the value <value>:
+    Usage - for entry \<entryName\> having the value <value>:
     @verbatim
         <entryName>    constant  <value>
     @endverbatim
diff --git a/src/OpenFOAM/primitives/functions/DataEntry/Table/Table.H b/src/OpenFOAM/primitives/functions/DataEntry/Table/Table.H
index 5fe73deccbf9d83859019cad01c49d9505845d66..31fedafbbe69e636c007f093547d94c612833d0d 100644
--- a/src/OpenFOAM/primitives/functions/DataEntry/Table/Table.H
+++ b/src/OpenFOAM/primitives/functions/DataEntry/Table/Table.H
@@ -27,7 +27,7 @@ Class
 Description
     Templated table container data entry. Items are stored in a list of
     Tuple2's. First column is always stored as scalar entries. Data is read
-    in the form, e.g. for an entry <entryName> that is (scalar, vector):
+    in the form, e.g. for an entry \<entryName\> that is (scalar, vector):
 
     @verbatim
         <entryName>   table
diff --git a/src/OpenFOAM/primitives/functions/DataEntry/polynomial/polynomial.H b/src/OpenFOAM/primitives/functions/DataEntry/polynomial/polynomial.H
index e336068020995f8a358eb512bf9d4033b0fb957d..33d3adcc5eeb9b83b3573793ee0e75165f4f5f99 100644
--- a/src/OpenFOAM/primitives/functions/DataEntry/polynomial/polynomial.H
+++ b/src/OpenFOAM/primitives/functions/DataEntry/polynomial/polynomial.H
@@ -26,7 +26,7 @@ Class
 
 Description
     Polynomial container data entry for scalars. Items are stored in a list of
-    Tuple2's. Data is input in the form, e.g. for an entry <entryName> that
+    Tuple2's. Data is input in the form, e.g. for an entry \<entryName\> that
     describes y = x^2 + 2x^3
 
     @verbatim
diff --git a/src/OpenFOAM/primitives/hashes/Hasher/HasherInt.H b/src/OpenFOAM/primitives/hashes/Hasher/HasherInt.H
index f5a1e8b3ff132b1e1b60048e978460ca7c4cd1a8..11f68e5c173a82ab5b6e037004acbbf848dcfd60 100644
--- a/src/OpenFOAM/primitives/hashes/Hasher/HasherInt.H
+++ b/src/OpenFOAM/primitives/hashes/Hasher/HasherInt.H
@@ -49,21 +49,21 @@ namespace Foam
 
     //- An optimized version of Hasher
     //  @param[in] data - an array of uint32_t values
-    //  @param[in] len  - the number of values (not bytes)
+    //  @param[in] length - the number of values (not bytes)
     //  @param[in] seed - the previous hash, or an arbitrary value
-    unsigned HasherInt(const uint32_t*, size_t length, unsigned seed = 0);
+    unsigned HasherInt(const uint32_t* data, size_t length, unsigned seed = 0);
 
     //- An optimized version of Hasher, returning dual hash values
     //  @param[in] data - an array of uint32_t values
-    //  @param[in] len  - the number of values (not bytes)
+    //  @param[in] length - the number of values (not bytes)
     //  @param[in] hash1 - the previous hash, or an arbitrary value
     //    on output, the primary hash value
     //  @param[in] hash1 - the previous hash, or an arbitrary value
     //    on output, the secondary hash value
     unsigned HasherDual
     (
-        const uint32_t*,
-        size_t len,
+        const uint32_t* data,
+        size_t length,
         unsigned& hash1,
         unsigned& hash2
     );
diff --git a/src/finiteVolume/cfdTools/general/porousMedia/PorousZones.H b/src/finiteVolume/cfdTools/general/porousMedia/PorousZones.H
index c34b60c143d87a9f93d4deb41e19e264b866ce76..b918eda99a1d11b9a08a1db63cacc191ba878198 100644
--- a/src/finiteVolume/cfdTools/general/porousMedia/PorousZones.H
+++ b/src/finiteVolume/cfdTools/general/porousMedia/PorousZones.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2004-2010 OpenCFD Ltd.
+    \\  /    A nd           | Copyright (C) 2004-2011 OpenCFD Ltd.
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -22,7 +22,7 @@ License
     along with OpenFOAM.  If not, see <http://www.gnu.org/licenses/>.
 
 Class
-    Foam::PorousZones<ZoneType>
+    Foam::PorousZones
 
 Description
     A centralized ZoneType collection.
diff --git a/src/finiteVolume/fvMesh/fvMesh.H b/src/finiteVolume/fvMesh/fvMesh.H
index 2a5c81fcc2d7e0589dc75b0e2fd62eb0d8d1e64b..6a98e07ed22a29ada56727df5b822b28b7f3a077 100644
--- a/src/finiteVolume/fvMesh/fvMesh.H
+++ b/src/finiteVolume/fvMesh/fvMesh.H
@@ -1,8 +1,8 @@
 /*---------------------------------------------------------------------------*\
   =========                 |
-  \\      /  F ield         | OpenFOAM: The Open So
+  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2004-2010 OpenCFD Ltd.
+    \\  /    A nd           | Copyright (C) 2004-2011 OpenCFD Ltd.
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -42,6 +42,16 @@ SourceFiles
     fvMesh.C
     fvMeshGeometry.C
 
+See Also
+    hmm
+
+Usage
+    oeuoeuoeu
+
+ToDo
+    oeuoeuoeu
+    oeueouoeu
+
 \*---------------------------------------------------------------------------*/
 
 #ifndef fvMesh_H
diff --git a/src/finiteVolume/interpolation/surfaceInterpolation/surfaceInterpolation/surfaceInterpolate.H b/src/finiteVolume/interpolation/surfaceInterpolation/surfaceInterpolation/surfaceInterpolate.H
index 7bda1c56868f88694267fd66297fd429b3b5e546..207a19dcb10c6b2c90230f8c4e5d5dce83aa736a 100644
--- a/src/finiteVolume/interpolation/surfaceInterpolation/surfaceInterpolation/surfaceInterpolate.H
+++ b/src/finiteVolume/interpolation/surfaceInterpolation/surfaceInterpolation/surfaceInterpolate.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2004-2010 OpenCFD Ltd.
+    \\  /    A nd           | Copyright (C) 2004-2011 OpenCFD Ltd.
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -156,14 +156,14 @@ namespace fvc
     );
 
 
-    //- Interpolate tmp field onto faces using 'interpolate(<name>)'
+    //- Interpolate tmp field onto faces using 'interpolate(\<name\>)'
     template<class Type>
     static tmp<GeometricField<Type, fvsPatchField, surfaceMesh> > interpolate
     (
         const tmp<GeometricField<Type, fvPatchField, volMesh> >& tvf
     );
 
-    //- Interpolate tmp field onto faces using 'interpolate(<name>)'
+    //- Interpolate tmp field onto faces using 'interpolate(\<name\>)'
     template<class Type>
     static tmp<GeometricField<Type, fvsPatchField, surfaceMesh> > interpolate
     (
diff --git a/src/lagrangian/basic/Cloud/Cloud.H b/src/lagrangian/basic/Cloud/Cloud.H
index e82907d76b800b6a58395a27c2c3a9886d66a7ff..3715bcb75ca01a6c516aef345c8cdde41cef4aa8 100644
--- a/src/lagrangian/basic/Cloud/Cloud.H
+++ b/src/lagrangian/basic/Cloud/Cloud.H
@@ -381,7 +381,7 @@ public:
                 IOstream::compressionType cmp
             ) const;
 
-            //- Write positions to <cloudName>_positions.obj file
+            //- Write positions to \<cloudName\>_positions.obj file
             void writePositions() const;
 
 
diff --git a/src/postProcessing/foamCalcFunctions/basic/addSubtract/addSubtract.H b/src/postProcessing/foamCalcFunctions/basic/addSubtract/addSubtract.H
index b7755425a60cad3214c2aaf542566ddc7c7e4ad1..e8c8c56c95752608a9a42c6cca9b03e93263514f 100644
--- a/src/postProcessing/foamCalcFunctions/basic/addSubtract/addSubtract.H
+++ b/src/postProcessing/foamCalcFunctions/basic/addSubtract/addSubtract.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2008-2010 OpenCFD Ltd.
+    \\  /    A nd           | Copyright (C) 2008-2011 OpenCFD Ltd.
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -28,10 +28,10 @@ Description
     adds/subtracts a field or value to/from a base field.
 
     New field name specified by -resultName option, or automatically as:
-        <baseFieldName>_add_<addSubtractFieldName>
-        <baseFieldName>_add_value
-        <baseFieldName>_subtract_<addSubtractFieldName>
-        <baseFieldName>_subtract_value
+        \<baseFieldName\>_add_<addSubtractFieldName>
+        \<baseFieldName\>_add_value
+        \<baseFieldName\>_subtract_<addSubtractFieldName>
+        \<baseFieldName\>_subtract_value
 
     Example usage:
         addSubtract p add -value 100000 -resultName pAbs
diff --git a/src/turbulenceModels/compressible/RAS/derivedFvPatchFields/wallFunctions/mutWallFunctions/mutkRoughWallFunction/mutkRoughWallFunctionFvPatchScalarField.H b/src/turbulenceModels/compressible/RAS/derivedFvPatchFields/wallFunctions/mutWallFunctions/mutkRoughWallFunction/mutkRoughWallFunctionFvPatchScalarField.H
index ffc91e74544ed227470704dcea980314abf77f16..ce15860eab28849517c46ecdaa1521e0f67f7181 100644
--- a/src/turbulenceModels/compressible/RAS/derivedFvPatchFields/wallFunctions/mutWallFunctions/mutkRoughWallFunction/mutkRoughWallFunctionFvPatchScalarField.H
+++ b/src/turbulenceModels/compressible/RAS/derivedFvPatchFields/wallFunctions/mutWallFunctions/mutkRoughWallFunction/mutkRoughWallFunctionFvPatchScalarField.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2008-2010 OpenCFD Ltd.
+    \\  /    A nd           | Copyright (C) 2008-2011 OpenCFD Ltd.
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -22,7 +22,7 @@ License
     along with OpenFOAM.  If not, see <http://www.gnu.org/licenses/>.
 
 Class
-    Foam::compressible::RASModels::mutRoughWallFunctionFvPatchScalarField
+    Foam::compressible::RASModels::mutkRoughWallFunctionFvPatchScalarField
 
 Description
     Boundary condition for turbulent (kinematic) viscosity when using wall
diff --git a/src/turbulenceModels/incompressible/LES/SpalartAllmaras/SpalartAllmaras.H b/src/turbulenceModels/incompressible/LES/SpalartAllmaras/SpalartAllmaras.H
index 2b2687c407cbfed57b15b03c5a9251b1218aa892..85b98cc2265dc0340e8360dba9ad6385c6821f4a 100644
--- a/src/turbulenceModels/incompressible/LES/SpalartAllmaras/SpalartAllmaras.H
+++ b/src/turbulenceModels/incompressible/LES/SpalartAllmaras/SpalartAllmaras.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2004-2010 OpenCFD Ltd.
+    \\  /    A nd           | Copyright (C) 2004-2011 OpenCFD Ltd.
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -22,7 +22,7 @@ License
     along with OpenFOAM.  If not, see <http://www.gnu.org/licenses/>.
 
 Class
-    Foam::LESmodels::SpalartAllmaras
+    Foam::incompressible::LESModels::SpalartAllmaras
 
 Description
     SpalartAllmaras DES (SA + LES) turbulence model for incompressible flows
diff --git a/src/turbulenceModels/incompressible/LES/SpalartAllmarasDDES/SpalartAllmarasDDES.H b/src/turbulenceModels/incompressible/LES/SpalartAllmarasDDES/SpalartAllmarasDDES.H
index aeb936968f7bb8fb6f51a3ca60d05ace23b5a4c1..048a7a4b544bfb24a658b8c4f40c9ec65583ee32 100644
--- a/src/turbulenceModels/incompressible/LES/SpalartAllmarasDDES/SpalartAllmarasDDES.H
+++ b/src/turbulenceModels/incompressible/LES/SpalartAllmarasDDES/SpalartAllmarasDDES.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2008-2010 OpenCFD Ltd.
+    \\  /    A nd           | Copyright (C) 2008-2011 OpenCFD Ltd.
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -22,7 +22,7 @@ License
     along with OpenFOAM.  If not, see <http://www.gnu.org/licenses/>.
 
 Class
-    Foam::LESmodels::SpalartAllmarasDDES
+    Foam::incompressible::LESModels::SpalartAllmarasDDES
 
 Description
     SpalartAllmaras DDES LES turbulence model for incompressible flows
diff --git a/src/turbulenceModels/incompressible/LES/SpalartAllmarasIDDES/SpalartAllmarasIDDES.H b/src/turbulenceModels/incompressible/LES/SpalartAllmarasIDDES/SpalartAllmarasIDDES.H
index 80b13e1ec087852e42155788a861b2e0d0b9f41b..a4b8aedd5dd0b81e06ab2d75a4cd18745ff69dc2 100644
--- a/src/turbulenceModels/incompressible/LES/SpalartAllmarasIDDES/SpalartAllmarasIDDES.H
+++ b/src/turbulenceModels/incompressible/LES/SpalartAllmarasIDDES/SpalartAllmarasIDDES.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2008-2010 OpenCFD Ltd.
+    \\  /    A nd           | Copyright (C) 2008-2011 OpenCFD Ltd.
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -22,7 +22,7 @@ License
     along with OpenFOAM.  If not, see <http://www.gnu.org/licenses/>.
 
 Class
-    Foam::LESmodels::SpalartAllmarasIDDES
+    Foam::incompressible::LESModels::SpalartAllmarasIDDES
 
 Description
     SpalartAllmarasIDDES LES turbulence model for incompressible flows
diff --git a/src/turbulenceModels/incompressible/LES/kOmegaSSTSAS/kOmegaSSTSAS.H b/src/turbulenceModels/incompressible/LES/kOmegaSSTSAS/kOmegaSSTSAS.H
index 444392668b6a86f66fcb24dc8039ac4b185d3452..5ff2022a296b13f657a082023bb3ef2f25c6e45e 100644
--- a/src/turbulenceModels/incompressible/LES/kOmegaSSTSAS/kOmegaSSTSAS.H
+++ b/src/turbulenceModels/incompressible/LES/kOmegaSSTSAS/kOmegaSSTSAS.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2008-2010 OpenCFD Ltd.
+    \\  /    A nd           | Copyright (C) 2008-2011 OpenCFD Ltd.
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -22,7 +22,7 @@ License
     along with OpenFOAM.  If not, see <http://www.gnu.org/licenses/>.
 
 Class
-    Foam::LESmodels::kOmegaSSTSAS
+    Foam::incompressible::LESModels::kOmegaSSTSAS
 
 Description
     kOmegaSSTSAS LES turbulence model for incompressible flows