[Aptitude-devel] r3241 - in branches/aptitude-0.3/aptitude: . doc/en
Daniel Burrows
dburrows@costa.debian.org
Sun, 01 May 2005 17:18:00 +0000
Author: dburrows
Date: Sun May 1 17:17:57 2005
New Revision: 3241
Modified:
branches/aptitude-0.3/aptitude/ChangeLog
branches/aptitude-0.3/aptitude/doc/en/manpage.xml
Log:
Update the aptitude manpage again
Modified: branches/aptitude-0.3/aptitude/ChangeLog
==============================================================================
--- branches/aptitude-0.3/aptitude/ChangeLog (original)
+++ branches/aptitude-0.3/aptitude/ChangeLog Sun May 1 17:17:57 2005
@@ -1,5 +1,10 @@
2005-05-01 Daniel Burrows <dburrows@debian.org>
+ * doc/en/manpage.xml:
+
+ Further correct the manual page to adjust for the new stuff in
+ 0.3.2.
+
* configure.ac:
Add vi to ALL_LINGUAS (it was left out..oops).
Modified: branches/aptitude-0.3/aptitude/doc/en/manpage.xml
==============================================================================
--- branches/aptitude-0.3/aptitude/doc/en/manpage.xml (original)
+++ branches/aptitude-0.3/aptitude/doc/en/manpage.xml Sun May 1 17:17:57 2005
@@ -160,14 +160,103 @@
apt/experimental</literal></quote>.
</para>
- <para>
- Appending <quote>-</quote>, <quote>+</quote>, <quote>_</quote>, or <quote>=</quote> to the name of a
- package will cause the package to be removed,
- installed, purged, or held respectively. This can be
- used, for instance, to perform multiple actions from
- one command line.
- </para>
-
+ <para id='parOverrideSpecifiers'>
+ Not every package listed on the command line has to be
+ installed; you can tell &aptitude; to do something
+ different with a package by appending an <quote>override
+ specifier</quote> to the name of the package. For
+ example, <literal>aptitude remove wesnoth+</literal> will
+ install <literal>wesnoth</literal>, not remove it. The
+ following override specifiers are available:
+ </para>
+
+ <variablelist>
+ <varlistentry>
+ <term><replaceable>package</replaceable><literal>+</literal></term>
+ <listitem>
+ <para>
+ Install <replaceable>package</replaceable>.
+ </para>
+ </listitem>
+ </varlistentry>
+
+ <varlistentry>
+ <term><replaceable>package</replaceable><literal>+M</literal></term>
+ <listitem>
+ <para>
+ Install <replaceable>package</replaceable> and
+ immediately mark it as <link
+ linkend='secAutoInstall'>automatically
+ installed</link> (note that if nothing depends on
+ <replaceable>package</replaceable>, this will cause
+ it to be immediately removed).
+ </para>
+ </listitem>
+ </varlistentry>
+
+ <varlistentry>
+ <term><replaceable>package</replaceable><literal>-</literal></term>
+ <listitem>
+ <para>
+ Remove <replaceable>package</replaceable>.
+ </para>
+ </listitem>
+ </varlistentry>
+
+ <varlistentry>
+ <term><replaceable>package</replaceable><literal>_</literal></term>
+ <listitem>
+ <para>
+ Purge <replaceable>package</replaceable>: remove it
+ and all its associated configuration and data files.
+ </para>
+ </listitem>
+ </varlistentry>
+
+ <varlistentry>
+ <term><replaceable>package</replaceable><literal>=</literal></term>
+ <listitem>
+ <para>
+ Place <replaceable>package</replaceable> on hold:
+ cancel any active installation, upgrade, or removal,
+ and prevent this package from being automatically
+ upgraded in the future.
+ </para>
+ </listitem>
+ </varlistentry>
+
+ <varlistentry>
+ <term><replaceable>package</replaceable><literal>:</literal></term>
+ <listitem>
+ <para>
+ Keep <replaceable>package</replaceable> at its
+ current version: cancel any installation, removal,
+ or upgrade. Unlike <quote>hold</quote> (above) this
+ does not prevent automatic upgrades in the future.
+ </para>
+ </listitem>
+ </varlistentry>
+
+ <varlistentry>
+ <term><replaceable>package</replaceable><literal>&M</literal></term>
+ <listitem>
+ <para>
+ Mark <replaceable>package</replaceable> as having
+ been <link linkend='secAutoInstall'>automatically installed</link>.
+ </para>
+ </listitem>
+ </varlistentry>
+
+ <varlistentry>
+ <term><replaceable>package</replaceable><literal>&m</literal></term>
+ <listitem>
+ <para>
+ Mark <replaceable>package</replaceable> as having
+ been <link linkend='secAutoInstall'>manually installed</link>.
+ </para>
+ </listitem>
+ </varlistentry>
+ </variablelist>
<para>
As a special case, <quote><literal>install</literal></quote> with no
@@ -176,13 +265,16 @@
<note>
<para>
- The <quote><literal>install</literal></quote>
- command will modify &aptitude;'s stored information
- about what actions to perform. Therefore, if you
- issue (e.g.) the command <quote><literal>aptitude
- install foo bar</literal></quote> and then abort the
- installation, you will need to run <quote><literal>aptitude remove foo
- bar</literal></quote> to cancel that order.
+ Once you enter <userinput>Y</userinput> at the final
+ confirmation prompt, the
+ <quote><literal>install</literal></quote> command will
+ modify &aptitude;'s stored information about what
+ actions to perform. Therefore, if you issue (e.g.) the
+ command <quote><literal>aptitude install foo
+ bar</literal></quote> and then abort the installation
+ once &aptitude; has started downloading and installing
+ packages, you will need to run <quote><literal>aptitude
+ remove foo bar</literal></quote> to cancel that order.
</para>
</note>
</listitem>
@@ -193,9 +285,10 @@
<listitem>
<para>
- These commands are the same as <quote><literal>install</literal></quote>, but apply
- the named action to all packages given on the command
- line, unless specified otherwise.
+ These commands are the same as
+ <quote><literal>install</literal></quote>, but apply the
+ named action to all packages given on the command line
+ for which it is not <link linkend='parOverride'>overridden</link>.
</para>
<para>