Merge topic 'minor-cleanup'

e3b7eac Style: Don't put an else after a return.
ad304a2 cmSystemTools: Fix typo in comment.
08319e0 Genex: Fix indentation in docs.

Source/cmDocumentGeneratorExpressions.h

@@ -44,9 +44,9 @@
   "used.\n"                                                             \
   "  $<C_COMPILER_ID:comp>     = '1' if the CMake-id of the C "         \
   "compiler matches comp, otherwise '0'.\n"                             \
-  "  $<CXX_COMPILER_ID>          = The CMake-id of the CXX compiler "   \
+  "  $<CXX_COMPILER_ID>        = The CMake-id of the CXX compiler "     \
   "used.\n"                                                             \
-  "  $<CXX_COMPILER_ID:comp>     = '1' if the CMake-id of the CXX "     \
+  "  $<CXX_COMPILER_ID:comp>   = '1' if the CMake-id of the CXX "       \
   "compiler matches comp, otherwise '0'.\n"                             \
   "  $<TARGET_FILE:tgt>        = main file (.exe, .so.1.2, .a)\n"       \
   "  $<TARGET_LINKER_FILE:tgt> = file used to link (.a, .lib, .so)\n"   \

Source/cmGeneratorExpressionEvaluator.cxx

@@ -266,8 +266,6 @@ struct CompilerIdNode : public cmGeneratorExpressionNode
       {
       return compilerId ? compilerId : "";
       }
-    else
-    {
     cmsys::RegularExpression compilerIdValidator;
     compilerIdValidator.compile("^[A-Za-z0-9_]*$");
     if (!compilerIdValidator.find(parameters.begin()->c_str()))
@@ -286,7 +284,6 @@ struct CompilerIdNode : public cmGeneratorExpressionNode
       return "1";
       }
     return "0";
-    }
   }
 };
 

Source/cmSystemTools.h

@@ -274,7 +274,7 @@ public:
   static bool GetRunCommandOutput() { return s_DisableRunCommandOutput; }
 
   /**
-   * Come constants for different file formats.
+   * Some constants for different file formats.
    */
   enum FileFormat {
     NO_FILE_FORMAT = 0,