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

9 files changed, 10 insertions, 10 deletions

diff --git a/test/integration/framework b/test/integration/framework
index 256c90261..c65ac5acb 100644
--- a/test/integration/framework
+++ b/test/integration/framework
@@ -1202,7 +1202,7 @@ signreleasefiles() {
 		# FIXME: This should be the full name, but we can't encode the space properly currently
 		SIGUSERS="${SIGUSERS} -u ${SIGNER#* }"
 		if [ "${SIGNER}" = 'Rex Expired' ]; then
-			# the key is expired, so gpg doesn't allow to sign with and the --faked-system-time
+			# the key is expired, so gpg doesn't allow one to sign with and the --faked-system-time
 			# option doesn't exist anymore (and using faketime would add a new obscure dependency)
 			# therefore we 'temporary' make the key not expired and restore a backup after signing
 			cp "${REXKEY}.sec" "$SECEXPIREBAK"
diff --git a/test/integration/test-apt-ftparchive-by-hash b/test/integration/test-apt-ftparchive-by-hash
index 75fb0cf2c..ccfc62734 100755
--- a/test/integration/test-apt-ftparchive-by-hash
+++ b/test/integration/test-apt-ftparchive-by-hash
@@ -23,7 +23,7 @@ confighashes 'SHA256' 'SHA512'
 # enable by-hash in apt-ftparchive
 echo 'APT::FTPArchive::DoByHash "1";' >> aptconfig.conf
 
-# build one pacakge
+# build one package
 buildsimplenativepackage 'foo' 'i386' '1' 'unstable'
 buildaptarchivefromincoming
 
diff --git a/test/integration/test-apt-ftparchive-cachedb b/test/integration/test-apt-ftparchive-cachedb
index 1a06ff343..73d762cc8 100755
--- a/test/integration/test-apt-ftparchive-cachedb
+++ b/test/integration/test-apt-ftparchive-cachedb
@@ -64,7 +64,7 @@ Tree "dists/test" {
 };
 EOF
 
-# build one pacakge
+# build one package
 buildsimplenativepackage 'foo' 'i386' '1' 'test'
 mv incoming/* aptarchive/pool/main/
 
diff --git a/test/integration/test-apt-ftparchive-cachedb-lp1274466 b/test/integration/test-apt-ftparchive-cachedb-lp1274466
index 3a5527230..b0bcae8ec 100755
--- a/test/integration/test-apt-ftparchive-cachedb-lp1274466
+++ b/test/integration/test-apt-ftparchive-cachedb-lp1274466
@@ -16,7 +16,7 @@ if command -v db_dump-5 >/dev/null 2>&1; then
     db_dump=db_dump-5
 fi
 
-# gather the db and the deb, ensure mtime is not modfied as its saved in the DB
+# gather the db and the deb, ensure mtime is not modified as its saved in the DB
 cp -p "$TESTDIR/deb-lp1274466-cachedb.deb" foo_1_i386.deb
 cp -p "$TESTDIR/cachedb-lp1274466-old-format.db" old-format.db
 
diff --git a/test/integration/test-apt-source-and-build-dep b/test/integration/test-apt-source-and-build-dep
index 5fa87d57d..7f7457217 100755
--- a/test/integration/test-apt-source-and-build-dep
+++ b/test/integration/test-apt-source-and-build-dep
@@ -28,7 +28,7 @@ insertsource 'stable' 'foo' 'all' '0.5'
 insertpackage 'stable' 'foo' 'all' '1.0'
 insertsource 'stable' 'foo' 'all' '1.0'
 
-# this packages exists only as sources, add two versions to ensure that
+# these packages exists only as sources, add two versions to ensure that
 # apt will pick the higher version number (bts #731853)
 insertsource 'wheezy' 'foo' 'all' '0.0.1'
 insertsource 'wheezy' 'foo' 'all' '0.1'
diff --git a/test/integration/test-bug-770291-reinstall b/test/integration/test-bug-770291-reinstall
index 389fb1814..a1caf25f8 100755
--- a/test/integration/test-bug-770291-reinstall
+++ b/test/integration/test-bug-770291-reinstall
@@ -56,7 +56,7 @@ Conf dependsb (1 unstable [i386])
 Conf dependsa (1 unstable [i386])' aptget install --reinstall dependsa dependsb -s
 
 # there is a chance dpkg can actually do these, BUT this depends on the maintainerscripts (not) present
-# which is very very risky to depend on (and apt doesn't know about that anyhow).
+# which is very risky to depend on (and apt doesn't know about that anyhow).
 testfailure aptget install --reinstall predependsa predependsb -s -o Debug::pkgPackageManager=1
 testsuccess grep "^E: Couldn't configure predependsa:i386, probably a dependency cycle.$" rootdir/tmp/testfailure.output
 
@@ -89,7 +89,7 @@ Conf dependsb (1 unstable [i386])
 Conf dependsa (1 unstable [i386])' aptget install dependsa dependsb -s
 
 # there is a chance dpkg can actually do these, BUT this depends on the maintainerscripts (not) present
-# which is very very risky to depend on (and apt doesn't know about that anyhow).
+# which is very risky to depend on (and apt doesn't know about that anyhow).
 testfailure aptget install predependsa predependsb -s -o Debug::pkgPackageManager=1
 testsuccess grep "^E: Couldn't configure predependsa:i386, probably a dependency cycle.$" rootdir/tmp/testfailure.output
 
diff --git a/test/integration/test-pdiff-usage b/test/integration/test-pdiff-usage
index 59a3fd8af..430551fa4 100755
--- a/test/integration/test-pdiff-usage
+++ b/test/integration/test-pdiff-usage
@@ -210,7 +210,7 @@ Filename: pool/futurestuff_1.0_i386.deb
 Size: 202200
 SHA256: b46fd154615edaae5ba33c56a5cc0e7deaef23e2da3e4f129727fd660f28f050
 Description: some cool and shiny future stuff
- This package will appear in the next next mirror update
+ This package will appear in the next^2 mirror update
 Description-md5: d5f89fbbc2ce34c455dfee9b67d82b6b' >> aptarchive/Packages
 
 	compressfile 'aptarchive/Packages'
diff --git a/test/integration/test-releasefile-valid-until b/test/integration/test-releasefile-valid-until
index f64c6329d..b18dde2b6 100755
--- a/test/integration/test-releasefile-valid-until
+++ b/test/integration/test-releasefile-valid-until
@@ -48,7 +48,7 @@ runtest 'rejected' 'bad Max-Valid (bad Until, bad Min-Valid) <' 'now - 7 days' '
 runtest 'rejected' 'bad Max-Valid (bad Until, bad Min-Valid) >' 'now - 7 days' 'now - 2 days' -o Acquire::Max-ValidTime=12096 -o Acquire::Min-ValidTime=241920
 
 sed -i -e 's#\(deb\(-src\)\?\) #\1 [check-valid-until=no] #' rootdir/etc/apt/sources.list.d/*
-runtest 'accepted' 'bad Until but overriden by sources option' 'now - 7 days' 'now - 4 days'
+runtest 'accepted' 'bad Until but overridden by sources option' 'now - 7 days' 'now - 4 days'
 
 sed -i -e 's#\(deb\(-src\)\?\) \[check-valid-until=no\] #\1 [valid-until-max=86400] #' rootdir/etc/apt/sources.list.d/*
 runtest 'rejected' 'bad Max-Valid (good Until) via sources option' 'now - 7 days' 'now + 4 days'
diff --git a/test/integration/test-releasefile-verification b/test/integration/test-releasefile-verification
index e043fa8b5..36a90f9d5 100755
--- a/test/integration/test-releasefile-verification
+++ b/test/integration/test-releasefile-verification
@@ -383,7 +383,7 @@ runtest3() {
 	done
 }
 
-# diable some protection by default and ensure we still do the verification
+# disable some protection by default and ensure we still do the verification
 # correctly
 cat > rootdir/etc/apt/apt.conf.d/weaken-security <<EOF
 Acquire::AllowInsecureRepositories "1";