[Aptitude-devel] [PATCH] Add documentation on missing package states.

[Matthew W.S. Bell]

Add documentation on missing package states.

Please note that I am unsure as to what further steps are required for
the il18n and translation of those files in doc/.
---
 doc/en/aptitude.xml | 18 ++++++++++++++++++
 help.txt            |  3 +++
 src/gtk/gui.cc      |  3 ++-
 3 files changed, 23 insertions(+), 1 deletion(-)

diff --git a/doc/en/aptitude.xml b/doc/en/aptitude.xml
index 89a8d68..842966b 100644
--- a/doc/en/aptitude.xml
+++ b/doc/en/aptitude.xml
@@ -3135,6 +3135,24 @@ Th+-------------------------------------------------------------------------+
 			interrupted.
 		      </entry>
 		    </row>
+
+		    <row>
+		      <entry><computeroutput>W</computeroutput></entry>
+		      <entry>-</entry>
+		      <entry>
+			triggers-awaited: the package awaits trigger
+			processing by another package.
+		       </entry>
+		    </row>
+
+		    <row>
+		      <entry><computeroutput>T</computeroutput></entry>
+		      <entry>-</entry>
+		      <entry>
+			triggers-pending: The package has had an update
+			triggered due to changes in another package.
+		      </entry>
+		    </row>
 		  </tbody>
 		</tgroup>
 	      </informaltable>
diff --git a/help.txt b/help.txt
index 091e2e9..faf1f86 100644
--- a/help.txt
+++ b/help.txt
@@ -100,7 +100,10 @@ versions of the package.
    u - "unpacked"
    C - half-configured
    H - half-installed
+   W - waiting for updates triggered in other packages
+   T - pending updates triggered by other packages
    c - removed, but config-files still present (ie, not purged)
+   p - purged, removed with config-files not present
    i - installed
    E - internal error (should not happen)
 
diff --git a/src/gtk/gui.cc b/src/gtk/gui.cc
index fa7d3a2..0c244b4 100644
--- a/src/gtk/gui.cc
+++ b/src/gtk/gui.cc
@@ -76,6 +76,7 @@ using aptitude::Loggers;
 
 namespace gui
 {
+  // Ensure help.txt and doc/ is kept in synchronisation with the below states
   // \todo Some of these icon choices suck.
   const entity_state_info not_installed_columns("p", N_("Not installed"), Gtk::StockID());
   const entity_state_info virtual_columns("p", N_("Virtual"), Gtk::StockID());
@@ -86,7 +87,7 @@ namespace gui
   const entity_state_info triggers_awaited_columns("W", N_("Triggers awaited"), Gtk::Stock::DIALOG_WARNING);
   const entity_state_info triggers_pending_columns("T", N_("Triggers pending"), Gtk::Stock::DIALOG_WARNING);
   const entity_state_info installed_columns("i", N_("Installed"), Gtk::Stock::YES);
-  const entity_state_info error_columns("E", "Internal Error (bad state)", Gtk::Stock::DIALOG_ERROR);
+  const entity_state_info error_columns("E", "Internal error (bad state)", Gtk::Stock::DIALOG_ERROR);
 
   const entity_state_info install_columns("i", N_("Install"), Gtk::Stock::ADD);
   const entity_state_info reinstall_columns("r", N_("Reinstall"), Gtk::Stock::ADD);
-- 
1.9.0

-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 473 bytes
Desc: OpenPGP digital signature
URL: <http://lists.alioth.debian.org/pipermail/aptitude-devel/attachments/20141118/14ecfc09/attachment.sig>