From 037fada40db175e95f44c0cb039474c6dc518963 Mon Sep 17 00:00:00 2001 From: Konstantin Manna Date: Sun, 15 Jun 2014 00:53:04 +0200 Subject: fix two german manpage spelling mistakes Closes: 751635 --- doc/po/de.po | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'doc') diff --git a/doc/po/de.po b/doc/po/de.po index b048d9661..feeb7736e 100644 --- a/doc/po/de.po +++ b/doc/po/de.po @@ -726,7 +726,7 @@ msgid "" "installed instead of removed." msgstr "" "remove ist identisch mit install, mit " -"der Ausnahme, dass Pakte entfernt anstatt installiert werden. Beachten Sie, " +"der Ausnahme, dass Pakete entfernt anstatt installiert werden. Beachten Sie, " "dass das Entfernen von Paketen deren Konfigurationsdateien im System " "belässt. Wenn ein Pluszeichen an den Paketnamen angehängt wird (ohne " "Leerzeichen dazwischen) wird das erkannte Paket installiert anstatt entfernt." @@ -1051,7 +1051,7 @@ msgid "" "you wish to upgrade, and if a newer version is available, it (and its " "dependencies, as described above) will be downloaded and installed." msgstr "" -"Dies ist außerdem die bevorzugt zu benutzende Art, wenn Sie Sie ein Upgrade " +"Dies ist außerdem die bevorzugt zu benutzende Art, wenn Sie ein Upgrade " "eines oder mehrerer bereits installierter Pakete durchführen möchten, ohne " "ein Upgrade aller Pakete, die Sie auf Ihrem System haben, durchzuführen. " "Anders als das Ziel von »upgrade«, das die neusten Versionen aller aktuell " -- cgit v1.2.3-70-g09d2 From 480c2414e72058b50fa287f779a4fda7b22e1018 Mon Sep 17 00:00:00 2001 From: Konstantin Manna Date: Sun, 15 Jun 2014 18:35:15 +0200 Subject: add missing comma in SEE ALSO of apt-secure manpage Closes: 748506 --- doc/apt-secure.8.xml | 2 +- doc/po/apt-doc.pot | 2 +- doc/po/de.po | 4 ++-- doc/po/es.po | 4 ++-- doc/po/fr.po | 4 ++-- doc/po/it.po | 4 ++-- doc/po/ja.po | 4 ++-- doc/po/pl.po | 4 ++-- doc/po/pt.po | 4 ++-- doc/po/pt_BR.po | 2 +- 10 files changed, 17 insertions(+), 17 deletions(-) (limited to 'doc') diff --git a/doc/apt-secure.8.xml b/doc/apt-secure.8.xml index 981351615..15a73476d 100644 --- a/doc/apt-secure.8.xml +++ b/doc/apt-secure.8.xml @@ -193,7 +193,7 @@ See Also &apt-conf;, &apt-get;, &sources-list;, &apt-key;, &apt-ftparchive;, -&debsign; &debsig-verify;, &gpg; +&debsign;, &debsig-verify;, &gpg; For more background information you might want to review the diff --git a/doc/po/apt-doc.pot b/doc/po/apt-doc.pot index a058e6506..94ad1238d 100644 --- a/doc/po/apt-doc.pot +++ b/doc/po/apt-doc.pot @@ -2153,7 +2153,7 @@ msgstr "" #: apt-secure.8.xml:195 msgid "" "&apt-conf;, &apt-get;, &sources-list;, &apt-key;, &apt-ftparchive;, " -"&debsign; &debsig-verify;, &gpg;" +"&debsign;, &debsig-verify;, &gpg;" msgstr "" #. type: Content of: diff --git a/doc/po/de.po b/doc/po/de.po index feeb7736e..98bfcb6e4 100644 --- a/doc/po/de.po +++ b/doc/po/de.po @@ -3010,10 +3010,10 @@ msgstr "" #: apt-secure.8.xml:195 msgid "" "&apt-conf;, &apt-get;, &sources-list;, &apt-key;, &apt-ftparchive;, " -"&debsign; &debsig-verify;, &gpg;" +"&debsign;, &debsig-verify;, &gpg;" msgstr "" "&apt-conf;, &apt-get;, &sources-list;, &apt-key;, &apt-ftparchive;, " -"&debsign; &debsig-verify;, &gpg;" +"&debsign;, &debsig-verify;, &gpg;" #. type: Content of: #: apt-secure.8.xml:199 diff --git a/doc/po/es.po b/doc/po/es.po index 2cf3a070a..0b594afe9 100644 --- a/doc/po/es.po +++ b/doc/po/es.po @@ -3098,10 +3098,10 @@ msgstr "" #: apt-secure.8.xml:195 msgid "" "&apt-conf;, &apt-get;, &sources-list;, &apt-key;, &apt-ftparchive;, " -"&debsign; &debsig-verify;, &gpg;" +"&debsign;, &debsig-verify;, &gpg;" msgstr "" "&apt-conf;, &apt-get;, &sources-list;, &apt-key;, &apt-ftparchive;, " -"&debsign; &debsig-verify;, &gpg;" +"&debsign;, &debsig-verify;, &gpg;" #. type: Content of: #: apt-secure.8.xml:199 diff --git a/doc/po/fr.po b/doc/po/fr.po index 530de5046..0c69a1482 100644 --- a/doc/po/fr.po +++ b/doc/po/fr.po @@ -3022,10 +3022,10 @@ msgstr "" #: apt-secure.8.xml:195 msgid "" "&apt-conf;, &apt-get;, &sources-list;, &apt-key;, &apt-ftparchive;, " -"&debsign; &debsig-verify;, &gpg;" +"&debsign;, &debsig-verify;, &gpg;" msgstr "" "&apt-conf;, &apt-get;, &sources-list;, &apt-key;, &apt-ftparchive;, " -"&debsign; &debsig-verify;, &gpg;" +"&debsign;, &debsig-verify;, &gpg;" #. type: Content of: #: apt-secure.8.xml:199 diff --git a/doc/po/it.po b/doc/po/it.po index c5ef090ff..fc098a6ab 100644 --- a/doc/po/it.po +++ b/doc/po/it.po @@ -3033,10 +3033,10 @@ msgstr "" #: apt-secure.8.xml:195 msgid "" "&apt-conf;, &apt-get;, &sources-list;, &apt-key;, &apt-ftparchive;, " -"&debsign; &debsig-verify;, &gpg;" +"&debsign;, &debsig-verify;, &gpg;" msgstr "" "&apt-conf;, &apt-get;, &sources-list;, &apt-key;, &apt-ftparchive;, " -"&debsign; &debsig-verify;, &gpg;" +"&debsign;, &debsig-verify;, &gpg;" #. type: Content of: #: apt-secure.8.xml:199 diff --git a/doc/po/ja.po b/doc/po/ja.po index 2475b810d..5f127426a 100644 --- a/doc/po/ja.po +++ b/doc/po/ja.po @@ -2963,10 +2963,10 @@ msgstr "" #: apt-secure.8.xml:195 msgid "" "&apt-conf;, &apt-get;, &sources-list;, &apt-key;, &apt-ftparchive;, " -"&debsign; &debsig-verify;, &gpg;" +"&debsign;, &debsig-verify;, &gpg;" msgstr "" "&apt-conf;, &apt-get;, &sources-list;, &apt-key;, &apt-ftparchive;, " -"&debsign; &debsig-verify;, &gpg;" +"&debsign;, &debsig-verify;, &gpg;" #. type: Content of: #: apt-secure.8.xml:199 diff --git a/doc/po/pl.po b/doc/po/pl.po index 5f92c521c..66b494ff9 100644 --- a/doc/po/pl.po +++ b/doc/po/pl.po @@ -3131,10 +3131,10 @@ msgstr "" #: apt-secure.8.xml:195 msgid "" "&apt-conf;, &apt-get;, &sources-list;, &apt-key;, &apt-ftparchive;, " -"&debsign; &debsig-verify;, &gpg;" +"&debsign;, &debsig-verify;, &gpg;" msgstr "" "&apt-conf;, &apt-get;, &sources-list;, &apt-key;, &apt-ftparchive;, " -"&debsign; &debsig-verify;, &gpg;" +"&debsign;, &debsig-verify;, &gpg;" #. type: Content of: #: apt-secure.8.xml:199 diff --git a/doc/po/pt.po b/doc/po/pt.po index 6ebf93bc7..b67dc8b03 100644 --- a/doc/po/pt.po +++ b/doc/po/pt.po @@ -3042,10 +3042,10 @@ msgstr "" #: apt-secure.8.xml:195 msgid "" "&apt-conf;, &apt-get;, &sources-list;, &apt-key;, &apt-ftparchive;, " -"&debsign; &debsig-verify;, &gpg;" +"&debsign;, &debsig-verify;, &gpg;" msgstr "" "&apt-conf;, &apt-get;, &sources-list;, &apt-key;, &apt-ftparchive;, " -"&debsign; &debsig-verify;, &gpg;" +"&debsign;, &debsig-verify;, &gpg;" #. type: Content of: #: apt-secure.8.xml:199 diff --git a/doc/po/pt_BR.po b/doc/po/pt_BR.po index e9e785f08..b1df8a068 100644 --- a/doc/po/pt_BR.po +++ b/doc/po/pt_BR.po @@ -2159,7 +2159,7 @@ msgstr "" #: apt-secure.8.xml:195 msgid "" "&apt-conf;, &apt-get;, &sources-list;, &apt-key;, &apt-ftparchive;, " -"&debsign; &debsig-verify;, &gpg;" +"&debsign;, &debsig-verify;, &gpg;" msgstr "" #. type: Content of: -- cgit v1.2.3-70-g09d2 From 4010ee76cb1a771d57f1339df725e962df23900e Mon Sep 17 00:00:00 2001 From: Stefano Zacchiroli Date: Tue, 17 Jun 2014 17:03:27 +0200 Subject: EDSP doc: clarify that Install/Remove packages are arch-qualified --- doc/external-dependency-solver-protocol.txt | 16 ++++++++++++---- 1 file changed, 12 insertions(+), 4 deletions(-) (limited to 'doc') diff --git a/doc/external-dependency-solver-protocol.txt b/doc/external-dependency-solver-protocol.txt index 790f2f1ee..eb7832120 100644 --- a/doc/external-dependency-solver-protocol.txt +++ b/doc/external-dependency-solver-protocol.txt @@ -5,6 +5,14 @@ external dependency solvers. The protocol is called APT EDSP, for "APT External Dependency Solver Protocol". +## Terminology + +In the following we use the term **architecture qualified package name** +(or *arch-qualified package names* for short) to refer to package +identifiers of the form "arch:package" where "arch" is a dpkg +architecture and "package" a dpkg package name. + + ## Components - **APT**: we know this one. @@ -132,9 +140,9 @@ The following **configuration fields** are supported in request stanzas: The following **action fields** are supported in request stanzas: - **Install:** (optional, defaults to the empty string) A space - separated list of package names, with *no version attached*, to - install. This field denotes a list of packages that the user wants to - install, usually via an APT `install` request. + separated list of arch-qualified package names, with *no version + attached*, to install. This field denotes a list of packages that the + user wants to install, usually via an APT `install` request. - **Remove:** (optional, defaults to the empty string) Same syntax of Install. This field denotes a list of packages that the user wants to @@ -201,7 +209,7 @@ field. The following fields are supported in package stanzas: - **APT-Candidate:** (optional, defaults to `no`). Allowed values: `yes`, `no`. When set to `yes`, the corresponding package is the APT candidate for installation among all available packages with the same - name. + name and with the same architecture. - **APT-Automatic:** (optional, defaults to `no`). Allowed values: `yes`, `no`. When set to `yes`, the corresponding package is marked by -- cgit v1.2.3-70-g09d2 From 22c3ac52252b6eafe0d31485b18730cfb53a8dc3 Mon Sep 17 00:00:00 2001 From: Stefano Zacchiroli Date: Tue, 17 Jun 2014 17:04:09 +0200 Subject: EDSP doc: (minor) consistently use 2 blank lines before headings Git-Dch: Ignore --- doc/external-dependency-solver-protocol.txt | 2 ++ 1 file changed, 2 insertions(+) (limited to 'doc') diff --git a/doc/external-dependency-solver-protocol.txt b/doc/external-dependency-solver-protocol.txt index eb7832120..7db1479b2 100644 --- a/doc/external-dependency-solver-protocol.txt +++ b/doc/external-dependency-solver-protocol.txt @@ -70,6 +70,7 @@ configuration documentation for more, and more up to date, information. - **Dir::Bin::Solvers**: absolute path of the directory where to look for external solvers. Defaults to `/usr/lib/apt/solvers`. + ## Protocol When configured to use an external solver, APT will resort to it to @@ -226,6 +227,7 @@ field. The following fields are supported in package stanzas: Release file entry (Origin, Label, Codename, etc.) in the format of APT_PREFERENCES(5). + ### Answer An answer from the external solver to APT is either a *solution* or an -- cgit v1.2.3-70-g09d2 From 82ced5c894cd013721f432ae8da66114155e04c7 Mon Sep 17 00:00:00 2001 From: David Kalnischkies Date: Tue, 17 Jun 2014 19:25:03 +0200 Subject: EDSP doc: some typo and wording fixes Git-Dch: Ignore --- doc/external-dependency-solver-protocol.txt | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) (limited to 'doc') diff --git a/doc/external-dependency-solver-protocol.txt b/doc/external-dependency-solver-protocol.txt index 7db1479b2..14e9528c8 100644 --- a/doc/external-dependency-solver-protocol.txt +++ b/doc/external-dependency-solver-protocol.txt @@ -9,8 +9,8 @@ External Dependency Solver Protocol". In the following we use the term **architecture qualified package name** (or *arch-qualified package names* for short) to refer to package -identifiers of the form "arch:package" where "arch" is a dpkg -architecture and "package" a dpkg package name. +identifiers of the form "package:arch" where "package" is a package name +and "arch" a dpkg architecture. ## Components @@ -210,7 +210,7 @@ field. The following fields are supported in package stanzas: - **APT-Candidate:** (optional, defaults to `no`). Allowed values: `yes`, `no`. When set to `yes`, the corresponding package is the APT candidate for installation among all available packages with the same - name and with the same architecture. + name and architecture. - **APT-Automatic:** (optional, defaults to `no`). Allowed values: `yes`, `no`. When set to `yes`, the corresponding package is marked by @@ -236,11 +236,11 @@ An answer from the external solver to APT is either a *solution* or an The following invariant on **exit codes** must hold true. When the external solver is *able to find a solution*, it will write the solution to standard output and then exit with an exit code of 0. When the -external solver is *unable to find a solution* (and s aware of that), it -will write an error to standard output and then exit with an exit code -of 0. An exit code other than 0 will be interpreted as a solver crash -with no meaningful error about dependency resolution to convey to the -user. +external solver is *unable to find a solution* (and is aware of that), +it will write an error to standard output and then exit with an exit +code of 0. An exit code other than 0 will be interpreted as a solver +crash with no meaningful error about dependency resolution to convey to +the user. #### Solution -- cgit v1.2.3-70-g09d2