Merge branch 'master' into 2.3.0

Conflicts:
	AUTHORS
	CMakeLists.txt
	INSTALL
	NEWS
	cmake.h.in
	doc/man/task-faq.5.in
	package-config/osx/README
	scripts/utils/verify_l10n
	src/API.h
	src/Config.cpp
	src/Context.cpp
	src/DOM.cpp
	src/Hooks.cpp
	src/TransportShell.h
	src/commands/CmdDiagnostics.cpp
	src/commands/CmdShell.cpp
	src/commands/CmdVersion.cpp
	src/en-US.h
	src/shell/Readline.h
	src/wcwidth6.cpp
	test/CMakeLists.txt
	test/color.uda.t
	test/duration.t.cpp
	test/hook.on-launch.t
	test/template.t
	test/uuid.t
This commit is contained in:
Paul Beckingham
2013-04-07 17:51:24 -04:00
548 changed files with 13752 additions and 2435 deletions

View File

@@ -1,4 +1,4 @@
.TH taskrc 5 2012-09-18 "${PACKAGE_STRING}" "User Manuals"
.TH taskrc 5 2013-04-07 "${PACKAGE_STRING}" "User Manuals"
.SH NAME
taskrc \- Configuration file for the task(1) command
@@ -347,6 +347,11 @@ May be yes or no, and determines whether the 'tags' command lists all the tag
names you have used, or just the ones used in active tasks. The default value is
"no".
.TP
.B print.empty.columns=no
May be yes or no, and determines whether columns with no data for any task are
printed. Defaults to no.
.TP
.B search.case.sensitive=yes
May be yes or no, and determines whether keyword lookup and substitutions on the
@@ -504,7 +509,7 @@ D two-digit day, for example 01 or 30
.br
M two-digit month, for example 01 or 12
.br
Y four-digit year, for example 2009 or 2012
Y four-digit year, for example 2009 or 2013
.br
a short name of weekday, for example Mon or Wed
.br
@@ -584,9 +589,9 @@ field that is set. Otherwise, they are set to the corresponding values of
.RS
.RS
.br
8/1/2012 with m/d/Y implies August 1, 2012 at midnight (inferred)
8/1/2013 with m/d/Y implies August 1, 2013 at midnight (inferred)
.br
8/1 20:40 with m/d H:N implies August 1, 2012 (inferred) at 20:40
8/1 20:40 with m/d H:N implies August 1, 2013 (inferred) at 20:40
.RE
.RE
@@ -841,6 +846,11 @@ Colors any task assigned to project X.
Colors any task where the description or any annotation contains X.
.RE
.TP
.B color.uda.X=on green
Colors any taks that has the user defined attribute X.
.RE
.TP
.B color.error=green
Colors any of the error messages.
@@ -964,7 +974,7 @@ Colors the output of the merge command.
.RE
.TP
.B rule.precedence.color=due.today,active,blocking,blocked,overdue,due,scheduled,keyword.,project.,tag.,recurring,pri,tagged,completed,deleted
.B rule.precedence.color=due.today,active,blocking,blocked,overdue,due,scheduled,keyword.,project.,tag.,uda.,recurring,pri.,tagged,completed,deleted
.RS
This setting specifies the precedence of the color rules, from highest to
lowest. Note that the prefix 'color.' is omitted (for brevity), and that any
@@ -1334,7 +1344,7 @@ of a task.
.RE
.SH "CREDITS & COPYRIGHTS"
Copyright (C) 2006 \- 2012 P. Beckingham, F. Hernandez.
Copyright (C) 2006 \- 2013 P. Beckingham, F. Hernandez.
This man page was originally written by Federico Hernandez.