diff options
| -rw-r--r-- | README.md | 20 | ||||
| -rw-r--r-- | doc/apt-ftparchive.1.xml | 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 |
12 files changed, 21 insertions, 21 deletions
@@ -1,8 +1,8 @@ APT === -apt is the main commandline package manager for Debian and its derivatives. -It provides commandline tools for searching and managing as well as querying +apt is the main command-line package manager for Debian and its derivatives. +It provides command-line tools for searching and managing as well as querying information about packages as well as low-level access to all features provided by the libapt-pkg and libapt-inst libraries which higher-level package managers can depend upon. @@ -22,7 +22,7 @@ Included tools are: * **apt-ftparchive** creates Packages and other index files needed to publish an archive of debian packages * **apt-sortpkgs** is a Packages/Sources file normalizer -* **apt** is a high-level commandline interface for better interactive usage +* **apt** is a high-level command-line interface for better interactive usage The libraries libapt-pkg and libapt-inst are also maintained as part of this project, alongside various additional binaries like the acquire-methods used by them. @@ -101,7 +101,7 @@ automatically inserts an rpath so the binaries find the correct libraries. Note that you have to invoke CMake with the right install prefix set (e.g. `-DCMAKE_INSTALL_PREFIX=/usr`) to have your build find and use the right files -by default or alternatively set the locations at runtime via an `APT_CONFIG` +by default or alternatively set the locations at run-time via an `APT_CONFIG` configuration file. ### Integration tests @@ -121,7 +121,7 @@ run them on [Travis CI](https://travis-ci.org/) and [Shippable](https://shippable.com/) as well as via autopkgtests e.g. on [Debian Continuous Integration](https://ci.debian.net/packages/a/apt/). -A testcase here is a shellscript embedded in a framework creating an environment in which +A test case here is a shell script embedded in a framework creating an environment in which apt tools can be used naturally without root-rights to test every aspect of its behavior itself as well as in conjunction with dpkg and other tools while working with packages. @@ -137,7 +137,7 @@ Debugging --------- APT does many things, so there is no central debug mode which could be -activated. It uses instead various config-options to activate debug output +activated. It uses instead various configuration options to activate debug output in certain areas. The following describes some common scenarios and generally useful options, but is in no way exhaustive. @@ -174,7 +174,7 @@ and marked for installation, keep back or removal. Option `Debug::pkgDepCache::M shows this. This also decides which packages are to be installed to satisfy dependencies, which can be seen by `Debug::pkgDepCache::AutoInstall`. After this is done, we might be in a situation in which two packages want to be installed, but only on of them can be. -It is the job of the pkgProblemResolver to decide which of two packages 'wins' and can +It is the job of the `pkgProblemResolver` to decide which of two packages 'wins' and can therefore decide what has to happen. You can see the contenders as well as their fight and the resulting resolution with `Debug::pkgProblemResolver`. @@ -184,8 +184,8 @@ Various binaries (called 'methods') are tasked with downloading files. The Acqui talks to them via simple text protocol. Depending on which side you want to see, either `Debug::pkgAcquire::Worker` or `Debug::Acquire::http` (or similar) will show the messages. -The integration tests use a simple self-built webserver which also logs. If you find that -the http(s) methods do not behave like they should be try to implement this behavior in the +The integration tests use a simple self-built web server (`webserver`) which also logs. If you find that +the http(s) methods do not behave like they should be try to implement this behavior in webserver for simpler and more controlled testing. ### Installation order @@ -209,7 +209,7 @@ targeted at developers of related programs or only of special interest. * [Protocol specification of APT's communication with external dependency solvers (EDSP)](./doc/external-dependency-solver-protocol.md) * [Protocol specification of APT's communication with external installation planners (EIPP)](./doc/external-installation-planner-protocol.md) -* [Howto use and configure APT to acquire additional files in 'update' operations](./doc/acquire-additional-files.md) +* [How to use and configure APT to acquire additional files in 'update' operations](./doc/acquire-additional-files.md) * [Download and package installation progress reporting details](./doc/progress-reporting.md) * [Remarks on DNS SRV record support in APT](./doc/srv-records-support.md) * [Protocol specification of APT interfacing with external hooks via JSON](./doc/json-hooks-protocol.md) diff --git a/doc/apt-ftparchive.1.xml b/doc/apt-ftparchive.1.xml index 32b01aa82..607c5b821 100644 --- a/doc/apt-ftparchive.1.xml +++ b/doc/apt-ftparchive.1.xml @@ -584,7 +584,7 @@ for i in Sections do as the now outdated cached metadata like size and checksums will be used. With this option enabled this will no longer happen as it will be checked if the file was changed. Note that this option is set to "<literal>false</literal>" by default as it is not recommend - to upload multiply versions/builds of a package with the same version number, so in theory + to upload multiple versions/builds of a package with the same version number, so in theory nobody will have these problems and therefore all these extra checks are useless. </para></listitem> </varlistentry> diff --git a/doc/po/apt-doc.pot b/doc/po/apt-doc.pot index b6d8f6946..ced3644c4 100644 --- a/doc/po/apt-doc.pot +++ b/doc/po/apt-doc.pot @@ -6856,7 +6856,7 @@ msgid "" "checksums will be used. With this option enabled this will no longer happen " "as it will be checked if the file was changed. Note that this option is set " "to \"<literal>false</literal>\" by default as it is not recommend to upload " -"multiply versions/builds of a package with the same version number, so in " +"multiple versions/builds of a package with the same version number, so in " "theory nobody will have these problems and therefore all these extra checks " "are useless." msgstr "" diff --git a/doc/po/de.po b/doc/po/de.po index f75c94a73..718163d78 100644 --- a/doc/po/de.po +++ b/doc/po/de.po @@ -9822,7 +9822,7 @@ msgid "" "checksums will be used. With this option enabled this will no longer happen " "as it will be checked if the file was changed. Note that this option is set " "to \"<literal>false</literal>\" by default as it is not recommend to upload " -"multiply versions/builds of a package with the same version number, so in " +"multiple versions/builds of a package with the same version number, so in " "theory nobody will have these problems and therefore all these extra checks " "are useless." msgstr "" diff --git a/doc/po/es.po b/doc/po/es.po index 2b9183d52..9829f0b27 100644 --- a/doc/po/es.po +++ b/doc/po/es.po @@ -9612,7 +9612,7 @@ msgid "" "checksums will be used. With this option enabled this will no longer happen " "as it will be checked if the file was changed. Note that this option is set " "to \"<literal>false</literal>\" by default as it is not recommend to upload " -"multiply versions/builds of a package with the same version number, so in " +"multiple versions/builds of a package with the same version number, so in " "theory nobody will have these problems and therefore all these extra checks " "are useless." msgstr "" diff --git a/doc/po/fr.po b/doc/po/fr.po index 1a9278738..7d23a5c9e 100644 --- a/doc/po/fr.po +++ b/doc/po/fr.po @@ -9788,7 +9788,7 @@ msgid "" "checksums will be used. With this option enabled this will no longer happen " "as it will be checked if the file was changed. Note that this option is set " "to \"<literal>false</literal>\" by default as it is not recommend to upload " -"multiply versions/builds of a package with the same version number, so in " +"multiple versions/builds of a package with the same version number, so in " "theory nobody will have these problems and therefore all these extra checks " "are useless." msgstr "" diff --git a/doc/po/it.po b/doc/po/it.po index 01f3d0d14..f2e2dda0e 100644 --- a/doc/po/it.po +++ b/doc/po/it.po @@ -9757,7 +9757,7 @@ msgid "" "checksums will be used. With this option enabled this will no longer happen " "as it will be checked if the file was changed. Note that this option is set " "to \"<literal>false</literal>\" by default as it is not recommend to upload " -"multiply versions/builds of a package with the same version number, so in " +"multiple versions/builds of a package with the same version number, so in " "theory nobody will have these problems and therefore all these extra checks " "are useless." msgstr "" diff --git a/doc/po/ja.po b/doc/po/ja.po index 00bbad7f3..e50c5c42e 100644 --- a/doc/po/ja.po +++ b/doc/po/ja.po @@ -9377,7 +9377,7 @@ msgid "" "checksums will be used. With this option enabled this will no longer happen " "as it will be checked if the file was changed. Note that this option is set " "to \"<literal>false</literal>\" by default as it is not recommend to upload " -"multiply versions/builds of a package with the same version number, so in " +"multiple versions/builds of a package with the same version number, so in " "theory nobody will have these problems and therefore all these extra checks " "are useless." msgstr "" diff --git a/doc/po/nl.po b/doc/po/nl.po index 841fed8a0..4a27d9120 100644 --- a/doc/po/nl.po +++ b/doc/po/nl.po @@ -9963,7 +9963,7 @@ msgid "" "checksums will be used. With this option enabled this will no longer happen " "as it will be checked if the file was changed. Note that this option is set " "to \"<literal>false</literal>\" by default as it is not recommend to upload " -"multiply versions/builds of a package with the same version number, so in " +"multiple versions/builds of a package with the same version number, so in " "theory nobody will have these problems and therefore all these extra checks " "are useless." msgstr "" diff --git a/doc/po/pl.po b/doc/po/pl.po index 8b65b72aa..d9ff49c2a 100644 --- a/doc/po/pl.po +++ b/doc/po/pl.po @@ -8840,7 +8840,7 @@ msgid "" "checksums will be used. With this option enabled this will no longer happen " "as it will be checked if the file was changed. Note that this option is set " "to \"<literal>false</literal>\" by default as it is not recommend to upload " -"multiply versions/builds of a package with the same version number, so in " +"multiple versions/builds of a package with the same version number, so in " "theory nobody will have these problems and therefore all these extra checks " "are useless." msgstr "" diff --git a/doc/po/pt.po b/doc/po/pt.po index 0daf70522..a4693a832 100644 --- a/doc/po/pt.po +++ b/doc/po/pt.po @@ -9700,7 +9700,7 @@ msgid "" "checksums will be used. With this option enabled this will no longer happen " "as it will be checked if the file was changed. Note that this option is set " "to \"<literal>false</literal>\" by default as it is not recommend to upload " -"multiply versions/builds of a package with the same version number, so in " +"multiple versions/builds of a package with the same version number, so in " "theory nobody will have these problems and therefore all these extra checks " "are useless." msgstr "" diff --git a/doc/po/pt_BR.po b/doc/po/pt_BR.po index 18ca7399b..a20f6a6dc 100644 --- a/doc/po/pt_BR.po +++ b/doc/po/pt_BR.po @@ -7174,7 +7174,7 @@ msgid "" "checksums will be used. With this option enabled this will no longer happen " "as it will be checked if the file was changed. Note that this option is set " "to \"<literal>false</literal>\" by default as it is not recommend to upload " -"multiply versions/builds of a package with the same version number, so in " +"multiple versions/builds of a package with the same version number, so in " "theory nobody will have these problems and therefore all these extra checks " "are useless." msgstr "" |