diff --git a/Source/cmGeneratedFileStream.cxx b/Source/cmGeneratedFileStream.cxx
index 70d1c77b9..e8be5fdff 100644
--- a/Source/cmGeneratedFileStream.cxx
+++ b/Source/cmGeneratedFileStream.cxx
@@ -44,7 +44,8 @@ cmGeneratedFileStream::cmGeneratedFileStream(const char* name, bool quiet):
   // Check if the file opened.
   if(!*this && !quiet)
     {
-    cmSystemTools::Error("Cannot open file for write: ", this->TempName.c_str());
+    cmSystemTools::Error("Cannot open file for write: ", 
+                         this->TempName.c_str());
     cmSystemTools::ReportLastSystemError("");
     }
 }
@@ -70,7 +71,8 @@ cmGeneratedFileStream::Open(const char* name, bool quiet, bool binaryFlag)
   // Open the temporary output file.
   if ( binaryFlag )
     {
-    this->Stream::open(this->TempName.c_str(), std::ios::out | std::ios::binary);
+    this->Stream::open(this->TempName.c_str(), 
+                       std::ios::out | std::ios::binary);
     }
   else
     {
@@ -80,7 +82,8 @@ cmGeneratedFileStream::Open(const char* name, bool quiet, bool binaryFlag)
   // Check if the file opened.
   if(!*this && !quiet)
     {
-    cmSystemTools::Error("Cannot open file for write: ", this->TempName.c_str());
+    cmSystemTools::Error("Cannot open file for write: ", 
+                         this->TempName.c_str());
     cmSystemTools::ReportLastSystemError("");
     }
   return *this;
diff --git a/Source/cmGetDirectoryPropertyCommand.cxx b/Source/cmGetDirectoryPropertyCommand.cxx
index 79a18adca..8d08c6b8e 100644
--- a/Source/cmGetDirectoryPropertyCommand.cxx
+++ b/Source/cmGetDirectoryPropertyCommand.cxx
@@ -60,7 +60,9 @@ bool cmGetDirectoryPropertyCommand::InitialPass(
     if (!lg)
       {
       this->SetError
-        ("DIRECTORY argument provided but requested directory not found. This could be because the directory argument was invalid or, it is valid but has not been processed yet.");
+        ("DIRECTORY argument provided but requested directory not found. "
+         "This could be because the directory argument was invalid or, "
+         "it is valid but has not been processed yet.");
       return false;
       }
     dir = lg->GetMakefile();
@@ -140,8 +142,8 @@ bool cmGetDirectoryPropertyCommand::InitialPass(
     ++i;
     if (i == args.end())
       {
-      this->SetError
-        ("A request for a variable definition was made without providing the name of the variable to get.");
+      this->SetError("A request for a variable definition was made without "
+                     "providing the name of the variable to get.");
       return false;
       }
     output = dir->GetSafeDefinition(i->c_str());
diff --git a/Source/cmGetFilenameComponentCommand.cxx b/Source/cmGetFilenameComponentCommand.cxx
index d8b29d361..7bd5ac962 100644
--- a/Source/cmGetFilenameComponentCommand.cxx
+++ b/Source/cmGetFilenameComponentCommand.cxx
@@ -18,7 +18,8 @@
 #include "cmSystemTools.h"
 
 // cmGetFilenameComponentCommand
-bool cmGetFilenameComponentCommand::InitialPass(std::vector<std::string> const& args)
+bool cmGetFilenameComponentCommand
+::InitialPass(std::vector<std::string> const& args)
 {
   if(args.size() < 3)
     {
@@ -63,7 +64,8 @@ bool cmGetFilenameComponentCommand::InitialPass(std::vector<std::string> const&
           }
         }
       }
-    cmSystemTools::SplitProgramFromArgs(filename.c_str(), result, programArgs);
+    cmSystemTools::SplitProgramFromArgs(filename.c_str(), 
+                                        result, programArgs);
     }
   else if (args[2] == "EXT")
     {
@@ -102,17 +104,15 @@ bool cmGetFilenameComponentCommand::InitialPass(std::vector<std::string> const&
     {
     if(programArgs.size() && storeArgs.size())
       {
-      this->Makefile->AddCacheDefinition(storeArgs.c_str(),
-                                     programArgs.c_str(),
-                                     "",
-                                     args[2] == "PATH" ? cmCacheManager::FILEPATH
-                                     : cmCacheManager::STRING);
+      this->Makefile->AddCacheDefinition
+        (storeArgs.c_str(), programArgs.c_str(),
+         "", args[2] == "PATH" ? cmCacheManager::FILEPATH
+         : cmCacheManager::STRING);
       }
-    this->Makefile->AddCacheDefinition(args[0].c_str(),
-                                   result.c_str(),
-                                   "",
-                                   args[2] == "PATH" ? cmCacheManager::FILEPATH
-                                                     : cmCacheManager::STRING);
+    this->Makefile->AddCacheDefinition
+      (args[0].c_str(), result.c_str(), "",
+       args[2] == "PATH" ? cmCacheManager::FILEPATH
+       : cmCacheManager::STRING);
     }
   else 
     {
diff --git a/Source/cmGetFilenameComponentCommand.h b/Source/cmGetFilenameComponentCommand.h
index fe490ddbd..a9c1dbb0f 100644
--- a/Source/cmGetFilenameComponentCommand.h
+++ b/Source/cmGetFilenameComponentCommand.h
@@ -73,8 +73,8 @@ public:
       "extension (EXT), file name without extension (NAME_WE) of FileName, "
       "or the full absolute (ABSOLUTE) file name without symlinks.  "
       "Note that the path is converted to Unix slashes format and has no "
-      "trailing slashes. The longest file extension is always considered.  If "
-      "the optional CACHE argument is specified, the result variable is "
+      "trailing slashes. The longest file extension is always considered. "
+      "If the optional CACHE argument is specified, the result variable is "
       "added to the cache.\n"
       "  GET_FILENAME_COMPONENT(VarName FileName\n"
       "                         PROGRAM [PROGRAM_ARGS ArgVar]\n"
diff --git a/Source/cmGetSourceFilePropertyCommand.h b/Source/cmGetSourceFilePropertyCommand.h
index aefbe2341..ed12fa724 100644
--- a/Source/cmGetSourceFilePropertyCommand.h
+++ b/Source/cmGetSourceFilePropertyCommand.h
@@ -55,7 +55,7 @@ public:
         "  GET_SOURCE_FILE_PROPERTY(VAR file property)\n"
         "Get a property from a source file.  The value of the property is "
         "stored in the variable VAR.  If the property is not found, VAR "
-        "will be set to \"NOTFOUND\".  Use SET_SOURCE_FILES_PROPERTIES to set "
+        "will be set to \"NOTFOUND\". Use SET_SOURCE_FILES_PROPERTIES to set "
         "property values.  Source file properties usually control how the "
         "file is built. One property that is always there is LOCATION";
     }
diff --git a/Source/cmGlobalBorlandMakefileGenerator.cxx b/Source/cmGlobalBorlandMakefileGenerator.cxx
index b1efb700c..5018a8c26 100644
--- a/Source/cmGlobalBorlandMakefileGenerator.cxx
+++ b/Source/cmGlobalBorlandMakefileGenerator.cxx
@@ -28,8 +28,8 @@ cmGlobalBorlandMakefileGenerator::cmGlobalBorlandMakefileGenerator()
 }
 
 
-void cmGlobalBorlandMakefileGenerator::EnableLanguage(std::vector<std::string>const& l,
-                                                      cmMakefile *mf)
+void cmGlobalBorlandMakefileGenerator
+::EnableLanguage(std::vector<std::string>const& l, cmMakefile *mf)
 {
   std::string outdir = this->CMakeInstance->GetStartOutputDirectory();
   mf->AddDefinition("BORLAND", "1");
@@ -55,7 +55,8 @@ cmLocalGenerator *cmGlobalBorlandMakefileGenerator::CreateLocalGenerator()
 
 
 //----------------------------------------------------------------------------
-void cmGlobalBorlandMakefileGenerator::GetDocumentation(cmDocumentationEntry& entry) const
+void cmGlobalBorlandMakefileGenerator
+::GetDocumentation(cmDocumentationEntry& entry) const
 {
   entry.name = this->GetName();
   entry.brief = "Generates Borland makefiles.";