summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJulian Andres Klode <jak@debian.org>2024-03-22 10:07:49 +0000
committerJulian Andres Klode <jak@debian.org>2024-03-22 10:07:49 +0000
commit2534288b97c5e0dfd0bf900c32166b5595e5bbe7 (patch)
treebf0bdaa4d405dfda6e527d11ad027ca8d90aeba5
parent1c1d8b26f067e7a1f7740718c0ded84ec8a386cb (diff)
parent16a8cbb11305adff4fff0f30270feb3faf5a59ce (diff)
Merge branch '1065831-apt_upgrade_documentation' into 'main'
Update documentation for apt-get upgrade with pkg arg See merge request apt-team/apt!334
-rw-r--r--doc/apt-get.8.xml10
-rw-r--r--doc/apt.8.xml8
-rw-r--r--doc/po/nl.po7
3 files changed, 20 insertions, 5 deletions
diff --git a/doc/apt-get.8.xml b/doc/apt-get.8.xml
index 8d6bd8ede..cab6120f9 100644
--- a/doc/apt-get.8.xml
+++ b/doc/apt-get.8.xml
@@ -62,8 +62,10 @@
retrieved and installed. New versions of currently installed packages that
cannot be upgraded without changing the install status of another package
will be left at their current version. An <literal>update</literal> must be
- performed first so that <command>apt-get</command> knows that new versions of packages are
- available.</para></listitem>
+ performed first so that <command>apt-get</command> knows that new versions
+ of packages are available.</para><para>When a package is supplied as an
+ argument, the package will be installed prior to the upgrade
+ action.</para></listitem>
</varlistentry>
<varlistentry><term><option>dist-upgrade</option></term>
@@ -76,7 +78,9 @@
The <filename>/etc/apt/sources.list</filename> file contains a list of locations
from which to retrieve desired package files.
See also &apt-preferences; for a mechanism for
- overriding the general settings for individual packages.</para></listitem>
+ overriding the general settings for individual packages.</para><para>When
+ a package is supplied as an argument, the package will be installed prior
+ to the upgrade action.</para></listitem>
</varlistentry>
<varlistentry><term><option>dselect-upgrade</option></term>
diff --git a/doc/apt.8.xml b/doc/apt.8.xml
index b897369b2..51ed820dc 100644
--- a/doc/apt.8.xml
+++ b/doc/apt.8.xml
@@ -59,14 +59,18 @@
packages will never be removed. If an upgrade for a package requires
the removal of an installed package the upgrade for this package
isn't performed.
- </para></listitem>
+ </para>
+ <para>When a package is supplied as an argument, the package will be
+ installed prior to the upgrade action.</para>
+ </listitem>
</varlistentry>
<varlistentry><term><option>full-upgrade</option> (&apt-get;)</term>
<listitem><para><literal>full-upgrade</literal> performs the function of
upgrade but will remove currently installed packages if this is
needed to upgrade the system as a whole.
- </para></listitem>
+ </para><para>When a package is supplied as an argument, the package will
+ be installed prior to the upgrade action.</para></listitem>
</varlistentry>
<varlistentry><term><option>install</option>, <option>reinstall</option>, <option>remove</option>, <option>purge</option> (&apt-get;)</term>
diff --git a/doc/po/nl.po b/doc/po/nl.po
index 47221f2b1..9f96f9c4c 100644
--- a/doc/po/nl.po
+++ b/doc/po/nl.po
@@ -770,6 +770,13 @@ msgstr ""
"opwaardering van een pakket vereist dat een geïnstalleerd pakket verwijderd "
"wordt, zal de opwaardering voor dat pakket niet uitgevoerd worden."
+msgid ""
+"When a package is supplied as an argument, the package will be installed "
+"prior to the upgrade action."
+msgstr ""
+"Wanneer een pakket wordt opgegeven als argument, zal het pakket geïnstalleerd "
+"worden voordat de opwaardering plaats vindt."
+
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
#: apt.8.xml
msgid ""