--- a/contrib/nightly_tests/runtests.sh	Tue Oct 23 15:50:01 2012 +0200
+++ b/contrib/nightly_tests/runtests.sh	Tue Oct 23 15:50:04 2012 +0200
@@ -14,7 +14,7 @@
 # The script requires a local.cmake file to exist and define the following:
 # CTEST_SITE=
 #     the name of the build slave.
-# Exemple: SET(CTEST_SITE "Ubuntu-Lucid-64b")
+# Example: SET(CTEST_SITE "Ubuntu-Lucid-64b")
 if [ ! -e $ROOTDIR/local.cmake ]; then
    echo "Missing $ROOTDIR/local.cmake file, generating one (edit as needed, and run the script again)";
    echo "SET(CTEST_SITE \""`hostname --fqdn`"\")" > $ROOTDIR/local.cmake

--- a/doc/freediameter.conf.sample	Tue Oct 23 15:50:01 2012 +0200
+++ b/doc/freediameter.conf.sample	Tue Oct 23 15:50:04 2012 +0200
@@ -175,7 +175,7 @@
 # Format:
 #LoadExtension = "/path/to/extension" [ : "/optional/configuration/file" ] ;
 #
-# Exemples:
+# Examples:
 #LoadExtension = "extensions/sample.so";
 #LoadExtension = "extensions/sample.so":"conf/sample.conf";
 

--- a/extensions/app_acct/acct_db.c	Tue Oct 23 15:50:01 2012 +0200
+++ b/extensions/app_acct/acct_db.c	Tue Oct 23 15:50:04 2012 +0200
@@ -250,7 +250,7 @@
 		PQreset(conn);
 		if (PQstatus(conn) != CONNECTION_OK) {
 			TRACE_DEBUG(INFO, "Lost connection to the database server, and attempt to reestablish it failed");
-			TODO("Terminate the freeDiameter instance completly?");
+			TODO("Terminate the freeDiameter instance completely?");
 			return ENOTCONN;
 		}
 	}

--- a/include/freeDiameter/CMakeLists.txt	Tue Oct 23 15:50:01 2012 +0200
+++ b/include/freeDiameter/CMakeLists.txt	Tue Oct 23 15:50:04 2012 +0200
@@ -5,7 +5,7 @@
 ########################
 # Configurable parameters
 
-# Disable SCTP support completly ?
+# Disable SCTP support completely ?
 OPTION(DISABLE_SCTP "Disable SCTP support?" OFF)
 IF (NOT DISABLE_SCTP)
 	OPTION(DEBUG_SCTP "Verbose SCTP (for debug)?" OFF)
@@ -19,7 +19,7 @@
 SET(DEFAULT_EXTENSIONS_PATH ${CMAKE_INSTALL_PREFIX}/${INSTALL_EXTENSIONS_SUFFIX})
 
 # IDNA considerations
-OPTION(DIAMID_IDNA_IGNORE "Ignore completly invalid characters in Diameter Identities (process blindly)?" OFF)
+OPTION(DIAMID_IDNA_IGNORE "Ignore completely invalid characters in Diameter Identities (process blindly)?" OFF)
 IF (NOT DIAMID_IDNA_IGNORE)
 	OPTION (DIAMID_IDNA_REJECT "Reject internationalized Diameter Identities, do not attempt to convert it (stringprep) ?" OFF)
 ENDIF (NOT DIAMID_IDNA_IGNORE)

--- a/include/freeDiameter/libfdproto.h	Tue Oct 23 15:50:01 2012 +0200
+++ b/include/freeDiameter/libfdproto.h	Tue Oct 23 15:50:04 2012 +0200
@@ -1966,7 +1966,7 @@
  *
  *  A message is made of a header ( msg ) and 0 or more AVPs ( avp ).
  * The structure is a kind of tree, where some AVPs (grouped AVPs) can contain other AVPs.
- * Exemple:
+ * Example:
  * msg
  *  |-avp
  *  |-gavp

--- a/libfdcore/core.c	Tue Oct 23 15:50:01 2012 +0200
+++ b/libfdcore/core.c	Tue Oct 23 15:50:04 2012 +0200
@@ -46,7 +46,7 @@
 GCRY_THREAD_OPTION_PTHREAD_IMPL;
 #endif /* GNUTLS_VERSION_210 */
 
-/* Signal extensions when the framework is completly initialized (they are waiting in fd_core_waitstartcomplete()) */
+/* Signal extensions when the framework is completely initialized (they are waiting in fd_core_waitstartcomplete()) */
 static int             is_ready = 0;
 static pthread_mutex_t is_ready_mtx = PTHREAD_MUTEX_INITIALIZER;
 static pthread_cond_t  is_ready_cnd = PTHREAD_COND_INITIALIZER;

--- a/libfdproto/messages.c	Tue Oct 23 15:50:01 2012 +0200
+++ b/libfdproto/messages.c	Tue Oct 23 15:50:04 2012 +0200
@@ -62,7 +62,7 @@
  *
  *  A message is made of a header ( msg ) and 0 or more AVPs ( avp ).
  * The structure is a kind of tree, where some AVPs (grouped AVPs) can contain other AVPs.
- * Exemple:
+ * Example:
  * msg
  *  |-avp
  *  |-gavp