diff --git a/etc/controlDict b/etc/controlDict
index a52db70f3c82a9bb521be33814e611cb887f1f07..be828dedbc0d1997b05925913df3cfb568428dca 100644
--- a/etc/controlDict
+++ b/etc/controlDict
@@ -5,22 +5,15 @@
 |   \\  /    A nd           | Web:      http://www.openfoam.org               |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
-
-// Foam Dictionary.
-
 FoamFile
 {
-    version         2.0;
-    format          ascii;
-
-    root            "";
-    case            "";
-    instance        "";
-    local           "";
-    class           dictionary;
-    object          controlDict;
+    version     2.0;
+    format      ascii;
+    class       dictionary;
+    object      controlDict;
 }
 
+// NB: the #functions do not work here
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 hosts
@@ -63,14 +56,18 @@ caseRoots
 
 Documentation
 {
-    docBrowser        "kde-open %f";
+    docBrowser      "kde-open %f";
     doxyDocDirs
     (
         "$WM_PROJECT_USER_DIR/Doxygen/html"
         "~OpenFOAM/Doxygen/html"
         "$WM_PROJECT_DIR/doc/Doxygen/html"
     );
-    doxySourceFileExt "_8C.html";
+    doxySourceFileExts
+    (
+        "App_8C.html"
+        "_8C.html"
+    );
 }
 
 DebugSwitches
@@ -280,9 +277,9 @@ DebugSwitches
     SyamlalRogersOBrien 0;
     TAB                 0;
     ThermoCloud<reactingParcel> 0;
-    ThermoCloud<thermoParcel> 0;
+    ThermoCloud<thermoParcel>   0;
     ThermoParcel<reactingParcel> 0;
-    ThermoParcel<thermoParcel> 0;
+    ThermoParcel<thermoParcel>  0;
     UMIST               0;
     UMISTV              0;
     Unix                0;
@@ -296,8 +293,8 @@ DebugSwitches
     addPoint            0;
     advective           0;
     algebraicPair       0;
-    angularOscillatingDisplacement 0;
-    angularOscillatingVelocity 0;
+    angularOscillatingDisplacement  0;
+    angularOscillatingVelocity  0;
     anisotropic         0;
     ash                 0;
     atomizationModel    0;
@@ -313,7 +310,7 @@ DebugSwitches
     basicThermoCloud    0;
     binaryAbsorptionEmission 0;
     blended             0;
-    blobsSheetAtomization 0;
+    blobsSheetAtomization   0;
     blobsSwirlInjector  0;
     booleanSurface      0;
     boundaryCutter      0;
@@ -358,8 +355,8 @@ DebugSwitches
     conductivityModel   0;
     constInjector       0;
     constant            0;
-    constantAbsorptionEmission 0;
-    constantGammaContactAngle 0;
+    constantAbsorptionEmission  0;
+    constantGammaContactAngle   0;
     constantScatter     0;
     coordinateRotation  0;
     coordinateSystem    0;
@@ -388,7 +385,7 @@ DebugSwitches
     disallowDefaultFvsPatchField 0;
     disallowGenericFvPatchField 0;
     disallowGenericPointPatchField 0;
-    disallowGenericPolyPatch 0;
+    disallowGenericPolyPatch    0;
     dispersionLESModel  0;
     dispersionModel     0;
     dispersionRASModel  0;
diff --git a/src/OpenFOAM/global/argList/argList.C b/src/OpenFOAM/global/argList/argList.C
index 20b0868f36c22c6d1a5527c7a2413ef932f0acb3..98966023994f6e618fbc69c2c5e2da95c148778b 100644
--- a/src/OpenFOAM/global/argList/argList.C
+++ b/src/OpenFOAM/global/argList/argList.C
@@ -607,27 +607,33 @@ void Foam::argList::displayDoc() const
 {
     const dictionary& docDict = debug::controlDict().subDict("Documentation");
     List<fileName> docDirs(docDict.lookup("doxyDocDirs"));
+    List<fileName> docExts(docDict.lookup("doxySourceFileExts"));
 
     fileName docFile;
     bool found = false;
 
     forAll(docDirs, dirI)
     {
-        docFile =
-            fileName(docDirs[dirI])/executable()
-          + fileName(docDict.lookup("doxySourceFileExt"));
-        docFile.expand();
+        forAll(docExts, extI)
+        {
+            docFile = docDirs[dirI]/executable() + docExts[extI];
+            docFile.expand();
 
-        if (exists(docFile))
+            if (exists(docFile))
+            {
+                found = true;
+                break;
+            }
+        }
+        if (found)
         {
-            found = true;
             break;
         }
     }
 
     if (found)
     {
-        string docBrowser = docDict.lookup("docBrowser");
+        string docBrowser(docDict.lookup("docBrowser"));
         docBrowser.replaceAll("%f", docFile);
 
         Info<< "Show documentation: " << docBrowser.c_str() << endl;