From d2d270f48603505248c833b911a6096a75d61e21 Mon Sep 17 00:00:00 2001
From: Paul Beckingham <paul@beckingham.net>
Date: Sun, 28 Sep 2014 17:59:03 -0400
Subject: [PATCH] Documentation

- Added note in the NEWS file about deprecated future features.
- Updated ChangeLog with 'taskd.trust' change.
---
 ChangeLog | 2 ++
 NEWS      | 2 ++
 2 files changed, 4 insertions(+)

diff --git a/ChangeLog b/ChangeLog
index e1a1812c6..f586a5363 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -199,6 +199,8 @@
 - Added rc.hooks, a master control setting for hooks processing, which defaults
   to 'on'.
 - File format 3 (used in version 1.6.0 - 1.7.1) is no longer supported.
+- If the 'taskd.trust' setting contains a bad value, the 'diag' command will
+  indicate this, and the 'sync' command will error out.
 
 ------ current release ---------------------------
 
diff --git a/NEWS b/NEWS
index d53d50cab..a47dd41a5 100644
--- a/NEWS
+++ b/NEWS
@@ -40,6 +40,8 @@ New configuration options in taskwarrior 2.4.0
 Newly deprecated features in taskwarrior 2.4.0
 
   - The alias '_query' is deprecated.
+  - Bare word search terms are deprecated, so 'task pattern list' will not
+    be supported in future releases, instead requiring 'task /pattern/ list'.
 
 Removed features in 2.4.0