Merge topic 'fix-comment-typos'

bef23e81 Fix some spelling errors in comments
2014-10-14 09:20:11 -04:00 · 2014-10-14 09:20:11 -04:00 · 19f87a73bd
parent 54ff77dc62 bef23e8181
commit 19f87a73bd
17 changed files with 22 additions and 22 deletions
--- a/Source/cmGlobalBorlandMakefileGenerator.h
+++ b/Source/cmGlobalBorlandMakefileGenerator.h
@ -39,7 +39,7 @@ public:
  virtual cmLocalGenerator *CreateLocalGenerator();

  /**
-   * Try to determine system infomation such as shared library
+   * Try to determine system information such as shared library
   * extension, pthreads, byte order etc.
   */
  virtual void EnableLanguage(std::vector<std::string>const& languages,
--- a/Source/cmGlobalGenerator.cxx
+++ b/Source/cmGlobalGenerator.cxx
@ -318,7 +318,7 @@ void cmGlobalGenerator::FindMakeProgram(cmMakefile* mf)
    // will run xcodebuild and if it sees the error text file busy
    // it will stop forwarding output, and let the build finish.
    // Then it will retry the build.  It will continue this
-    // untill no text file busy errors occur.
+    // until no text file busy errors occur.
    std::string cmakexbuild =
      this->CMakeInstance->GetCacheManager()->GetCacheValue("CMAKE_COMMAND");
    cmakexbuild = cmakexbuild.substr(0, cmakexbuild.length()-5);
@ -1008,9 +1008,9 @@ void cmGlobalGenerator::SetLanguageEnabledMaps(const std::string& l,
    if (sscanf(linkerPref, "%d", &preference)!=1)
      {
      // backward compatibility: before 2.6 LINKER_PREFERENCE
-      // was either "None" or "Prefered", and only the first character was
+      // was either "None" or "Preferred", and only the first character was
      // tested. So if there is a custom language out there and it is
-      // "Prefered", set its preference high
+      // "Preferred", set its preference high
      if (linkerPref[0]=='P')
        {
        preference = 100;
--- a/Source/cmGlobalGenerator.h
+++ b/Source/cmGlobalGenerator.h
@ -39,7 +39,7 @@ class cmExportBuildFileGenerator;
 class cmQtAutoGenerators;

 /** \class cmGlobalGenerator
- * \brief Responable for overseeing the generation process for the entire tree
+ * \brief Responsible for overseeing the generation process for the entire tree
 *
 * Subclasses of this class generate makefiles for various
 * platforms.
@ -94,7 +94,7 @@ public:
  void ClearEnabledLanguages();
  void GetEnabledLanguages(std::vector<std::string>& lang) const;
  /**
-   * Try to determine system infomation such as shared library
+   * Try to determine system information such as shared library
   * extension, pthreads, byte order etc.
   */
  virtual void EnableLanguage(std::vector<std::string>const& languages,
@ -108,7 +108,7 @@ public:
                               bool optional) const;

  /**
-   * Try to determine system infomation, get it from another generator
+   * Try to determine system information, get it from another generator
   */
  virtual void EnableLanguagesFromGenerator(cmGlobalGenerator *gen,
                                            cmMakefile* mf);
@ -198,7 +198,7 @@ public:
  std::string GetLanguageFromExtension(const char* ext) const;
  ///! is an extension to be ignored
  bool IgnoreFile(const char* ext) const;
-  ///! What is the preference for linkers and this language (None or Prefered)
+  ///! What is the preference for linkers and this language (None or Preferred)
  int GetLinkerPreference(const std::string& lang) const;
  ///! What is the object file extension for a given source file?
  std::string GetLanguageOutputExtension(cmSourceFile const&) const;
--- a/Source/cmGlobalJOMMakefileGenerator.h
+++ b/Source/cmGlobalJOMMakefileGenerator.h
@ -40,7 +40,7 @@ public:
  virtual cmLocalGenerator *CreateLocalGenerator();

  /**
-   * Try to determine system infomation such as shared library
+   * Try to determine system information such as shared library
   * extension, pthreads, byte order etc.
   */
  virtual void EnableLanguage(std::vector<std::string>const& languages,
--- a/Source/cmGlobalMSYSMakefileGenerator.h
+++ b/Source/cmGlobalMSYSMakefileGenerator.h
@ -39,7 +39,7 @@ public:
  virtual cmLocalGenerator *CreateLocalGenerator();

  /**
-   * Try to determine system infomation such as shared library
+   * Try to determine system information such as shared library
   * extension, pthreads, byte order etc.
   */
  virtual void EnableLanguage(std::vector<std::string>const& languages,
--- a/Source/cmGlobalMinGWMakefileGenerator.h
+++ b/Source/cmGlobalMinGWMakefileGenerator.h
@ -38,7 +38,7 @@ public:
  virtual cmLocalGenerator *CreateLocalGenerator();

  /**
-   * Try to determine system infomation such as shared library
+   * Try to determine system information such as shared library
   * extension, pthreads, byte order etc.
   */
  virtual void EnableLanguage(std::vector<std::string>const& languages,
--- a/Source/cmGlobalNMakeMakefileGenerator.h
+++ b/Source/cmGlobalNMakeMakefileGenerator.h
@ -38,7 +38,7 @@ public:
  virtual cmLocalGenerator *CreateLocalGenerator();

  /**
-   * Try to determine system infomation such as shared library
+   * Try to determine system information such as shared library
   * extension, pthreads, byte order etc.
   */
  virtual void EnableLanguage(std::vector<std::string>const& languages,
--- a/Source/cmGlobalNinjaGenerator.h
+++ b/Source/cmGlobalNinjaGenerator.h
@ -337,7 +337,7 @@ private:

  std::string ninjaCmd() const;

-  /// The file containing the build statement. (the relation ship of the
+  /// The file containing the build statement. (the relationship of the
  /// compilation DAG).
  cmGeneratedFileStream* BuildFileStream;
  /// The file containing the rule statements. (The action attached to each
--- a/Source/cmGlobalUnixMakefileGenerator3.h
+++ b/Source/cmGlobalUnixMakefileGenerator3.h
@ -71,7 +71,7 @@ public:
  virtual cmLocalGenerator *CreateLocalGenerator();

  /**
-   * Try to determine system infomation such as shared library
+   * Try to determine system information such as shared library
   * extension, pthreads, byte order etc.
   */
  virtual void EnableLanguage(std::vector<std::string>const& languages,
--- a/Source/cmGlobalVisualStudio10Generator.h
+++ b/Source/cmGlobalVisualStudio10Generator.h
@ -49,7 +49,7 @@ public:
  virtual cmLocalGenerator *CreateLocalGenerator();

  /**
-   * Try to determine system infomation such as shared library
+   * Try to determine system information such as shared library
   * extension, pthreads, byte order etc.
   */
  virtual void EnableLanguage(std::vector<std::string>const& languages,
--- a/Source/cmGlobalVisualStudio6Generator.h
+++ b/Source/cmGlobalVisualStudio6Generator.h
@ -42,7 +42,7 @@ public:
  virtual cmLocalGenerator *CreateLocalGenerator();

  /**
-   * Try to determine system infomation such as shared library
+   * Try to determine system information such as shared library
   * extension, pthreads, byte order etc.
   */
  virtual void EnableLanguage(std::vector<std::string>const& languages,
--- a/Source/cmGlobalVisualStudio7Generator.h
+++ b/Source/cmGlobalVisualStudio7Generator.h
@ -52,7 +52,7 @@ public:
  static void GetDocumentation(cmDocumentationEntry& entry);

  /**
-   * Try to determine system infomation such as shared library
+   * Try to determine system information such as shared library
   * extension, pthreads, byte order etc.
   */
  virtual void EnableLanguage(std::vector<std::string>const& languages,
--- a/Source/cmGlobalVisualStudio9Generator.h
+++ b/Source/cmGlobalVisualStudio9Generator.h
@ -32,7 +32,7 @@ public:
  virtual cmLocalGenerator *CreateLocalGenerator();

  /**
-   * Try to determine system infomation such as shared library
+   * Try to determine system information such as shared library
   * extension, pthreads, byte order etc.
   */
  virtual void WriteSLNHeader(std::ostream& fout);
--- a/Source/cmGlobalWatcomWMakeGenerator.h
+++ b/Source/cmGlobalWatcomWMakeGenerator.h
@ -38,7 +38,7 @@ public:
  virtual cmLocalGenerator *CreateLocalGenerator();

  /**
-   * Try to determine system infomation such as shared library
+   * Try to determine system information such as shared library
   * extension, pthreads, byte order etc.
   */
  virtual void EnableLanguage(std::vector<std::string>const& languages,
--- a/Source/cmGlobalXCodeGenerator.h
+++ b/Source/cmGlobalXCodeGenerator.h
@ -44,7 +44,7 @@ public:
  virtual cmLocalGenerator *CreateLocalGenerator();

  /**
-   * Try to determine system infomation such as shared library
+   * Try to determine system information such as shared library
   * extension, pthreads, byte order etc.
   */
  virtual void EnableLanguage(std::vector<std::string>const& languages,
--- a/Utilities/cmlibarchive/libarchive/archive_write_add_filter_lzop.c
+++ b/Utilities/cmlibarchive/libarchive/archive_write_add_filter_lzop.c
@ -85,7 +85,7 @@ static int archive_write_lzop_free(struct archive_write_filter *);
 #if defined(HAVE_LZO_LZOCONF_H) && defined(HAVE_LZO_LZO1X_H)
 /* Maximum block size. */
 #define BLOCK_SIZE			(256 * 1024)
-/* Block infomation is composed of uncompressed size(4 bytes),
+/* Block information is composed of uncompressed size(4 bytes),
 * compressed size(4 bytes) and the checksum of uncompressed data(4 bytes)
 * in this lzop writer. */
 #define BLOCK_INfO_SIZE			12
--- a/Utilities/cmlibarchive/libarchive/archive_write_set_format_mtree.c
+++ b/Utilities/cmlibarchive/libarchive/archive_write_set_format_mtree.c
@ -1115,7 +1115,7 @@ write_mtree_entry_tree(struct archive_write *a)
 	do {
 		if (mtree->output_global_set) {
 			/*
-			 * Collect attribute infomation to know which value
+			 * Collect attribute information to know which value
 			 * is frequently used among the children.
 			 */
 			attr_counter_set_reset(mtree);