Merge pull request #1976 from rudis/2.6.0

More doc fixes
This commit is contained in:
Paul Beckingham 2018-03-06 21:25:52 -05:00 committed by GitHub
commit 24634f2d15
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 6 additions and 9 deletions

View file

@ -222,11 +222,10 @@ variable 'rule.precedence.color', which by default contains:
deleted,completed,active,keyword.,tag.,project.,overdue,scheduled,due.today,due,blocked,blocking,recurring,tagged,uda. 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 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, The keyword rule shown here as 'keyword.' corresponds to a wildcard pattern,
meaning 'color.keyword.*', or in other words all the keyword rules. Similarly meaning 'color.keyword.*', or in other words all the keyword rules.
for the 'color.tag.*' and 'color.project.*' rules.
There is also 'color.project.none', 'color.tag.none' and 'color.pri.none' to There is also 'color.project.none', 'color.tag.none' and 'color.pri.none' to
specifically represent missing data. specifically represent missing data.

View file

@ -85,7 +85,7 @@ done on demand.
Setup is a matter of creating an account on a Taskserver (see your Taskserver Setup is a matter of creating an account on a Taskserver (see your Taskserver
provider or operate your own - see 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. 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: You'll need to put the certificate and key somewhere like this:

View file

@ -165,6 +165,9 @@ std::string configurationDefaults =
"# Color controls.\n" "# Color controls.\n"
"color=1 # Enable color\n" "color=1 # Enable color\n"
"\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" "rule.precedence.color=deleted,completed,active,keyword.,tag.,project.,overdue,scheduled,due.today,due,blocked,blocking,recurring,tagged,uda.\n"
"\n" "\n"
"# General decoration\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.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" "urgency.uda.priority.L.coefficient=1.8 # UDA priority coefficient for value 'L'\n"
"\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.project=foo # Default project for 'add' command\n"
"#default.due=eom # Default due date for 'add' command\n" "#default.due=eom # Default due date for 'add' command\n"
"#default.scheduled=eom # Default scheduled date for 'add' command\n" "#default.scheduled=eom # Default scheduled date for 'add' command\n"