From 7b58d9c18ce41fb1e3f96d1194de9e389615b8c1 Mon Sep 17 00:00:00 2001
From: Paul Beckingham <paul@beckingham.net>
Date: Mon, 30 Apr 2012 07:53:09 -0400
Subject: [PATCH] Bug #996

- Fixed bug #996, so that verbosity code and documentation are in agreement,
  and that the 'verbose=off' works as intended (thanks to Peter De Poorter,
  Louis-Claude Canon).
---
 ChangeLog           |  3 +++
 doc/man/taskrc.5.in | 23 +++++++++++++++++++----
 src/Context.cpp     |  4 ----
 3 files changed, 22 insertions(+), 8 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index a8d2d2724..0e4c7f2ac 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -32,6 +32,9 @@ Bugs
    (thanks to Louis-Claude Canon).
  + Fixed bug #995, which mis-parsed UUIDs in filters as other elements (thanks
    to Bryce Harrington).
+ + Fixed bug #996, so that verbosity code and documentation are in agreement,
+   and that the 'verbose=off' works as intended (thanks to Peter De Poorter,
+   Louis-Claude Canon).
  + Fixed bug #997, so that output is correctly conrolled by the 'affected'
    verbosity token.
  + Fixed grammar in feedback string (thanks to Uli Martens).
diff --git a/doc/man/taskrc.5.in b/doc/man/taskrc.5.in
index afb827f50..3aa49f673 100644
--- a/doc/man/taskrc.5.in
+++ b/doc/man/taskrc.5.in
@@ -237,11 +237,15 @@ default value is currently blank.
 .SS MISCELLANEOUS
 
 .TP
-.B verbose=on|off|list...
-When set to on (the default), helpful explanatory comments are added to all
-output from Taskwarrior.  Setting this to off means that you would see minimal
+.B verbose=on|off|nothing|list...
+When set to "on" (the default), helpful explanatory comments are added to all
+output from Taskwarrior.  Setting this to "off" means that you would see regular
 output.
 
+The special value "nothing" can be used to eliminate all optional output, which
+results in only the formatted data being show, with nothing else.  This output
+is most readily parsed and used by shell scripts.
+
 Alternatively, you can specify a comma-separated list of verbosity tokens that
 control specific occasions when output is generated.  This list may contain:
 
@@ -256,7 +260,18 @@ control specific occasions when output is generated.  This list may contain:
     project    Feedback about project status changes
 
 Note that the "on" setting is equivalent to all the tokens being specified,
-and the "off" setting is equivalent to none of the tokens being specified.
+and the "nothing" setting is equivalent to none of the tokens being specified.
+
+Here are the shortcut equivalents:
+
+    verbose=on
+    verbose=blank,header,footnote,label,new-id,affected,edit,special,project
+
+    verbose=off
+    verbose=blank,label,new-id,edit
+
+    verbose=nothing
+    verbose=
 
 .TP
 .B confirmation=yes
diff --git a/src/Context.cpp b/src/Context.cpp
index 2db171e25..06eaa972c 100644
--- a/src/Context.cpp
+++ b/src/Context.cpp
@@ -470,13 +470,9 @@ bool Context::verbose (const std::string& token)
 
       // This list emulates rc.verbose=off in version 1.9.4.
       verbosity.push_back ("blank");
-      verbosity.push_back ("footnote");
       verbosity.push_back ("label");
       verbosity.push_back ("new-id");
-      verbosity.push_back ("affected");
       verbosity.push_back ("edit");
-      verbosity.push_back ("special");
-      verbosity.push_back ("project");
     }
   }