diff -ur cmake-2.8.3/Source/cmFindFileCommand.cxx cmake-2.8.3-mod//Source/cmFindFileCommand.cxx
--- cmake-2.8.3/Source/cmFindFileCommand.cxx	2010-11-03 20:58:28.000000000 +0100
+++ cmake-2.8.3-mod//Source/cmFindFileCommand.cxx	2010-11-06 10:09:29.000000000 +0100
@@ -15,11 +15,24 @@
 cmFindFileCommand::cmFindFileCommand()
 {
   this->IncludeFileInPath = true;
-  cmSystemTools::ReplaceString(this->GenericDocumentation,
-                               "find_path", "find_file");
-  cmSystemTools::ReplaceString(this->GenericDocumentation,
-                               "directory containing the named file", 
-                               "full path to named file");
-  cmSystemTools::ReplaceString(this->GenericDocumentation,
-                                "file in a directory", "full path to a file");
 }
+
+const char* cmFindFileCommand
+::GetFullDocumentation()
+{
+  if(this->IncludeFileInPath)
+    {
+      cmFindPathCommand::GetFullDocumentation();
+    }
+  if(!this->fixedGenericDocumentation)
+    {
+      cmSystemTools::ReplaceString(this->GenericDocumentation,
+                                  "find_path", "find_file");
+      cmSystemTools::ReplaceString(this->GenericDocumentation,
+                                  "directory containing the named file", 
+                                  "full path to named file");
+      cmSystemTools::ReplaceString(this->GenericDocumentation,
+                                    "file in a directory", "full path to a file");
+    }
+  return cmFindPathCommand::GetFullDocumentation();
+}
\ Kein Zeilenumbruch am Dateiende.
Nur in cmake-2.8.3-mod//Source: cmFindFileCommand.cxx~.
diff -ur cmake-2.8.3/Source/cmFindFileCommand.h cmake-2.8.3-mod//Source/cmFindFileCommand.h
--- cmake-2.8.3/Source/cmFindFileCommand.h	2010-11-03 20:58:28.000000000 +0100
+++ cmake-2.8.3-mod//Source/cmFindFileCommand.h	2010-11-06 10:07:17.000000000 +0100
@@ -44,6 +44,9 @@
     }
   
   cmTypeMacro(cmFindFileCommand, cmFindPathCommand);
+  virtual const char* GetFullDocumentation();
+private:
+  bool fixedGenericDocumentation;
 };
 
 
Nur in cmake-2.8.3-mod//Source: cmFindFileCommand.h~.
diff -ur cmake-2.8.3/Source/cmFindLibraryCommand.cxx cmake-2.8.3-mod//Source/cmFindLibraryCommand.cxx
--- cmake-2.8.3/Source/cmFindLibraryCommand.cxx	2010-11-03 20:58:28.000000000 +0100
+++ cmake-2.8.3-mod//Source/cmFindLibraryCommand.cxx	2010-11-05 21:32:37.000000000 +0100
@@ -16,31 +16,7 @@
 
 cmFindLibraryCommand::cmFindLibraryCommand()
 { 
-  cmSystemTools::ReplaceString(this->GenericDocumentation,
-                               "FIND_XXX", "find_library");
-  cmSystemTools::ReplaceString(this->GenericDocumentation,
-                               "CMAKE_XXX_PATH", "CMAKE_LIBRARY_PATH");
-  cmSystemTools::ReplaceString(this->GenericDocumentation,
-                               "CMAKE_XXX_MAC_PATH",
-                               "CMAKE_FRAMEWORK_PATH");
-  cmSystemTools::ReplaceString(this->GenericDocumentation,
-                               "CMAKE_SYSTEM_XXX_MAC_PATH",
-                               "CMAKE_SYSTEM_FRAMEWORK_PATH");
-  cmSystemTools::ReplaceString(this->GenericDocumentation,
-                               "XXX_SYSTEM", "LIB");
-  cmSystemTools::ReplaceString(this->GenericDocumentation,
-                               "CMAKE_SYSTEM_XXX_PATH", 
-                               "CMAKE_SYSTEM_LIBRARY_PATH");
-  cmSystemTools::ReplaceString(this->GenericDocumentation,
-                               "SEARCH_XXX_DESC", "library");
-  cmSystemTools::ReplaceString(this->GenericDocumentation,
-                               "SEARCH_XXX", "library");
-  cmSystemTools::ReplaceString(this->GenericDocumentation,
-                               "XXX_SUBDIR", "lib");
-  cmSystemTools::ReplaceString(this->GenericDocumentation,
-                               "CMAKE_FIND_ROOT_PATH_MODE_XXX", 
-                               "CMAKE_FIND_ROOT_PATH_MODE_LIBRARY");
-
+  this->fixedGenericDocumentation = false;
   this->EnvironmentPath = "LIB";
   this->GenericDocumentation += 
     "\n"
@@ -51,6 +27,40 @@
     "link the framework to the target. ";
 }
 
+const char* cmFindLibraryCommand
+::GetFullDocumentation()
+{
+  if(!this->fixedGenericDocumentation)
+    {
+      fixedGenericDocumentation = true;
+      cmSystemTools::ReplaceString(this->GenericDocumentation,
+                                    "FIND_XXX", "find_library");
+      cmSystemTools::ReplaceString(this->GenericDocumentation,
+                                    "CMAKE_XXX_PATH", "CMAKE_LIBRARY_PATH");
+      cmSystemTools::ReplaceString(this->GenericDocumentation,
+                                    "CMAKE_XXX_MAC_PATH",
+                                    "CMAKE_FRAMEWORK_PATH");
+      cmSystemTools::ReplaceString(this->GenericDocumentation,
+                                    "CMAKE_SYSTEM_XXX_MAC_PATH",
+                                    "CMAKE_SYSTEM_FRAMEWORK_PATH");
+      cmSystemTools::ReplaceString(this->GenericDocumentation,
+                                    "XXX_SYSTEM", "LIB");
+      cmSystemTools::ReplaceString(this->GenericDocumentation,
+                                    "CMAKE_SYSTEM_XXX_PATH", 
+                                    "CMAKE_SYSTEM_LIBRARY_PATH");
+      cmSystemTools::ReplaceString(this->GenericDocumentation,
+                                    "SEARCH_XXX_DESC", "library");
+      cmSystemTools::ReplaceString(this->GenericDocumentation,
+                                    "SEARCH_XXX", "library");
+      cmSystemTools::ReplaceString(this->GenericDocumentation,
+                                    "XXX_SUBDIR", "lib");
+      cmSystemTools::ReplaceString(this->GenericDocumentation,
+                                    "CMAKE_FIND_ROOT_PATH_MODE_XXX", 
+                                    "CMAKE_FIND_ROOT_PATH_MODE_LIBRARY");
+    }
+  return cmFindBase::GetFullDocumentation();
+}
+
 // cmFindLibraryCommand
 bool cmFindLibraryCommand
 ::InitialPass(std::vector<std::string> const& argsIn, cmExecutionStatus &)
diff -ur cmake-2.8.3/Source/cmFindLibraryCommand.h cmake-2.8.3-mod//Source/cmFindLibraryCommand.h
--- cmake-2.8.3/Source/cmFindLibraryCommand.h	2010-11-03 20:58:28.000000000 +0100
+++ cmake-2.8.3-mod//Source/cmFindLibraryCommand.h	2010-11-05 21:32:26.000000000 +0100
@@ -60,6 +60,7 @@
     }
   cmTypeMacro(cmFindLibraryCommand, cmFindBase);
   
+  virtual const char* GetFullDocumentation();
 protected:
   void AddArchitecturePaths(const char* suffix);
   void AddLib64Paths();
@@ -67,6 +68,7 @@
 private:
   std::string FindNormalLibrary();
   std::string FindFrameworkLibrary();
+  bool fixedGenericDocumentation;
 };
 
 
diff -ur cmake-2.8.3/Source/cmFindPathCommand.cxx cmake-2.8.3-mod//Source/cmFindPathCommand.cxx
--- cmake-2.8.3/Source/cmFindPathCommand.cxx	2010-11-03 20:58:28.000000000 +0100
+++ cmake-2.8.3-mod//Source/cmFindPathCommand.cxx	2010-11-05 21:41:35.000000000 +0100
@@ -18,37 +18,42 @@
 {
   this->EnvironmentPath = "INCLUDE";
   this->IncludeFileInPath = false;
-  cmSystemTools::ReplaceString(this->GenericDocumentation,
-                               "FIND_XXX", "find_path");
-  cmSystemTools::ReplaceString(this->GenericDocumentation,
-                               "CMAKE_XXX_PATH", "CMAKE_INCLUDE_PATH");
-  cmSystemTools::ReplaceString(this->GenericDocumentation,
-                               "CMAKE_XXX_MAC_PATH",
-                               "CMAKE_FRAMEWORK_PATH");
-  cmSystemTools::ReplaceString(this->GenericDocumentation,
-                               "CMAKE_SYSTEM_XXX_MAC_PATH",
-                               "CMAKE_SYSTEM_FRAMEWORK_PATH");
-  cmSystemTools::ReplaceString(this->GenericDocumentation,
-                               "XXX_SYSTEM", "INCLUDE");
-  cmSystemTools::ReplaceString(this->GenericDocumentation,
-                               "CMAKE_SYSTEM_XXX_PATH", 
-                               "CMAKE_SYSTEM_INCLUDE_PATH"); 
-  cmSystemTools::ReplaceString(this->GenericDocumentation,
-                               "SEARCH_XXX_DESC", 
-                               "directory containing the named file");
-  cmSystemTools::ReplaceString(this->GenericDocumentation,
-                               "SEARCH_XXX", "file in a directory");
-  cmSystemTools::ReplaceString(this->GenericDocumentation,
-                               "XXX_SUBDIR", "include");
-  cmSystemTools::ReplaceString(this->GenericDocumentation,
-                               "CMAKE_FIND_ROOT_PATH_MODE_XXX", 
-                               "CMAKE_FIND_ROOT_PATH_MODE_INCLUDE");
 
   this->ExtraDocAdded = false;
 }
 
-const char* cmFindPathCommand::GetFullDocumentation()
+const char* cmFindPathCommand
+::GetFullDocumentation()
 {
+  if(!this->fixedGenericDocumentation)
+    {
+      fixedGenericDocumentation = true;
+      cmSystemTools::ReplaceString(this->GenericDocumentation,
+                                  "FIND_XXX", "find_path");
+      cmSystemTools::ReplaceString(this->GenericDocumentation,
+                                  "CMAKE_XXX_PATH", "CMAKE_INCLUDE_PATH");
+      cmSystemTools::ReplaceString(this->GenericDocumentation,
+                                  "CMAKE_XXX_MAC_PATH",
+                                  "CMAKE_FRAMEWORK_PATH");
+      cmSystemTools::ReplaceString(this->GenericDocumentation,
+                                  "CMAKE_SYSTEM_XXX_MAC_PATH",
+                                  "CMAKE_SYSTEM_FRAMEWORK_PATH");
+      cmSystemTools::ReplaceString(this->GenericDocumentation,
+                                  "XXX_SYSTEM", "INCLUDE");
+      cmSystemTools::ReplaceString(this->GenericDocumentation,
+                                  "CMAKE_SYSTEM_XXX_PATH", 
+                                  "CMAKE_SYSTEM_INCLUDE_PATH"); 
+      cmSystemTools::ReplaceString(this->GenericDocumentation,
+                                  "SEARCH_XXX_DESC", 
+                                  "directory containing the named file");
+      cmSystemTools::ReplaceString(this->GenericDocumentation,
+                                  "SEARCH_XXX", "file in a directory");
+      cmSystemTools::ReplaceString(this->GenericDocumentation,
+                                  "XXX_SUBDIR", "include");
+      cmSystemTools::ReplaceString(this->GenericDocumentation,
+                                  "CMAKE_FIND_ROOT_PATH_MODE_XXX", 
+                                  "CMAKE_FIND_ROOT_PATH_MODE_INCLUDE");
+    }
   if(!this->ExtraDocAdded && !this->IncludeFileInPath)
     {
     this->GenericDocumentation += 
@@ -61,7 +66,7 @@
       "file. ";
     this->ExtraDocAdded = true;
     }
-  return this->GenericDocumentation.c_str();
+  return cmFindBase::GetFullDocumentation();
 }
 
 // cmFindPathCommand