From 147fa2a75d0d2f13056c4aafff8f52abdc716157 Mon Sep 17 00:00:00 2001
From: Mark Olesen <Mark.Olesen@Germany>
Date: Tue, 27 Apr 2010 10:50:15 +0200
Subject: [PATCH] STYLE: add notes to some (most) command-line options

- mapFields and splitMeshRegions need more clarification
---
 .../uncoupledKinematicParcelFoam.C            |  7 +-
 .../combinePatchFaces/combinePatchFaces.C     | 15 ++--
 .../refineWallLayer/refineWallLayer.C         | 10 ++-
 .../refinementLevel/refinementLevel.C         | 14 ++--
 .../mesh/advanced/splitCells/splitCells.C     | 36 ++++++---
 .../mesh/conversion/ansysToFoam/ansysToFoam.L | 10 ++-
 .../mesh/conversion/cfx4ToFoam/cfx4ToFoam.C   | 10 ++-
 .../fluent3DMeshToFoam/fluent3DMeshToFoam.L   | 28 ++++++-
 .../fluentMeshToFoam/fluentMeshToFoam.L       | 24 ++++--
 .../foamToStarMesh/foamToStarMesh.C           |  2 +-
 .../conversion/foamToSurface/foamToSurface.C  |  4 +-
 .../conversion/gambitToFoam/gambitToFoam.L    | 10 ++-
 .../mesh/conversion/gmshToFoam/gmshToFoam.C   |  6 +-
 .../mesh/conversion/kivaToFoam/kivaToFoam.C   | 36 ++++++---
 .../mesh/conversion/kivaToFoam/readKivaGrid.H |  2 +-
 .../mesh/conversion/mshToFoam/mshToFoam.C     | 10 ++-
 .../conversion/plot3dToFoam/plot3dToFoam.C    | 29 +++++--
 .../conversion/polyDualMesh/polyDualMeshApp.C |  2 +-
 .../mesh/conversion/sammToFoam/sammToFoam.C   |  9 ++-
 .../mesh/conversion/star3ToFoam/star3ToFoam.C |  9 ++-
 .../mesh/conversion/star4ToFoam/star4ToFoam.C |  2 +-
 .../conversion/tetgenToFoam/tetgenToFoam.C    |  6 +-
 .../conversion/writeMeshObj/writeMeshObj.C    | 77 ++++++++++++++-----
 .../mesh/generation/blockMesh/blockMeshApp.C  |  4 +-
 .../extrudeToRegionMesh/extrudeToRegionMesh.C |  2 +-
 .../mesh/manipulation/checkMesh/checkMesh.C   | 18 ++++-
 .../createBaffles/createBaffles.C             | 31 ++++++--
 .../manipulation/mergeMeshes/createTimes.H    | 15 +++-
 .../manipulation/mergeMeshes/mergeMeshes.C    | 70 +++++++++++++++--
 .../mesh/manipulation/mergeMeshes/setRoots.H  | 32 --------
 .../mergeOrSplitBaffles/mergeOrSplitBaffles.C | 31 +++++---
 .../mesh/manipulation/refineMesh/refineMesh.C | 20 +++--
 .../manipulation/renumberMesh/renumberMesh.C  | 18 ++++-
 .../mesh/manipulation/setSet/setSet.C         |  7 +-
 .../manipulation/setsToZones/setsToZones.C    | 49 +++++++-----
 .../splitMeshRegions/splitMeshRegions.C       | 73 +++++++++++++-----
 .../mesh/manipulation/stitchMesh/stitchMesh.C | 41 +++++++---
 .../mesh/manipulation/subsetMesh/subsetMesh.C | 25 ++++--
 .../transformPoints/transformPoints.C         |  4 +-
 .../miscellaneous/foamInfoExec/foamInfoExec.C | 56 +++++++++-----
 .../decomposePar/decomposePar.C               | 16 ++--
 .../reconstructParMesh/reconstructParMesh.C   | 18 ++---
 .../redistributeMeshPar/redistributeMeshPar.C |  8 +-
 .../foamToFieldview9/foamToFieldview9.C       |  6 +-
 .../foamToTecplot360/foamToTecplot360.C       | 69 ++++++++++++-----
 .../dataConversion/foamToVTK/foamToVTK.C      | 64 +++++++++++----
 .../postProcessing/foamCalc/foamCalcApp.C     |  5 +-
 .../lagrangian/particleTracks/createFields.H  |  2 +-
 .../foamListTimes/foamListTimes.C             | 16 +++-
 .../postProcessing/wall/yPlusRAS/yPlusRAS.C   | 15 ++--
 .../applyBoundaryLayer/applyBoundaryLayer.C   | 25 +++++-
 .../applyBoundaryLayer/createFields.H         |  2 +-
 .../applyWallFunctionBoundaryConditions.C     |  8 +-
 .../changeDictionary/changeDictionary.C       | 15 +++-
 .../foamUpgradeFvSolution.C                   | 12 ++-
 .../preProcessing/mapFields/mapFields.C       | 49 +++++++++++-
 .../preProcessing/mapFields/setRoots.H        | 30 --------
 .../utilities/surface/surfaceAdd/surfaceAdd.C | 24 ++++--
 .../surfaceAutoPatch/surfaceAutoPatch.C       |  9 +--
 .../surface/surfaceCheck/surfaceCheck.C       | 18 +++--
 .../surface/surfaceClean/surfaceClean.C       |  4 +-
 .../surface/surfaceCoarsen/surfaceCoarsen.C   |  6 +-
 .../surface/surfaceConvert/surfaceConvert.C   | 27 +++++--
 .../surfaceFeatureConvert.C                   |  2 +-
 .../surfaceFeatureExtract.C                   | 51 +++++++++---
 .../surface/surfaceFind/surfaceFind.C         |  2 +-
 .../surface/surfaceInertia/surfaceInertia.C   |  8 +-
 .../surfaceMeshConvert/surfaceMeshConvert.C   | 13 +++-
 .../surfaceMeshConvertTesting.C               | 14 +++-
 .../surfaceMeshExport/surfaceMeshExport.C     | 59 +++++++++++---
 .../surfaceMeshImport/surfaceMeshImport.C     | 63 ++++++++++++---
 .../surfaceMeshTriangulate.C                  | 27 +++++--
 .../surface/surfaceOrient/surfaceOrient.C     | 28 ++++---
 .../surfacePointMerge/surfacePointMerge.C     |  4 +-
 .../surfaceRedistributePar.C                  | 22 ++++--
 .../surfaceRefineRedGreen.C                   |  4 +-
 .../surface/surfaceSmooth/surfaceSmooth.C     |  4 +-
 .../surfaceSplitByPatch/surfaceSplitByPatch.C |  6 +-
 .../surfaceSplitNonManifolds.C                | 15 +++-
 .../surface/surfaceSubset/surfaceSubset.C     |  4 +-
 .../surface/surfaceToPatch/surfaceToPatch.C   | 32 +++++---
 .../surfaceTransformPoints.C                  |  4 +-
 src/OpenFOAM/global/argList/argList.C         |  2 +-
 .../foamCalcFunctions/calcType/calcTypeNew.C  | 24 ++++--
 src/postProcessing/postCalc/postCalc.C        |  3 +-
 85 files changed, 1221 insertions(+), 472 deletions(-)
 delete mode 100644 applications/utilities/mesh/manipulation/mergeMeshes/setRoots.H
 delete mode 100644 applications/utilities/preProcessing/mapFields/setRoots.H

diff --git a/applications/solvers/lagrangian/uncoupledKinematicParcelFoam/uncoupledKinematicParcelFoam.C b/applications/solvers/lagrangian/uncoupledKinematicParcelFoam/uncoupledKinematicParcelFoam.C
index 13757df7ba..1fdc783a4f 100644
--- a/applications/solvers/lagrangian/uncoupledKinematicParcelFoam/uncoupledKinematicParcelFoam.C
+++ b/applications/solvers/lagrangian/uncoupledKinematicParcelFoam/uncoupledKinematicParcelFoam.C
@@ -41,7 +41,12 @@ Description
 
 int main(int argc, char *argv[])
 {
-    argList::addOption("cloudName", "cloud name");
+    argList::addOption
+    (
+        "cloudName",
+        "name",
+        "specify alternative cloud name. default is 'kinematicCloud'"
+    );
 
     #include "setRootCase.H"
     #include "createTime.H"
diff --git a/applications/utilities/mesh/advanced/combinePatchFaces/combinePatchFaces.C b/applications/utilities/mesh/advanced/combinePatchFaces/combinePatchFaces.C
index c3d671d232..56ea5e124f 100644
--- a/applications/utilities/mesh/advanced/combinePatchFaces/combinePatchFaces.C
+++ b/applications/utilities/mesh/advanced/combinePatchFaces/combinePatchFaces.C
@@ -38,7 +38,7 @@ Description
 
     E.g. to allow all faces on same patch to be merged:
 
-        combinePatchFaces .. cavity 180 -concaveAngle 90
+        combinePatchFaces 180 -concaveAngle 90
 
 \*---------------------------------------------------------------------------*/
 
@@ -429,15 +429,18 @@ int main(int argc, char *argv[])
 {
 #   include "addOverwriteOption.H"
 
-    argList::validArgs.append("feature angle [0..180]");
+    argList::validArgs.append("featureAngle [0..180]");
     argList::addOption
     (
         "concaveAngle",
-        "[0..180]",
-        "specify concave angle [0..180] degrees (default: 30.0 degrees)"
+        "degrees",
+        "specify concave angle [0..180] (default: 30 degrees)"
+    );
+    argList::addBoolOption
+    (
+        "snapMesh",
+        "use system/snapMeshDict"
     );
-
-    argList::addBoolOption("snapMesh");
 
 #   include "setRootCase.H"
 #   include "createTime.H"
diff --git a/applications/utilities/mesh/advanced/refineWallLayer/refineWallLayer.C b/applications/utilities/mesh/advanced/refineWallLayer/refineWallLayer.C
index 5e0ce9248f..4a1a9b5a08 100644
--- a/applications/utilities/mesh/advanced/refineWallLayer/refineWallLayer.C
+++ b/applications/utilities/mesh/advanced/refineWallLayer/refineWallLayer.C
@@ -46,12 +46,18 @@ using namespace Foam;
 
 int main(int argc, char *argv[])
 {
-#   include "addOverwriteOption.H"
+    #include "addOverwriteOption.H"
     argList::noParallel();
     argList::validArgs.append("patchName");
     argList::validArgs.append("edgeWeight");
 
-    argList::addOption("useSet", "cellSet");
+    argList::addOption
+    (
+        "useSet",
+        "name",
+        "restrict cells to refine based on specified cellSet name"
+    );
+
 
 #   include "setRootCase.H"
 #   include "createTime.H"
diff --git a/applications/utilities/mesh/advanced/refinementLevel/refinementLevel.C b/applications/utilities/mesh/advanced/refinementLevel/refinementLevel.C
index acaa9bf48d..0224943836 100644
--- a/applications/utilities/mesh/advanced/refinementLevel/refinementLevel.C
+++ b/applications/utilities/mesh/advanced/refinementLevel/refinementLevel.C
@@ -96,11 +96,15 @@ bool limitRefinementLevel
 
 int main(int argc, char *argv[])
 {
-    argList::addBoolOption("readLevel");
+    argList::addBoolOption
+    (
+        "readLevel",
+        "read level from refinementLevel file"
+    );
 
-#   include "setRootCase.H"
-#   include "createTime.H"
-#   include "createPolyMesh.H"
+    #include "setRootCase.H"
+    #include "createTime.H"
+    #include "createPolyMesh.H"
 
     Info<< "Dividing cells into bins depending on cell volume.\nThis will"
         << " correspond to refinement levels for a mesh with only 2x2x2"
@@ -109,7 +113,7 @@ int main(int argc, char *argv[])
         << " to allow for some truncation error."
         << nl << endl;
 
-    bool readLevel = args.optionFound("readLevel");
+    const bool readLevel = args.optionFound("readLevel");
 
     const scalarField& vols = mesh.cellVolumes();
 
diff --git a/applications/utilities/mesh/advanced/splitCells/splitCells.C b/applications/utilities/mesh/advanced/splitCells/splitCells.C
index 19828287bc..3967a51516 100644
--- a/applications/utilities/mesh/advanced/splitCells/splitCells.C
+++ b/applications/utilities/mesh/advanced/splitCells/splitCells.C
@@ -517,17 +517,35 @@ void collectCuts
 
 int main(int argc, char *argv[])
 {
-#   include "addOverwriteOption.H"
+    argList::addNote
+    (
+        "split cells with flat faces"
+    );
+    #include "addOverwriteOption.H"
     argList::noParallel();
-    argList::addOption("set", "cellSet name");
-    argList::addBoolOption("geometry");
-    argList::addOption("tol", "edge snap tolerance");
-    argList::validArgs.append("edge angle [0..360]");
+    argList::validArgs.append("edgeAngle [0..360]");
 
-#   include "setRootCase.H"
-#   include "createTime.H"
+    argList::addOption
+    (
+        "set",
+        "name",
+        "split cells from specified cellSet only"
+    );
+    argList::addBoolOption
+    (
+        "geometry",
+        "use geometric cut for hexes as well"
+    );
+    argList::addOption
+    (
+        "tol",
+        "scalar", "edge snap tolerance (default 0.2)"
+    );
+
+    #include "setRootCase.H"
+    #include "createTime.H"
     runTime.functionObjects().off();
-#   include "createPolyMesh.H"
+    #include "createPolyMesh.H"
     const word oldInstance = mesh.pointsInstance();
 
     const scalar featureAngle = args.argRead<scalar>(1);
@@ -538,7 +556,7 @@ int main(int argc, char *argv[])
     const bool geometry  = args.optionFound("geometry");
     const bool overwrite = args.optionFound("overwrite");
 
-    scalar edgeTol = args.optionLookupOrDefault("tol", 0.2);
+    const scalar edgeTol = args.optionLookupOrDefault("tol", 0.2);
 
     Info<< "Trying to split cells with internal angles > feature angle\n" << nl
         << "featureAngle      : " << featureAngle << nl
diff --git a/applications/utilities/mesh/conversion/ansysToFoam/ansysToFoam.L b/applications/utilities/mesh/conversion/ansysToFoam/ansysToFoam.L
index 2fb1c77043..16e3b9efe3 100644
--- a/applications/utilities/mesh/conversion/ansysToFoam/ansysToFoam.L
+++ b/applications/utilities/mesh/conversion/ansysToFoam/ansysToFoam.L
@@ -235,7 +235,12 @@ int main(int argc, char *argv[])
 {
     argList::noParallel();
     argList::validArgs.append("ANSYS input file");
-    argList::addOption("scale", "scale factor");
+    argList::addOption
+    (
+        "scale",
+        "factor",
+        "geometry scaling factor - default is 1"
+    );
 
     argList args(argc, argv);
 
@@ -244,8 +249,7 @@ int main(int argc, char *argv[])
         FatalError.exit();
     }
 
-    scalar scaleFactor = 1.0;
-    args.optionReadIfPresent("scale", scaleFactor);
+    const scalar scaleFactor = args.optionLookupOrDefault("scale", 1.0);
 
 #   include "createTime.H"
 
diff --git a/applications/utilities/mesh/conversion/cfx4ToFoam/cfx4ToFoam.C b/applications/utilities/mesh/conversion/cfx4ToFoam/cfx4ToFoam.C
index 02b758b569..2de1b840e9 100644
--- a/applications/utilities/mesh/conversion/cfx4ToFoam/cfx4ToFoam.C
+++ b/applications/utilities/mesh/conversion/cfx4ToFoam/cfx4ToFoam.C
@@ -49,7 +49,12 @@ int main(int argc, char *argv[])
 {
     argList::noParallel();
     argList::validArgs.append("CFX geom file");
-    argList::addOption("scale", "scale factor");
+    argList::addOption
+    (
+        "scale",
+        "factor",
+        "geometry scaling factor - default is 1"
+    );
 
     argList args(argc, argv);
 
@@ -58,8 +63,7 @@ int main(int argc, char *argv[])
          FatalError.exit();
     }
 
-    scalar scaleFactor = 1.0;
-    args.optionReadIfPresent("scale", scaleFactor);
+    const scalar scaleFactor = args.optionLookupOrDefault("scale", 1.0);
 
 #   include "createTime.H"
 
diff --git a/applications/utilities/mesh/conversion/fluent3DMeshToFoam/fluent3DMeshToFoam.L b/applications/utilities/mesh/conversion/fluent3DMeshToFoam/fluent3DMeshToFoam.L
index 02da5e6829..6c3a0c315a 100644
--- a/applications/utilities/mesh/conversion/fluent3DMeshToFoam/fluent3DMeshToFoam.L
+++ b/applications/utilities/mesh/conversion/fluent3DMeshToFoam/fluent3DMeshToFoam.L
@@ -761,10 +761,30 @@ int main(int argc, char *argv[])
 {
     argList::noParallel();
     argList::validArgs.append("Fluent mesh file");
-    argList::addOption("scale", "scale factor");
-    argList::addOption("ignoreCellGroups", "cell group names");
-    argList::addOption("ignoreFaceGroups", "face group names");
-    argList::addBoolOption("cubit");
+    argList::addOption
+    (
+        "scale",
+        "factor",
+        "geometry scaling factor - default is 1"
+    );
+    argList::addOption
+    (
+        "ignoreCellGroups",
+        "names",
+        "specify cell groups to ignore"
+    );
+    argList::addOption
+    (
+        "ignoreFaceGroups",
+        "names",
+        "specify face groups to ignore"
+    );
+
+    argList::addBoolOption
+    (
+        "cubit",
+        "special parsing of (incorrect) cubit files"
+    );
 
     argList args(argc, argv);
 
diff --git a/applications/utilities/mesh/conversion/fluentMeshToFoam/fluentMeshToFoam.L b/applications/utilities/mesh/conversion/fluentMeshToFoam/fluentMeshToFoam.L
index 8c954cd1cb..619374396f 100644
--- a/applications/utilities/mesh/conversion/fluentMeshToFoam/fluentMeshToFoam.L
+++ b/applications/utilities/mesh/conversion/fluentMeshToFoam/fluentMeshToFoam.L
@@ -866,9 +866,22 @@ int main(int argc, char *argv[])
 {
     argList::noParallel();
     argList::validArgs.append("Fluent mesh file");
-    argList::addOption("scale", "scale factor");
-    argList::addBoolOption("writeSets");
-    argList::addBoolOption("writeZones");
+    argList::addOption
+    (
+        "scale",
+        "factor",
+        "geometry scaling factor - default is 1"
+    );
+    argList::addBoolOption
+    (
+        "writeSets",
+        "write cell zones and patches as sets"
+    );
+    argList::addBoolOption
+    (
+        "writeZones",
+        "write cell zones as zones"
+    );
 
     argList args(argc, argv);
 
@@ -877,8 +890,7 @@ int main(int argc, char *argv[])
         FatalError.exit();
     }
 
-    scalar scaleFactor = 1.0;
-    args.optionReadIfPresent("scale", scaleFactor);
+    const scalar scaleFactor = args.optionLookupOrDefault("scale", 1.0);
 
     const bool writeSets  = args.optionFound("writeSets");
     const bool writeZones = args.optionFound("writeZones");
@@ -1554,7 +1566,7 @@ int main(int argc, char *argv[])
     // interior boundaries are handled via faceSets
     // cell zones will only be written if there is more than one
 
-    if (writeZones && cellGroupZoneID.size()>1)
+    if (writeZones && cellGroupZoneID.size() > 1)
     {
         Info<< "Adding Zones" << endl;
         List<pointZone*> pz(0);
diff --git a/applications/utilities/mesh/conversion/foamToStarMesh/foamToStarMesh.C b/applications/utilities/mesh/conversion/foamToStarMesh/foamToStarMesh.C
index fbb2c3b12f..09e34235e5 100644
--- a/applications/utilities/mesh/conversion/foamToStarMesh/foamToStarMesh.C
+++ b/applications/utilities/mesh/conversion/foamToStarMesh/foamToStarMesh.C
@@ -69,7 +69,7 @@ int main(int argc, char *argv[])
     (
         "scale",
         "factor",
-        "specify geometry scaling factor - default is 1000 ([m] to [mm])"
+        "geometry scaling factor - default is 1000 ([m] to [mm])"
     );
     argList::addBoolOption
     (
diff --git a/applications/utilities/mesh/conversion/foamToSurface/foamToSurface.C b/applications/utilities/mesh/conversion/foamToSurface/foamToSurface.C
index 1616173a83..28ced25e87 100644
--- a/applications/utilities/mesh/conversion/foamToSurface/foamToSurface.C
+++ b/applications/utilities/mesh/conversion/foamToSurface/foamToSurface.C
@@ -61,8 +61,8 @@ int main(int argc, char *argv[])
     argList::addOption
     (
         "scale",
-        "scale",
-        "specify geometry scaling factor"
+        "factor",
+        "geometry scaling factor - default is 1"
     );
     argList::addBoolOption
     (
diff --git a/applications/utilities/mesh/conversion/gambitToFoam/gambitToFoam.L b/applications/utilities/mesh/conversion/gambitToFoam/gambitToFoam.L
index 5e3b62bec5..c1d2b44e82 100644
--- a/applications/utilities/mesh/conversion/gambitToFoam/gambitToFoam.L
+++ b/applications/utilities/mesh/conversion/gambitToFoam/gambitToFoam.L
@@ -628,7 +628,12 @@ int main(int argc, char *argv[])
 {
     argList::noParallel();
     argList::validArgs.append("GAMBIT file");
-    argList::addOption("scale", "scale factor");
+    argList::addOption
+    (
+        "scale",
+        "factor",
+        "geometry scaling factor - default is 1"
+    );
 
     argList args(argc, argv);
 
@@ -637,8 +642,7 @@ int main(int argc, char *argv[])
          FatalError.exit();
     }
 
-    scalar scaleFactor = 1.0;
-    args.optionReadIfPresent("scale", scaleFactor);
+    const scalar scaleFactor = args.optionLookupOrDefault("scale", 1.0);
 
 #   include "createTime.H"
 
diff --git a/applications/utilities/mesh/conversion/gmshToFoam/gmshToFoam.C b/applications/utilities/mesh/conversion/gmshToFoam/gmshToFoam.C
index 1bcc998ae9..a3f607ba0b 100644
--- a/applications/utilities/mesh/conversion/gmshToFoam/gmshToFoam.C
+++ b/applications/utilities/mesh/conversion/gmshToFoam/gmshToFoam.C
@@ -716,7 +716,11 @@ int main(int argc, char *argv[])
 {
     argList::noParallel();
     argList::validArgs.append(".msh file");
-    argList::addBoolOption("keepOrientation");
+    argList::addBoolOption
+    (
+        "keepOrientation",
+        "retain raw orientation for prisms/hexs"
+    );
 
 #   include "setRootCase.H"
 #   include "createTime.H"
diff --git a/applications/utilities/mesh/conversion/kivaToFoam/kivaToFoam.C b/applications/utilities/mesh/conversion/kivaToFoam/kivaToFoam.C
index 5adeb68236..ab764547a3 100644
--- a/applications/utilities/mesh/conversion/kivaToFoam/kivaToFoam.C
+++ b/applications/utilities/mesh/conversion/kivaToFoam/kivaToFoam.C
@@ -46,7 +46,7 @@ Description
 
 using namespace Foam;
 
-// Supported KIVA versions
+//- Supported KIVA versions
 enum kivaVersions
 {
     kiva3,
@@ -59,37 +59,51 @@ enum kivaVersions
 int main(int argc, char *argv[])
 {
     argList::noParallel();
-    argList::addOption("file", "fileName");
-    argList::addOption("version", "[kiva3|kiva3v]");
-    argList::addOption("zHeadMin", "scalar");
+    argList::addOption
+    (
+        "file",
+        "name",
+        "specify alternative input file name - default is otape17"
+    );
+    argList::addOption
+    (
+        "version",
+        "version",
+        "specify kiva version [kiva3|kiva3v] - default is '3v'"
+    );
+    argList::addOption
+    (
+        "zHeadMin",
+        "scalar",
+        "minimum z-height for transferring liner faces to cylinder-head"
+    );
 
 #   include "setRootCase.H"
 #   include "createTime.H"
 
-    fileName kivaFileName("otape17");
-    args.optionReadIfPresent("file", kivaFileName);
+    const fileName kivaFileName =
+        args.optionLookupOrDefault<fileName>("file", "otape17");
 
     kivaVersions kivaVersion = kiva3v;
     if (args.optionFound("version"))
     {
-        const word kivaVersionName = args["version"];
+        const word versionName = args["version"];
 
-        if (kivaVersionName == "kiva3")
+        if (versionName == "kiva3")
         {
             kivaVersion = kiva3;
         }
-        else if (kivaVersionName == "kiva3v")
+        else if (versionName == "kiva3v")
         {
             kivaVersion = kiva3v;
         }
         else
         {
             FatalErrorIn("main(int argc, char *argv[])")
-                << "KIVA file version " << kivaVersionName << " not supported"
+                << "KIVA file version " << versionName << " not supported"
                 << exit(FatalError);
 
             args.printUsage();
-
             FatalError.exit(1);
         }
     }
diff --git a/applications/utilities/mesh/conversion/kivaToFoam/readKivaGrid.H b/applications/utilities/mesh/conversion/kivaToFoam/readKivaGrid.H
index 6c50c02fcd..d4356c2cdc 100644
--- a/applications/utilities/mesh/conversion/kivaToFoam/readKivaGrid.H
+++ b/applications/utilities/mesh/conversion/kivaToFoam/readKivaGrid.H
@@ -315,7 +315,7 @@ for (label i=0; i<nPoints; i++)
     }
 }
 
-// Tranfer liner faces that are above the minimum cylinder-head z height
+// Transfer liner faces that are above the minimum cylinder-head z height
 // into the cylinder-head region
 if
 (
diff --git a/applications/utilities/mesh/conversion/mshToFoam/mshToFoam.C b/applications/utilities/mesh/conversion/mshToFoam/mshToFoam.C
index 46ac3ce080..2d2c53e447 100644
--- a/applications/utilities/mesh/conversion/mshToFoam/mshToFoam.C
+++ b/applications/utilities/mesh/conversion/mshToFoam/mshToFoam.C
@@ -56,7 +56,11 @@ int main(int argc, char *argv[])
 {
     argList::noParallel();
     argList::validArgs.append(".msh file");
-    argList::addBoolOption("hex");
+    argList::addBoolOption
+    (
+        "hex",
+        "treat input as containing hex instead of tet cells"
+    );
 
 #   include "setRootCase.H"
 #   include "createTime.H"
@@ -69,11 +73,11 @@ int main(int argc, char *argv[])
 
     if (readHex)
     {
-        Info<< "Trying to read " << nCells << " hexes." << endl << endl;
+        Info<< "Trying to read " << nCells << " hexes." << nl << endl;
     }
     else
     {
-        Info<< "Trying to read " << nCells << " tets." << endl << endl;
+        Info<< "Trying to read " << nCells << " tets." << nl << endl;
     }
 
     cellShapeList cells(nCells);
diff --git a/applications/utilities/mesh/conversion/plot3dToFoam/plot3dToFoam.C b/applications/utilities/mesh/conversion/plot3dToFoam/plot3dToFoam.C
index a24cf8bc1b..40db7f47b5 100644
--- a/applications/utilities/mesh/conversion/plot3dToFoam/plot3dToFoam.C
+++ b/applications/utilities/mesh/conversion/plot3dToFoam/plot3dToFoam.C
@@ -57,10 +57,28 @@ int main(int argc, char *argv[])
 {
     argList::noParallel();
     argList::validArgs.append("PLOT3D geom file");
-    argList::addOption("scale", "scale factor");
-    argList::addBoolOption("noBlank");
-    argList::addBoolOption("singleBlock");
-    argList::addOption("2D", "thickness");
+    argList::addOption
+    (
+        "scale",
+        "factor",
+        "geometry scaling factor - default is 1"
+    );
+    argList::addBoolOption
+    (
+        "noBlank",
+        "skip blank items"
+    );
+    argList::addBoolOption
+    (
+        "singleBlock",
+        "input is a single block"
+    );
+    argList::addOption
+    (
+        "2D",
+        "thickness",
+        "use when converting a 2-D geometry"
+    );
 
     argList args(argc, argv);
 
@@ -69,8 +87,7 @@ int main(int argc, char *argv[])
          FatalError.exit();
     }
 
-    scalar scaleFactor = 1.0;
-    args.optionReadIfPresent("scale", scaleFactor);
+    const scalar scaleFactor = args.optionLookupOrDefault("scale", 1.0);
 
     bool readBlank = !args.optionFound("noBlank");
     bool singleBlock = args.optionFound("singleBlock");
diff --git a/applications/utilities/mesh/conversion/polyDualMesh/polyDualMeshApp.C b/applications/utilities/mesh/conversion/polyDualMesh/polyDualMeshApp.C
index 9f75b41566..f3c8246f81 100644
--- a/applications/utilities/mesh/conversion/polyDualMesh/polyDualMeshApp.C
+++ b/applications/utilities/mesh/conversion/polyDualMesh/polyDualMeshApp.C
@@ -356,7 +356,7 @@ int main(int argc, char *argv[])
     argList::noParallel();
     timeSelector::addOptions(true, false);
 
-    argList::validArgs.append("feature angle[0-180]");
+    argList::validArgs.append("featureAngle [0-180]");
     argList::addBoolOption
     (
         "splitAllFaces",
diff --git a/applications/utilities/mesh/conversion/sammToFoam/sammToFoam.C b/applications/utilities/mesh/conversion/sammToFoam/sammToFoam.C
index 82064e0b13..6eafe96a94 100644
--- a/applications/utilities/mesh/conversion/sammToFoam/sammToFoam.C
+++ b/applications/utilities/mesh/conversion/sammToFoam/sammToFoam.C
@@ -40,7 +40,12 @@ int main(int argc, char *argv[])
 {
     argList::noParallel();
     argList::validArgs.append("SAMM mesh file prefix");
-    argList::addOption("scale", "scale factor");
+    argList::addOption
+    (
+        "scale",
+        "factor",
+        "geometry scaling factor - default is 1"
+    );
 
     argList args(argc, argv);
 
@@ -49,7 +54,7 @@ int main(int argc, char *argv[])
         FatalError.exit();
     }
 
-    scalar scaleFactor = args.optionLookupOrDefault("scale", 1.0);
+    const scalar scaleFactor = args.optionLookupOrDefault("scale", 1.0);
 
 #   include "createTime.H"
 
diff --git a/applications/utilities/mesh/conversion/star3ToFoam/star3ToFoam.C b/applications/utilities/mesh/conversion/star3ToFoam/star3ToFoam.C
index f0011304bb..de32c0f5b3 100644
--- a/applications/utilities/mesh/conversion/star3ToFoam/star3ToFoam.C
+++ b/applications/utilities/mesh/conversion/star3ToFoam/star3ToFoam.C
@@ -40,7 +40,12 @@ int main(int argc, char *argv[])
 {
     argList::noParallel();
     argList::validArgs.append("STAR mesh file prefix");
-    argList::addOption("scale", "scale factor");
+    argList::addOption
+    (
+        "scale",
+        "factor",
+        "geometry scaling factor - default is 1"
+    );
 
     argList args(argc, argv);
 
@@ -49,7 +54,7 @@ int main(int argc, char *argv[])
         FatalError.exit();
     }
 
-    scalar scaleFactor = args.optionLookupOrDefault("scale", 1.0);
+    const scalar scaleFactor = args.optionLookupOrDefault("scale", 1.0);
 
 #   include "createTime.H"
 
diff --git a/applications/utilities/mesh/conversion/star4ToFoam/star4ToFoam.C b/applications/utilities/mesh/conversion/star4ToFoam/star4ToFoam.C
index 6523bb49f9..fc956582b3 100644
--- a/applications/utilities/mesh/conversion/star4ToFoam/star4ToFoam.C
+++ b/applications/utilities/mesh/conversion/star4ToFoam/star4ToFoam.C
@@ -69,7 +69,7 @@ int main(int argc, char *argv[])
     argList::addOption
     (
         "scale",
-        "scale",
+        "factor",
         "geometry scaling factor - default is 0.001 ([mm] to [m])"
     );
     argList::addBoolOption
diff --git a/applications/utilities/mesh/conversion/tetgenToFoam/tetgenToFoam.C b/applications/utilities/mesh/conversion/tetgenToFoam/tetgenToFoam.C
index fedbe40610..f4eacb2914 100644
--- a/applications/utilities/mesh/conversion/tetgenToFoam/tetgenToFoam.C
+++ b/applications/utilities/mesh/conversion/tetgenToFoam/tetgenToFoam.C
@@ -97,7 +97,11 @@ label findFace(const primitiveMesh& mesh, const face& f)
 int main(int argc, char *argv[])
 {
     argList::validArgs.append("file prefix");
-    argList::addBoolOption("noFaceFile");
+    argList::addBoolOption
+    (
+        "noFaceFile",
+        "skip reading .face file for boundary information"
+    );
 
 #   include "setRootCase.H"
 #   include "createTime.H"
diff --git a/applications/utilities/mesh/conversion/writeMeshObj/writeMeshObj.C b/applications/utilities/mesh/conversion/writeMeshObj/writeMeshObj.C
index 2d37090daa..a6014b0592 100644
--- a/applications/utilities/mesh/conversion/writeMeshObj/writeMeshObj.C
+++ b/applications/utilities/mesh/conversion/writeMeshObj/writeMeshObj.C
@@ -371,27 +371,65 @@ void writePointCells
 
 int main(int argc, char *argv[])
 {
-    timeSelector::addOptions();
-    argList::addBoolOption("patchFaces");
-    argList::addBoolOption("patchEdges");
-    argList::addOption("cell", "cellI");
-    argList::addOption("face", "faceI");
-    argList::addOption("point", "pointI");
-    argList::addOption("cellSet", "setName");
-    argList::addOption("faceSet", "setName");
-#   include "addRegionOption.H"
+    argList::addNote
+    (
+        "for mesh debugging: write mesh as separate OBJ files"
+    );
 
-#   include "setRootCase.H"
-#   include "createTime.H"
+    timeSelector::addOptions();
+    argList::addBoolOption
+    (
+        "patchFaces",
+        "write patch faces edges"
+    );
+    argList::addBoolOption
+    (
+        "patchEdges",
+        "write patch boundary edges"
+    );
+    argList::addOption
+    (
+        "cell",
+        "int",
+        "write points for the specified cell"
+    );
+    argList::addOption
+    (
+        "face",
+        "int",
+        "write specified face"
+    );
+    argList::addOption
+    (
+        "point",
+        "int",
+        "write specified point"
+    );
+    argList::addOption
+    (
+        "cellSet",
+        "name",
+        "write points for specified cellSet"
+    );
+    argList::addOption
+    (
+        "faceSet",
+        "name",
+        "write points for specified faceSet"
+    );
+    #include "addRegionOption.H"
+
+    #include "setRootCase.H"
+    #include "createTime.H"
     runTime.functionObjects().off();
 
-    bool patchFaces = args.optionFound("patchFaces");
-    bool patchEdges = args.optionFound("patchEdges");
-    bool doCell     = args.optionFound("cell");
-    bool doPoint    = args.optionFound("point");
-    bool doFace     = args.optionFound("face");
-    bool doCellSet  = args.optionFound("cellSet");
-    bool doFaceSet  = args.optionFound("faceSet");
+    const bool patchFaces = args.optionFound("patchFaces");
+    const bool patchEdges = args.optionFound("patchEdges");
+    const bool doCell     = args.optionFound("cell");
+    const bool doPoint    = args.optionFound("point");
+    const bool doFace     = args.optionFound("face");
+    const bool doCellSet  = args.optionFound("cellSet");
+    const bool doFaceSet  = args.optionFound("faceSet");
 
 
     Info<< "Writing mesh objects as .obj files such that the object"
@@ -401,7 +439,7 @@ int main(int argc, char *argv[])
 
     instantList timeDirs = timeSelector::select0(runTime, args);
 
-#   include "createNamedPolyMesh.H"
+    #include "createNamedPolyMesh.H"
 
     forAll(timeDirs, timeI)
     {
@@ -465,7 +503,6 @@ int main(int argc, char *argv[])
                     << endl;
 
                 writePoints(mesh, cells.toc(), runTime.timeName());
-
             }
             if (doFaceSet)
             {
diff --git a/applications/utilities/mesh/generation/blockMesh/blockMeshApp.C b/applications/utilities/mesh/generation/blockMesh/blockMeshApp.C
index 56ab0a35cd..b896cb3033 100644
--- a/applications/utilities/mesh/generation/blockMesh/blockMeshApp.C
+++ b/applications/utilities/mesh/generation/blockMesh/blockMeshApp.C
@@ -42,7 +42,7 @@ Usage
     Specify an alternative mesh region.
 
     @param -dict \<filename\> \n
-    Specify an alternative dictionary for the block mesh description.
+    Specify alternative dictionary for the block mesh description.
 
 \*---------------------------------------------------------------------------*/
 
@@ -80,7 +80,7 @@ int main(int argc, char *argv[])
     (
         "dict",
         "file",
-        "specify an alternative dictionary for the blockMesh description"
+        "specify alternative dictionary for the blockMesh description"
     );
 
 #   include "addRegionOption.H"
diff --git a/applications/utilities/mesh/generation/extrudeToRegionMesh/extrudeToRegionMesh.C b/applications/utilities/mesh/generation/extrudeToRegionMesh/extrudeToRegionMesh.C
index dfcfb91471..2a5aef33d1 100644
--- a/applications/utilities/mesh/generation/extrudeToRegionMesh/extrudeToRegionMesh.C
+++ b/applications/utilities/mesh/generation/extrudeToRegionMesh/extrudeToRegionMesh.C
@@ -632,7 +632,7 @@ int main(int argc, char *argv[])
     argList::validArgs.append("thickness");
 
     #include "addRegionOption.H"
-    argList::validOptions.insert("overwrite", "");
+    #include "addOverwriteOption.H"
     #include "setRootCase.H"
     #include "createTime.H"
     #include "createNamedMesh.H"
diff --git a/applications/utilities/mesh/manipulation/checkMesh/checkMesh.C b/applications/utilities/mesh/manipulation/checkMesh/checkMesh.C
index c426128e31..8662f404c1 100644
--- a/applications/utilities/mesh/manipulation/checkMesh/checkMesh.C
+++ b/applications/utilities/mesh/manipulation/checkMesh/checkMesh.C
@@ -48,9 +48,21 @@ int main(int argc, char *argv[])
 {
     timeSelector::addOptions();
 #   include "addRegionOption.H"
-    argList::addBoolOption("noTopology");
-    argList::addBoolOption("allGeometry");
-    argList::addBoolOption("allTopology");
+    argList::addBoolOption
+    (
+        "noTopology",
+        "skip checking the mesh topology"
+    );
+    argList::addBoolOption
+    (
+        "allGeometry",
+        "include bounding box checks"
+    );
+    argList::addBoolOption
+    (
+        "allTopology",
+        "include extra topology checks"
+    );
 
 #   include "setRootCase.H"
 #   include "createTime.H"
diff --git a/applications/utilities/mesh/manipulation/createBaffles/createBaffles.C b/applications/utilities/mesh/manipulation/createBaffles/createBaffles.C
index e02d0e1420..97a7571807 100644
--- a/applications/utilities/mesh/manipulation/createBaffles/createBaffles.C
+++ b/applications/utilities/mesh/manipulation/createBaffles/createBaffles.C
@@ -124,18 +124,35 @@ label findPatchID(const polyMesh& mesh, const word& name)
 
 int main(int argc, char *argv[])
 {
-#   include "addOverwriteOption.H"
-#   include "addRegionOption.H"
+    argList::addNote
+    (
+        "Makes internal faces into boundary faces.\n"
+        "Does not duplicate points, unlike mergeOrSplitBaffles."
+    );
+
+    #include "addOverwriteOption.H"
+    #include "addRegionOption.H"
 
     argList::validArgs.append("faceZone");
     argList::validArgs.append("patch");
-    argList::addOption("additionalPatches", "(patch2 .. patchN)");
-    argList::addBoolOption("internalFacesOnly");
 
-#   include "setRootCase.H"
-#   include "createTime.H"
+    argList::addOption
+    (
+        "additionalPatches",
+        "(patch2 .. patchN)",
+        "specify additional patches for creating baffles"
+    );
+    argList::addBoolOption
+    (
+        "internalFacesOnly",
+        "do not convert boundary faces"
+    );
+
+    #include "setRootCase.H"
+    #include "createTime.H"
     runTime.functionObjects().off();
-#   include "createNamedMesh.H"
+    #include "createNamedMesh.H"
+
     const word oldInstance = mesh.pointsInstance();
 
     const polyBoundaryMesh& patches = mesh.boundaryMesh();
diff --git a/applications/utilities/mesh/manipulation/mergeMeshes/createTimes.H b/applications/utilities/mesh/manipulation/mergeMeshes/createTimes.H
index 4098a89e6e..01f173f10c 100644
--- a/applications/utilities/mesh/manipulation/mergeMeshes/createTimes.H
+++ b/applications/utilities/mesh/manipulation/mergeMeshes/createTimes.H
@@ -1,15 +1,22 @@
     Info<< nl << "Create Times" << endl;
 
+    const fileName masterCasePath = masterCase.path();
+    const fileName masterCaseName = masterCase.name();
+
     Time runTimeMaster
     (
         Time::controlDictName,
-        rootDirMaster,
-        caseDirMaster
+        masterCasePath,
+        masterCaseName
     );
 
+    const fileName addCasePath = addCase.path();
+    const fileName addCaseName = addCase.name();
+
     Time runTimeToAdd
     (
         Time::controlDictName,
-        rootDirToAdd,
-        caseDirToAdd
+        addCasePath,
+        addCaseName
     );
+
diff --git a/applications/utilities/mesh/manipulation/mergeMeshes/mergeMeshes.C b/applications/utilities/mesh/manipulation/mergeMeshes/mergeMeshes.C
index 502f1b7dd6..03741a528c 100644
--- a/applications/utilities/mesh/manipulation/mergeMeshes/mergeMeshes.C
+++ b/applications/utilities/mesh/manipulation/mergeMeshes/mergeMeshes.C
@@ -32,16 +32,76 @@ Description
 
 using namespace Foam;
 
+void getRootCase(fileName& casePath)
+{
+    casePath.clean();
+
+    if (casePath.empty() || casePath == ".")
+    {
+        // handle degenerate form and '.'
+        casePath = cwd();
+    }
+    else if (casePath[0] != '/' && casePath.name() == "..")
+    {
+        // avoid relative cases ending in '..' - makes for very ugly names
+        casePath = cwd()/casePath;
+        casePath.clean();
+    }
+}
+
+
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 // Main program:
 
 int main(int argc, char *argv[])
 {
-    argList::noParallel();
-#   include "setRoots.H"
-#   include "createTimes.H"
+    argList::addNote
+    (
+        "merge two meshes"
+    );
 
-    Info<< "Reading master mesh for time = " << runTimeMaster.timeName() << endl;
+    argList::noParallel();
+    argList::validArgs.clear();
+
+    argList::validArgs.append("masterCase");
+    argList::addOption
+    (
+        "masterRegion",
+        "name",
+        "specify alternative mesh region for the master mesh"
+    );
+
+    argList::validArgs.append("addCase");
+    argList::addOption
+    (
+        "addRegion",
+        "name",
+        "specify alternative mesh region for the additional mesh"
+    );
+
+    argList args(argc, argv);
+    if (!args.check())
+    {
+         FatalError.exit();
+    }
+
+    fileName masterCase = args[1];
+    word masterRegion = polyMesh::defaultRegion;
+    args.optionReadIfPresent("masterRegion", masterRegion);
+
+    fileName addCase = args[2];
+    word addRegion = polyMesh::defaultRegion;
+    args.optionReadIfPresent("addRegion", addRegion);
+
+    getRootCase(masterCase);
+    getRootCase(addCase);
+
+    Info<< "Master:      " << masterCase << "  region " << masterRegion << nl
+        << "mesh to add: " << addCase    << "  region " << addRegion << endl;
+
+    #include "createTimes.H"
+
+    Info<< "Reading master mesh for time = " << runTimeMaster.timeName() << nl;
 
     Info<< "Create mesh\n" << endl;
     mergePolyMesh masterMesh
@@ -55,7 +115,7 @@ int main(int argc, char *argv[])
     );
 
 
-    Info<< "Reading mesh to add for time = " << runTimeToAdd.timeName() << endl;
+    Info<< "Reading mesh to add for time = " << runTimeToAdd.timeName() << nl;
 
     Info<< "Create mesh\n" << endl;
     polyMesh meshToAdd
diff --git a/applications/utilities/mesh/manipulation/mergeMeshes/setRoots.H b/applications/utilities/mesh/manipulation/mergeMeshes/setRoots.H
deleted file mode 100644
index 3d1fdd0132..0000000000
--- a/applications/utilities/mesh/manipulation/mergeMeshes/setRoots.H
+++ /dev/null
@@ -1,32 +0,0 @@
-    argList::validArgs.clear();
-
-    argList::validArgs.append("master root");
-    argList::validArgs.append("master case");
-    argList::addOption("masterRegion", "name");
-
-    argList::validArgs.append("root to add");
-    argList::validArgs.append("case to add");
-    argList::addOption("addRegion", "name");
-
-    argList args(argc, argv);
-
-    if (!args.check())
-    {
-         FatalError.exit();
-    }
-
-    fileName rootDirMaster = args[1];
-    fileName caseDirMaster = args[2];
-    word masterRegion = polyMesh::defaultRegion;
-    args.optionReadIfPresent("masterRegion", masterRegion);
-
-    fileName rootDirToAdd = args[3];
-    fileName caseDirToAdd = args[4];
-    word addRegion = polyMesh::defaultRegion;
-    args.optionReadIfPresent("addRegion", addRegion);
-
-    Info<< "Master:      " << rootDirMaster << " " << caseDirMaster
-        << "  region " << masterRegion << nl
-        << "mesh to add: " << rootDirToAdd << " " << caseDirToAdd
-        << "  region " << addRegion << endl;
-
diff --git a/applications/utilities/mesh/manipulation/mergeOrSplitBaffles/mergeOrSplitBaffles.C b/applications/utilities/mesh/manipulation/mergeOrSplitBaffles/mergeOrSplitBaffles.C
index d7a24a2bf9..399fcb0421 100644
--- a/applications/utilities/mesh/manipulation/mergeOrSplitBaffles/mergeOrSplitBaffles.C
+++ b/applications/utilities/mesh/manipulation/mergeOrSplitBaffles/mergeOrSplitBaffles.C
@@ -221,15 +221,30 @@ labelList findBaffles(const polyMesh& mesh, const labelList& boundaryFaces)
 
 int main(int argc, char *argv[])
 {
-#   include "addOverwriteOption.H"
-#   include "addRegionOption.H"
-    argList::addBoolOption("split");
-    argList::addBoolOption("detectOnly");
+    argList::addNote
+    (
+        "Detect faces that share points (baffles).\n"
+        "Merge them or duplicate the points."
+    );
 
-#   include "setRootCase.H"
-#   include "createTime.H"
+    #include "addOverwriteOption.H"
+    #include "addRegionOption.H"
+    argList::addBoolOption
+    (
+        "detectOnly",
+        "find baffles only, but do not merge or split them"
+    );
+    argList::addBoolOption
+    (
+        "split",
+        "topologically split duplicate surfaces"
+    );
+
+    #include "setRootCase.H"
+    #include "createTime.H"
     runTime.functionObjects().off();
-#   include "createNamedMesh.H"
+    #include "createNamedMesh.H"
+
     const word oldInstance = mesh.pointsInstance();
 
     const bool split      = args.optionFound("split");
@@ -248,12 +263,10 @@ int main(int argc, char *argv[])
     if (detectOnly)
     {
         findBaffles(mesh, boundaryFaces);
-
         return 0;
     }
 
 
-
     // Read objects in time directory
     IOobjectList objects(mesh, runTime.timeName());
 
diff --git a/applications/utilities/mesh/manipulation/refineMesh/refineMesh.C b/applications/utilities/mesh/manipulation/refineMesh/refineMesh.C
index 783848d09b..ba3170d281 100644
--- a/applications/utilities/mesh/manipulation/refineMesh/refineMesh.C
+++ b/applications/utilities/mesh/manipulation/refineMesh/refineMesh.C
@@ -290,18 +290,26 @@ label twoDNess(const polyMesh& mesh)
 
 int main(int argc, char *argv[])
 {
-#   include "addOverwriteOption.H"
-    argList::addBoolOption("dict");
+    argList::addNote
+    (
+        "refine cells in multiple directions"
+    );
 
-#   include "setRootCase.H"
-#   include "createTime.H"
+    #include "addOverwriteOption.H"
+    argList::addBoolOption
+    (
+        "dict",
+        "refine according to system/refineMeshDict"
+    );
+
+    #include "setRootCase.H"
+    #include "createTime.H"
     runTime.functionObjects().off();
-#   include "createPolyMesh.H"
+    #include "createPolyMesh.H"
     const word oldInstance = mesh.pointsInstance();
 
     printEdgeStats(mesh);
 
-
     //
     // Read/construct control dictionary
     //
diff --git a/applications/utilities/mesh/manipulation/renumberMesh/renumberMesh.C b/applications/utilities/mesh/manipulation/renumberMesh/renumberMesh.C
index 11bf6e853d..80f9b6f93a 100644
--- a/applications/utilities/mesh/manipulation/renumberMesh/renumberMesh.C
+++ b/applications/utilities/mesh/manipulation/renumberMesh/renumberMesh.C
@@ -363,9 +363,21 @@ autoPtr<mapPolyMesh> reorderMesh
 
 int main(int argc, char *argv[])
 {
-    argList::addBoolOption("blockOrder");
-    argList::addBoolOption("orderPoints");
-    argList::addBoolOption("writeMaps");
+    argList::addBoolOption
+    (
+        "blockOrder",
+        "order cells into regions (using decomposition)"
+    );
+    argList::addBoolOption
+    (
+        "orderPoints",
+        "order points into internal and boundary points"
+    );
+    argList::addBoolOption
+    (
+        "writeMaps",
+        "write cellMap, faceMap, pointMap in polyMesh/"
+    );
 
 #   include "addOverwriteOption.H"
 #   include "addTimeOptions.H"
diff --git a/applications/utilities/mesh/manipulation/setSet/setSet.C b/applications/utilities/mesh/manipulation/setSet/setSet.C
index d8c216c662..54ff169f16 100644
--- a/applications/utilities/mesh/manipulation/setSet/setSet.C
+++ b/applications/utilities/mesh/manipulation/setSet/setSet.C
@@ -828,7 +828,12 @@ int main(int argc, char *argv[])
 #   include "addRegionOption.H"
     argList::addBoolOption("noVTK", "do not write VTK files");
     argList::addBoolOption("loop", "execute batch commands for all timesteps");
-    argList::addOption("batch", "file");
+    argList::addOption
+    (
+        "batch",
+        "file",
+        "process in batch mode, using input from specified file"
+    );
 
 #   include "setRootCase.H"
 #   include "createTime.H"
diff --git a/applications/utilities/mesh/manipulation/setsToZones/setsToZones.C b/applications/utilities/mesh/manipulation/setsToZones/setsToZones.C
index 8a30d3bdf8..5a2cdfdccc 100644
--- a/applications/utilities/mesh/manipulation/setsToZones/setsToZones.C
+++ b/applications/utilities/mesh/manipulation/setsToZones/setsToZones.C
@@ -57,14 +57,23 @@ using namespace Foam;
 
 int main(int argc, char *argv[])
 {
-    argList::addBoolOption("noFlipMap");
+    argList::addNote
+    (
+        "add point/face/cell Zones from similar named point/face/cell Sets"
+    );
 
-#   include "addRegionOption.H"
-#   include "addTimeOptions.H"
-#   include "setRootCase.H"
-#   include "createTime.H"
+    argList::addBoolOption
+    (
+        "noFlipMap",
+        "ignore orientation of faceSet"
+    );
 
-    bool noFlipMap = args.optionFound("noFlipMap");
+    #include "addRegionOption.H"
+    #include "addTimeOptions.H"
+    #include "setRootCase.H"
+    #include "createTime.H"
+
+    const bool noFlipMap = args.optionFound("noFlipMap");
 
     // Get times list
     instantList Times = runTime.times();
@@ -73,11 +82,11 @@ int main(int argc, char *argv[])
     label endTime = Times.size();
 
     // check -time and -latestTime options
-#   include "checkTimeOption.H"
+    #include "checkTimeOption.H"
 
     runTime.setTime(Times[startTime], startTime);
 
-#   include "createNamedPolyMesh.H"
+    #include "createNamedPolyMesh.H"
 
     // Search for list of objects for the time of the mesh
     word setsInstance = runTime.findInstance
@@ -153,9 +162,19 @@ int main(int argc, char *argv[])
         DynamicList<label> addressing(set.size());
         DynamicList<bool> flipMap(set.size());
 
-        if (!noFlipMap)
+        if (noFlipMap)
         {
-            word setName(set.name() + "SlaveCells");
+            // No flip map.
+            forAll(faceLabels, i)
+            {
+                label faceI = faceLabels[i];
+                addressing.append(faceI);
+                flipMap.append(false);
+            }
+        }
+        else
+        {
+            const word setName(set.name() + "SlaveCells");
 
             Info<< "Trying to load cellSet " << setName
                 << " to find out the slave side of the zone." << nl
@@ -226,16 +245,6 @@ int main(int argc, char *argv[])
                 flipMap.append(flip);
             }
         }
-        else
-        {
-            // No flip map.
-            forAll(faceLabels, i)
-            {
-                label faceI = faceLabels[i];
-                addressing.append(faceI);
-                flipMap.append(false);
-            }
-        }
 
         label zoneID = mesh.faceZones().findZoneID(set.name());
         if (zoneID == -1)
diff --git a/applications/utilities/mesh/manipulation/splitMeshRegions/splitMeshRegions.C b/applications/utilities/mesh/manipulation/splitMeshRegions/splitMeshRegions.C
index 1bac3a554b..969f9e703e 100644
--- a/applications/utilities/mesh/manipulation/splitMeshRegions/splitMeshRegions.C
+++ b/applications/utilities/mesh/manipulation/splitMeshRegions/splitMeshRegions.C
@@ -1473,26 +1473,64 @@ void writeCellToRegion(const fvMesh& mesh, const labelList& cellRegion)
 }
 
 
-
 // Main program:
 
 int main(int argc, char *argv[])
 {
-#   include "addOverwriteOption.H"
-    argList::addBoolOption("cellZones");
-    argList::addBoolOption("cellZonesOnly");
-    argList::addOption("cellZonesFileOnly", "cellZonesName");
-    argList::addOption("blockedFaces", "faceSet");
-    argList::addBoolOption("makeCellZones");
-    argList::addBoolOption("largestOnly");
-    argList::addOption("insidePoint", "point");
-    argList::addBoolOption("detectOnly");
-    argList::addBoolOption("sloppyCellZones");
+    argList::addNote
+    (
+        "splits mesh into multiple regions"
+    );
+    #include "addOverwriteOption.H"
+    argList::addBoolOption
+    (
+        "cellZones"
+    );
+    argList::addBoolOption
+    (
+        "cellZonesOnly",
+        "use current cellZones to split mesh into regions"
+    );
+    argList::addOption
+    (
+        "cellZonesFileOnly",
+        "file",
+        "like -cellZonesOnly, but use specified file"
+    );
+    argList::addOption
+    (
+        "blockedFaces",
+        "faceSet"
+    );
+    argList::addBoolOption
+    (
+        "makeCellZones",
+        "place cells into cellZones instead of splitting mesh"
+    );
+    argList::addBoolOption
+    (
+        "largestOnly"
+    );
+    argList::addOption
+    (
+        "insidePoint",
+        "point"
+    );
+    argList::addBoolOption
+    (
+        "detectOnly",
+        "do not write mesh"
+    );
+    argList::addBoolOption
+    (
+        "sloppyCellZones",
+        "try to match regions to existing cell zones"
+    );
 
-#   include "setRootCase.H"
-#   include "createTime.H"
+    #include "setRootCase.H"
+    #include "createTime.H"
     runTime.functionObjects().off();
-#   include "createMesh.H"
+    #include "createMesh.H"
     const word oldInstance = mesh.pointsInstance();
 
     word blockedFacesName;
@@ -1514,10 +1552,7 @@ int main(int argc, char *argv[])
     if
     (
         (useCellZonesOnly || useCellZonesFile)
-     && (
-            blockedFacesName != word::null
-         || useCellZones
-        )
+     && (useCellZones || blockedFacesName.size())
     )
     {
         FatalErrorIn(args.executable())
@@ -1529,7 +1564,6 @@ int main(int argc, char *argv[])
     }
 
 
-
     if (insidePoint && largestOnly)
     {
         FatalErrorIn(args.executable())
@@ -1719,7 +1753,6 @@ int main(int argc, char *argv[])
     writeCellToRegion(mesh, cellRegion);
 
 
-
     // Sizes per region
     // ~~~~~~~~~~~~~~~~
 
diff --git a/applications/utilities/mesh/manipulation/stitchMesh/stitchMesh.C b/applications/utilities/mesh/manipulation/stitchMesh/stitchMesh.C
index 3b7bb42a1c..05c0246473 100644
--- a/applications/utilities/mesh/manipulation/stitchMesh/stitchMesh.C
+++ b/applications/utilities/mesh/manipulation/stitchMesh/stitchMesh.C
@@ -40,6 +40,7 @@ Description
     Comparable to running a meshModifier of the form
     (if masterPatch is called "M" and slavePatch "S"):
 
+    @verbatim
     couple
     {
         type                    slidingInterface;
@@ -51,6 +52,7 @@ Description
         slavePatchName          S;
         typeOfMatch             partial or integral
     }
+    @endverbatim
 
 
 \*---------------------------------------------------------------------------*/
@@ -192,22 +194,41 @@ void checkPatch(const polyBoundaryMesh& bMesh, const word& name)
 
 int main(int argc, char *argv[])
 {
+    argList::addNote
+    (
+        "merge the faces on the specified patches (if geometrically possible)\n"
+        "so the faces become internal"
+    );
+
     argList::noParallel();
-#   include "addOverwriteOption.H"
-#   include "addRegionOption.H"
+    #include "addOverwriteOption.H"
+    #include "addRegionOption.H"
 
     argList::validArgs.append("masterPatch");
     argList::validArgs.append("slavePatch");
 
-    argList::addBoolOption("partial");
-    argList::addBoolOption("perfect");
+    argList::addBoolOption
+    (
+        "partial",
+        "couple partially overlapping patches"
+    );
+    argList::addBoolOption
+    (
+        "perfect",
+        "couple perfectly aligned patches"
+    );
+    argList::addOption
+    (
+        "toleranceDict",
+        "file",
+        "dictionary file with tolerances"
+    );
 
-    argList::addOption("toleranceDict", "file with tolerances");
-
-#   include "setRootCase.H"
-#   include "createTime.H"
+    #include "setRootCase.H"
+    #include "createTime.H"
     runTime.functionObjects().off();
-#   include "createNamedMesh.H"
+    #include "createNamedMesh.H"
+
     const word oldInstance = mesh.pointsInstance();
 
     const word masterPatchName = args[1];
@@ -220,7 +241,7 @@ int main(int argc, char *argv[])
     if (partialCover && perfectCover)
     {
         FatalErrorIn(args.executable())
-            << "Cannot both supply partial and perfect." << endl
+            << "Cannot supply both partial and perfect." << endl
             << "Use perfect match option if the patches perfectly align"
             << " (both vertex positions and face centres)" << endl
             << exit(FatalError);
diff --git a/applications/utilities/mesh/manipulation/subsetMesh/subsetMesh.C b/applications/utilities/mesh/manipulation/subsetMesh/subsetMesh.C
index 5c9ed448f1..bfff3950f3 100644
--- a/applications/utilities/mesh/manipulation/subsetMesh/subsetMesh.C
+++ b/applications/utilities/mesh/manipulation/subsetMesh/subsetMesh.C
@@ -150,14 +150,25 @@ void subsetPointFields
 
 int main(int argc, char *argv[])
 {
-#   include "addOverwriteOption.H"
-    argList::validArgs.append("set");
-    argList::addOption("patch", "patch name");
+    argList::addNote
+    (
+        "select a mesh subset based on a cellSet"
+    );
 
-#   include "setRootCase.H"
-#   include "createTime.H"
+    #include "addOverwriteOption.H"
+    argList::validArgs.append("cellSet");
+    argList::addOption
+    (
+        "patch",
+        "name",
+        "add exposed internal faces to specified patch instead of to "
+        "'oldInternalFaces'"
+    );
+    #include "setRootCase.H"
+    #include "createTime.H"
     runTime.functionObjects().off();
-#   include "createMesh.H"
+    #include "createMesh.H"
+
     const word oldInstance = mesh.pointsInstance();
 
     const word setName = args[1];
@@ -190,7 +201,7 @@ int main(int argc, char *argv[])
     else
     {
         Info<< "Adding exposed internal faces to a patch called"
-            << " \"oldInternalFaces\" (created if nessecary)" << endl
+            << " \"oldInternalFaces\" (created if necessary)" << endl
             << endl;
     }
 
diff --git a/applications/utilities/mesh/manipulation/transformPoints/transformPoints.C b/applications/utilities/mesh/manipulation/transformPoints/transformPoints.C
index b5fe48ec47..7a089c5f98 100644
--- a/applications/utilities/mesh/manipulation/transformPoints/transformPoints.C
+++ b/applications/utilities/mesh/manipulation/transformPoints/transformPoints.C
@@ -158,13 +158,13 @@ int main(int argc, char *argv[])
     (
         "rollPitchYaw",
         "vector",
-        "transform in terms of '( roll pitch yaw )' in degrees"
+        "transform in terms of '(roll pitch yaw)' in degrees"
     );
     argList::addOption
     (
         "yawPitchRoll",
         "vector",
-        "transform in terms of '( yaw pitch roll )' in degrees"
+        "transform in terms of '(yaw pitch roll)' in degrees"
     );
     argList::addBoolOption
     (
diff --git a/applications/utilities/miscellaneous/foamInfoExec/foamInfoExec.C b/applications/utilities/miscellaneous/foamInfoExec/foamInfoExec.C
index 8945c0cf5e..0fe8bbd945 100644
--- a/applications/utilities/miscellaneous/foamInfoExec/foamInfoExec.C
+++ b/applications/utilities/miscellaneous/foamInfoExec/foamInfoExec.C
@@ -22,7 +22,7 @@ License
     along with OpenFOAM.  If not, see <http://www.gnu.org/licenses/>.
 
 Description
-    Interrogates a case and prints information to screen
+    Interrogates a case and prints information to stdout
 
 \*---------------------------------------------------------------------------*/
 
@@ -38,15 +38,33 @@ using namespace Foam;
 
 int main(int argc, char *argv[])
 {
+    argList::addNote
+    (
+        "interrogates a case and prints information to stdout"
+    );
+
+    argList::noBanner();
     argList::noParallel();
-    argList::addBoolOption("times");
-    argList::addOption("dictionary", "dictionary name");
-    argList::addBoolOption("keywords");
-    argList::addOption("entry", "entry name");
+    argList::addBoolOption("times", "list available times");
+    argList::addBoolOption
+    (
+        "keywords",
+        "report keywords for the specified dictionary"
+    );
+    argList::addOption
+    (
+        "dict",
+        "file",
+        "specify a dictionary to interrogate"
+    );
+    argList::addOption
+    (
+        "entry",
+        "name",
+        "report the named entry for the specified dictionary"
+    );
 
-#   include "setRootCase.H"
-
-    Info<< endl;
+    #include "setRootCase.H"
 
     if (args.optionFound("times"))
     {
@@ -61,11 +79,11 @@ int main(int argc, char *argv[])
         }
     }
 
-    if (args.optionFound("dictionary"))
+    if (args.optionFound("dict"))
     {
-        fileName dictFileName
+        const fileName dictFileName
         (
-            args.rootPath()/args.caseName()/args["dictionary"]
+            args.rootPath()/args.caseName()/args["dict"]
         );
 
         IFstream dictFile(dictFileName);
@@ -74,14 +92,7 @@ int main(int argc, char *argv[])
         {
             dictionary dict(dictFile);
 
-            if (args.optionFound("keywords") && !args.optionFound("entry"))
-            {
-                forAllConstIter(dictionary, dict, iter)
-                {
-                    Info<< iter().keyword() << endl;
-                }
-            }
-            else if (args.optionFound("entry"))
+            if (args.optionFound("entry"))
             {
                 wordList entryNames
                 (
@@ -152,6 +163,13 @@ int main(int argc, char *argv[])
                     FatalError.exit(2);
                 }
             }
+            else if (args.optionFound("keywords"))
+            {
+                forAllConstIter(dictionary, dict, iter)
+                {
+                    Info<< iter().keyword() << endl;
+                }
+            }
             else
             {
                 Info<< dict;
diff --git a/applications/utilities/parallelProcessing/decomposePar/decomposePar.C b/applications/utilities/parallelProcessing/decomposePar/decomposePar.C
index f63026e3f0..c465aa3c3b 100644
--- a/applications/utilities/parallelProcessing/decomposePar/decomposePar.C
+++ b/applications/utilities/parallelProcessing/decomposePar/decomposePar.C
@@ -81,8 +81,13 @@ Usage
 
 int main(int argc, char *argv[])
 {
+    argList::addNote
+    (
+        "decompose a mesh and fields of a case for parallel execution"
+    );
+
     argList::noParallel();
-#   include "addRegionOption.H"
+    #include "addRegionOption.H"
     argList::addBoolOption
     (
         "cellDist",
@@ -110,12 +115,7 @@ int main(int argc, char *argv[])
         "only decompose geometry if the number of domains has changed"
     );
 
-    argList::addNote
-    (
-        "decompose a mesh and fields of a case for parallel execution"
-    );
-
-#   include "setRootCase.H"
+    #include "setRootCase.H"
 
     word regionName = fvMesh::defaultRegion;
     word regionDir = word::null;
@@ -132,7 +132,7 @@ int main(int argc, char *argv[])
     bool forceOverwrite          = args.optionFound("force");
     bool ifRequiredDecomposition = args.optionFound("ifRequired");
 
-#   include "createTime.H"
+    #include "createTime.H"
 
     Info<< "Time = " << runTime.timeName() << endl;
 
diff --git a/applications/utilities/parallelProcessing/reconstructParMesh/reconstructParMesh.C b/applications/utilities/parallelProcessing/reconstructParMesh/reconstructParMesh.C
index 4d35b661d4..e827fee60c 100644
--- a/applications/utilities/parallelProcessing/reconstructParMesh/reconstructParMesh.C
+++ b/applications/utilities/parallelProcessing/reconstructParMesh/reconstructParMesh.C
@@ -279,6 +279,11 @@ autoPtr<mapPolyMesh> mergeSharedPoints
 
 int main(int argc, char *argv[])
 {
+    argList::addNote
+    (
+        "reconstruct a mesh using geometric information only"
+    );
+
     argList::noParallel();
     argList::addOption
     (
@@ -293,15 +298,10 @@ int main(int argc, char *argv[])
         "do (slower) geometric matching on all boundary faces"
     );
 
-    argList::addNote
-    (
-        "reconstruct a mesh using geometric information only"
-    );
-
-#   include "addTimeOptions.H"
-#   include "addRegionOption.H"
-#   include "setRootCase.H"
-#   include "createTime.H"
+    #include "addTimeOptions.H"
+    #include "addRegionOption.H"
+    #include "setRootCase.H"
+    #include "createTime.H"
 
     Info<< "This is an experimental tool which tries to merge"
         << " individual processor" << nl
diff --git a/applications/utilities/parallelProcessing/redistributeMeshPar/redistributeMeshPar.C b/applications/utilities/parallelProcessing/redistributeMeshPar/redistributeMeshPar.C
index 9c0caebc08..c3a2003d40 100644
--- a/applications/utilities/parallelProcessing/redistributeMeshPar/redistributeMeshPar.C
+++ b/applications/utilities/parallelProcessing/redistributeMeshPar/redistributeMeshPar.C
@@ -503,7 +503,13 @@ void compareFields
 int main(int argc, char *argv[])
 {
 #   include "addRegionOption.H"
-    argList::addOption("mergeTol", "relative merge distance");
+    argList::addOption
+    (
+        "mergeTol",
+        "scalar",
+        "specify the merge distance relative to the bounding box size "
+        "(default 1E-6)"
+    );
     // Create argList. This will check for non-existing processor dirs.
 #   include "setRootCase.H"
 
diff --git a/applications/utilities/postProcessing/dataConversion/foamToFieldview9/foamToFieldview9.C b/applications/utilities/postProcessing/dataConversion/foamToFieldview9/foamToFieldview9.C
index deaf3897fc..ea9a685b67 100644
--- a/applications/utilities/postProcessing/dataConversion/foamToFieldview9/foamToFieldview9.C
+++ b/applications/utilities/postProcessing/dataConversion/foamToFieldview9/foamToFieldview9.C
@@ -176,7 +176,11 @@ static void writeFaceData
 int main(int argc, char *argv[])
 {
     argList::noParallel();
-    argList::addBoolOption("noWall");
+    argList::addBoolOption
+    (
+        "noWall",
+        "skip setting wall information"
+    );
     timeSelector::addOptions(true, false);
 
 #   include "setRootCase.H"
diff --git a/applications/utilities/postProcessing/dataConversion/foamToTecplot360/foamToTecplot360.C b/applications/utilities/postProcessing/dataConversion/foamToTecplot360/foamToTecplot360.C
index 2ba61565d9..a801d001be 100644
--- a/applications/utilities/postProcessing/dataConversion/foamToTecplot360/foamToTecplot360.C
+++ b/applications/utilities/postProcessing/dataConversion/foamToTecplot360/foamToTecplot360.C
@@ -31,7 +31,7 @@ Usage
 
     - foamToTecplot360 [OPTION]
 
-    @param -fields \<fields\>\n
+    @param -fields \<names\>\n
     Convert selected fields only. For example,
     @verbatim
          -fields '( p T U )'
@@ -163,30 +163,65 @@ labelList getSelectedPatches
 
 int main(int argc, char *argv[])
 {
+    argList::addNote
+    (
+        "Tecplot binary file format writer"
+    );
+
     timeSelector::addOptions();
+    #include "addRegionOption.H"
 
-#   include "addRegionOption.H"
-
-    argList::addOption("fields", "fields");
-    argList::addOption("cellSet", "cellSet name");
-    argList::addOption("faceSet", "faceSet name");
-    argList::addBoolOption("nearCellValue");
-    argList::addBoolOption("noInternal");
-    argList::addBoolOption("noPointValues");
+    argList::addOption
+    (
+        "fields",
+        "names",
+        "convert selected fields only. eg, '(p T U)'"
+    );
+    argList::addOption
+    (
+        "cellSet",
+        "name",
+        "restrict conversion to the specified cellSet"
+    );
+    argList::addOption
+    (
+        "faceSet",
+        "name",
+        "restrict conversion to the specified cellSet"
+    );
+    argList::addBoolOption
+    (
+        "nearCellValue",
+        "output cell value on patches instead of patch value itself"
+    );
+    argList::addBoolOption
+    (
+        "noInternal",
+        "do not generate file for mesh, only for patches"
+    );
+    argList::addBoolOption
+    (
+        "noPointValues",
+        "no pointFields"
+    );
     argList::addOption
     (
         "excludePatches",
         "patches (wildcards) to exclude"
     );
-    argList::addBoolOption("noFaceZones");
+    argList::addBoolOption
+    (
+        "noFaceZones",
+        "no faceZones"
+    );
 
-#   include "setRootCase.H"
-#   include "createTime.H"
+    #include "setRootCase.H"
+    #include "createTime.H"
 
-    bool doWriteInternal = !args.optionFound("noInternal");
-    bool doFaceZones     = !args.optionFound("noFaceZones");
-
-    bool nearCellValue = args.optionFound("nearCellValue");
+    const bool doWriteInternal = !args.optionFound("noInternal");
+    const bool doFaceZones     = !args.optionFound("noFaceZones");
+    const bool nearCellValue = args.optionFound("nearCellValue");
+    const bool noPointValues = args.optionFound("noPointValues");
 
     if (nearCellValue)
     {
@@ -195,8 +230,6 @@ int main(int argc, char *argv[])
             << nl << endl;
     }
 
-    bool noPointValues = args.optionFound("noPointValues");
-
     if (noPointValues)
     {
         WarningIn(args.executable())
diff --git a/applications/utilities/postProcessing/dataConversion/foamToVTK/foamToVTK.C b/applications/utilities/postProcessing/dataConversion/foamToVTK/foamToVTK.C
index a93885d976..511c5c0f83 100644
--- a/applications/utilities/postProcessing/dataConversion/foamToVTK/foamToVTK.C
+++ b/applications/utilities/postProcessing/dataConversion/foamToVTK/foamToVTK.C
@@ -226,13 +226,17 @@ labelList getSelectedPatches
 
 int main(int argc, char *argv[])
 {
+    argList::addNote
+    (
+        "legacy VTK file format writer"
+    );
     timeSelector::addOptions();
 
-#   include "addRegionOption.H"
-
+    #include "addRegionOption.H"
     argList::addOption
     (
-        "fields", "wordList",
+        "fields",
+        "wordList",
         "only convert the specified fields - eg '(p T U)'"
     );
     argList::addOption
@@ -241,25 +245,59 @@ int main(int argc, char *argv[])
         "name",
         "convert a mesh subset corresponding to the specified cellSet"
     );
-    argList::addOption("faceSet", "name");
-    argList::addOption("pointSet", "name");
+    argList::addOption
+    (
+        "faceSet",
+        "name",
+        "restrict conversion to the specified faceSet"
+    );
+    argList::addOption
+    (
+        "pointSet",
+        "name",
+        "restrict conversion to the specified pointSet"
+    );
     argList::addBoolOption
     (
         "ascii",
         "write in ASCII format instead of binary"
     );
-    argList::addBoolOption("surfaceFields");
-    argList::addBoolOption("nearCellValue");
-    argList::addBoolOption("noInternal");
-    argList::addBoolOption("noPointValues");
-    argList::addBoolOption("allPatches");
+    argList::addBoolOption
+    (
+        "surfaceFields",
+        "write surfaceScalarFields (e.g., phi)"
+    );
+    argList::addBoolOption
+    (
+        "nearCellValue",
+        "use cell value on patches instead of patch value itself"
+    );
+    argList::addBoolOption
+    (
+        "noInternal",
+        "do not generate file for mesh, only for patches"
+    );
+    argList::addBoolOption
+    (
+        "noPointValues",
+        "no pointFields"
+    );
+    argList::addBoolOption
+    (
+        "allPatches",
+        "combine all patches into a single file"
+    );
     argList::addOption
     (
         "excludePatches",
         "wordReList",
         "a list of patches to exclude - eg '( inlet \".*Wall\" )' "
     );
-    argList::addBoolOption("noFaceZones");
+    argList::addBoolOption
+    (
+        "noFaceZones",
+        "no faceZones"
+    );
     argList::addBoolOption
     (
         "noLinks",
@@ -271,8 +309,8 @@ int main(int argc, char *argv[])
         "use the time name instead of the time index when naming the files"
     );
 
-#   include "setRootCase.H"
-#   include "createTime.H"
+    #include "setRootCase.H"
+    #include "createTime.H"
 
     const bool doWriteInternal = !args.optionFound("noInternal");
     const bool doFaceZones     = !args.optionFound("noFaceZones");
diff --git a/applications/utilities/postProcessing/foamCalc/foamCalcApp.C b/applications/utilities/postProcessing/foamCalc/foamCalcApp.C
index 9661e4257b..85365b2a43 100644
--- a/applications/utilities/postProcessing/foamCalc/foamCalcApp.C
+++ b/applications/utilities/postProcessing/foamCalc/foamCalcApp.C
@@ -51,7 +51,8 @@ int main(int argc, char *argv[])
     Foam::argList::addOption
     (
         "dict",
-        "dictionary name"
+        "name",
+        "dictionary to use"
     );
 
     if (argc < 2)
@@ -61,7 +62,7 @@ int main(int argc, char *argv[])
             << exit(FatalError);
     }
 
-    word utilityName = argv[1];
+    const word utilityName = argv[1];
 
     Foam::autoPtr<Foam::calcType> utility
     (
diff --git a/applications/utilities/postProcessing/lagrangian/particleTracks/createFields.H b/applications/utilities/postProcessing/lagrangian/particleTracks/createFields.H
index aef0139de1..61c126e492 100644
--- a/applications/utilities/postProcessing/lagrangian/particleTracks/createFields.H
+++ b/applications/utilities/postProcessing/lagrangian/particleTracks/createFields.H
@@ -9,7 +9,7 @@ IOdictionary propsDict
     )
 );
 
-word cloudName(propsDict.lookup("cloudName"));
+const word cloudName(propsDict.lookup("cloudName"));
 
 label sampleFrequency(readLabel(propsDict.lookup("sampleFrequency")));
 
diff --git a/applications/utilities/postProcessing/miscellaneous/foamListTimes/foamListTimes.C b/applications/utilities/postProcessing/miscellaneous/foamListTimes/foamListTimes.C
index 73a21450cb..73fa1c803f 100644
--- a/applications/utilities/postProcessing/miscellaneous/foamListTimes/foamListTimes.C
+++ b/applications/utilities/postProcessing/miscellaneous/foamListTimes/foamListTimes.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 1991-2009 OpenCFD Ltd.
+    \\  /    A nd           | Copyright (C) 1991-2010 OpenCFD Ltd.
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -32,7 +32,7 @@ Usage
     - foamListTimes [OPTION]
 
     @param -processor \n
-    List times from processor0 directory
+    List times from processor0/ directory
 
 \*---------------------------------------------------------------------------*/
 
@@ -46,11 +46,19 @@ using namespace Foam;
 
 int main(int argc, char *argv[])
 {
+    argList::addNote
+    (
+        "list times using timeSelector"
+    );
+
     timeSelector::addOptions();  // -constant enabled
     argList::noBanner();
     argList::noParallel();
-    argList::addBoolOption("processor");
-
+    argList::addBoolOption
+    (
+        "processor",
+        "list times from processor0/ directory"
+    );
 #   include "setRootCase.H"
 
     label nProcs = 0;
diff --git a/applications/utilities/postProcessing/wall/yPlusRAS/yPlusRAS.C b/applications/utilities/postProcessing/wall/yPlusRAS/yPlusRAS.C
index bc8083bc94..bb3216333f 100644
--- a/applications/utilities/postProcessing/wall/yPlusRAS/yPlusRAS.C
+++ b/applications/utilities/postProcessing/wall/yPlusRAS/yPlusRAS.C
@@ -28,8 +28,8 @@ Description
     Calculates and reports yPlus for all wall patches, for the specified times
     when using RAS turbulence models.
 
-    Default behaviour assumes operating in incompressible mode. To apply to
-    compressible RAS cases, use the -compressible option.
+    Default behaviour assumes operating in incompressible mode.
+    Use the -compressible option for compressible RAS cases.
 
 \*---------------------------------------------------------------------------*/
 
@@ -185,14 +185,18 @@ int main(int argc, char *argv[])
 
     #include "addRegionOption.H"
 
-    argList::addBoolOption("compressible");
+    argList::addBoolOption
+    (
+        "compressible",
+        "calculate compressible y+"
+    );
 
     #include "setRootCase.H"
     #include "createTime.H"
     instantList timeDirs = timeSelector::select0(runTime, args);
     #include "createNamedMesh.H"
 
-    bool compressible = args.optionFound("compressible");
+    const bool compressible = args.optionFound("compressible");
 
     forAll(timeDirs, timeI)
     {
@@ -205,8 +209,7 @@ int main(int argc, char *argv[])
         {
             Info<< "Calculating wall distance\n" << endl;
             wallDist y(mesh, true);
-            Info<< "Writing wall distance to field "
-                << y.name() << nl << endl;
+            Info<< "Writing wall distance to field " << y.name() << nl << endl;
             y.write();
         }
 
diff --git a/applications/utilities/preProcessing/applyBoundaryLayer/applyBoundaryLayer.C b/applications/utilities/preProcessing/applyBoundaryLayer/applyBoundaryLayer.C
index 6d1efa3a1d..13bc8f7476 100644
--- a/applications/utilities/preProcessing/applyBoundaryLayer/applyBoundaryLayer.C
+++ b/applications/utilities/preProcessing/applyBoundaryLayer/applyBoundaryLayer.C
@@ -49,9 +49,28 @@ static const scalar kappa(0.41);
 
 int main(int argc, char *argv[])
 {
-    argList::addOption("ybl", "scalar");
-    argList::addOption("Cbl", "scalar");
-    argList::addBoolOption("writenut");
+    argList::addNote
+    (
+        "apply a simplified boundary-layer model to the velocity and\n"
+        "turbulence fields based on the 1/7th power-law."
+    );
+
+    argList::addOption
+    (
+        "ybl",
+        "scalar",
+        "specify the boundary-layer thickness"
+    );
+    argList::addOption
+    (
+        "Cbl", "scalar",
+        "boundary-layer thickness as Cbl * mean distance to wall"
+    );
+    argList::addBoolOption
+    (
+        "writenut",
+        "write nut field"
+    );
 
     #include "setRootCase.H"
     #include "createTime.H"
diff --git a/applications/utilities/preProcessing/applyBoundaryLayer/createFields.H b/applications/utilities/preProcessing/applyBoundaryLayer/createFields.H
index 00e8b413ae..2c12ed376d 100644
--- a/applications/utilities/preProcessing/applyBoundaryLayer/createFields.H
+++ b/applications/utilities/preProcessing/applyBoundaryLayer/createFields.H
@@ -60,7 +60,7 @@ License
     else if (args.optionFound("Cbl"))
     {
         // Calculate boundary layer thickness as Cbl * mean distance to wall
-        ybl.value() = gAverage(y)*args.optionRead<scalar>("Cbl");
+        ybl.value() = gAverage(y) * args.optionRead<scalar>("Cbl");
     }
     else
     {
diff --git a/applications/utilities/preProcessing/applyWallFunctionBoundaryConditions/applyWallFunctionBoundaryConditions.C b/applications/utilities/preProcessing/applyWallFunctionBoundaryConditions/applyWallFunctionBoundaryConditions.C
index 28dc3add1b..4023a6d17e 100644
--- a/applications/utilities/preProcessing/applyWallFunctionBoundaryConditions/applyWallFunctionBoundaryConditions.C
+++ b/applications/utilities/preProcessing/applyWallFunctionBoundaryConditions/applyWallFunctionBoundaryConditions.C
@@ -333,13 +333,17 @@ void updateIncompressibleCase(const fvMesh& mesh)
 int main(int argc, char *argv[])
 {
     #include "addTimeOptions.H"
-    argList::addBoolOption("compressible");
+    argList::addBoolOption
+    (
+        "compressible",
+        "force use of compressible wall functions. default is auto-detect."
+    );
 
     #include "setRootCase.H"
     #include "createTime.H"
     #include "createMesh.H"
 
-    bool compressible = args.optionFound("compressible");
+    const bool compressible = args.optionFound("compressible");
 
     Info<< "Updating turbulence fields to operate using new run time "
         << "selectable" << nl << "wall functions"
diff --git a/applications/utilities/preProcessing/changeDictionary/changeDictionary.C b/applications/utilities/preProcessing/changeDictionary/changeDictionary.C
index 9f26439076..69a201e558 100644
--- a/applications/utilities/preProcessing/changeDictionary/changeDictionary.C
+++ b/applications/utilities/preProcessing/changeDictionary/changeDictionary.C
@@ -244,15 +244,24 @@ bool merge
 
 int main(int argc, char *argv[])
 {
-    argList::addOption("instance", "instance");
-    argList::addBoolOption("literalRE");
+    argList::addOption
+    (
+        "instance",
+        "name",
+        "specify alternate time instance - default is latest time"
+    );
+    argList::addBoolOption
+    (
+        "literalRE",
+        "treat regular expressions literally (ie, as a keyword)"
+    );
     #include "addRegionOption.H"
 
     #include "setRootCase.H"
     #include "createTime.H"
     #include "createNamedMesh.H"
 
-    bool literalRE = args.optionFound("literalRE");
+    const bool literalRE = args.optionFound("literalRE");
 
     if (literalRE)
     {
diff --git a/applications/utilities/preProcessing/foamUpgradeFvSolution/foamUpgradeFvSolution.C b/applications/utilities/preProcessing/foamUpgradeFvSolution/foamUpgradeFvSolution.C
index 5d26016631..0cdf0cbe77 100644
--- a/applications/utilities/preProcessing/foamUpgradeFvSolution/foamUpgradeFvSolution.C
+++ b/applications/utilities/preProcessing/foamUpgradeFvSolution/foamUpgradeFvSolution.C
@@ -48,8 +48,17 @@ using namespace Foam;
 
 int main(int argc, char *argv[])
 {
+    argList::addNote
+    (
+        "upgrade the syntax of system/fvSolution::solvers"
+    );
+
     argList::noParallel();
-    argList::addBoolOption("test");
+    argList::addBoolOption
+    (
+        "test",
+        "suppress writing the updated system/fvSolution file"
+    );
 
 #   include "setRootCase.H"
 #   include "createTime.H"
@@ -89,7 +98,6 @@ int main(int argc, char *argv[])
                     << (solutionDict.objectPath() + ".old") << nl;
             }
 
-
             solutionDict.writeObject
             (
                 IOstream::ASCII,
diff --git a/applications/utilities/preProcessing/mapFields/mapFields.C b/applications/utilities/preProcessing/mapFields/mapFields.C
index 649f4bbafe..2d416fd029 100644
--- a/applications/utilities/preProcessing/mapFields/mapFields.C
+++ b/applications/utilities/preProcessing/mapFields/mapFields.C
@@ -227,7 +227,53 @@ wordList addProcessorPatches
 
 int main(int argc, char *argv[])
 {
-    #include "setRoots.H"
+    argList::addNote
+    (
+        "map volume fields from one mesh to another"
+    );
+    argList::noParallel();
+    argList::validArgs.clear();
+    argList::validArgs.append("sourceCase");
+
+    argList::addOption
+    (
+        "sourceTime",
+        "scalar",
+        "specify the source time"
+    );
+    argList::addBoolOption
+    (
+        "parallelSource",
+        "the source is decomposed"
+    );
+    argList::addBoolOption
+    (
+        "parallelTarget",
+        "the target is decomposed"
+    );
+    argList::addBoolOption("consistent");
+
+    argList args(argc, argv);
+
+    if (!args.check())
+    {
+         FatalError.exit();
+    }
+
+    fileName rootDirTarget(args.rootPath());
+    fileName caseDirTarget(args.globalCaseName());
+
+    const fileName casePath = args[1];
+    const fileName rootDirSource = casePath.path();
+    const fileName caseDirSource = casePath.name();
+
+    Info<< "Source: " << rootDirSource << " " << caseDirSource << nl
+        << "Target: " << rootDirTarget << " " << caseDirTarget << endl;
+
+    const bool parallelSource = args.optionFound("parallelSource");
+    const bool parallelTarget = args.optionFound("parallelTarget");
+    const bool consistent     = args.optionFound("consistent");
+
     #include "createTimes.H"
 
     HashTable<word> patchMap;
@@ -249,7 +295,6 @@ int main(int argc, char *argv[])
         );
 
         mapFieldsDict.lookup("patchMap") >> patchMap;
-
         mapFieldsDict.lookup("cuttingPatches") >>  cuttingPatches;
     }
 
diff --git a/applications/utilities/preProcessing/mapFields/setRoots.H b/applications/utilities/preProcessing/mapFields/setRoots.H
deleted file mode 100644
index d7651306b4..0000000000
--- a/applications/utilities/preProcessing/mapFields/setRoots.H
+++ /dev/null
@@ -1,30 +0,0 @@
-    argList::noParallel();
-    argList::validArgs.clear();
-    argList::validArgs.append("source dir");
-
-    argList::addOption("sourceTime", "scalar");
-    argList::addBoolOption("parallelSource");
-    argList::addBoolOption("parallelTarget");
-    argList::addBoolOption("consistent");
-
-    argList args(argc, argv);
-
-    if (!args.check())
-    {
-         FatalError.exit();
-    }
-
-    fileName rootDirTarget(args.rootPath());
-    fileName caseDirTarget(args.globalCaseName());
-
-    const fileName casePath = args[1];
-    const fileName rootDirSource = casePath.path();
-    const fileName caseDirSource = casePath.name();
-
-    Info<< "Source: " << rootDirSource << " " << caseDirSource << nl
-        << "Target: " << rootDirTarget << " " << caseDirTarget << endl;
-
-    const bool parallelSource = args.optionFound("parallelSource");
-    const bool parallelTarget = args.optionFound("parallelTarget");
-    const bool consistent     = args.optionFound("consistent");
-
diff --git a/applications/utilities/surface/surfaceAdd/surfaceAdd.C b/applications/utilities/surface/surfaceAdd/surfaceAdd.C
index 775ccaa3fd..5dd58b1402 100644
--- a/applications/utilities/surface/surfaceAdd/surfaceAdd.C
+++ b/applications/utilities/surface/surfaceAdd/surfaceAdd.C
@@ -45,14 +45,28 @@ using namespace Foam;
 
 int main(int argc, char *argv[])
 {
+    argList::addNote
+    (
+        "add two surfaces via a geometric merge on points."
+    );
+
     argList::noParallel();
     argList::validArgs.clear();
-    argList::validArgs.append("Foam surface file");
-    argList::validArgs.append("Foam surface file");
-    argList::validArgs.append("Foam output file");
+    argList::validArgs.append("surfaceFile");
+    argList::validArgs.append("surfaceFile");
+    argList::validArgs.append("output surfaceFile");
 
-    argList::addOption("points", "pointsFile");
-    argList::addBoolOption("mergeRegions");
+    argList::addOption
+    (
+        "points",
+        "file",
+        "provide additional points"
+    );
+    argList::addBoolOption
+    (
+        "mergeRegions",
+        "combine regions from both surfaces"
+    );
 
     argList args(argc, argv);
 
diff --git a/applications/utilities/surface/surfaceAutoPatch/surfaceAutoPatch.C b/applications/utilities/surface/surfaceAutoPatch/surfaceAutoPatch.C
index ff68646a42..8144b54f21 100644
--- a/applications/utilities/surface/surfaceAutoPatch/surfaceAutoPatch.C
+++ b/applications/utilities/surface/surfaceAutoPatch/surfaceAutoPatch.C
@@ -47,17 +47,16 @@ int main(int argc, char *argv[])
 {
     argList::noParallel();
     argList::validArgs.clear();
-    argList::validArgs.append("input surface file");
-    argList::validArgs.append("output surface file");
-    argList::validArgs.append("included angle [0..180]");
+    argList::validArgs.append("input surfaceFile");
+    argList::validArgs.append("output surfaceFile");
+    argList::validArgs.append("includedAngle [0..180]");
     argList args(argc, argv);
 
     const fileName inFileName  = args[1];
     const fileName outFileName = args[2];
     const scalar includedAngle = args.argRead<scalar>(3);
 
-    Info<< "Surface        : " << inFileName << nl
-        << endl;
+    Info<< "Surface        : " << inFileName << nl << endl;
 
 
     // Read
diff --git a/applications/utilities/surface/surfaceCheck/surfaceCheck.C b/applications/utilities/surface/surfaceCheck/surfaceCheck.C
index 4d9171af46..4cad39c8aa 100644
--- a/applications/utilities/surface/surfaceCheck/surfaceCheck.C
+++ b/applications/utilities/surface/surfaceCheck/surfaceCheck.C
@@ -175,10 +175,18 @@ int main(int argc, char *argv[])
     argList::noParallel();
 
     argList::validArgs.clear();
-    argList::validArgs.append("surface file");
+    argList::validArgs.append("surfaceFile");
 
-    argList::addBoolOption("checkSelfIntersection");
-    argList::addBoolOption("verbose");
+    argList::addBoolOption
+    (
+        "checkSelfIntersection",
+        "also check for self-intersection"
+    );
+    argList::addBoolOption
+    (
+        "verbose",
+        "verbose operation"
+    );
     argList::addBoolOption
     (
         "blockMesh",
@@ -224,8 +232,8 @@ int main(int argc, char *argv[])
             <<"    hex (0 1 2 3 4 5 6 7) (10 10 10) simpleGrading (1 1 1)\n"
             <<");\n" << nl;
 
-        Info<<"edges();" << nl
-            <<"patches();" << endl;
+        Info<<"edges\n();" << nl
+            <<"patches\n();" << endl;
     }
 
 
diff --git a/applications/utilities/surface/surfaceClean/surfaceClean.C b/applications/utilities/surface/surfaceClean/surfaceClean.C
index 46d9bb90da..2547240472 100644
--- a/applications/utilities/surface/surfaceClean/surfaceClean.C
+++ b/applications/utilities/surface/surfaceClean/surfaceClean.C
@@ -48,9 +48,9 @@ int main(int argc, char *argv[])
 {
     argList::validArgs.clear();
     argList::noParallel();
-    argList::validArgs.append("surface file");
+    argList::validArgs.append("surfaceFile");
     argList::validArgs.append("min length");
-    argList::validArgs.append("output surface file");
+    argList::validArgs.append("output surfaceFile");
     argList args(argc, argv);
 
     const fileName inFileName = args[1];
diff --git a/applications/utilities/surface/surfaceCoarsen/surfaceCoarsen.C b/applications/utilities/surface/surfaceCoarsen/surfaceCoarsen.C
index 76c97af3cd..af9d5ff9c6 100644
--- a/applications/utilities/surface/surfaceCoarsen/surfaceCoarsen.C
+++ b/applications/utilities/surface/surfaceCoarsen/surfaceCoarsen.C
@@ -65,9 +65,9 @@ int main(int argc, char *argv[])
 {
     argList::noParallel();
     argList::validArgs.clear();
-    argList::validArgs.append("Foam surface file");
-    argList::validArgs.append("reduction factor");
-    argList::validArgs.append("Foam output file");
+    argList::validArgs.append("surfaceFile");
+    argList::validArgs.append("reductionFactor");
+    argList::validArgs.append("output surfaceFile");
     argList args(argc, argv);
 
     const fileName inFileName = args[1];
diff --git a/applications/utilities/surface/surfaceConvert/surfaceConvert.C b/applications/utilities/surface/surfaceConvert/surfaceConvert.C
index 6c97d9ff1c..566c9f1583 100644
--- a/applications/utilities/surface/surfaceConvert/surfaceConvert.C
+++ b/applications/utilities/surface/surfaceConvert/surfaceConvert.C
@@ -58,14 +58,32 @@ using namespace Foam;
 
 int main(int argc, char *argv[])
 {
+    argList::addNote
+    (
+        "convert between surface formats"
+    );
+
     argList::noParallel();
     argList::validArgs.clear();
     argList::validArgs.append("inputFile");
     argList::validArgs.append("outputFile");
 
-    argList::addBoolOption("clean");
-    argList::addBoolOption("group");
-    argList::addOption("scale", "scale");
+    argList::addBoolOption
+    (
+        "clean",
+        "perform some surface checking/cleanup on the input surface"
+    );
+    argList::addBoolOption
+    (
+        "group",
+        "reorder faces into groups; one per region"
+    );
+    argList::addOption
+    (
+        "scale",
+        "factor",
+        "geometry scaling factor - default is 1"
+    );
 
     argList args(argc, argv);
 
@@ -96,8 +114,7 @@ int main(int argc, char *argv[])
         Info<< endl;
     }
 
-    bool sortByRegion = args.optionFound("group");
-
+    const bool sortByRegion = args.optionFound("group");
     if (sortByRegion)
     {
         Info<< "Reordering faces into groups; one per region." << endl;
diff --git a/applications/utilities/surface/surfaceFeatureConvert/surfaceFeatureConvert.C b/applications/utilities/surface/surfaceFeatureConvert/surfaceFeatureConvert.C
index 3323deccfc..38469872e4 100644
--- a/applications/utilities/surface/surfaceFeatureConvert/surfaceFeatureConvert.C
+++ b/applications/utilities/surface/surfaceFeatureConvert/surfaceFeatureConvert.C
@@ -53,7 +53,7 @@ int main(int argc, char *argv[])
     (
         "scale",
         "factor",
-        "specify a scaling factor for the points"
+        "geometry scaling factor - default is 1"
     );
 
     argList args(argc, argv);
diff --git a/applications/utilities/surface/surfaceFeatureExtract/surfaceFeatureExtract.C b/applications/utilities/surface/surfaceFeatureExtract/surfaceFeatureExtract.C
index 0ed7cff2b6..5775e68a6b 100644
--- a/applications/utilities/surface/surfaceFeatureExtract/surfaceFeatureExtract.C
+++ b/applications/utilities/surface/surfaceFeatureExtract/surfaceFeatureExtract.C
@@ -90,19 +90,53 @@ void deleteBox
 
 int main(int argc, char *argv[])
 {
+    argList::addNote
+    (
+        "extract and write surface features to file"
+    );
     argList::noParallel();
 
     argList::validArgs.clear();
     argList::validArgs.append("surface");
     argList::validArgs.append("output set");
 
-    argList::addOption("includedAngle", "included angle [0..180]");
-    argList::addOption("set", "input feature set");
+    argList::addOption
+    (
+        "includedAngle",
+        "degrees",
+        "construct feature set from included angle [0..180]"
+    );
+    argList::addOption
+    (
+        "set",
+        "name",
+        "use existing feature set from file"
+    );
+    argList::addOption
+    (
+        "minLen",
+        "scalar",
+        "remove features shorter than the specified cumulative length"
+    );
+    argList::addOption
+    (
+        "minElem",
+        "int",
+        "remove features with fewer than the specified number of edges"
+    );
+    argList::addOption
+    (
+        "subsetBox",
+        "((x0 y0 z0)(x1 y1 z1))",
+        "remove edges outside specified bounding box"
+    );
+    argList::addOption
+    (
+        "deleteBox",
+        "((x0 y0 z0)(x1 y1 z1))",
+        "remove edges within specified bounding box"
+    );
 
-    argList::addOption("minLen", "cumulative length of feature");
-    argList::addOption("minElem", "number of edges in feature");
-    argList::addOption("subsetBox", "((x0 y0 z0)(x1 y1 z1))");
-    argList::addOption("deleteBox", "((x0 y0 z0)(x1 y1 z1))");
     argList args(argc, argv);
 
     Info<< "Feature line extraction is only valid on closed manifold surfaces."
@@ -143,7 +177,7 @@ int main(int argc, char *argv[])
     }
     else if (args.optionFound("includedAngle"))
     {
-        scalar includedAngle = args.optionRead<scalar>("includedAngle");
+        const scalar includedAngle = args.optionRead<scalar>("includedAngle");
 
         Info<< "Constructing feature set from included angle " << includedAngle
             << endl;
@@ -175,8 +209,6 @@ int main(int argc, char *argv[])
         << endl;
 
 
-
-
     // Trim set
     // ~~~~~~~~
 
@@ -200,7 +232,6 @@ int main(int argc, char *argv[])
     }
 
 
-
     // Subset
     // ~~~~~~
 
diff --git a/applications/utilities/surface/surfaceFind/surfaceFind.C b/applications/utilities/surface/surfaceFind/surfaceFind.C
index b2019c2f17..383a692800 100644
--- a/applications/utilities/surface/surfaceFind/surfaceFind.C
+++ b/applications/utilities/surface/surfaceFind/surfaceFind.C
@@ -45,7 +45,7 @@ int main(int argc, char *argv[])
     argList::addOption("y", "Y", "The point y-coordinate (if non-zero)");
     argList::addOption("z", "Z", "The point y-coordinate (if non-zero)");
 
-    argList::validArgs.append("surface file");
+    argList::validArgs.append("surfaceFile");
 
     argList args(argc, argv);
 
diff --git a/applications/utilities/surface/surfaceInertia/surfaceInertia.C b/applications/utilities/surface/surfaceInertia/surfaceInertia.C
index ded1d16b69..0819c4bbb6 100644
--- a/applications/utilities/surface/surfaceInertia/surfaceInertia.C
+++ b/applications/utilities/surface/surfaceInertia/surfaceInertia.C
@@ -289,8 +289,12 @@ int main(int argc, char *argv[])
     );
 
     argList::noParallel();
-    argList::validArgs.append("surface file");
-    argList::addBoolOption("shellProperties");
+    argList::validArgs.append("surfaceFile");
+    argList::addBoolOption
+    (
+        "shellProperties",
+        "inertia of a thin shell"
+    );
 
     argList::addOption
     (
diff --git a/applications/utilities/surface/surfaceMeshConvert/surfaceMeshConvert.C b/applications/utilities/surface/surfaceMeshConvert/surfaceMeshConvert.C
index 28c3b5fd37..248ac3e3d0 100644
--- a/applications/utilities/surface/surfaceMeshConvert/surfaceMeshConvert.C
+++ b/applications/utilities/surface/surfaceMeshConvert/surfaceMeshConvert.C
@@ -71,6 +71,11 @@ using namespace Foam;
 
 int main(int argc, char *argv[])
 {
+    argList::addNote
+    (
+        "convert between surface formats"
+    );
+
     argList::noParallel();
     argList::validArgs.append("inputFile");
     argList::validArgs.append("outputFile");
@@ -83,14 +88,14 @@ int main(int argc, char *argv[])
     argList::addOption
     (
         "scaleIn",
-        "scale",
-        "specify input geometry scaling factor"
+        "factor",
+        "geometry scaling factor on input"
     );
     argList::addOption
     (
         "scaleOut",
-        "scale",
-        "specify output geometry scaling factor"
+        "factor",
+        "geometry scaling factor on output"
     );
     argList::addOption
     (
diff --git a/applications/utilities/surface/surfaceMeshConvertTesting/surfaceMeshConvertTesting.C b/applications/utilities/surface/surfaceMeshConvertTesting/surfaceMeshConvertTesting.C
index 220aaf1be1..30a76b846e 100644
--- a/applications/utilities/surface/surfaceMeshConvertTesting/surfaceMeshConvertTesting.C
+++ b/applications/utilities/surface/surfaceMeshConvertTesting/surfaceMeshConvertTesting.C
@@ -71,6 +71,13 @@ using namespace Foam;
 
 int main(int argc, char *argv[])
 {
+    argList::addNote
+    (
+        "convert between surface formats, "
+        "but primarily for testing functionality\n"
+        "Normally use surfaceMeshConvert instead."
+    );
+
     argList::noParallel();
     argList::validArgs.append("inputFile");
     argList::validArgs.append("outputFile");
@@ -82,7 +89,12 @@ int main(int argc, char *argv[])
     argList::addBoolOption("unsorted");
     argList::addBoolOption("triFace");
 
-    argList::addOption("scale", "scale");
+    argList::addOption
+    (
+        "scale",
+        "factor",
+        "geometry scaling factor - default is 1"
+    );
 
 #   include "setRootCase.H"
 
diff --git a/applications/utilities/surface/surfaceMeshExport/surfaceMeshExport.C b/applications/utilities/surface/surfaceMeshExport/surfaceMeshExport.C
index a4ae9d2472..dda71c3565 100644
--- a/applications/utilities/surface/surfaceMeshExport/surfaceMeshExport.C
+++ b/applications/utilities/surface/surfaceMeshExport/surfaceMeshExport.C
@@ -48,10 +48,10 @@ Usage
     Specify an alternative dictionary for constant/coordinateSystems.
 
     @param -from \<coordinateSystem\> \n
-    Specify a coordinate System when reading files.
+    Specify a coordinate system when reading files.
 
     @param -to \<coordinateSystem\> \n
-    Specify a coordinate System when writing files.
+    Specify a coordinate system when writing files.
 
 Note
     The filename extensions are used to determine the file format type.
@@ -72,17 +72,56 @@ using namespace Foam;
 
 int main(int argc, char *argv[])
 {
+    argList::addNote
+    (
+        "export from surfMesh to various third-party surface formats"
+    );
+
     argList::noParallel();
     argList::validArgs.append("outputFile");
 
-    argList::addBoolOption("clean");
-
-    argList::addOption("name",  "name");
-    argList::addOption("scaleIn",  "scale");
-    argList::addOption("scaleOut", "scale");
-    argList::addOption("dict", "coordinateSystemsDict");
-    argList::addOption("from", "sourceCoordinateSystem");
-    argList::addOption("to",   "targetCoordinateSystem");
+    argList::addBoolOption
+    (
+        "clean",
+        "perform some surface checking/cleanup on the input surface"
+    );
+    argList::addOption
+    (
+        "name",
+        "name",
+        "specify an alternative surface name when reading - "
+        "default is 'default'"
+    );
+    argList::addOption
+    (
+        "scaleIn",
+        "factor",
+        "geometry scaling factor on input - default is 1"
+    );
+    argList::addOption
+    (
+        "scaleOut",
+        "factor",
+        "geometry scaling factor on output - default is 1"
+    );
+    argList::addOption
+    (
+        "dict",
+        "file",
+        "specify an alternative dictionary for constant/coordinateSystems"
+    );
+    argList::addOption
+    (
+        "from",
+        "coordinateSystem",
+        "specify the source coordinate system, applied after '-scaleIn'"
+    );
+    argList::addOption
+    (
+        "to",
+        "coordinateSystem",
+        "specify the target coordinate system, applied before '-scaleOut'"
+    );
 
     argList args(argc, argv);
     Time runTime(args.rootPath(), args.caseName());
diff --git a/applications/utilities/surface/surfaceMeshImport/surfaceMeshImport.C b/applications/utilities/surface/surfaceMeshImport/surfaceMeshImport.C
index 2df0724891..853becfc89 100644
--- a/applications/utilities/surface/surfaceMeshImport/surfaceMeshImport.C
+++ b/applications/utilities/surface/surfaceMeshImport/surfaceMeshImport.C
@@ -48,10 +48,10 @@ Usage
     Specify an alternative dictionary for constant/coordinateSystems.
 
     @param -from \<coordinateSystem\> \n
-    Specify a coordinate System when reading files.
+    Specify a coordinate system when reading files.
 
     @param -to \<coordinateSystem\> \n
-    Specify a coordinate System when writing files.
+    Specify a coordinate system when writing files.
 
 Note
     The filename extensions are used to determine the file format type.
@@ -72,20 +72,59 @@ using namespace Foam;
 
 int main(int argc, char *argv[])
 {
+    argList::addNote
+    (
+        "import from various third-party surface formats into surfMesh"
+    );
+
     argList::noParallel();
     argList::validArgs.append("inputFile");
 
-    argList::addBoolOption("clean");
+    argList::addBoolOption
+    (
+        "clean",
+        "perform some surface checking/cleanup on the input surface"
+    );
+    argList::addOption
+    (
+        "name",
+        "name",
+        "specify an alternative surface name when writing - "
+        "default is 'default'"
+    );
+    argList::addOption
+    (
+        "scaleIn",
+        "factor",
+        "geometry scaling factor on input - default is 1"
+    );
+    argList::addOption
+    (
+        "scaleOut",
+        "factor",
+        "geometry scaling factor on output - default is 1"
+    );
+    argList::addOption
+    (
+        "dict",
+        "file",
+        "specify an alternative dictionary for constant/coordinateSystems"
+    );
+    argList::addOption
+    (
+        "from",
+        "coordinateSystem",
+        "specify a local coordinate system when reading files."
+    );
+    argList::addOption
+    (
+        "to",
+        "coordinateSystem",
+        "specify a local coordinate system when writing files."
+    );
 
-    argList::addOption("name",  "name");
-    argList::addOption("scaleIn",  "scale");
-    argList::addOption("scaleOut", "scale");
-    argList::addOption("dict", "coordinateSystemsDict");
-    argList::addOption("from", "sourceCoordinateSystem");
-    argList::addOption("to",   "targetCoordinateSystem");
-
-#   include "setRootCase.H"
-#   include "createTime.H"
+    #include "setRootCase.H"
+    #include "createTime.H"
 
     // try for the latestTime, but create "constant" as needed
     instantList Times = runTime.times();
diff --git a/applications/utilities/surface/surfaceMeshTriangulate/surfaceMeshTriangulate.C b/applications/utilities/surface/surfaceMeshTriangulate/surfaceMeshTriangulate.C
index 5bcbb7dc49..f797213a1b 100644
--- a/applications/utilities/surface/surfaceMeshTriangulate/surfaceMeshTriangulate.C
+++ b/applications/utilities/surface/surfaceMeshTriangulate/surfaceMeshTriangulate.C
@@ -48,13 +48,26 @@ using namespace Foam;
 
 int main(int argc, char *argv[])
 {
+    argList::addNote
+    (
+        "extract surface from a polyMesh and triangulate boundary faces"
+    );
     argList::validArgs.append("output file");
-#   include "addRegionOption.H"
-    argList::addBoolOption("excludeProcPatches");
-    argList::addOption("patches", "(patch0 .. patchN)");
+    #include "addRegionOption.H"
+    argList::addBoolOption
+    (
+        "excludeProcPatches",
+        "exclude processor patches"
+    );
+    argList::addOption
+    (
+        "patches",
+        "(patch0 .. patchN)",
+        "only triangulate named patches"
+    );
 
-#   include "setRootCase.H"
-#   include "createTime.H"
+    #include "setRootCase.H"
+    #include "createTime.H"
 
     const fileName outFileName(runTime.path()/args[1]);
 
@@ -63,9 +76,9 @@ int main(int argc, char *argv[])
 
     Pout<< "Reading mesh from time " << runTime.value() << endl;
 
-#   include "createNamedPolyMesh.H"
+    #include "createNamedPolyMesh.H"
 
-    bool includeProcPatches =
+    const bool includeProcPatches =
        !(
             args.optionFound("excludeProcPatches")
          || Pstream::parRun()
diff --git a/applications/utilities/surface/surfaceOrient/surfaceOrient.C b/applications/utilities/surface/surfaceOrient/surfaceOrient.C
index 0d02aaea31..b19a39ff1c 100644
--- a/applications/utilities/surface/surfaceOrient/surfaceOrient.C
+++ b/applications/utilities/surface/surfaceOrient/surfaceOrient.C
@@ -39,12 +39,22 @@ using namespace Foam;
 
 int main(int argc, char *argv[])
 {
+    argList::addNote
+    (
+        "set face normals consistent with a user-provided 'outside' point"
+    );
+
     argList::noParallel();
     argList::validArgs.clear();
-    argList::validArgs.append("Foam surface file");
+    argList::validArgs.append("surfaceFile");
     argList::validArgs.append("visiblePoint");
-    argList::validArgs.append("output file");
-    argList::addBoolOption("inside");
+    argList::validArgs.append("output surfaceFile");
+    argList::addBoolOption
+    (
+        "inside",
+        "treat provided point as being inside"
+    );
+
     argList args(argc, argv);
 
     const fileName surfFileName = args[1];
@@ -53,18 +63,18 @@ int main(int argc, char *argv[])
 
     const bool orientInside = args.optionFound("inside");
 
-    Info<< "Reading surface from " << surfFileName << endl;
-    Info<< "Visible point " << visiblePoint << endl;
+    Info<< "Reading surface from " << surfFileName << nl
+        << "Visible point " << visiblePoint << nl
+        << "Orienting surface such that visiblePoint " << visiblePoint
+        << " is ";
 
     if (orientInside)
     {
-        Info<< "Orienting surface such that visiblePoint " << visiblePoint
-            << " is inside" << endl;
+        Info<< "inside" << endl;
     }
     else
     {
-        Info<< "Orienting surface such that visiblePoint " << visiblePoint
-            << " is outside" << endl;
+        Info<< "outside" << endl;
     }
 
     Info<< "Writing surface to " << outFileName << endl;
diff --git a/applications/utilities/surface/surfacePointMerge/surfacePointMerge.C b/applications/utilities/surface/surfacePointMerge/surfacePointMerge.C
index c70b31ea4e..da6df12877 100644
--- a/applications/utilities/surface/surfacePointMerge/surfacePointMerge.C
+++ b/applications/utilities/surface/surfacePointMerge/surfacePointMerge.C
@@ -43,9 +43,9 @@ int main(int argc, char *argv[])
 {
     argList::noParallel();
     argList::validArgs.clear();
-    argList::validArgs.append("surface file");
+    argList::validArgs.append("surfaceFile");
     argList::validArgs.append("merge distance");
-    argList::validArgs.append("output file");
+    argList::validArgs.append("output surfaceFile");
     argList args(argc, argv);
 
     const fileName surfFileName = args[1];
diff --git a/applications/utilities/surface/surfaceRedistributePar/surfaceRedistributePar.C b/applications/utilities/surface/surfaceRedistributePar/surfaceRedistributePar.C
index a960603ae2..8e2c7eb918 100644
--- a/applications/utilities/surface/surfaceRedistributePar/surfaceRedistributePar.C
+++ b/applications/utilities/surface/surfaceRedistributePar/surfaceRedistributePar.C
@@ -80,7 +80,7 @@ void writeProcStats
     {
         const List<treeBoundBox>& bbs = meshBb[procI];
 
-        Info<< "processor" << procI << endl
+        Info<< "processor" << procI << nl
             << "\tMesh bounds          : " << bbs[0] << nl;
         for (label i = 1; i < bbs.size(); i++)
         {
@@ -99,19 +99,27 @@ void writeProcStats
 
 int main(int argc, char *argv[])
 {
+    argList::addNote
+    (
+        "redistribute a triSurface"
+    );
+
     argList::validArgs.append("triSurfaceMesh");
     argList::validArgs.append("distributionType");
+    argList::addBoolOption
+    (
+        "keepNonMapped",
+        "preserve surface outside of mesh bounds"
+    );
 
-    argList::addBoolOption("keepNonMapped");
-#   include "setRootCase.H"
-#   include "createTime.H"
+    #include "setRootCase.H"
+    #include "createTime.H"
     runTime.functionObjects().off();
 
     const fileName surfFileName = args[1];
     const word distType = args[2];
 
-    Info<< "Reading surface from " << surfFileName << nl
-        << nl
+    Info<< "Reading surface from " << surfFileName << nl << nl
         << "Using distribution method "
         << distributedTriSurfaceMesh::distributionTypeNames_[distType]
         << " " << distType << nl << endl;
@@ -138,7 +146,7 @@ int main(int argc, char *argv[])
     }
 
 
-#   include "createPolyMesh.H"
+    #include "createPolyMesh.H"
 
     Random rndGen(653213);
 
diff --git a/applications/utilities/surface/surfaceRefineRedGreen/surfaceRefineRedGreen.C b/applications/utilities/surface/surfaceRefineRedGreen/surfaceRefineRedGreen.C
index d7e84e1303..786adff49d 100644
--- a/applications/utilities/surface/surfaceRefineRedGreen/surfaceRefineRedGreen.C
+++ b/applications/utilities/surface/surfaceRefineRedGreen/surfaceRefineRedGreen.C
@@ -48,8 +48,8 @@ int main(int argc, char *argv[])
 {
     argList::noParallel();
     argList::validArgs.clear();
-    argList::validArgs.append("surface file");
-    argList::validArgs.append("output surface file");
+    argList::validArgs.append("surfaceFile");
+    argList::validArgs.append("output surfaceFile");
     argList args(argc, argv);
 
     const fileName surfFileName = args[1];
diff --git a/applications/utilities/surface/surfaceSmooth/surfaceSmooth.C b/applications/utilities/surface/surfaceSmooth/surfaceSmooth.C
index d023c8f027..bb767307ab 100644
--- a/applications/utilities/surface/surfaceSmooth/surfaceSmooth.C
+++ b/applications/utilities/surface/surfaceSmooth/surfaceSmooth.C
@@ -43,10 +43,10 @@ int main(int argc, char *argv[])
     argList::noParallel();
     argList::validOptions.clear();
     argList::validArgs.clear();
-    argList::validArgs.append("surface file");
+    argList::validArgs.append("surfaceFile");
     argList::validArgs.append("underrelax factor (0..1)");
     argList::validArgs.append("iterations");
-    argList::validArgs.append("output file");
+    argList::validArgs.append("output surfaceFile");
     argList args(argc, argv);
 
     const fileName surfFileName = args[1];
diff --git a/applications/utilities/surface/surfaceSplitByPatch/surfaceSplitByPatch.C b/applications/utilities/surface/surfaceSplitByPatch/surfaceSplitByPatch.C
index 50502faebe..2f11567cda 100644
--- a/applications/utilities/surface/surfaceSplitByPatch/surfaceSplitByPatch.C
+++ b/applications/utilities/surface/surfaceSplitByPatch/surfaceSplitByPatch.C
@@ -36,6 +36,11 @@ using namespace Foam;
 
 int main(int argc, char *argv[])
 {
+    argList::addNote
+    (
+        "write surface mesh regions to separate files"
+    );
+
     argList::noParallel();
     argList::validArgs.clear();
     argList::validArgs.append("input file");
@@ -104,7 +109,6 @@ int main(int argc, char *argv[])
         subSurf.write(outFile);
     }
 
-
     Info<< "End\n" << endl;
 
     return 0;
diff --git a/applications/utilities/surface/surfaceSplitNonManifolds/surfaceSplitNonManifolds.C b/applications/utilities/surface/surfaceSplitNonManifolds/surfaceSplitNonManifolds.C
index 32975365c8..284732438b 100644
--- a/applications/utilities/surface/surfaceSplitNonManifolds/surfaceSplitNonManifolds.C
+++ b/applications/utilities/surface/surfaceSplitNonManifolds/surfaceSplitNonManifolds.C
@@ -666,12 +666,20 @@ bool splitBorderEdges
 
 int main(int argc, char *argv[])
 {
+    argList::addNote
+    (
+        "split multiply connected surface edges by duplicating points"
+    );
     argList::noParallel();
     argList::validArgs.clear();
 
-    argList::validArgs.append("surface file");
-    argList::validArgs.append("output surface file");
-    argList::addBoolOption("debug");
+    argList::validArgs.append("surfaceFile");
+    argList::validArgs.append("output surfaceFile");
+    argList::addBoolOption
+    (
+        "debug",
+        "add debugging output"
+    );
 
     argList args(argc, argv);
 
@@ -679,7 +687,6 @@ int main(int argc, char *argv[])
     const fileName outSurfName = args[2];
     const bool debug = args.optionFound("debug");
 
-
     Info<< "Reading surface from " << inSurfName << endl;
 
     triSurface surf(inSurfName);
diff --git a/applications/utilities/surface/surfaceSubset/surfaceSubset.C b/applications/utilities/surface/surfaceSubset/surfaceSubset.C
index 43698ec4e5..9de7881744 100644
--- a/applications/utilities/surface/surfaceSubset/surfaceSubset.C
+++ b/applications/utilities/surface/surfaceSubset/surfaceSubset.C
@@ -49,8 +49,8 @@ int main(int argc, char *argv[])
     argList::noParallel();
     argList::validArgs.clear();
     argList::validArgs.append("surfaceSubsetDict");
-    argList::validArgs.append("surface file");
-    argList::validArgs.append("output file");
+    argList::validArgs.append("surfaceFile");
+    argList::validArgs.append("output surfaceFile");
     argList args(argc, argv);
 
     Info<< "Reading dictionary " << args[1] << " ..." << endl;
diff --git a/applications/utilities/surface/surfaceToPatch/surfaceToPatch.C b/applications/utilities/surface/surfaceToPatch/surfaceToPatch.C
index eb0a69f89f..1ee292499b 100644
--- a/applications/utilities/surface/surfaceToPatch/surfaceToPatch.C
+++ b/applications/utilities/surface/surfaceToPatch/surfaceToPatch.C
@@ -163,14 +163,29 @@ bool repatchFace
 
 int main(int argc, char *argv[])
 {
-    argList::noParallel();
-    argList::validArgs.append("surface file");
-    argList::addOption("faceSet", "faceSet name");
-    argList::addOption("tol", "fraction of mesh size");
+    argList::addNote
+    (
+        "reads surface and applies surface regioning to a mesh"
+    );
 
-#   include "setRootCase.H"
-#   include "createTime.H"
-#   include "createPolyMesh.H"
+    argList::noParallel();
+    argList::validArgs.append("surfaceFile");
+    argList::addOption
+    (
+        "faceSet",
+        "name",
+        "only repatch the faces in specified faceSet"
+    );
+    argList::addOption
+    (
+        "tol",
+        "scalar",
+        "search tolerance as fraction of mesh size (default 1e-3)"
+    );
+
+    #include "setRootCase.H"
+    #include "createTime.H"
+    #include "createPolyMesh.H"
 
     const fileName surfName = args[1];
 
@@ -190,7 +205,7 @@ int main(int argc, char *argv[])
             << " triangle ..." << endl;
     }
 
-    scalar searchTol = args.optionLookupOrDefault("tol", 1e-3);
+    const scalar searchTol = args.optionLookupOrDefault("tol", 1e-3);
 
     // Get search box. Anything not within this box will not be considered.
     const boundBox& meshBb = mesh.globalData().bb();
@@ -212,7 +227,6 @@ int main(int argc, char *argv[])
     Info<< endl;
 
 
-
     boundaryMesh bMesh;
 
     // Load in the surface.
diff --git a/applications/utilities/surface/surfaceTransformPoints/surfaceTransformPoints.C b/applications/utilities/surface/surfaceTransformPoints/surfaceTransformPoints.C
index 92fe956fb8..189a281877 100644
--- a/applications/utilities/surface/surfaceTransformPoints/surfaceTransformPoints.C
+++ b/applications/utilities/surface/surfaceTransformPoints/surfaceTransformPoints.C
@@ -61,8 +61,8 @@ int main(int argc, char *argv[])
     );
     argList::noParallel();
     argList::validArgs.clear();
-    argList::validArgs.append("surface file");
-    argList::validArgs.append("output surface file");
+    argList::validArgs.append("surfaceFile");
+    argList::validArgs.append("output surfaceFile");
     argList::addOption
     (
         "translate",
diff --git a/src/OpenFOAM/global/argList/argList.C b/src/OpenFOAM/global/argList/argList.C
index b3937e4495..287dc9efcc 100644
--- a/src/OpenFOAM/global/argList/argList.C
+++ b/src/OpenFOAM/global/argList/argList.C
@@ -344,7 +344,7 @@ void Foam::argList::getRootCase()
     else
     {
         // qualify relative path
-        fileName casePath = cwd()/rootPath_/globalCase_;
+        casePath = cwd()/rootPath_/globalCase_;
         casePath.clean();
 
         setEnv("FOAM_CASE", casePath, true);
diff --git a/src/postProcessing/foamCalcFunctions/calcType/calcTypeNew.C b/src/postProcessing/foamCalcFunctions/calcType/calcTypeNew.C
index 52bec69e4a..4dbc73fbd4 100644
--- a/src/postProcessing/foamCalcFunctions/calcType/calcTypeNew.C
+++ b/src/postProcessing/foamCalcFunctions/calcType/calcTypeNew.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 1991-2009 OpenCFD Ltd.
+    \\  /    A nd           | Copyright (C) 1991-2010 OpenCFD Ltd.
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -39,11 +39,23 @@ Foam::autoPtr<Foam::calcType> Foam::calcType::New
 
     if (cstrIter == dictionaryConstructorTablePtr_->end())
     {
-        FatalErrorIn("calcType::New()")
-            << "Unknown calcType type " << calcTypeName
-            << "Valid calcType selections are:" << nl
-            << dictionaryConstructorTablePtr_->sortedToc() << nl
-            << abort(FatalError);
+        // special treatment for -help
+        // exit without stack trace
+        if (calcTypeName == "-help")
+        {
+            FatalErrorIn("calcType::New()")
+                << "Valid calcType selections are:" << nl
+                << dictionaryConstructorTablePtr_->sortedToc() << nl
+                << exit(FatalError);
+        }
+        else
+        {
+            FatalErrorIn("calcType::New()")
+                << "Unknown calcType type " << calcTypeName << nl
+                << "Valid calcType selections are:" << nl
+                << dictionaryConstructorTablePtr_->sortedToc() << nl
+                << abort(FatalError);
+        }
     }
 
     return autoPtr<calcType>(cstrIter()());
diff --git a/src/postProcessing/postCalc/postCalc.C b/src/postProcessing/postCalc/postCalc.C
index 32fe0f2269..f33fe390e7 100644
--- a/src/postProcessing/postCalc/postCalc.C
+++ b/src/postProcessing/postCalc/postCalc.C
@@ -65,7 +65,8 @@ int main(int argc, char *argv[])
     Foam::argList::addOption
     (
         "dict",
-        "dictionary name"
+        "name",
+        "dictionary to use"
     );
 
     #include "setRootCase.H"