From 620f9b40b207ce5dc974124c27625be8be28fc06 Mon Sep 17 00:00:00 2001
From: Paul Beckingham <paul@beckingham.net>
Date: Sat, 5 Apr 2014 12:13:02 -0400
Subject: [PATCH] Documentation

- Added man page updates to reflect new 'taskd.trust' settings.
---
 NEWS                |  2 ++
 doc/man/taskrc.5.in | 10 ++++++----
 2 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/NEWS b/NEWS
index 8cc9372f1..197b9f9d5 100644
--- a/NEWS
+++ b/NEWS
@@ -13,6 +13,8 @@ New commands in taskwarrior 2.4.0
 
 New configuration options in taskwarrior 2.4.0
 
+  - The 'taskd.trust' setting is now a tri-state, supporting values 'strict',
+    'ignore hostname' and 'allow all', for server certificate validation.
   - New themes: dark-default-16.theme, dark-gray-blue-256.theme
 
 Newly deprecated features in taskwarrior 2.4.0
diff --git a/doc/man/taskrc.5.in b/doc/man/taskrc.5.in
index fdd0eaaa3..44a3e138f 100644
--- a/doc/man/taskrc.5.in
+++ b/doc/man/taskrc.5.in
@@ -1358,11 +1358,13 @@ using a self-signed certificate.  Optional.
 .RE
 
 .TP
-.B taskd.trust=yes|no
+.B taskd.trust=strict|ignore hostname|allow all
 .RS
-If you do not specify a CA certificate when your Taskserver is using a self-
-signed certificate, you can override the certificate validation by setting this
-value to 'yes'.  Default is not to trust a server certificate.
+This settings allows you to override the trust level when server certificates
+are validated. With "allow all", the server certificate is trusted
+automatically. With "ignore hostname", the server certificate is verified but
+the hostname is ignored. With "strict", the server certificate is verified.
+Default is "strict", which requires full validation.
 .RE
 
 .TP