Merge branch 'master' of github.com:doxygen/doxygen

Author: doxygen

testing/111/111__autolink_8cpp.xml

@@ -62,7 +62,7 @@
         <argsstring>()</argsstring>
         <name>foo</name>
         <briefdescription>
-          <para>My foo funciton. </para>
+          <para>My foo function. </para>
         </briefdescription>
         <detaileddescription>
         </detaileddescription>

testing/111_autolink.cpp

@@ -31,7 +31,7 @@ typedef enum
 } my_enum_t;
 
 /**
- * @brief My foo funciton
+ * @brief My foo function
  */
 void foo();