Merge pull request #560 from luzpaz/typos

typos

6 files changed, 7 insertions, 7 deletions

diff --git a/src/config.xml b/src/config.xml
index 227f8bf..2a7cbeb 100644
--- a/src/config.xml
+++ b/src/config.xml
@@ -747,7 +747,7 @@ Go to the <a href="commands.html">next</a> section or return to the
       </docs>
     </option>
     <option type='int' id='LOOKUP_CACHE_SIZE' minval='0' maxval='9' defval='0'>
-      <!-- be carefull when changing these formulas as they are hard coded in the conversion script -->
+      <!-- be careful when changing these formulas as they are hard coded in the conversion script -->
       <docs>
 <![CDATA[
  The size of the symbol lookup cache can be 
diff --git a/src/definition.cpp b/src/definition.cpp
index 68201da..26d828b 100644
--- a/src/definition.cpp
+++ b/src/definition.cpp
@@ -1109,7 +1109,7 @@ void Definition::writeInlineCode(OutputList &ol,const char *scopeName)
           actualStart,actualEnd,codeFragment)
        )
     {
-      //printf("Adding code fragement '%s' ext='%s'\n",
+      //printf("Adding code fragment '%s' ext='%s'\n",
       //    codeFragment.data(),m_impl->defFileExt.data());
       ParserInterface *pIntf = Doxygen::parserManager->getParser(m_impl->defFileExt);
       pIntf->resetCodeParserState();
diff --git a/src/pre.l b/src/pre.l
index 1e01483..4c4763d 100644
--- a/src/pre.l
+++ b/src/pre.l
@@ -1050,7 +1050,7 @@ static int getNextId(const QCString &expr,int p,int *l)
   return -1;
 }
 
-/*! preforms recursive macro expansion on the string \a expr
+/*! performs recursive macro expansion on the string \a expr
  *  starting at position \a pos.
  *  May read additional characters from the input while re-scanning!
  *  If \a expandAll is \c TRUE then all macros in the expression are
diff --git a/src/sqlite3gen.cpp b/src/sqlite3gen.cpp
index 6bc8789..8996014 100644
--- a/src/sqlite3gen.cpp
+++ b/src/sqlite3gen.cpp
@@ -491,8 +491,8 @@ static int step(sqlite3 *db, SqlStmt &s,bool getRowId=FALSE, bool select=FALSE)
     sqlite3_clear_bindings(s.stmt);
     return -1;
   }
-  if (getRowId && select) rowid = sqlite3_column_int(s.stmt, 0); // works on selects, doesnt on inserts
-  if (getRowId && !select) rowid = sqlite3_last_insert_rowid(db); //works on inserts, doesnt on selects
+  if (getRowId && select) rowid = sqlite3_column_int(s.stmt, 0); // works on selects, doesn't on inserts
+  if (getRowId && !select) rowid = sqlite3_last_insert_rowid(db); //works on inserts, doesn't on selects
   sqlite3_reset(s.stmt);
   sqlite3_clear_bindings(s.stmt); // XXX When should this really be called
   return rowid;
diff --git a/src/tclscanner.l b/src/tclscanner.l
index d0d8ca0..e50d9c1 100644
--- a/src/tclscanner.l
+++ b/src/tclscanner.l
@@ -542,7 +542,7 @@ static void tcl_name(const QCString &ns0, const QCString &name0, QCString &ns, Q
 static void tcl_name_SnippetAware(const QCString &ns0, const QCString &name0, QCString &ns, QCString &name)
 {
   // If we are inside an inlined code snippet then ns0
-  // already containes the complete namespace path.
+  // already contains the complete namespace path.
   // Any namespace qualifiers in name0 are redundant.
   int i = name0.findRev("::");
   if (i>=0 && tcl.memberdef)
diff --git a/src/util.cpp b/src/util.cpp
index 0d45758..e44f825 100644
--- a/src/util.cpp
+++ b/src/util.cpp
@@ -8416,7 +8416,7 @@ uint getUtf8CodeToLower( const QCString& s, int idx )
 }
 
 
-/*! @brief Returns one unicode character as ian unsigned interger 
+/*! @brief Returns one unicode character as an unsigned integer 
  *  from utf-8 string, making the character upper case if it was lower case.
  *
  * @param s utf-8 encoded string