[Aptitude-svn-commit] r4265 - in branches/aptitude-0.3/aptitude: . doc/en

[Daniel Burrows]

Author: dburrows
Date: Mon Sep 26 03:41:25 2005
New Revision: 4265

Modified:
   branches/aptitude-0.3/aptitude/ChangeLog
   branches/aptitude-0.3/aptitude/doc/en/aptitude.xml
Log:
Explicitly document that ~a matches the current state of a package, not its potential state;
i.e., ~aupgrade is not ~U.  This fixes a documentation bug in the code.
Also add a missing Closes from the last commit (oops).

Modified: branches/aptitude-0.3/aptitude/ChangeLog
==============================================================================
--- branches/aptitude-0.3/aptitude/ChangeLog	(original)
+++ branches/aptitude-0.3/aptitude/ChangeLog	Mon Sep 26 03:41:25 2005
@@ -1,9 +1,16 @@
 2005-09-25  Daniel Burrows  <dburrows at debian.org>
 
+	* doc/en/aptitude.xml:
+
+	  Explicitly note that ~a matches the *current state* of a
+	  package; for instance, ~aupgrade doesn't do what ~U does.
+	  (Closes: #311290)
+
 	* FAQ, doc/en/aptitude.xml:
 
 	  Apply several typo fixes submitted by
 	  Olivier Trichet <olivier.trichet at freesurf.fr>.
+	  (Closes: #268916)
 
 	* doc/en/manpage.xml:
 

Modified: branches/aptitude-0.3/aptitude/doc/en/aptitude.xml
==============================================================================
--- branches/aptitude-0.3/aptitude/doc/en/aptitude.xml	(original)
+++ branches/aptitude-0.3/aptitude/doc/en/aptitude.xml	Mon Sep 26 03:41:25 2005
@@ -3844,6 +3844,17 @@
 	      <!-- Should I document more extensively what each option
 	           does? -->
 	    </para>
+
+	    <para>
+	      Note that this only tests whether an action is actually
+	      queued up to be performed on a package, not whether it
+	      <emphasis>could</emphasis> be performed.  Thus, for
+	      instance, <literal>~aupgrade</literal> matches exactly
+	      those packages that you have already decided to upgrade,
+	      not packages which <emphasis>could</emphasis> be
+	      upgraded in the future (for that, use
+	      <literal>~U</literal>).
+	    </para>
 	  </listitem>
 	</varlistentry>