fix various typos reported by spellintian

Most of them in (old) code comments. The two instances of user visible
string changes the po files of the manpages are fixed up as well.

Gbp-Dch: Ignore
Reported-By: spellintian

7 files changed, 11 insertions, 11 deletions

diff --git a/apt-pkg/contrib/configuration.cc b/apt-pkg/contrib/configuration.cc
index 13d678539..8005ef7d4 100644
--- a/apt-pkg/contrib/configuration.cc
+++ b/apt-pkg/contrib/configuration.cc
@@ -1043,7 +1043,7 @@ bool ReadConfigFile(Configuration &Conf,const string &FName,bool const &AsSectio
 	    {
 	       Stack.push(ParentTag);
 
-	       /* Make sectional tags incorperate the section into the
+	       /* Make sectional tags incorporate the section into the
 	          tag string */
 	       if (AsSectional == true && Word.empty() == false)
 	       {
diff --git a/apt-pkg/contrib/error.h b/apt-pkg/contrib/error.h
index e56999b14..b01a5fc1b 100644
--- a/apt-pkg/contrib/error.h
+++ b/apt-pkg/contrib/error.h
@@ -3,7 +3,7 @@
 // $Id: error.h,v 1.8 2001/05/07 05:06:52 jgg Exp $
 /* ######################################################################
    
-   Global Erorr Class - Global error mechanism
+   Global Error Class - Global error mechanism
 
    This class has a single global instance. When a function needs to 
    generate an error condition, such as a read error, it calls a member
diff --git a/apt-pkg/contrib/gpgv.cc b/apt-pkg/contrib/gpgv.cc
index 683530428..cdf9481cb 100644
--- a/apt-pkg/contrib/gpgv.cc
+++ b/apt-pkg/contrib/gpgv.cc
@@ -431,7 +431,7 @@ bool OpenMaybeClearSignedFile(std::string const &ClearSignedFileName, FileFd &Me
       free(message);
       return _error->Errno("mkstemp", "Couldn't create temporary file to work with %s", ClearSignedFileName.c_str());
    }
-   // we have the fd, thats enough for us
+   // we have the fd, that's enough for us
    unlink(message);
    free(message);
 
diff --git a/apt-pkg/contrib/mmap.cc b/apt-pkg/contrib/mmap.cc
index 74870b404..cd24a2808 100644
--- a/apt-pkg/contrib/mmap.cc
+++ b/apt-pkg/contrib/mmap.cc
@@ -156,9 +156,9 @@ bool MMap::Close(bool DoSync)
    return true;
 }
 									/*}}}*/
-// MMap::Sync - Syncronize the map with the disk			/*{{{*/
+// MMap::Sync - Synchronize the map with the disk			/*{{{*/
 // ---------------------------------------------------------------------
-/* This is done in syncronous mode - the docs indicate that this will 
+/* This is done in synchronous mode - the docs indicate that this will 
    not return till all IO is complete */
 bool MMap::Sync()
 {
@@ -183,7 +183,7 @@ bool MMap::Sync()
    return true;
 }
 									/*}}}*/
-// MMap::Sync - Syncronize a section of the file to disk		/*{{{*/
+// MMap::Sync - Synchronize a section of the file to disk		/*{{{*/
 // ---------------------------------------------------------------------
 /* */
 bool MMap::Sync(unsigned long Start,unsigned long Stop)
diff --git a/apt-pkg/contrib/mmap.h b/apt-pkg/contrib/mmap.h
index c1dfedf6d..62e64b95e 100644
--- a/apt-pkg/contrib/mmap.h
+++ b/apt-pkg/contrib/mmap.h
@@ -10,7 +10,7 @@
    from file fd's this function will use read and normal allocated 
    memory.
    
-   Writing to a public mmap will always fully comit all changes when the 
+   Writing to a public mmap will always fully commit all changes when the
    class is deleted. Ie it will rewrite the file, unless it is readonly
 
    The DynamicMMap class is used to help the on-disk data structure 
diff --git a/apt-pkg/contrib/proxy.cc b/apt-pkg/contrib/proxy.cc
index 62cfba032..1b7a92c68 100644
--- a/apt-pkg/contrib/proxy.cc
+++ b/apt-pkg/contrib/proxy.cc
@@ -2,7 +2,7 @@
 // Description								/*{{{*/
 /* ######################################################################
    
-   Proxy - Proxy releated functions
+   Proxy - Proxy related functions
    
    ##################################################################### */
 									/*}}}*/
diff --git a/apt-pkg/contrib/strutl.cc b/apt-pkg/contrib/strutl.cc
index da0121eca..88113f7a4 100644
--- a/apt-pkg/contrib/strutl.cc
+++ b/apt-pkg/contrib/strutl.cc
@@ -760,7 +760,7 @@ int StringToBool(const string &Text,int Default)
 // TimeRFC1123 - Convert a time_t into RFC1123 format			/*{{{*/
 // ---------------------------------------------------------------------
 /* This converts a time_t into a string time representation that is
-   year 2000 complient and timezone neutral */
+   year 2000 compliant and timezone neutral */
 string TimeRFC1123(time_t Date)
 {
    return TimeRFC1123(Date, false);
@@ -1478,7 +1478,7 @@ string StripEpoch(const string &VerStr)
 // tolower_ascii - tolower() function that ignores the locale		/*{{{*/
 // ---------------------------------------------------------------------
 /* This little function is the most called method we have and tries
-   therefore to do the absolut minimum - and is notable faster than
+   therefore to do the absolute minimum - and is notable faster than
    standard tolower/toupper and as a bonus avoids problems with different
    locales - we only operate on ascii chars anyway. */
 #undef tolower_ascii
@@ -1492,7 +1492,7 @@ int tolower_ascii(int const c)
 // isspace_ascii - isspace() function that ignores the locale		/*{{{*/
 // ---------------------------------------------------------------------
 /* This little function is one of the most called methods we have and tries
-   therefore to do the absolut minimum - and is notable faster than
+   therefore to do the absolute minimum - and is notable faster than
    standard isspace() and as a bonus avoids problems with different
    locales - we only operate on ascii chars anyway. */
 #undef isspace_ascii