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

32 files changed, 58 insertions, 58 deletions

diff --git a/apt-pkg/acquire-item.cc b/apt-pkg/acquire-item.cc
index 6a809a1c6..83f725662 100644
--- a/apt-pkg/acquire-item.cc
+++ b/apt-pkg/acquire-item.cc
@@ -1907,7 +1907,7 @@ void pkgAcqMetaSig::Done(string const &Message, HashStringList const &Hashes,
    {
       auto const Releasegpg = GetFinalFilename();
       auto const Release = MetaIndex->GetFinalFilename();
-      // if this is an IMS-Hit on Release ensure we also have the the Release.gpg file stored
+      // if this is an IMS-Hit on Release ensure we also have the Release.gpg file stored
       // (previously an unknown pubkey) – but only if the Release file exists locally (unlikely
       // event of InRelease removed from the mirror causing fallback but still an IMS-Hit)
       if (TransactionManager->IMSHit == false ||
@@ -2892,7 +2892,7 @@ pkgAcqIndex::pkgAcqIndex(pkgAcquire * const Owner,
                 << TransactionManager << std::endl;
 }
 									/*}}}*/
-// AcqIndex::Init - defered Constructor					/*{{{*/
+// AcqIndex::Init - deferred Constructor				/*{{{*/
 static void NextCompressionExtension(std::string &CurrentCompressionExtension, std::string &CompressionExtensions, bool const preview)
 {
    size_t const nextExt = CompressionExtensions.find(' ');
diff --git a/apt-pkg/acquire-item.h b/apt-pkg/acquire-item.h
index 8be8801bf..7741dbf22 100644
--- a/apt-pkg/acquire-item.h
+++ b/apt-pkg/acquire-item.h
@@ -114,7 +114,7 @@ class pkgAcquire::Item : public WeakPointable				/*{{{*/
 
    /** \brief A client-supplied unique identifier.
     *
-    *  This field is initalized to 0; it is meant to be filled in by
+    *  This field is initialized to 0; it is meant to be filled in by
     *  clients that wish to use it to uniquely identify items.
     *
     *  APT progress reporting will store an ID there as shown in "Get:42 …"
diff --git a/apt-pkg/acquire-method.cc b/apt-pkg/acquire-method.cc
index 39d5e61f2..ab0908014 100644
--- a/apt-pkg/acquire-method.cc
+++ b/apt-pkg/acquire-method.cc
@@ -239,7 +239,7 @@ void pkgAcqMethod::URIDone(FetchResult &Res, FetchResult *Alt)
    Dequeue();
 }
 									/*}}}*/
-// AcqMethod::MediaFail - Syncronous request for new media		/*{{{*/
+// AcqMethod::MediaFail - Synchronous request for new media		/*{{{*/
 // ---------------------------------------------------------------------
 /* This sends a 403 Media Failure message to the APT and waits for it
    to be ackd */
diff --git a/apt-pkg/acquire.h b/apt-pkg/acquire.h
index 1fae662f8..5f1212338 100644
--- a/apt-pkg/acquire.h
+++ b/apt-pkg/acquire.h
@@ -10,11 +10,11 @@
    
    Each file to download is represented by an Acquire::Item class subclassed
    into a specialization. The Item class can add itself to several URI
-   acquire queues each prioritized by the download scheduler. When the 
-   system is run the proper URI handlers are spawned and the the acquire 
+   acquire queues each prioritized by the download scheduler. When the
+   system is run the proper URI handlers are spawned and the acquire
    queues are fed into the handlers by the schedular until the queues are
    empty. This allows for an Item to be downloaded from an alternate source
-   if the first try turns out to fail. It also alows concurrent downloading
+   if the first try turns out to fail. It also allows concurrent downloading
    of multiple items from multiple sources as well as dynamic balancing
    of load between the sources.
    
@@ -241,7 +241,7 @@ class pkgAcquire
     */
    bool RunFdsSane(fd_set *RSet,fd_set *WSet);
 
-   // just here for compatbility, needs to be removed on the next
+   // just here for compatibility, needs to be removed on the next
    // ABI/API break. RunFdsSane() is what should be used as it
    // returns if there is an error condition on one of the fds
    virtual void RunFds(fd_set *RSet,fd_set *WSet);
@@ -395,7 +395,7 @@ class pkgAcquire
 /** \brief Represents a single download source from which an item
  *  should be downloaded.
  *
- *  An item may have several assocated ItemDescs over its lifetime.
+ *  An item may have several associated ItemDescs over its lifetime.
  */
 struct pkgAcquire::ItemDesc : public WeakPointable
 {
diff --git a/apt-pkg/algorithms.cc b/apt-pkg/algorithms.cc
index 4e651a9f3..1fb158a36 100644
--- a/apt-pkg/algorithms.cc
+++ b/apt-pkg/algorithms.cc
@@ -1051,7 +1051,7 @@ bool pkgProblemResolver::ResolveInternal(bool const BrokenFix)
 	       }
 	    }
 
-	    // Hm, nothing can possibly satisify this dep. Nuke it.
+	    // Hm, nothing can possibly satisfy this dep. Nuke it.
 	    if (VList[0] == 0 &&
 		Start.IsNegative() == false &&
 		(Flags[I->ID] & Protected) != Protected)
@@ -1283,7 +1283,7 @@ bool pkgProblemResolver::ResolveByKeepInternal()
 	    continue;
 
 	 /* Hm, the group is broken.. I suppose the best thing to do is to
-	    is to try every combination of keep/not-keep for the set, but thats
+	    is to try every combination of keep/not-keep for the set, but that's
 	    slow, and this never happens, just be conservative and assume the
 	    list of ors is in preference and keep till it starts to work. */
 	 while (true)
@@ -1373,7 +1373,7 @@ void pkgProblemResolver::InstallProtect()
 									/*}}}*/
 // PrioSortList - Sort a list of versions by priority			/*{{{*/
 // ---------------------------------------------------------------------
-/* This is ment to be used in conjunction with AllTargets to get a list 
+/* This is meant to be used in conjunction with AllTargets to get a list 
    of versions ordered by preference. */
 
 struct PrioComp {
diff --git a/apt-pkg/cacheset.cc b/apt-pkg/cacheset.cc
index 816925c4d..f8ab7acb9 100644
--- a/apt-pkg/cacheset.cc
+++ b/apt-pkg/cacheset.cc
@@ -858,7 +858,7 @@ APT_IGNORE_DEPRECATED_PUSH
 	case TASK: showTaskSelection(pkg, pattern); break;
 	case FNMATCH: showFnmatchSelection(pkg, pattern); break;
 APT_IGNORE_DEPRECATED_POP
-	case PACKAGENAME: /* no suprises here */ break;
+	case PACKAGENAME: /* no surprises here */ break;
 	case STRING: /* handled by the special cases */ break;
 	case UNKNOWN: break;
 	}
@@ -898,7 +898,7 @@ APT_IGNORE_DEPRECATED_POP
 	case INSTCAND:
 	case ALL:
 	case CANDANDINST:
-		// not really suprises, but in fact: just not implemented
+		// not really surprises, but in fact: just not implemented
 		break;
 	}
 }
diff --git a/apt-pkg/cacheset.h b/apt-pkg/cacheset.h
index 7edeac4af..1ac61af59 100644
--- a/apt-pkg/cacheset.h
+++ b/apt-pkg/cacheset.h
@@ -465,7 +465,7 @@ APT_IGNORE_DEPRECATED_POP
 	/** \brief returns all packages in the cache who belong to the given task
 
 	    A simple helper responsible for search for all members of a task
-	    in the cache. Optional it prints a a notice about the
+	    in the cache. Optional it prints a notice about the
 	    packages chosen cause of the given task.
 	    \param Cache the packages are in
 	    \param pattern name of the task
@@ -483,7 +483,7 @@ APT_IGNORE_DEPRECATED_POP
 	/** \brief returns all packages in the cache whose name matchs a given pattern
 
 	    A simple helper responsible for executing a regular expression on all
-	    package names in the cache. Optional it prints a a notice about the
+	    package names in the cache. Optional it prints a notice about the
 	    packages chosen cause of the given package.
 	    \param Cache the packages are in
 	    \param pattern regular expression for package names
diff --git a/apt-pkg/cdrom.cc b/apt-pkg/cdrom.cc
index d83d05f9e..a3248fc17 100644
--- a/apt-pkg/cdrom.cc
+++ b/apt-pkg/cdrom.cc
@@ -67,7 +67,7 @@ bool pkgCdrom::FindPackages(string CD,
 	 InfoDir = InfoDir + CD + ".disk/";
    }
 
-   // Don't look into directories that have been marked to ingore.
+   // Don't look into directories that have been marked to ignore.
    if (RealFileExists(".aptignr") == true)
       return true;
 
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
diff --git a/apt-pkg/deb/debrecords.h b/apt-pkg/deb/debrecords.h
index 7fc82a88d..ae75a2b78 100644
--- a/apt-pkg/deb/debrecords.h
+++ b/apt-pkg/deb/debrecords.h
@@ -5,8 +5,8 @@
    
    Debian Package Records - Parser for debian package records
    
-   This provides display-type parsing for the Packages file. This is 
-   different than the the list parser which provides cache generation
+   This provides display-type parsing for the Packages file. This is
+   different than the list parser which provides cache generation
    services. There should be no overlap between these two.
    
    ##################################################################### */
diff --git a/apt-pkg/deb/dpkgpm.cc b/apt-pkg/deb/dpkgpm.cc
index 8944254ca..80bee03dd 100644
--- a/apt-pkg/deb/dpkgpm.cc
+++ b/apt-pkg/deb/dpkgpm.cc
@@ -1446,7 +1446,7 @@ bool pkgDPkgPM::ExpandPendingCalls(std::vector<Item> &List, pkgDepCache &Cache)
 }
 bool pkgDPkgPM::Go(APT::Progress::PackageManager *progress)
 {
-   // explicitely remove&configure everything for hookscripts and progress building
+   // explicitly remove&configure everything for hookscripts and progress building
    // we need them only temporarily through, so keep the length and erase afterwards
    decltype(List)::const_iterator::difference_type explicitIdx =
       std::distance(List.cbegin(), List.cend());
@@ -1909,7 +1909,7 @@ bool pkgDPkgPM::Go(APT::Progress::PackageManager *progress)
 	       ADDARG(fullname);
 	    }
 	 }
-	 // skip configure action if all sheduled packages disappeared
+	 // skip configure action if all scheduled packages disappeared
 	 if (oldSize == Size)
 	    continue;
       }
@@ -2101,7 +2101,7 @@ bool pkgDPkgPM::Go(APT::Progress::PackageManager *progress)
 
    if (d->dpkg_error.empty() == false)
    {
-      // no point in reseting packages we already completed removal for
+      // no point in resetting packages we already completed removal for
       StripAlreadyDoneFrom(approvedStates.Remove());
       StripAlreadyDoneFrom(approvedStates.Purge());
       APT::StateChanges undo;
diff --git a/apt-pkg/depcache.cc b/apt-pkg/depcache.cc
index 3925d2e7c..f3615302e 100644
--- a/apt-pkg/depcache.cc
+++ b/apt-pkg/depcache.cc
@@ -787,7 +787,7 @@ bool pkgDepCache::MarkKeep(PkgIterator const &Pkg, bool Soft, bool FromUser,
 
    ActionGroup group(*this);
 
-#if 0 // reseting the autoflag here means we lose the 
+#if 0 // resetting the autoflag here means we lose the 
       // auto-mark information if a user selects a package for removal
       // but changes  his mind then and sets it for keep again
       // - this makes sense as default when all Garbage dependencies
@@ -1079,7 +1079,7 @@ bool pkgDepCache::MarkInstall(PkgIterator const &Pkg,bool AutoInst,
 
    StateCache &P = PkgState[Pkg->ID];
 
-   // See if there is even any possible instalation candidate
+   // See if there is even any possible installation candidate
    if (P.CandidateVer == 0)
       return false;
 
@@ -1781,7 +1781,7 @@ bool pkgDepCache::Policy::IsImportantDep(DepIterator const &Dep) const
    {
       if (InstallRecommends)
 	 return true;
-      // we suport a special mode to only install-recommends for certain
+      // we support a special mode to only install-recommends for certain
       // sections
       // FIXME: this is a meant as a temporarly solution until the
       //        recommends are cleaned up
diff --git a/apt-pkg/depcache.h b/apt-pkg/depcache.h
index 03a2cb0a8..1ab86644d 100644
--- a/apt-pkg/depcache.h
+++ b/apt-pkg/depcache.h
@@ -21,7 +21,7 @@
    3 dependency results.
      Now - Compared using the Currently install version
      Install - Compared using the install version (final state)
-     CVer - (Candidate Verion) Compared using the Candidate Version
+     CVer - (Candidate Version) Compared using the Candidate Version
    The candidate and now results are used to decide wheather a package
    should be automatically installed or if it should be left alone.
    
diff --git a/apt-pkg/edsp.h b/apt-pkg/edsp.h
index ed49ac28c..2c9082ed3 100644
--- a/apt-pkg/edsp.h
+++ b/apt-pkg/edsp.h
@@ -133,7 +133,7 @@ namespace EDSP								/*{{{*/
 	 *  \param[out] remove is a list which gets populated with requested removals
 	 *  \param[out] upgrade is true if it is a request like apt-get upgrade
 	 *  \param[out] distUpgrade is true if it is a request like apt-get dist-upgrade
-	 *  \param[out] autoRemove is true if removal of uneeded packages should be performed
+	 *  \param[out] autoRemove is true if removal of unneeded packages should be performed
 	 *
 	 *  \return true if the request could be found and worked on, otherwise false
 	 */
diff --git a/apt-pkg/indexfile.h b/apt-pkg/indexfile.h
index 68753a40a..046216ab2 100644
--- a/apt-pkg/indexfile.h
+++ b/apt-pkg/indexfile.h
@@ -155,7 +155,7 @@ class pkgIndexFile
       rather bad (doesn't take three character like ast into account).*/
    APT_DEPRECATED_MSG("These methods make no sense anymore with multi-language support") static bool CheckLanguageCode(const char * const Lang);
    /* As we have now possibly more than one LanguageCode this method is
-      superseeded by a) private classmembers or b) getLanguages() */
+      superseded by a) private classmembers or b) getLanguages() */
    APT_DEPRECATED_MSG("These methods make no sense anymore with multi-language support") static std::string LanguageCode();
 
    bool IsTrusted() const { return Trusted; };
diff --git a/apt-pkg/orderlist.cc b/apt-pkg/orderlist.cc
index bfdc50e6c..0be0cc8df 100644
--- a/apt-pkg/orderlist.cc
+++ b/apt-pkg/orderlist.cc
@@ -57,7 +57,7 @@
    There are complications in this algorithm when presented with cycles.
    For all known practical cases it works, all cases where it doesn't work
    is fixable by tweaking the package descriptions. However, it should be
-   possible to impove this further to make some better choices when 
+   possible to improve this further to make some better choices when 
    presented with cycles. 
    
    ##################################################################### */
@@ -134,7 +134,7 @@ bool pkgOrderList::IsMissing(PkgIterator Pkg)
 									/*}}}*/
 // OrderList::DoRun - Does an order run					/*{{{*/
 // ---------------------------------------------------------------------
-/* The caller is expeted to have setup the desired probe state */
+/* The caller is expected to have setup the desired probe state */
 bool pkgOrderList::DoRun()
 {   
    // Temp list
@@ -587,7 +587,7 @@ bool pkgOrderList::VisitNode(PkgIterator Pkg, char const* from)
 
    DepFunc Old = Primary;
    
-   // Perform immedate configuration of the package if so flagged.
+   // Perform immediate configuration of the package if so flagged.
    if (IsFlag(Pkg,Immediate) == true && Primary != &pkgOrderList::DepUnPackPre)
       Primary = &pkgOrderList::DepUnPackPreD;
 
@@ -875,7 +875,7 @@ bool pkgOrderList::DepUnPackDep(DepIterator D)
    orders configuration so that when a package comes to be configured it's
    dependents are configured. 
  
-   Loops are ingored. Depends loop entry points are chaotic. */
+   Loops are ignored. Depends loop entry points are chaotic. */
 bool pkgOrderList::DepConfigure(DepIterator D)
 {
    // Never consider reverse configuration dependencies.
diff --git a/apt-pkg/packagemanager.cc b/apt-pkg/packagemanager.cc
index 90dd3a3ee..a8537431b 100644
--- a/apt-pkg/packagemanager.cc
+++ b/apt-pkg/packagemanager.cc
@@ -135,7 +135,7 @@ bool pkgPackageManager::FixMissing()
    return Resolve.ResolveByKeep() == true && Cache.BrokenCount() == 0;   
 }
 									/*}}}*/
-// PM::ImmediateAdd - Add the immediate flag recursivly			/*{{{*/
+// PM::ImmediateAdd - Add the immediate flag recursively		/*{{{*/
 // ---------------------------------------------------------------------
 /* This adds the immediate flag to the pkg and recursively to the
    dependencies
@@ -806,7 +806,7 @@ bool pkgPackageManager::SmartUnPack(PkgIterator Pkg, bool const Immediate, int c
 		     break;
 		  }
 
-		  // check if it needs unpack or if if configure is enough
+		  // check if it needs unpack or if configure is enough
 		  if (List->IsFlag(DepPkg,pkgOrderList::UnPacked) == false)
 		  {
 		     // two packages pre-depending on each other can't be handled sanely
@@ -1015,7 +1015,7 @@ bool pkgPackageManager::SmartUnPack(PkgIterator Pkg, bool const Immediate, int c
       return false;
 
    if (Immediate == true) {
-      // Perform immedate configuration of the package. 
+      // Perform immediate configuration of the package. 
          if (SmartConfigure(Pkg, Depth + 1) == false)
             _error->Error(_("Could not perform immediate configuration on '%s'. "
                "Please see man 5 apt.conf under APT::Immediate-Configure for details. (%d)"),Pkg.FullName().c_str(),2);
diff --git a/apt-pkg/packagemanager.h b/apt-pkg/packagemanager.h
index 5046e2dc0..e4c7a0a0a 100644
--- a/apt-pkg/packagemanager.h
+++ b/apt-pkg/packagemanager.h
@@ -7,7 +7,7 @@
    Three steps are 
      - Aquiration of archives (stores the list of final file names)
      - Sorting of operations
-     - Invokation of package manager
+     - Invocation of package manager
    
    This is the final stage when the package cache entities get converted
    into file names and the state stored in a DepCache is transformed
diff --git a/apt-pkg/pkgcache.cc b/apt-pkg/pkgcache.cc
index 67d4bc007..c4bf34022 100644
--- a/apt-pkg/pkgcache.cc
+++ b/apt-pkg/pkgcache.cc
@@ -612,8 +612,8 @@ bool pkgCache::DepIterator::IsNegative() const
 /* This intellegently looks at dep target packages and tries to figure
    out which package should be used. This is needed to nicely handle
    provide mapping. If the target package has no other providing packages
-   then it returned. Otherwise the providing list is looked at to 
-   see if there is one one unique providing package if so it is returned.
+   then it returned. Otherwise the providing list is looked at to
+   see if there is one unique providing package if so it is returned.
    Otherwise true is returned and the target package is set. The return
    result indicates whether the node should be expandable 
  
diff --git a/apt-pkg/pkgrecords.h b/apt-pkg/pkgrecords.h
index 8da3265c6..7c50c5d41 100644
--- a/apt-pkg/pkgrecords.h
+++ b/apt-pkg/pkgrecords.h
@@ -10,7 +10,7 @@
    package files. This is different than the generators parser in that
    it is used to access information not generate information. No 
    information touched by the generator should be parable from here as
-   it can always be retreived directly from the cache.
+   it can always be retrieved directly from the cache.
    
    ##################################################################### */
 									/*}}}*/
diff --git a/apt-pkg/policy.h b/apt-pkg/policy.h
index 04747c5a1..943332bbb 100644
--- a/apt-pkg/policy.h
+++ b/apt-pkg/policy.h
@@ -8,7 +8,7 @@
    standard 'Version 0' engine is included inside the DepCache which is
    it's historical location.
    
-   The V4 engine allows the user to completly control all aspects of
+   The V4 engine allows the user to completely control all aspects of
    version selection. There are three primary means to choose a version
     * Selection by version match
     * Selection by Release file match
diff --git a/apt-pkg/tagfile.cc b/apt-pkg/tagfile.cc
index 200a7f2fd..d9519175e 100644
--- a/apt-pkg/tagfile.cc
+++ b/apt-pkg/tagfile.cc
@@ -1092,7 +1092,7 @@ bool TFRewrite(FILE *Output,pkgTagSection const &Tags,const char *Order[],
 	 Rewrite[J].NewTag = Rewrite[J].Tag;
    }
    
-   // Write all all of the tags, in order.
+   // Write all of the tags, in order.
    if (Order != NULL)
    {
       for (unsigned int I = 0; Order[I] != 0; I++)
diff --git a/apt-pkg/tagfile.h b/apt-pkg/tagfile.h
index 3b89d0e45..e02e7332e 100644
--- a/apt-pkg/tagfile.h
+++ b/apt-pkg/tagfile.h
@@ -146,7 +146,7 @@ class pkgTagSection
 
    /** \brief amount of Tags in the current section
     *
-    * Note: if a Tag is mentioned repeatly it will be counted multiple
+    * Note: if a Tag is mentioned repeatedly it will be counted multiple
     * times, but only the last occurrence is available via Find methods.
     */
    unsigned int Count() const;
diff --git a/apt-pkg/update.h b/apt-pkg/update.h
index e35cd14f6..559516f1b 100644
--- a/apt-pkg/update.h
+++ b/apt-pkg/update.h
@@ -2,8 +2,8 @@
 // Description								/*{{{*/
 /* ######################################################################
 
-   Update - ListUpdate releated code
-   
+   Update - ListUpdate related code
+
    ##################################################################### */
 									/*}}}*/
 
diff --git a/apt-pkg/upgrade.cc b/apt-pkg/upgrade.cc
index afc9ad613..a61789c11 100644
--- a/apt-pkg/upgrade.cc
+++ b/apt-pkg/upgrade.cc
@@ -210,7 +210,7 @@ static bool pkgAllUpgradeWithNewPackages(pkgDepCache &Cache, OpProgress * const
    if (Progress != NULL)
       Progress->Progress(50);
 
-   // ... but it may remove stuff, we we need to clean up afterwards again
+   // ... but it may remove stuff, we need to clean up afterwards again
    for (pkgCache::PkgIterator I = Cache.PkgBegin(); I.end() == false; ++I)
       if (Cache[I].Delete() == true)
 	 Cache.MarkKeep(I, false, false);
diff --git a/apt-pkg/upgrade.h b/apt-pkg/upgrade.h
index 71dbb4fd3..2d9c0fa36 100644
--- a/apt-pkg/upgrade.h
+++ b/apt-pkg/upgrade.h
@@ -2,8 +2,8 @@
 // Description								/*{{{*/
 /* ######################################################################
 
-   Upgrade - Upgrade/DistUpgrade releated code
-   
+   Upgrade - Upgrade/DistUpgrade related code
+
    ##################################################################### */
 									/*}}}*/