diff options
author | Felix Geyer <fgeyer@debian.org> | 2016-03-29 18:24:20 (GMT) |
---|---|---|
committer | Brad King <brad.king@kitware.com> | 2016-03-29 18:31:02 (GMT) |
commit | 49e82c15d57db01a95f740f511715064a3887615 (patch) | |
tree | 8c03b2bd20b20248d7ab61531aacde3667e7b485 /Source | |
parent | 90f24f016e93d18f6a244b39fd21c68355bdbe48 (diff) | |
download | CMake-49e82c15d57db01a95f740f511715064a3887615.zip CMake-49e82c15d57db01a95f740f511715064a3887615.tar.gz CMake-49e82c15d57db01a95f740f511715064a3887615.tar.bz2 |
Fix spelling typos in comments and documentation (#16037)
The Debian package checker tool (lintian) detected several typos in
CMake.
Diffstat (limited to 'Source')
-rw-r--r-- | Source/CTest/cmCTestBZR.cxx | 2 | ||||
-rw-r--r-- | Source/CursesDialog/cmCursesStringWidget.cxx | 2 | ||||
-rw-r--r-- | Source/CursesDialog/form/fld_def.c | 4 | ||||
-rw-r--r-- | Source/CursesDialog/form/fld_ftlink.c | 2 | ||||
-rw-r--r-- | Source/CursesDialog/form/fld_newftyp.c | 2 | ||||
-rw-r--r-- | Source/CursesDialog/form/form.priv.h | 2 | ||||
-rw-r--r-- | Source/CursesDialog/form/frm_def.c | 4 | ||||
-rw-r--r-- | Source/CursesDialog/form/frm_driver.c | 4 | ||||
-rw-r--r-- | Source/cmFileCommand.cxx | 2 | ||||
-rw-r--r-- | Source/cmFortranLexer.cxx | 2 | ||||
-rw-r--r-- | Source/cmFortranLexer.in.l | 2 | ||||
-rw-r--r-- | Source/cmListFileCache.cxx | 2 | ||||
-rw-r--r-- | Source/cmQtAutoGenerators.cxx | 6 | ||||
-rw-r--r-- | Source/cmStringCommand.cxx | 2 | ||||
-rw-r--r-- | Source/cmSystemTools.h | 2 |
15 files changed, 20 insertions, 20 deletions
diff --git a/Source/CTest/cmCTestBZR.cxx b/Source/CTest/cmCTestBZR.cxx index 587b583..eb18b70 100644 --- a/Source/CTest/cmCTestBZR.cxx +++ b/Source/CTest/cmCTestBZR.cxx @@ -80,7 +80,7 @@ cmCTestBZR::cmCTestBZR(cmCTest* ct, std::ostream& log): cmCTestGlobalVC(ct, log) { this->PriorRev = this->Unknown; - // Even though it is specified in the documention, with bzr 1.13 + // Even though it is specified in the documentation, with bzr 1.13 // BZR_PROGRESS_BAR has no effect. In the future this bug might be fixed. // Since it doesn't hurt, we specify this environment variable. cmSystemTools::PutEnv("BZR_PROGRESS_BAR=none"); diff --git a/Source/CursesDialog/cmCursesStringWidget.cxx b/Source/CursesDialog/cmCursesStringWidget.cxx index 6eb15c1..1c832dd 100644 --- a/Source/CursesDialog/cmCursesStringWidget.cxx +++ b/Source/CursesDialog/cmCursesStringWidget.cxx @@ -105,7 +105,7 @@ bool cmCursesStringWidget::HandleInput(int& key, cmCursesMainForm* fm, } } - // If resize occured during edit, move out of edit mode + // If resize occurred during edit, move out of edit mode if (!this->InEdit && ( key != 10 && key != KEY_ENTER ) ) { return false; diff --git a/Source/CursesDialog/form/fld_def.c b/Source/CursesDialog/form/fld_def.c index 4a49a25..00da3b4 100644 --- a/Source/CursesDialog/form/fld_def.c +++ b/Source/CursesDialog/form/fld_def.c @@ -73,7 +73,7 @@ FIELD *_nc_Default_Field = &default_field; | int *err ) | | Description : Create an argument structure for the specified type. -| Use the type-dependant argument list to construct +| Use the type-dependent argument list to construct | it. | | Return Values : Pointer to argument structure. Maybe NULL. @@ -193,7 +193,7 @@ _nc_Free_Argument(const FIELDTYPE * typ, TypeArgument * argp) | Description : Copy argument structure of field src to field dst | | Return Values : TRUE - copy worked -| FALSE - error occured +| FALSE - error occurred +--------------------------------------------------------------------------*/ bool _nc_Copy_Type(FIELD *dst, FIELD const *src) diff --git a/Source/CursesDialog/form/fld_ftlink.c b/Source/CursesDialog/form/fld_ftlink.c index 1cb80d1..e98a4ca 100644 --- a/Source/CursesDialog/form/fld_ftlink.c +++ b/Source/CursesDialog/form/fld_ftlink.c @@ -46,7 +46,7 @@ MODULE_ID("$Id$") | E_BAD_ARGUMENT - invalid arguments | E_SYSTEM_ERROR - system error (no memory) | -| Return Values : Fieldtype pointer or NULL if error occured. +| Return Values : Fieldtype pointer or NULL if error occurred. +--------------------------------------------------------------------------*/ FIELDTYPE *link_fieldtype(FIELDTYPE * type1, FIELDTYPE * type2) { diff --git a/Source/CursesDialog/form/fld_newftyp.c b/Source/CursesDialog/form/fld_newftyp.c index b45ebd8..b839f19 100644 --- a/Source/CursesDialog/form/fld_newftyp.c +++ b/Source/CursesDialog/form/fld_newftyp.c @@ -63,7 +63,7 @@ const FIELDTYPE* _nc_Default_FieldType = &default_fieldtype; | E_BAD_ARGUMENT - invalid arguments | E_SYSTEM_ERROR - system error (no memory) | -| Return Values : Fieldtype pointer or NULL if error occured +| Return Values : Fieldtype pointer or NULL if error occurred +--------------------------------------------------------------------------*/ FIELDTYPE *new_fieldtype( bool (* const field_check)(FIELD *,const void *), diff --git a/Source/CursesDialog/form/form.priv.h b/Source/CursesDialog/form/form.priv.h index 8516a6f..6e00af6 100644 --- a/Source/CursesDialog/form/form.priv.h +++ b/Source/CursesDialog/form/form.priv.h @@ -40,7 +40,7 @@ /* field status values */ #define _CHANGED (0x01) /* Field has been changed */ -#define _NEWTOP (0x02) /* Vertical scrolling occured */ +#define _NEWTOP (0x02) /* Vertical scrolling occurred */ #define _NEWPAGE (0x04) /* field begins new page of form */ #define _MAY_GROW (0x08) /* dynamic field may still grow */ diff --git a/Source/CursesDialog/form/frm_def.c b/Source/CursesDialog/form/frm_def.c index 0b28f5f..645b3ba 100644 --- a/Source/CursesDialog/form/frm_def.c +++ b/Source/CursesDialog/form/frm_def.c @@ -240,7 +240,7 @@ static int Connect_Fields(FORM * form, FIELD ** fields) | If there are fields, position to first active field. | | Return Values : E_OK - success -| any other - error occured +| any other - error occurred +--------------------------------------------------------------------------*/ INLINE static int Associate_Fields(FORM *form, FIELD **fields) { @@ -267,7 +267,7 @@ INLINE static int Associate_Fields(FORM *form, FIELD **fields) | | Description : Create new form with given array of fields. | -| Return Values : Pointer to form. NULL if error occured. +| Return Values : Pointer to form. NULL if error occurred. +--------------------------------------------------------------------------*/ FORM *new_form(FIELD ** fields) { diff --git a/Source/CursesDialog/form/frm_driver.c b/Source/CursesDialog/form/frm_driver.c index 26f580e..e4e72aa 100644 --- a/Source/CursesDialog/form/frm_driver.c +++ b/Source/CursesDialog/form/frm_driver.c @@ -1676,7 +1676,7 @@ static int VSC_Generic(FORM *form, int lines) | | Description : Performs the generic vertical scrolling routines. | This has to check for a multi-line field and to set -| the _NEWTOP flag if scrolling really occured. +| the _NEWTOP flag if scrolling really occurred. | | Return Values : Propagated error code from low-level driver calls +--------------------------------------------------------------------------*/ @@ -2159,7 +2159,7 @@ static int Wrapping_Not_Necessary_Or_Wrapping_Ok(FORM * form) | | Description : Generic routine for field editing requests. The driver | routines are only called for editable fields, the -| _WINDOW_MODIFIED flag is set if editing occured. +| _WINDOW_MODIFIED flag is set if editing occurred. | This is somewhat special due to the overload semantics | of the NEW_LINE and DEL_PREV requests. | diff --git a/Source/cmFileCommand.cxx b/Source/cmFileCommand.cxx index 1fa27eb..b0a61b2 100644 --- a/Source/cmFileCommand.cxx +++ b/Source/cmFileCommand.cxx @@ -1015,7 +1015,7 @@ bool cmFileCommand::HandleGlobCommand(std::vector<std::string> const& args, else { this->Makefile->IssueMessage(cmake::FATAL_ERROR, - "Error has occured while globbing for '" + "Error has occurred while globbing for '" + *i + "' - " + it->content); shouldExit = true; } diff --git a/Source/cmFortranLexer.cxx b/Source/cmFortranLexer.cxx index 6779c1a..7cde4cb 100644 --- a/Source/cmFortranLexer.cxx +++ b/Source/cmFortranLexer.cxx @@ -1241,7 +1241,7 @@ case 43: /* rule 43 can match eol */ YY_RULE_SETUP #line 172 "cmFortranLexer.in.l" -/* Ignore line-endings preceeded by \ */ +/* Ignore line-endings preceded by \ */ YY_BREAK case 44: YY_RULE_SETUP diff --git a/Source/cmFortranLexer.in.l b/Source/cmFortranLexer.in.l index 53984bb..e59ff5f 100644 --- a/Source/cmFortranLexer.in.l +++ b/Source/cmFortranLexer.in.l @@ -169,7 +169,7 @@ $[ \t]*endif { return F90PPR_ENDIF; } [ \t\r,] /* Ignore */ -\\[ \t]*\n /* Ignore line-endings preceeded by \ */ +\\[ \t]*\n /* Ignore line-endings preceded by \ */ . { return *yytext; } diff --git a/Source/cmListFileCache.cxx b/Source/cmListFileCache.cxx index 7ba61f3..d5d0184 100644 --- a/Source/cmListFileCache.cxx +++ b/Source/cmListFileCache.cxx @@ -249,7 +249,7 @@ bool cmListFile::ParseFile(const char* filename, //---------------------------------------------------------------------------- bool cmListFileParser::ParseFunction(const char* name, long line) { - // Inintialize a new function call. + // Ininitialize a new function call. this->Function = cmListFileFunction(); this->Function.Name = name; this->Function.Line = line; diff --git a/Source/cmQtAutoGenerators.cxx b/Source/cmQtAutoGenerators.cxx index b16eccd..ebe08b0 100644 --- a/Source/cmQtAutoGenerators.cxx +++ b/Source/cmQtAutoGenerators.cxx @@ -795,7 +795,7 @@ void cmQtAutoGenerators::ParseCppFile(const std::string& absFilename, "\", but does not contain a " << macroName << " macro. Running moc on " << "\"" << headerToMoc << "\" ! Include \"moc_" - << basename << ".cpp\" for a compatiblity with " + << basename << ".cpp\" for a compatibility with " "strict mode (see CMAKE_AUTOMOC_RELAXED_MODE).\n" << std::endl; } @@ -806,7 +806,7 @@ void cmQtAutoGenerators::ParseCppFile(const std::string& absFilename, "\" instead of \"moc_" << basename << ".cpp\". " "Running moc on " << "\"" << headerToMoc << "\" ! Include \"moc_" - << basename << ".cpp\" for compatiblity with " + << basename << ".cpp\" for compatibility with " "strict mode (see CMAKE_AUTOMOC_RELAXED_MODE).\n" << std::endl; } @@ -848,7 +848,7 @@ void cmQtAutoGenerators::ParseCppFile(const std::string& absFilename, "includes " << "\"" << ownMocUnderscoreFile << "\". Running moc on " << "\"" << absFilename << "\" ! Better include \"" - << scannedFileBasename << ".moc\" for compatiblity with " + << scannedFileBasename << ".moc\" for compatibility with " "strict mode (see CMAKE_AUTOMOC_RELAXED_MODE).\n" << std::endl; includedMocs[absFilename] = ownMocUnderscoreFile; diff --git a/Source/cmStringCommand.cxx b/Source/cmStringCommand.cxx index 649fb39..3c027a0 100644 --- a/Source/cmStringCommand.cxx +++ b/Source/cmStringCommand.cxx @@ -565,7 +565,7 @@ bool cmStringCommand::HandleFindCommand(std::vector<std::string> const& // ensure that the user cannot accidentally specify REVERSE as a variable if(outvar == "REVERSE") { - this->SetError("sub-command FIND does not allow to select REVERSE as " + this->SetError("sub-command FIND does not allow one to select REVERSE as " "the output variable. " "Maybe you missed the actual output variable?"); return false; diff --git a/Source/cmSystemTools.h b/Source/cmSystemTools.h index f511ae4..d444675 100644 --- a/Source/cmSystemTools.h +++ b/Source/cmSystemTools.h @@ -116,7 +116,7 @@ public: return cmSystemTools::s_FatalErrorOccured || GetInterruptFlag(); } - ///! Set the error occured flag and fatal error back to false + ///! Set the error occurred flag and fatal error back to false static void ResetErrorOccuredFlag() { cmSystemTools::s_FatalErrorOccured = false; |