diff --git a/etc/controlDict b/etc/controlDict
index 403aa02285..4aa8a3ec0a 100644
--- a/etc/controlDict
+++ b/etc/controlDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  1.7                                   |
+|  \\    /   O peration     | Version:  2.0                                   |
 |   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
@@ -24,6 +24,7 @@ Documentation
         "$WM_PROJECT_USER_DIR/html"
         "~OpenFOAM/html"
         "$WM_PROJECT_DIR/doc/Doxygen/html"
+        "$WM_PROJECT_DIR/doc/doxygen/html"
     );
     doxySourceFileExts
     (
@@ -32,6 +33,34 @@ Documentation
     );
 }
 
+
+InfoSwitches
+{
+    writePrecision  6;
+    writeJobInfo    0;
+
+    // Allow case-supplied c++ code (#codeStream, codedFixedValue)
+    allowSystemOperations   0;
+}
+
+
+OptimisationSwitches
+{
+    fileModificationSkew 10;
+
+    //- Modification checking:
+    //  - timeStamp         : use modification time on file
+    //  - inotify           : use inotify framework
+    //  - timeStampMaster   : do time stamp (and file reading) only on master.
+    //  - inotifyMaster     : do inotify (and file reading) only on master.
+    fileModificationChecking timeStampMaster;//inotify;timeStamp;inotifyMaster;
+
+    commsType       nonBlocking; //scheduled; //blocking;
+    floatTransfer   0;
+    nProcsSimpleSum 0;
+}
+
+
 DebugSwitches
 {
     Analytical          0;
@@ -864,30 +893,6 @@ DebugSwitches
     zoneToPoint         0;
 }
 
-InfoSwitches
-{
-    writePrecision  6;
-    writeJobInfo    0;
-
-    // Allow case-supplied c++ code (#codeStream, codedFixedValue)
-    allowSystemOperations   0;
-}
-
-OptimisationSwitches
-{
-    fileModificationSkew 10;
-
-    //- Modification checking:
-    //  - timeStamp         : use modification time on file
-    //  - inotify           : use inotify framework
-    //  - timeStampMaster   : do time stamp (and file reading) only on master.
-    //  - inotifyMaster     : do inotify (and file reading) only on master.
-    fileModificationChecking timeStampMaster;//inotify;timeStamp;inotifyMaster;
-
-    commsType       nonBlocking; //scheduled; //blocking;
-    floatTransfer   0;
-    nProcsSimpleSum 0;
-}
 
 DimensionedConstants
 {