From 9a18d77005756c4f4219183da9593384970603e4 Mon Sep 17 00:00:00 2001
From: Louis-Claude Canon <louis-claude.canon@inria.fr>
Date: Tue, 24 Apr 2012 23:45:28 -0400
Subject: [PATCH] Bug #991

- Fixed bug #991, which removes an obsolete consistency check.
- Removed 'annotations' example from man page, because it is obsolete.

Signed-off-by: Paul Beckingham <paul@beckingham.net>
---
 AUTHORS                    | 2 +-
 ChangeLog                  | 2 ++
 doc/man/task-tutorial.5.in | 2 --
 src/commands/CmdShow.cpp   | 9 ---------
 4 files changed, 3 insertions(+), 12 deletions(-)

diff --git a/AUTHORS b/AUTHORS
index 67cd1e6ad..33d9edd65 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -71,6 +71,7 @@ The following submitted code, packages or analysis, and deserve special thanks:
   Sam Stuck
   Christoph Robbert
   Oleksii Tsai
+  Louis-Claude Canon
 
 Thanks to the following, who submitted detailed bug reports and excellent
 suggestions:
@@ -135,5 +136,4 @@ suggestions:
   Victor Roetman
   Andy Spiegl
   Ethan Schoonover
-  Louis-Claude Canon
 
diff --git a/ChangeLog b/ChangeLog
index da5b9a8cb..c30e22a23 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -26,6 +26,8 @@ Bugs
    accumulate after an active task is completed (thanks to Louis-Claude Canon).
  + Fixed bug #988, updating the documentation so that 'undo.data' usage is more
    clearly stated (thanks to Louis-Claude Canon).
+ + Applied patch for bug #991, which removes an obsolete consistency check
+   (thanks to Louis-Claude Canon).
  + Fixed grammar in feedback string (thanks to Uli Martens).
  + Addressed valgrind complaints (thanks to Bryce Harrington).
  + Removed default configuration value for the obsolete 'annotations' setting.
diff --git a/doc/man/task-tutorial.5.in b/doc/man/task-tutorial.5.in
index fc1d3aa10..dcfc6fe2d 100644
--- a/doc/man/task-tutorial.5.in
+++ b/doc/man/task-tutorial.5.in
@@ -752,8 +752,6 @@ alias.ghistory                  ghistory.monthly
 alias.history                   history.monthly
 .br
 alias.rm                        delete
-.br
-annotations                     full
 .br
  ...
 .br
diff --git a/src/commands/CmdShow.cpp b/src/commands/CmdShow.cpp
index 174a7d65d..af86e898d 100644
--- a/src/commands/CmdShow.cpp
+++ b/src/commands/CmdShow.cpp
@@ -372,15 +372,6 @@ int CmdShow::execute (std::string& output)
   }
 #endif
 
-  // Check for bad values in rc.annotations.
-  // TODO Deprecated.
-  std::string annotations = context.config.get ("annotations");
-  if (annotations != "full"   &&
-      annotations != "sparse" &&
-      annotations != "none")
-    out << format (STRING_CMD_SHOW_CONFIG_ERROR, "annotations", annotations)
-        << "\n";
-
   // Check for bad values in rc.calendar.details.
   std::string calendardetails = context.config.get ("calendar.details");
   if (calendardetails != "full"   &&