fix various typos reported by codespell

Reported-By: codespell

18 files changed, 59 insertions, 59 deletions

diff --git a/apt-inst/filelist.cc b/apt-inst/filelist.cc
index 4dbc4a2d7..a55416d6b 100644
--- a/apt-inst/filelist.cc
+++ b/apt-inst/filelist.cc
@@ -468,7 +468,7 @@ bool pkgFLCache::AddDiversion(PkgIterator const &Owner,
    if (FromN->Pointer != 0)
       Diver = FromN->Pointer;
   
-   /* Make sure from and to point to the same diversion, if they dont
+   /* Make sure from and to point to the same diversion, if they don't
       then we are trying to intermix diversions - very bad */
    if (ToN->Pointer != 0 && ToN->Pointer != Diver)
    {
diff --git a/apt-pkg/acquire.h b/apt-pkg/acquire.h
index 0d2b21233..10025a6ef 100644
--- a/apt-pkg/acquire.h
+++ b/apt-pkg/acquire.h
@@ -4,7 +4,7 @@
 
    Acquire - File Acquiration
    
-   This module contians the Acquire system. It is responsible for bringing
+   This module contains the Acquire system. It is responsible for bringing
    files into the local pathname space. It deals with URIs for files and
    URI handlers responsible for downloading or finding the URIs.
    
diff --git a/apt-pkg/cacheiterators.h b/apt-pkg/cacheiterators.h
index 48547e564..887d2e691 100644
--- a/apt-pkg/cacheiterators.h
+++ b/apt-pkg/cacheiterators.h
@@ -298,7 +298,7 @@ class pkgCache::DepIterator : public Iterator<Dependency, DepIterator> {
 		return (S2->CompareOp & pkgCache::Dep::MultiArchImplicit) == pkgCache::Dep::MultiArchImplicit;
 	}
 	/* This covers additionally negative dependencies, which aren't arch-specific,
-	   but change architecture nontheless as a Conflicts: foo does applies for all archs */
+	   but change architecture nonetheless as a Conflicts: foo does applies for all archs */
 	bool IsImplicit() const APT_PURE;
 
 	bool IsSatisfied(VerIterator const &Ver) const APT_PURE;
diff --git a/apt-pkg/orderlist.cc b/apt-pkg/orderlist.cc
index 1e0640422..d1118e319 100644
--- a/apt-pkg/orderlist.cc
+++ b/apt-pkg/orderlist.cc
@@ -257,7 +257,7 @@ bool pkgOrderList::OrderUnpack(string *FileList)
       clog << "** Pass C" << endl;
    LoopCount = 0;
    RevDepends = 0;
-   Remove = 0;             // Otherwise the libreadline remove problem occures
+   Remove = 0;             // Otherwise the libreadline remove problem occurs
    if (DoRun() == false)
       return false;
 
diff --git a/buildlib/po4a_manpage.mak b/buildlib/po4a_manpage.mak
index 2e98652a5..82cfba394 100644
--- a/buildlib/po4a_manpage.mak
+++ b/buildlib/po4a_manpage.mak
@@ -60,7 +60,7 @@ endif
 INCLUDES :=
 
 ifndef HAVE_PO4A
-# Strip from the source list any man pages we dont have compiled already
+# Strip from the source list any man pages we don't have compiled already
 SOURCE := $(wildcard $(SOURCE))
 endif
 
diff --git a/cmdline/apt-key.in b/cmdline/apt-key.in
index 881f8a990..8c47b5359 100644
--- a/cmdline/apt-key.in
+++ b/cmdline/apt-key.in
@@ -240,7 +240,7 @@ import_keyring_into_keyring() {
     shift 2
     rm -f "${GPGHOMEDIR}/gpgoutput.log"
     # the idea is simple: We take keys from one keyring and copy it to another
-    # we do this with so many checks inbetween to ensure that WE control the
+    # we do this with so many checks in between to ensure that WE control the
     # creation, so we know that the (potentially) created $TO keyring is a
     # simple keyring rather than a keybox as gpg2 would create it which in turn
     # can't be read by gpgv.
diff --git a/debian/changelog b/debian/changelog
index b5541c10c..87fcaec8c 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -70,7 +70,7 @@ apt (1.1~exp9) experimental; urgency=medium
   * add more parsing error checking for rred
   * support hashes for compressed pdiff files
   * do not request files if we expect an IMS hit
-  * configureable acquire targets to download additional files
+  * configurable acquire targets to download additional files
   * show URI.Path in all acquire item descriptions
   * implement 'apt-get files' to access index targets
   * store Release files data in the Cache
@@ -350,7 +350,7 @@ apt (1.1~exp5) experimental; urgency=medium
   * Document Acquire{MaxReleaseFileSize,AllowInsecureRepositories,
     AllowDowngradeToInsecureRepositories} and
     --no-allow-insecure-repositories
-  * Fix backward compatiblity of the new pkgAcquireMethod::DropPrivsOrDie()
+  * Fix backward compatibility of the new pkgAcquireMethod::DropPrivsOrDie()
   * Change default of Acquire::AllowInsecureRepositories to "true"
     so that this change is less disruptive, this will be switched
     to "false" again after jessie
@@ -506,7 +506,7 @@ apt (1.1~exp1) experimental; urgency=low
   * add Debug::Acquire::Progress debug option
   * [ABI-Break] lp:~mvo/apt/source-hashes:
     - use sha{512,256,1} for deb-src when available LP: #1098738
-  * [ABI-Break] stop exporting the accidently exported parsenetrc() symbol
+  * [ABI-Break] stop exporting the accidentally exported parsenetrc() symbol
   * [ABI-Break] remove the PACKAGE_MATCHER_ABI_COMPAT defines
   * [ABI BREAK] apt-pkg/pkgcache.h:
     - adjust pkgCache::State::VerPriority enum, to match reality
@@ -941,7 +941,7 @@ apt (1.0.4) unstable; urgency=low
   * Never parse Version/Architecture tags in a Translation-$lang file
   * Show upgradable packages after apt update (Closes: 748389)
   * Fix various errors found by clang -fsanitize=address
-  * Fix various errors foudn by clang scan-build
+  * Fix various errors found by clang scan-build
   * Show unauthenticated warning for source packages as well (Closes: #749795)
   * Add compat mode for old (32bit FileSize) CacheDB (LP: #1274466)
   * cmdline/apt-helper.cc: use less generic description/short-description 
@@ -1766,7 +1766,7 @@ apt (0.9.9) unstable; urgency=low
   * rewrite pkgOrderList::DepRemove to stop incorrect immediate setting
     (Closes: 645713)
   * prefer Essentials over Removals in ordering score
-  * fix priority sorting by prefering higher in MarkInstall
+  * fix priority sorting by preferring higher in MarkInstall
   * try all providers in order if uninstallable in MarkInstall
   * do unpacks before configures in SmartConfigure (Closes: #707578)
   * fix support for multiple patterns in apt-cache search (Closes: #691453)
@@ -1851,17 +1851,17 @@ apt (0.9.8) unstable; urgency=low
     - handle language tags for descriptions are unique strings to be shared
     - factor version string creation out of NewDepends, so we can easily reuse
       version strings e.g. for implicit multi-arch dependencies
-    - equal comparisions are used mostly in same-source relations,
+    - equal comparisons are used mostly in same-source relations,
       so use this to try to reuse some version strings
     - sort group and package names in the hashtable on insert
     - share version strings between same versions (of different architectures)
-      to save some space and allow quick comparisions later on
+      to save some space and allow quick comparisons later on
   * apt-pkg/pkgcache.cc:
     - assume sorted hashtable entries for groups/packages
   * apt-pkg/cacheiterators.h:
     - provide DepIterator::IsSatisfied as a nicer shorthand for DepCheck
   * apt-pkg/deb/debversion.cc:
-    - add a string-equal shortcut for equal version comparisions
+    - add a string-equal shortcut for equal version comparisons
 
   [ Marc Deslauriers ]
   * make apt-ftparchive generate missing deb-src hashes (LP: #1078697)
@@ -2301,7 +2301,7 @@ apt (0.9.7) unstable; urgency=low
     - add PackageContainerInterface::FromGroup to support
       architecture specifications with wildcards on the commandline
   * apt-pkg/pkgcache.cc:
-    - do a string comparision for architecture checking in IsMultiArchImplicit
+    - do a string comparison for architecture checking in IsMultiArchImplicit
       as 'unique' strings in the pkgcache aren't unique (Closes: #677454)
   * buildlib/configure.mak:
     - print a message detailing how to get config.guess and config.sub
@@ -2400,7 +2400,7 @@ apt (0.9.5.1) unstable; urgency=low
     - dup() given compressed fd in OpenDescriptor if AutoClose
       is disabled as otherwise gzclose() and co will close it
   * doc/*.xml:
-    - mark even more stuff as untranslateable and improve the
+    - mark even more stuff as untranslatable and improve the
       markup here and there (no real text change)
     - use docbook DTD 4.5 instead of 4.2 to have valid docs
 
@@ -2494,7 +2494,7 @@ apt (0.9.4) unstable; urgency=low
   [ Raphael Geissert ]
   * apt-pkg/acquire*.cc:
     - handle redirections in the worker with the right method instead of
-      in the method the redirection occured in (Closes: #668111)
+      in the method the redirection occurred in (Closes: #668111)
   * methods/http.cc:
     - forbid redirects to change protocol
   * methods/mirror.cc:
@@ -3791,7 +3791,7 @@ apt (0.8.13) unstable; urgency=low
   * mirror method:
     - when downloading data, show the mirror being used
     - randomize mirror list after download in a host specific way
-      to ensure that the load is evenly spreaded accross the mirrors
+      to ensure that the load is evenly spread across the mirrors
     - fix some missing "Fail-Ignore"
 
  -- Michael Vogt <mvo@debian.org>  Wed, 16 Mar 2011 08:04:42 +0100
@@ -5339,7 +5339,7 @@ apt (0.7.24) unstable; urgency=low
     - when tcgetattr() returns non-zero skip all pty magic 
       (thanks to Simon Richter, closes: #509866)
   * apt-inst/contrib/arfile.cc:
-    - show propper error message for Invalid archive members
+    - show proper error message for Invalid archive members
 
   [ David Kalnischkies ]
   * doc/Doxyfile.in:
@@ -5613,7 +5613,7 @@ apt (0.7.22) unstable; urgency=low
   * Apply patch from Sami Liedes <sliedes@cc.hut.fi> to reduce the
     number of times we call progress bar updating and debugging
     configuration settings.
-  * Apply patch from Sami Liedes <sliedes@cc.hut.fi> to avoid unecessary
+  * Apply patch from Sami Liedes <sliedes@cc.hut.fi> to avoid unnecessary
     temporary allocations.
 
  -- Michael Vogt <mvo@debian.org>  Wed, 29 Jul 2009 19:16:22 +0200
@@ -5809,7 +5809,7 @@ apt (0.7.17) unstable; urgency=low
     - Bumped 'Standards-Version' to 3.8.0, no changes needed.
     - Actualized 'Uploaders' field.
   * doc/:
-    - Substituded 'apt-archive' with 'apt-ftparchive' in docs.
+    - Substituted 'apt-archive' with 'apt-ftparchive' in docs.
       Patch based on work of Andre Felipe Machado. (Closes: #350865)
     - Mentioned '/<release>' and '=<version>' for 'apt-get install' and
       '=<version>' for 'apt-get source' in apt-get manpage. Patch based on
@@ -6267,7 +6267,7 @@ apt (0.7.9) unstable; urgency=low
     - Swedish updated.
 
   [ Otavio Salvador ]
-  * Fix configure script to check for CURL library and headers presense.
+  * Fix configure script to check for CURL library and headers presence.
   * Applied patch from Brian M. Carlson <sandals@crustytoothpaste.ath.cx>
     to add backward support for arches that lacks pselect support,
     closes: #448406.
@@ -6579,7 +6579,7 @@ apt (0.7.0) experimental; urgency=low
     - install new recommends on "upgrade" if --install-recommends is 
       given
     - new "--fix-policy" option to install all packages with unmet
-      important dependencies (usefull with --install-recommends to
+      important dependencies (useful with --install-recommends to
       see what not-installed recommends are on the system)
     - fix of recommended packages display (only show CandidateVersion
       fix or-group handling)
@@ -6788,7 +6788,7 @@ apt (0.6.44.2) unstable; urgency=low
   * apt-pkg/depcache.cc:
     - added Debug::pkgDepCache::AutoInstall (thanks to infinity)
   * apt-pkg/acquire-item.cc:
-    - fix missing chmod() in the new aquire code 
+    - fix missing chmod() in the new acquire code
       (thanks to Bastian Blank, Closes: #367425)
   * merged from 
     http://www.perrier.eu.org/debian/packages/d-i/level4/apt-main:
@@ -6843,13 +6843,13 @@ apt (0.6.44) unstable; urgency=low
   * Merge from http://www.perrier.eu.org/debian/packages/d-i/level4/apt-main:
   	* bg.po: Added, complete to 512t. Closes: #360262
   * doc/apt-ftparchive.1.xml:
-    - fix documentation for "SrcPackages" -> "Sources" 
+    - fix documentation for "SrcPackages" -> "Sources"
       (thanks to Bart Martens for the patch, closes: #307756)
   * debian/libapt-pkg-doc.doc-base.cache:
     - remove broken charackter from description (closes: #361129)
-  * apt-inst/deb/dpkgdb.cc, methods/gpgv.cc: 
+  * apt-inst/deb/dpkgdb.cc, methods/gpgv.cc:
     - i18n fixes (closes: #349298)
-  * debian/postinst: dont fail on not available
+  * debian/postinst: don't fail on not available
     /usr/share/doc/apt/examples/sources.list (closes: #361130)
   * methods/ftp.cc:
     - unlink empty file in partial if the download failed because
@@ -6858,7 +6858,7 @@ apt (0.6.44) unstable; urgency=low
     - treats a version string with explicit zero epoch equal
       than the same without epoch (Policy 5.6.12, closes: #363358)
       Thanks to Lionel Elie Mamane for the patch
-  
+
  -- Michael Vogt <mvo@debian.org>  Mon,  8 May 2006 22:28:53 +0200
 
 apt (0.6.43.3) unstable; urgency=low
@@ -6884,12 +6884,12 @@ apt (0.6.43.3) unstable; urgency=low
     - don't explode on a DepCompareOp in a Provides line, but warn about
       it and ignore it otherwise (thanks to James Troup for reporting it)
   * cmdline/apt-get.cc:
-    - don't lock the lists directory in DoInstall, breaks --print-uri 
+    - don't lock the lists directory in DoInstall, breaks --print-uri
       (thanks to James Troup for reporting it)
-  * debian/apt.dirs: create /etc/apt/sources.list.d 
+  * debian/apt.dirs: create /etc/apt/sources.list.d
   * make apt-cache madison work without deb-src entries (#352583)
-  * cmdline/apt-get.cc: only run the list-cleaner if a update was 
-    successfull
+  * cmdline/apt-get.cc: only run the list-cleaner if a update was
+    successful
 
  -- Michael Vogt <mvo@debian.org>  Wed, 22 Feb 2006 10:13:04 +0100
 
@@ -6996,7 +6996,7 @@ apt (0.6.42.1) unstable; urgency=low
     - revert patch from last version, it causes trouble on alpha 
       and ia64 (closes: #335102, #335103)
   * cmdline/apt-get.cc:
-    - be extra carefull in FindSrc (closes: #335213)
+    - be extra careful in FindSrc (closes: #335213)
 
  -- Michael Vogt <mvo@debian.org>  Sat, 22 Oct 2005 23:44:35 +0200
 
@@ -7196,7 +7196,7 @@ apt (0.6.33) hoary; urgency=low
     - patch-3: (doc) new config variables added configure-index
     - patch-4: pkgAcquire::Run() pulse intervall can be configured
     - patch-5: fix for apt-get update removing Release.gpg files (#6865)
-    - patch-6: change the path scoring in apt-cdrom, prefer pathes without
+    - patch-6: change the path scoring in apt-cdrom, prefer paths without
       symlinks
 
  -- Matt Zimmerman <mdz@ubuntu.com>  Sat, 26 Feb 2005 15:21:17 -0800
@@ -7218,7 +7218,7 @@ apt (0.6.31) hoary; urgency=low
     - Fix build/install of Polish offline documentation, based on patch from
       Christian Perrier (Closes: #270404)
   * Michael Vogt
-    - apt-cdrom.cc seperated into frontend (cmdline/apt-cdrom.cc and library
+    - apt-cdrom.cc separated into frontend (cmdline/apt-cdrom.cc and library
       apt-pkg/cdrom.{cc,h}) (Ubuntu #5668)
 
  -- Matt Zimmerman <mdz@ubuntu.com>  Fri,  4 Feb 2005 10:23:01 -0800
@@ -7253,7 +7253,7 @@ apt (0.6.27ubuntu4) hoary; urgency=low
     (see ubuntu #4769 for the rational)
   * added apt-key update method (uses ubuntu-keyring)
   * documented the "--allow-unauthenticated" switch
-  * added DEB_BUILD_PROG_OPTS to debian/rules (additonal options can be 
+  * added DEB_BUILD_PROG_OPTS to debian/rules (additional options can be
     passed to DEB_BUILD_PROG like "-S")
 
  -- Michael Vogt <mvo@debian.org>  Thu, 23 Dec 2004 11:12:51 +0100
@@ -7267,7 +7267,7 @@ apt (0.6.27ubuntu3) hoary; urgency=low
 
 apt (0.6.27ubuntu2) hoary; urgency=low
 
-  * fixed a bug in the rule file that happend during the big 0.5->0.6 merge
+  * fixed a bug in the rule file that happened during the big 0.5->0.6 merge
 
  -- Michael Vogt <mvo@debian.org>  Tue, 14 Dec 2004 12:14:25 +0100
 
@@ -8270,7 +8270,7 @@ apt (0.5.5) unstable; urgency=low
   * Update es.po.  Closes: #183111.
   * Add pt_BR translation of apt_preferences(5).  Also, build fr manpages.
     Closes: #183904.
-  * Add a vcg command to apt-cache, similiar to dotty.  Closes: #150512.
+  * Add a vcg command to apt-cache, similar to dotty.  Closes: #150512.
   * Add option to apt-get to show versions of packages being
     upgraded/installed.
   * Be quiet in apt.post{inst,rm}.  Closes: #70685.
@@ -8318,7 +8318,7 @@ apt (0.5.4) unstable; urgency=low
   * Whatever. Closes: #89762
   * libstdc++ and HURD. Closes: #92025
   * More apt-utils verbage. Closes: #86954
-  * Fliped comparision operator. Closes: #94618
+  * Fliped comparison operator. Closes: #94618
   * Used the right copyright file. Closes: #65691
   * Randolph's G++3 patches.
   * Fixed no_proxy tokanizing. Closes: #100046
@@ -8487,7 +8487,7 @@ apt (0.3.19) frozen unstable; urgency=low
   * Fixed hardcoded path. Closes: #59743
   * Fixed Jay's relative path bug
   * Allowed source only CDs. Closes: #58952
-  * Space check is supressed if --print-uris is given. Closes: #58965
+  * Space check is suppressed if --print-uris is given. Closes: #58965
   * Clarified the documenation examples for non-us. Closes: #58646
   * Typo in the package description. Closes: #60230
   * Man Page typo. Closes: #60347
@@ -8695,7 +8695,7 @@ apt (0.3.6) unstable; urgency=low
   * apt-get source support. Closes: #23934, #27190
   * Renames .debs that fail MD5 checking, provides automatic corruption
     recovery. Closes: #35931
-  * Fixed autoconf verison. Closes: #37305
+  * Fixed autoconf version. Closes: #37305
   * Random Segfaulting. Closes: #37312, #37530
   * Fixed apt-cache man page. Closes: #36904
   * Added a newline to apt-cache showpkg. Closes: #36903
@@ -8756,10 +8756,10 @@ apt (0.1.9) frozen unstable; urgency=low
   * apt-get dist-upgrade problems fixed
   * tiny patch for http method to fix an endless loop
   * nice fix from /usr/doc/lintian/ to remove rpath nastiness from
-    libtool and add proper shared lib dependancies
+    libtool and add proper shared lib dependencies
   * now dh_shlibdeps is called with LD_LIBRARY_PATH=debian/tmp/usr/lib
     in case an old libpkg is installed while building APT to prevent
-    spurious dependancies
+    spurious dependencies
 
  -- Ben Gertzfield <che@debian.org>  Thu,  5 Nov 1998 17:43:25 -0800
 
@@ -8789,7 +8789,7 @@ apt (0.1.5) unstable; urgency=low
 apt (0.1.3) unstable; urgency=low
 
   * New upstreamish version.
-  * ftp method rewritten in C. Removes dependancies on all perl/perl
+  * ftp method rewritten in C. Removes dependencies on all perl/perl
     related modules. This fixes many of the ftp method bugs.
 
  -- Ben Gertzfield <che@debian.org>  Thu, 16 Jul 1998 22:19:00 -0700
@@ -8880,7 +8880,7 @@ apt (0.0.12) experimental; urgency=low
 
 apt (0.0.11) experimental; urgency=low
 
-  * Change dependancies to pre-depends since breaking your packaging tools
+  * Change dependencies to pre-depends since breaking your packaging tools
     in the middle of an installation isn't very good.
   * Bug fixes to ftp method and general apt-get code
 
@@ -8953,7 +8953,7 @@ apt (0.0.4) experimental; urgency=low
 
   * New usage guide.
   * Various documentation updates and cleanup.
-  * Added '-f' option to apt-get attempt to fix broken dependancies.
+  * Added '-f' option to apt-get attempt to fix broken dependencies.
 
  -- Scott K. Ellis <scott@debian.org>  Sat,  4 Apr 1998 14:36:00 -0500
 
@@ -8963,7 +8963,7 @@ apt (0.0.3) experimental; urgency=low
   * Updates to how apt-get handles bad states in installed packages.
   * Updated rules to make sure build works from a freshly checked out source
     archive.  Building from CVS needs libtool/automake/autoconf, builds from
-    the distributed source package should have no such dependancy.
+    the distributed source package should have no such dependency.
 
  -- Scott K. Ellis <scott@debian.org>  Fri,  3 Apr 1998 11:49:47 -0500
 
diff --git a/doc/offline.dbk b/doc/offline.dbk
index cbfc4f690..2ad1d98d8 100644
--- a/doc/offline.dbk
+++ b/doc/offline.dbk
@@ -68,7 +68,7 @@ host</emphasis> the one with bad or no connection.
 <para>
 This is achieved by creatively manipulating the APT configuration file. The
 essential premise to tell APT to look on a disc for it's archive files. Note
-that the disc should be formated with a filesystem that can handle long file
+that the disc should be formatted with a filesystem that can handle long file
 names such as ext2, fat32 or vfat.
 </para>
 </section>
diff --git a/doc/sources.list.5.xml b/doc/sources.list.5.xml
index e27eddb0e..77458d8fe 100644
--- a/doc/sources.list.5.xml
+++ b/doc/sources.list.5.xml
@@ -271,7 +271,7 @@ deb-src [ option1=value1 option2=value2 ] uri suite [component1] [component2] [.
 		repository is considered valid. -Max can be especially useful
 		if the repository provides no Valid-Until field on its Release
 		file to set your own value, while -Min can be used to increase
-		the valid time on seldomly updated (local) mirrors of a more
+		the valid time on seldom updated (local) mirrors of a more
 		frequently updated but less accessible archive (which is in the
 		sources.list as well) instead of disabling the check entirely.
 		Default to the value of the configuration options
diff --git a/methods/ftp.cc b/methods/ftp.cc
index 1a9a1c4eb..d84a194ca 100644
--- a/methods/ftp.cc
+++ b/methods/ftp.cc
@@ -1072,7 +1072,7 @@ bool FtpMethod::Fetch(FetchItem *Itm)
       URIStart(Res);
       
       FailFile = Itm->DestFile;
-      FailFile.c_str();   // Make sure we dont do a malloc in the signal handler
+      FailFile.c_str();   // Make sure we don't do a malloc in the signal handler
       FailFd = Fd.Fd();
       
       bool Missing;
diff --git a/methods/rsh.cc b/methods/rsh.cc
index 7ef2f7c7a..44aa7084d 100644
--- a/methods/rsh.cc
+++ b/methods/rsh.cc
@@ -504,7 +504,7 @@ bool RSHMethod::Fetch(FetchItem *Itm)
       URIStart(Res);
 
       FailFile = Itm->DestFile;
-      FailFile.c_str();   // Make sure we dont do a malloc in the signal handler
+      FailFile.c_str();   // Make sure we don't do a malloc in the signal handler
       FailFd = Fd.Fd();
 
       bool Missing;
diff --git a/methods/server.cc b/methods/server.cc
index f61a6fedb..1c42c69c2 100644
--- a/methods/server.cc
+++ b/methods/server.cc
@@ -358,7 +358,7 @@ ServerMethod::DealWithHeaders(FetchResult &Res)
       }
    }
 
-   /* We have a reply we dont handle. This should indicate a perm server
+   /* We have a reply we don't handle. This should indicate a perm server
       failure */
    if (Server->Result < 200 || Server->Result >= 300)
    {
@@ -382,7 +382,7 @@ ServerMethod::DealWithHeaders(FetchResult &Res)
       return ERROR_NOT_FROM_SERVER;
 
    FailFile = Queue->DestFile;
-   FailFile.c_str();   // Make sure we dont do a malloc in the signal handler
+   FailFile.c_str();   // Make sure we don't do a malloc in the signal handler
    FailFd = File->Fd();
    FailTime = Server->Date;
 
diff --git a/test/integration/framework b/test/integration/framework
index d9282eede..c046507e4 100644
--- a/test/integration/framework
+++ b/test/integration/framework
@@ -1555,7 +1555,7 @@ listcurrentlistsdirectory() {
 	} | sort
 }
 
-### convinience hacks ###
+### convenience hacks ###
 mkdir() {
 	# creating some directories by hand is a tedious task, so make it look simple
 	if [ "$*" = '-p rootdir/var/lib/apt/lists' ] || [ "$*" = "${TMPWORKINGDIRECTORY}/rootdir/var/lib/apt/lists" ] ||
diff --git a/test/integration/test-apt-by-hash-update b/test/integration/test-apt-by-hash-update
index 2229e991d..cef46a1b8 100755
--- a/test/integration/test-apt-by-hash-update
+++ b/test/integration/test-apt-by-hash-update
@@ -11,7 +11,7 @@ insertpackage 'unstable' 'foo' 'all' '1.0'
 
 setupaptarchive --no-update
 
-# make Packages *only* accessable by-hash for this test
+# make Packages *only* accessible by-hash for this test
 mkdir -p aptarchive/dists/unstable/main/binary-i386/by-hash/SHA512
 (cd  aptarchive/dists/unstable/main/binary-i386/by-hash/SHA512 && 
      mv ../../Packages* . &&
diff --git a/test/integration/test-apt-extracttemplates b/test/integration/test-apt-extracttemplates
index 5dadc4933..8f335589e 100755
--- a/test/integration/test-apt-extracttemplates
+++ b/test/integration/test-apt-extracttemplates
@@ -10,7 +10,7 @@ configarchitecture 'amd64'
 # apt-extracttemplates needs this
 insertinstalledpackage 'pkg-with-template' 'amd64' '1.0'
 
-# build a simple package that contains a config and a tempalte
+# build a simple package that contains a config and a template
 mkdir -p DEBIAN
 CONFIG_STR="#!/bin/sh
 random shell stuff
diff --git a/test/integration/test-apt-translation-has-no-packages b/test/integration/test-apt-translation-has-no-packages
index ec2e1e43b..fec525568 100755
--- a/test/integration/test-apt-translation-has-no-packages
+++ b/test/integration/test-apt-translation-has-no-packages
@@ -4,7 +4,7 @@
 # Translation-$lang file on disk that is actually a Packages file. In this
 # case apt used to generate invalid package versions out of the
 # Translation-$lang file (i.e. apt-cache policy foo) would show a version
-# comming out of a Translation file. Downloading this versions fails as
+# coming out of a Translation file. Downloading this versions fails as
 # there is no acquire method available for the package
 #
 set -e
diff --git a/test/integration/test-apt-update-nofallback b/test/integration/test-apt-update-nofallback
index 6e9db2cae..dae537c32 100755
--- a/test/integration/test-apt-update-nofallback
+++ b/test/integration/test-apt-update-nofallback
@@ -115,7 +115,7 @@ test_cve_2012_0214()
     # the unauthenticated Release file too giving the false impression that
     # Release was authenticated
     #
-    # Note that this is pretty much impossible nowdays because:
+    # Note that this is pretty much impossible nowadays because:
     # a) InRelease is left as is, not split to InRelease/Release as it was 
     #    in the old days
     # b) we refuse to go from signed->unsigned
diff --git a/test/integration/test-releasefile-verification b/test/integration/test-releasefile-verification
index c4d1455eb..60aa4421a 100755
--- a/test/integration/test-releasefile-verification
+++ b/test/integration/test-releasefile-verification
@@ -264,7 +264,7 @@ Acquire::AllowInsecureRepositories "1";
 Acquire::AllowDowngradeToInsecureRepositories "1";
 EOF
 
-msgmsg "Runing base test"
+msgmsg "Running base test"
 runtest2
 
 DELETEFILE="InRelease"