From 93cff633a830e222693fc0f3d78e6e534d1126ee Mon Sep 17 00:00:00 2001 From: David Kalnischkies Date: Thu, 19 Jan 2017 15:14:19 +0100 Subject: 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 --- doc/acquire-additional-files.txt | 6 +++--- doc/apt-key.8.xml | 2 +- doc/apt-verbatim.ent | 2 +- doc/dpkg-tech.dbk | 2 +- doc/examples/apt-https-method-example.conf | 2 +- doc/examples/configure-index | 4 ++-- doc/external-dependency-solver-protocol.txt | 4 ++-- doc/guide.dbk | 2 +- doc/libapt-pkg2_to_3.txt | 9 +++++---- doc/method.dbk | 2 +- doc/po/apt-doc.pot | 4 ++-- doc/po/de.po | 4 ++-- doc/po/es.po | 4 ++-- doc/po/fr.po | 4 ++-- doc/po/it.po | 6 +++--- doc/po/ja.po | 4 ++-- doc/po/nl.po | 4 ++-- doc/po/pl.po | 4 ++-- doc/po/pt.po | 4 ++-- doc/po/pt_BR.po | 4 ++-- doc/style.txt | 2 +- 21 files changed, 40 insertions(+), 39 deletions(-) (limited to 'doc') diff --git a/doc/acquire-additional-files.txt b/doc/acquire-additional-files.txt index c9bea068f..c55d5fe19 100644 --- a/doc/acquire-additional-files.txt +++ b/doc/acquire-additional-files.txt @@ -217,9 +217,9 @@ To get all the filenames of all Translation-en files you can e.g. call: apt-get indextargets --format '$(FILENAME)' "Identifier: Translations" "Language: en" The line-based filtering and the formatting is rather crude and feature- -less by design: The default format is Debians standard format deb822 (in -particular: Field names are case-insensitive and the order of fields in -the stanza is undefined), so instead of apt reimplementing powerful +less by design: The default format is Debian's standard format deb822 +(in particular: Field names are case-insensitive and the order of fields +in the stanza is undefined), so instead of apt reimplementing powerful filters and formatting for this command, it is recommend to use piping and dedicated tools like 'grep-dctrl' if you need more than the basics provided. diff --git a/doc/apt-key.8.xml b/doc/apt-key.8.xml index eacd18d4d..279c417c7 100644 --- a/doc/apt-key.8.xml +++ b/doc/apt-key.8.xml @@ -133,7 +133,7 @@ Pass advanced options to gpg. With adv --recv-key you - can e.g. download key from keyservers directly into the the trusted set of + can e.g. download key from keyservers directly into the trusted set of keys. Note that there are no checks performed, so it is easy to completely undermine the &apt-secure; infrastructure if used without care. diff --git a/doc/apt-verbatim.ent b/doc/apt-verbatim.ent index 0f9275d2f..b14bce34a 100644 --- a/doc/apt-verbatim.ent +++ b/doc/apt-verbatim.ent @@ -250,7 +250,7 @@ + There is no way perl could be classified "good" (or "bad") in any version… --> diff --git a/doc/dpkg-tech.dbk b/doc/dpkg-tech.dbk index f95716cf4..d2d5061ab 100644 --- a/doc/dpkg-tech.dbk +++ b/doc/dpkg-tech.dbk @@ -95,7 +95,7 @@ therefore not be configured while broken -Each of these dependencies can specify a version and a depedency on that +Each of these dependencies can specify a version and a dependency on that version, for example "<= 0.5-1", "== 2.7.2-1", etc. The comparators available are:- diff --git a/doc/examples/apt-https-method-example.conf b/doc/examples/apt-https-method-example.conf index a03766746..3152ef1e2 100644 --- a/doc/examples/apt-https-method-example.conf +++ b/doc/examples/apt-https-method-example.conf @@ -113,7 +113,7 @@ Acquire::https::secure.dom2.tld::SslKey "/etc/apt/certs/my-key.pem"; Acquire::https[::repo.domain.tld]::IssuerCert "/path/to/issuer/cert.pem"; - Allows to constrain the issuer of the server certificate (for all + Allows one to constrain the issuer of the server certificate (for all https mirrors or a specific one) to a specific issuer. If the server certificate has not been issued by this certificate, connection fails. diff --git a/doc/examples/configure-index b/doc/examples/configure-index index 653bdec1e..eb0a242c5 100644 --- a/doc/examples/configure-index +++ b/doc/examples/configure-index @@ -239,7 +239,7 @@ Acquire // HTTPS method configuration: uses the http // - proxy config // - cache-control values - // - Dl-Limit, Timout, ... values + // - Dl-Limit, Timeout, ... values // if not set explicit for https // // see /usr/share/doc/apt/examples/apt-https-method-example.conf.gz @@ -464,7 +464,7 @@ Debug pkgInitConfig ""; pkgProblemResolver ""; pkgProblemResolver::ShowScores ""; - pkgDepCache::AutoInstall ""; // what packages apt install to satify dependencies + pkgDepCache::AutoInstall ""; // what packages apt installs to satisfy dependencies pkgDepCache::Marker ""; pkgCacheGen ""; pkgAcquire ""; diff --git a/doc/external-dependency-solver-protocol.txt b/doc/external-dependency-solver-protocol.txt index 566890665..68902812c 100644 --- a/doc/external-dependency-solver-protocol.txt +++ b/doc/external-dependency-solver-protocol.txt @@ -229,8 +229,8 @@ field. The following fields are supported in package stanzas: Note: the Status field present in the dpkg database must not be passed to the external solver, as it's an internal dpkg field. Installed and - other fields permit to encode the most relevant aspects of Status in - communications with solvers. + other fields permit one to encode the most relevant aspects of Status + in communications with solvers. - **Hold:** (optional, defaults to `no`). Allowed values: `yes`, `no`. When set to `yes`, the corresponding package is marked as "on diff --git a/doc/guide.dbk b/doc/guide.dbk index e7ab5ad87..dbc4f5431 100644 --- a/doc/guide.dbk +++ b/doc/guide.dbk @@ -22,7 +22,7 @@ -This document provides an overview of how to use the the APT package manager. +This document provides an overview of how to use the APT package manager. diff --git a/doc/libapt-pkg2_to_3.txt b/doc/libapt-pkg2_to_3.txt index 58e7b30cf..2806f4081 100644 --- a/doc/libapt-pkg2_to_3.txt +++ b/doc/libapt-pkg2_to_3.txt @@ -1,8 +1,9 @@ -libapt-pkg v2 to v3 incorperates several source-incompatible changes that -people need to be aware of.. Many of this changes are done so that most old -source will continue to function, but perhaps at reduced functionality. +libapt-pkg v2 to v3 incorporates several source-incompatible changes +that people need to be aware of.. Many of this changes are done so that +most old source will continue to function, but perhaps at reduced +functionality. -* pkgDepCache is no longer self initilizing, you have to call the Init +* pkgDepCache is no longer self initializing, you have to call the Init method separately after constructing it. Users of pkgCacheFile do not need to worry about this * GetCandidateVer/etc is gone from the pkgCache. It exists only in the diff --git a/doc/method.dbk b/doc/method.dbk index 09ef63e8c..e5e035a2b 100644 --- a/doc/method.dbk +++ b/doc/method.dbk @@ -685,7 +685,7 @@ http - For HTTP servers The two internal methods, copy and gzip, are used by the acquire code to -parallize and simplify the automatic decompression of package files as well as +parallelize and simplify the automatic decompression of package files as well as copying package files around the file system. Both methods can be seen to act the same except that one decompresses on the fly. APT uses them by generating a copy URI that is formed identically to a file URI. The destination file is diff --git a/doc/po/apt-doc.pot b/doc/po/apt-doc.pot index 3792c7d80..9a6b8dd81 100644 --- a/doc/po/apt-doc.pot +++ b/doc/po/apt-doc.pot @@ -2021,7 +2021,7 @@ msgstr "" #: apt-key.8.xml:1 msgid "" "Pass advanced options to gpg. With adv --recv-key you can " -"e.g. download key from keyservers directly into the the trusted set of " +"e.g. download key from keyservers directly into the trusted set of " "keys. Note that there are no checks performed, so it is " "easy to completely undermine the &apt-secure; infrastructure if used without " "care." @@ -6802,7 +6802,7 @@ msgstr "" #. type: Content of: #: guide.dbk:1 msgid "" -"This document provides an overview of how to use the the APT package " +"This document provides an overview of how to use the APT package " "manager." msgstr "" diff --git a/doc/po/de.po b/doc/po/de.po index 74f46b029..b78cfe49f 100644 --- a/doc/po/de.po +++ b/doc/po/de.po @@ -2841,7 +2841,7 @@ msgstr "listet vertrauenswürdige Schlüssel mit Fingerabdrücken auf." #: apt-key.8.xml msgid "" "Pass advanced options to gpg. With adv --recv-key you can " -"e.g. download key from keyservers directly into the the trusted set of keys. " +"e.g. download key from keyservers directly into the trusted set of keys. " "Note that there are no checks performed, so it is easy " "to completely undermine the &apt-secure; infrastructure if used without care." msgstr "" @@ -9730,7 +9730,7 @@ msgstr "Version &apt-product-version;" #. type: Content of: #: guide.dbk msgid "" -"This document provides an overview of how to use the the APT package manager." +"This document provides an overview of how to use the APT package manager." msgstr "" "Dieses Dokument stellt eine Übersicht bereit, wie das APT-" "Paketverwaltungsprogramm benutzt wird." diff --git a/doc/po/es.po b/doc/po/es.po index b98c1df49..8f454c12c 100644 --- a/doc/po/es.po +++ b/doc/po/es.po @@ -2898,7 +2898,7 @@ msgstr "Lista las claves de confianza." #: apt-key.8.xml msgid "" "Pass advanced options to gpg. With adv --recv-key you can " -"e.g. download key from keyservers directly into the the trusted set of keys. " +"e.g. download key from keyservers directly into the trusted set of keys. " "Note that there are no checks performed, so it is easy " "to completely undermine the &apt-secure; infrastructure if used without care." msgstr "" @@ -9597,7 +9597,7 @@ msgstr "" #. type: Content of: #: guide.dbk msgid "" -"This document provides an overview of how to use the the APT package manager." +"This document provides an overview of how to use the APT package manager." msgstr "" "Este documento ofrece una introducción sobre cómo usar el gestor de paquetes " "APT." diff --git a/doc/po/fr.po b/doc/po/fr.po index 4ae28c353..a83576544 100644 --- a/doc/po/fr.po +++ b/doc/po/fr.po @@ -2828,7 +2828,7 @@ msgstr "Afficher la liste des clés fiables." #: apt-key.8.xml msgid "" "Pass advanced options to gpg. With adv --recv-key you can " -"e.g. download key from keyservers directly into the the trusted set of keys. " +"e.g. download key from keyservers directly into the trusted set of keys. " "Note that there are no checks performed, so it is easy " "to completely undermine the &apt-secure; infrastructure if used without care." msgstr "" @@ -9559,7 +9559,7 @@ msgstr "Version &apt-product-version;" #. type: Content of: #: guide.dbk msgid "" -"This document provides an overview of how to use the the APT package manager." +"This document provides an overview of how to use the APT package manager." msgstr "" "Ce document fournit un aperçu des méthode d'utilisation du gestionnaire de " "paquets APT." diff --git a/doc/po/it.po b/doc/po/it.po index 734c048a0..f140ca743 100644 --- a/doc/po/it.po +++ b/doc/po/it.po @@ -2866,7 +2866,7 @@ msgstr "Elenca le chiavi fidate." #: apt-key.8.xml msgid "" "Pass advanced options to gpg. With adv --recv-key you can " -"e.g. download key from keyservers directly into the the trusted set of keys. " +"e.g. download key from keyservers directly into the trusted set of keys. " "Note that there are no checks performed, so it is easy " "to completely undermine the &apt-secure; infrastructure if used without care." msgstr "" @@ -9730,7 +9730,7 @@ msgstr "Versione &apt-product-version;" #. type: Content of: #: guide.dbk msgid "" -"This document provides an overview of how to use the the APT package manager." +"This document provides an overview of how to use the APT package manager." msgstr "" "Questo documento fornisce una panoramica su come usare il gestore di " "pacchetti APT." @@ -13322,7 +13322,7 @@ msgstr "che userà gli archivi già scaricati e presenti sul disco." #~ "The binary override file is fully compatible with &dpkg-scanpackages;. It " #~ "contains 4 fields separated by spaces. The first field is the package " #~ "name, the second is the priority to force that package to, the third is " -#~ "the the section to force that package to and the final field is the " +#~ "the section to force that package to and the final field is the " #~ "maintainer permutation field." #~ msgstr "" #~ "Il file override binario è completamente compatibile con &dpkg-" diff --git a/doc/po/ja.po b/doc/po/ja.po index 0efb139d3..6fc9ae577 100644 --- a/doc/po/ja.po +++ b/doc/po/ja.po @@ -2770,7 +2770,7 @@ msgstr "信頼キーとそのフィンガープリントを一覧表示します #: apt-key.8.xml msgid "" "Pass advanced options to gpg. With adv --recv-key you can " -"e.g. download key from keyservers directly into the the trusted set of keys. " +"e.g. download key from keyservers directly into the trusted set of keys. " "Note that there are no checks performed, so it is easy " "to completely undermine the &apt-secure; infrastructure if used without care." msgstr "" @@ -9291,7 +9291,7 @@ msgstr "バージョン &apt-product-version;" #. type: Content of: #: guide.dbk msgid "" -"This document provides an overview of how to use the the APT package manager." +"This document provides an overview of how to use the APT package manager." msgstr "本文書は APT パッケージマネージャの使い方の概要を提供します。" #. type: Content of: diff --git a/doc/po/nl.po b/doc/po/nl.po index 83057433e..e8a4cbad1 100644 --- a/doc/po/nl.po +++ b/doc/po/nl.po @@ -2921,7 +2921,7 @@ msgstr "Som betrouwbare sleutels op met hun vingerafdruk." #: apt-key.8.xml msgid "" "Pass advanced options to gpg. With adv --recv-key you can " -"e.g. download key from keyservers directly into the the trusted set of keys. " +"e.g. download key from keyservers directly into the trusted set of keys. " "Note that there are no checks performed, so it is easy " "to completely undermine the &apt-secure; infrastructure if used without care." msgstr "" @@ -9887,7 +9887,7 @@ msgstr "Versie &apt-product-version;" #. type: Content of: #: guide.dbk msgid "" -"This document provides an overview of how to use the the APT package manager." +"This document provides an overview of how to use the APT package manager." msgstr "" "Dit document geeft een overzicht van het gebruik van de pakketmanager APT." diff --git a/doc/po/pl.po b/doc/po/pl.po index 6ea492f93..8a398f85f 100644 --- a/doc/po/pl.po +++ b/doc/po/pl.po @@ -2946,7 +2946,7 @@ msgstr "Wyświetla listę zaufanych kluczy." #: apt-key.8.xml msgid "" "Pass advanced options to gpg. With adv --recv-key you can " -"e.g. download key from keyservers directly into the the trusted set of keys. " +"e.g. download key from keyservers directly into the trusted set of keys. " "Note that there are no checks performed, so it is easy " "to completely undermine the &apt-secure; infrastructure if used without care." msgstr "" @@ -8752,7 +8752,7 @@ msgstr "" #. type: Content of: #: guide.dbk msgid "" -"This document provides an overview of how to use the the APT package manager." +"This document provides an overview of how to use the APT package manager." msgstr "Dokument zawiera opis używania menadżera pakietów APT." #. type: Content of: diff --git a/doc/po/pt.po b/doc/po/pt.po index 8da7a9102..5e247bbc0 100644 --- a/doc/po/pt.po +++ b/doc/po/pt.po @@ -2840,7 +2840,7 @@ msgstr "Lista as chaves de confiança." #: apt-key.8.xml msgid "" "Pass advanced options to gpg. With adv --recv-key you can " -"e.g. download key from keyservers directly into the the trusted set of keys. " +"e.g. download key from keyservers directly into the trusted set of keys. " "Note that there are no checks performed, so it is easy " "to completely undermine the &apt-secure; infrastructure if used without care." msgstr "" @@ -9522,7 +9522,7 @@ msgstr "Versão &apt-product-version;" #. type: Content of: #: guide.dbk msgid "" -"This document provides an overview of how to use the the APT package manager." +"This document provides an overview of how to use the APT package manager." msgstr "" "Este documento disponibiliza uma visão geral de como usar o gestor de " "pacotes APT." diff --git a/doc/po/pt_BR.po b/doc/po/pt_BR.po index a0e3b9e5c..29ad3cddf 100644 --- a/doc/po/pt_BR.po +++ b/doc/po/pt_BR.po @@ -1988,7 +1988,7 @@ msgstr "" #: apt-key.8.xml msgid "" "Pass advanced options to gpg. With adv --recv-key you can " -"e.g. download key from keyservers directly into the the trusted set of keys. " +"e.g. download key from keyservers directly into the trusted set of keys. " "Note that there are no checks performed, so it is easy " "to completely undermine the &apt-secure; infrastructure if used without care." msgstr "" @@ -7113,7 +7113,7 @@ msgstr "" #. type: Content of: #: guide.dbk msgid "" -"This document provides an overview of how to use the the APT package manager." +"This document provides an overview of how to use the APT package manager." msgstr "" #. type: Content of: diff --git a/doc/style.txt b/doc/style.txt index 7658b0314..cd5f8b677 100644 --- a/doc/style.txt +++ b/doc/style.txt @@ -50,7 +50,7 @@ standard library, but not for my code. Arguments and Ownership ~~~~~~~~~~~~~~~~~~~~~~~ [much of the code follows this now] -These guidlines should be followed except in two cases.. the first +These guidelines should be followed except in two cases.. the first is where it makes no sense, such as in a casting operator and the second is to retain API compatibility (this should be rare, since a change in the input almost always designates a change in ownership rules). -- cgit v1.2.3