diff options
-rw-r--r-- | apt-pkg/contrib/sha2_internal.cc | 2 | ||||
-rw-r--r-- | apt-pkg/depcache.cc | 2 | ||||
-rw-r--r-- | debian/changelog | 2 | ||||
-rw-r--r-- | doc/apt-secure.8.xml | 2 | ||||
-rw-r--r-- | doc/examples/configure-index | 2 | ||||
-rw-r--r-- | doc/po/apt-doc.pot | 2 | ||||
-rw-r--r-- | doc/po/de.po | 2 | ||||
-rw-r--r-- | doc/po/es.po | 2 | ||||
-rw-r--r-- | doc/po/fr.po | 2 | ||||
-rw-r--r-- | doc/po/it.po | 2 | ||||
-rw-r--r-- | doc/po/ja.po | 2 | ||||
-rw-r--r-- | doc/po/nl.po | 2 | ||||
-rw-r--r-- | doc/po/pl.po | 2 | ||||
-rw-r--r-- | doc/po/pt.po | 2 | ||||
-rw-r--r-- | doc/po/pt_BR.po | 2 | ||||
-rw-r--r-- | ftparchive/writer.cc | 2 | ||||
-rwxr-xr-x | triehash/triehash.pl | 2 |
17 files changed, 17 insertions, 17 deletions
diff --git a/apt-pkg/contrib/sha2_internal.cc b/apt-pkg/contrib/sha2_internal.cc index f70b7b17d..1c9844ca8 100644 --- a/apt-pkg/contrib/sha2_internal.cc +++ b/apt-pkg/contrib/sha2_internal.cc @@ -93,7 +93,7 @@ /* * Define the followingsha2_* types to types of the correct length on - * the native archtecture. Most BSD systems and Linux define u_intXX_t + * the native architecture. Most BSD systems and Linux define u_intXX_t * types. Machines with very recent ANSI C headers, can use the * uintXX_t definintions from inttypes.h by defining SHA2_USE_INTTYPES_H * during compile or in the sha.h header file. diff --git a/apt-pkg/depcache.cc b/apt-pkg/depcache.cc index f3615302e..05b788e45 100644 --- a/apt-pkg/depcache.cc +++ b/apt-pkg/depcache.cc @@ -1783,7 +1783,7 @@ bool pkgDepCache::Policy::IsImportantDep(DepIterator const &Dep) const return true; // we support a special mode to only install-recommends for certain // sections - // FIXME: this is a meant as a temporarly solution until the + // FIXME: this is a meant as a temporary solution until the // recommends are cleaned up const char *sec = Dep.ParentVer().Section(); if (sec && ConfigValueInSubTree("APT::Install-Recommends-Sections", sec)) diff --git a/debian/changelog b/debian/changelog index 3c56d05cd..e9ec2e230 100644 --- a/debian/changelog +++ b/debian/changelog @@ -76,7 +76,7 @@ apt (1.5~alpha1) experimental; urgency=medium [ David Kalnischkies ] * schedule the correct side of the conflict for removal. Thanks to Michael Biebl for helping find this with countless tests - * don't show incorrect 'How odd' errror in no-download mode (Closes: 863635) + * don't show incorrect 'How odd' error in no-download mode (Closes: 863635) * Show permission error if ProxyAutoDetect cmd can't be executed (Closes: 857885) * Avoid chdir in acquire clean with unlinkat (Closes: 860738) diff --git a/doc/apt-secure.8.xml b/doc/apt-secure.8.xml index 4f5d491f3..50f99d3c3 100644 --- a/doc/apt-secure.8.xml +++ b/doc/apt-secure.8.xml @@ -174,7 +174,7 @@ This information is shown in various places so a repository owner should always ensure correctness. Further more user configuration like &apt-preferences; can depend and make use of this information. Since version 1.5 the user must - therefore explicitly confirm changes to signal that the user is sufficently + therefore explicitly confirm changes to signal that the user is sufficiently prepared e.g. for the new major release of the distribution shipped in the repository (as e.g. indicated by the codename). </para> diff --git a/doc/examples/configure-index b/doc/examples/configure-index index 155dac84f..244d7c1c3 100644 --- a/doc/examples/configure-index +++ b/doc/examples/configure-index @@ -236,7 +236,7 @@ Acquire AllowInsecureRepositories "<BOOL>"; AllowWeakRepositories "<BOOL>"; AllowDowngradeToInsecureRepositories "<BOOL>"; - // allow repositories to change information potentally breaking user config like pinning + // allow repositories to change information potentially breaking user config like pinning AllowReleaseInfoChange "<BOOL>" { Origin "<BOOL>"; diff --git a/doc/po/apt-doc.pot b/doc/po/apt-doc.pot index 7151cf6f7..0412fcbab 100644 --- a/doc/po/apt-doc.pot +++ b/doc/po/apt-doc.pot @@ -2422,7 +2422,7 @@ msgid "" "always ensure correctness. Further more user configuration like " "&apt-preferences; can depend and make use of this information. Since version " "1.5 the user must therefore explicitly confirm changes to signal that the " -"user is sufficently prepared e.g. for the new major release of the " +"user is sufficiently prepared e.g. for the new major release of the " "distribution shipped in the repository (as e.g. indicated by the codename)." msgstr "" diff --git a/doc/po/de.po b/doc/po/de.po index 79d9778ce..b53e5010d 100644 --- a/doc/po/de.po +++ b/doc/po/de.po @@ -3416,7 +3416,7 @@ msgid "" "always ensure correctness. Further more user configuration like &apt-" "preferences; can depend and make use of this information. Since version 1.5 " "the user must therefore explicitly confirm changes to signal that the user " -"is sufficently prepared e.g. for the new major release of the distribution " +"is sufficiently prepared e.g. for the new major release of the distribution " "shipped in the repository (as e.g. indicated by the codename)." msgstr "" diff --git a/doc/po/es.po b/doc/po/es.po index 58a87ca81..3323b8bb1 100644 --- a/doc/po/es.po +++ b/doc/po/es.po @@ -3449,7 +3449,7 @@ msgid "" "always ensure correctness. Further more user configuration like &apt-" "preferences; can depend and make use of this information. Since version 1.5 " "the user must therefore explicitly confirm changes to signal that the user " -"is sufficently prepared e.g. for the new major release of the distribution " +"is sufficiently prepared e.g. for the new major release of the distribution " "shipped in the repository (as e.g. indicated by the codename)." msgstr "" diff --git a/doc/po/fr.po b/doc/po/fr.po index 36e025e52..8a6c8f620 100644 --- a/doc/po/fr.po +++ b/doc/po/fr.po @@ -3417,7 +3417,7 @@ msgid "" "always ensure correctness. Further more user configuration like &apt-" "preferences; can depend and make use of this information. Since version 1.5 " "the user must therefore explicitly confirm changes to signal that the user " -"is sufficently prepared e.g. for the new major release of the distribution " +"is sufficiently prepared e.g. for the new major release of the distribution " "shipped in the repository (as e.g. indicated by the codename)." msgstr "" diff --git a/doc/po/it.po b/doc/po/it.po index dde2c4300..716fa8b02 100644 --- a/doc/po/it.po +++ b/doc/po/it.po @@ -3444,7 +3444,7 @@ msgid "" "always ensure correctness. Further more user configuration like &apt-" "preferences; can depend and make use of this information. Since version 1.5 " "the user must therefore explicitly confirm changes to signal that the user " -"is sufficently prepared e.g. for the new major release of the distribution " +"is sufficiently prepared e.g. for the new major release of the distribution " "shipped in the repository (as e.g. indicated by the codename)." msgstr "" diff --git a/doc/po/ja.po b/doc/po/ja.po index a0f1dc3e6..07f66a33e 100644 --- a/doc/po/ja.po +++ b/doc/po/ja.po @@ -3330,7 +3330,7 @@ msgid "" "always ensure correctness. Further more user configuration like &apt-" "preferences; can depend and make use of this information. Since version 1.5 " "the user must therefore explicitly confirm changes to signal that the user " -"is sufficently prepared e.g. for the new major release of the distribution " +"is sufficiently prepared e.g. for the new major release of the distribution " "shipped in the repository (as e.g. indicated by the codename)." msgstr "" diff --git a/doc/po/nl.po b/doc/po/nl.po index 59dd23d5a..2da4013bd 100644 --- a/doc/po/nl.po +++ b/doc/po/nl.po @@ -3507,7 +3507,7 @@ msgid "" "always ensure correctness. Further more user configuration like &apt-" "preferences; can depend and make use of this information. Since version 1.5 " "the user must therefore explicitly confirm changes to signal that the user " -"is sufficently prepared e.g. for the new major release of the distribution " +"is sufficiently prepared e.g. for the new major release of the distribution " "shipped in the repository (as e.g. indicated by the codename)." msgstr "" diff --git a/doc/po/pl.po b/doc/po/pl.po index 8e7840029..03e9f380e 100644 --- a/doc/po/pl.po +++ b/doc/po/pl.po @@ -3499,7 +3499,7 @@ msgid "" "always ensure correctness. Further more user configuration like &apt-" "preferences; can depend and make use of this information. Since version 1.5 " "the user must therefore explicitly confirm changes to signal that the user " -"is sufficently prepared e.g. for the new major release of the distribution " +"is sufficiently prepared e.g. for the new major release of the distribution " "shipped in the repository (as e.g. indicated by the codename)." msgstr "" diff --git a/doc/po/pt.po b/doc/po/pt.po index 556bbf9b0..0ea4faabb 100644 --- a/doc/po/pt.po +++ b/doc/po/pt.po @@ -3389,7 +3389,7 @@ msgid "" "always ensure correctness. Further more user configuration like &apt-" "preferences; can depend and make use of this information. Since version 1.5 " "the user must therefore explicitly confirm changes to signal that the user " -"is sufficently prepared e.g. for the new major release of the distribution " +"is sufficiently prepared e.g. for the new major release of the distribution " "shipped in the repository (as e.g. indicated by the codename)." msgstr "" diff --git a/doc/po/pt_BR.po b/doc/po/pt_BR.po index 369660154..b68a7dc91 100644 --- a/doc/po/pt_BR.po +++ b/doc/po/pt_BR.po @@ -2385,7 +2385,7 @@ msgid "" "always ensure correctness. Further more user configuration like &apt-" "preferences; can depend and make use of this information. Since version 1.5 " "the user must therefore explicitly confirm changes to signal that the user " -"is sufficently prepared e.g. for the new major release of the distribution " +"is sufficiently prepared e.g. for the new major release of the distribution " "shipped in the repository (as e.g. indicated by the codename)." msgstr "" diff --git a/ftparchive/writer.cc b/ftparchive/writer.cc index cac1d943d..7cda37459 100644 --- a/ftparchive/writer.cc +++ b/ftparchive/writer.cc @@ -417,7 +417,7 @@ bool PackagesWriter::DoPackage(string FileName) string Architecture; // if we generate a Packages file for a given arch, we use it to // look for overrides. if we run in "simple" mode without the - // "Architecures" variable in the config we use the architecure value + // "Architecures" variable in the config we use the architecture value // from the deb file if(Arch != "") Architecture = Arch; diff --git a/triehash/triehash.pl b/triehash/triehash.pl index 25300a765..841c0e7e2 100755 --- a/triehash/triehash.pl +++ b/triehash/triehash.pl @@ -306,7 +306,7 @@ package Trie { # For example, the words a-bc and a\rbc are identical in such a situation: # '-' | 0x20 == '-' == '\r' | 0x20 # We cannot simply switch on all 4 bytes at once, but need to split before - # the ambigious character so we can process the ambiguous character on its + # the ambiguous character so we can process the ambiguous character on its # own. sub find_ealier_split { my ($self, $key) = @_; |