From 1435ec0cfe28a560f7852dbd6d1ab00582aad75e Mon Sep 17 00:00:00 2001
From: Simon Ruderich <simon@ruderich.org>
Date: Sun, 4 Mar 2018 23:06:19 +0100
Subject: [PATCH 1/4] Docs: fix outdated link in task-sync.5

---
 doc/man/task-sync.5.in | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/doc/man/task-sync.5.in b/doc/man/task-sync.5.in
index 076c6a789..2ec5f96dc 100644
--- a/doc/man/task-sync.5.in
+++ b/doc/man/task-sync.5.in
@@ -85,7 +85,7 @@ done on demand.
 
 Setup is a matter of creating an account on a Taskserver (see your Taskserver
 provider or operate your own - see
-https://taskwarrior.org/docs/server_setup.html)
+https://taskwarrior.org/docs/taskserver/setup.html)
 
 Once you have an account, you'll receive a certificate, key, and credentials.
 You'll need to put the certificate and key somewhere like this:

From b92ab68ef6568e7dec857c418646aa59ea881278 Mon Sep 17 00:00:00 2001
From: Simon Ruderich <simon@ruderich.org>
Date: Tue, 6 Mar 2018 21:54:08 +0100
Subject: [PATCH 2/4] Context: remove duplicate default value for
 rule.precedence.color

---
 src/Context.cpp | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

diff --git a/src/Context.cpp b/src/Context.cpp
index 01b1e4477..17903dcda 100644
--- a/src/Context.cpp
+++ b/src/Context.cpp
@@ -165,6 +165,9 @@ std::string configurationDefaults =
   "# Color controls.\n"
   "color=1                                        # Enable color\n"
   "\n"
+  "# Here is the rule precedence order, highest to lowest.\n"
+  "# Note that these are just the color rule names, without the leading 'color.'\n"
+  "#      and any trailing '.value'.\n"
   "rule.precedence.color=deleted,completed,active,keyword.,tag.,project.,overdue,scheduled,due.today,due,blocked,blocking,recurring,tagged,uda.\n"
   "\n"
   "# General decoration\n"
@@ -248,11 +251,6 @@ std::string configurationDefaults =
   "urgency.uda.priority.M.coefficient=3.9         # UDA priority coefficient for value 'M'\n"
   "urgency.uda.priority.L.coefficient=1.8         # UDA priority coefficient for value 'L'\n"
   "\n"
-  "# Here is the rule precedence order, highest to lowest.\n"
-  "# Note that these are just the color rule names, without the leading 'color.'\n"
-  "#      and any trailing '.value'.\n"
-  "rule.precedence.color=deleted,completed,active,keyword.,tag.,project.,overdue,scheduled,due.today,due,blocked,blocking,recurring,tagged,uda.\n"
-  "\n"
   "#default.project=foo                           # Default project for 'add' command\n"
   "#default.due=eom                               # Default due date for 'add' command\n"
   "#default.scheduled=eom                         # Default scheduled date for 'add' command\n"

From bc0bf873de4a19c114c7f61bf7d24e3e7f9b4831 Mon Sep 17 00:00:00 2001
From: Simon Ruderich <simon@ruderich.org>
Date: Tue, 6 Mar 2018 21:58:29 +0100
Subject: [PATCH 3/4] Docs: fix incorrect value in task-color.5

---
 doc/man/task-color.5.in | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/doc/man/task-color.5.in b/doc/man/task-color.5.in
index 1958735fd..b516d6f0e 100644
--- a/doc/man/task-color.5.in
+++ b/doc/man/task-color.5.in
@@ -222,7 +222,7 @@ variable 'rule.precedence.color', which by default contains:
     deleted,completed,active,keyword.,tag.,project.,overdue,scheduled,due.today,due,blocked,blocking,recurring,tagged,uda.
 
 These are just the color rules with the 'color.' prefix removed.  The
-rule 'color.due.today' is the highest precedence, and 'color.deleted' is the lowest.
+rule 'color.deleted' has the highest precedence, and 'color.uda.' the lowest.
 
 The keyword rule shown here as 'keyword.' corresponds to a wildcard pattern,
 meaning 'color.keyword.*', or in other words all the keyword rules.  Similarly

From c4f217d5c45e0ddd4c01232b1ba410dac944e858 Mon Sep 17 00:00:00 2001
From: Simon Ruderich <simon@ruderich.org>
Date: Tue, 6 Mar 2018 21:59:12 +0100
Subject: [PATCH 4/4] Docs: remove duplication in task-color.5

In the example there are more than the three listed wildcard patterns.
Instead of listing them all, list just one. This is enough to describe
the idea.
---
 doc/man/task-color.5.in | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/doc/man/task-color.5.in b/doc/man/task-color.5.in
index b516d6f0e..cc024442d 100644
--- a/doc/man/task-color.5.in
+++ b/doc/man/task-color.5.in
@@ -225,8 +225,7 @@ These are just the color rules with the 'color.' prefix removed.  The
 rule 'color.deleted' has the highest precedence, and 'color.uda.' the lowest.
 
 The keyword rule shown here as 'keyword.' corresponds to a wildcard pattern,
-meaning 'color.keyword.*', or in other words all the keyword rules.  Similarly
-for the 'color.tag.*' and 'color.project.*' rules.
+meaning 'color.keyword.*', or in other words all the keyword rules.
 
 There is also 'color.project.none', 'color.tag.none' and 'color.pri.none' to
 specifically represent missing data.