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
commit 8af0a7f3ba
548 changed files with 13752 additions and 2435 deletions

View file

@ -1,4 +1,4 @@
.TH task-tutorial 5 2012-09-18 "${PACKAGE_STRING}" "User Manuals"
.TH task-tutorial 5 2013-04-07 "${PACKAGE_STRING}" "User Manuals"
.SH NAME
task-tutorial \- A tutorial for the task(1) command line todo manager.
@ -1096,49 +1096,6 @@ ID Project Pri Due Active Age Description
What you see is the result of a set of color rules being applied to the tasks.
There is a hierarchy of color rules that colorize a task based on the metadata.
Here is an example of an explicit override to the color rules where a specific
task is given a red background.
.RS
$ task 1 modify bg:on_red
.br
modified 1 task.
.br
$ task list
.br
.br
ID Project Pri Due Active Age Description
.br
-- ------- --- --- ------ ------- ----------------------------------
.br
1 party H 1 hr Select a free weekend in November
.br
10/16/2010 the 13th looks good
.br
2 party H 1 hr Select and book a venue
.br
5 party H 59 mins Design invitations
.br
8 33 mins Select some Music for after dinner
.br
7 home 50 mins Pay rent at the end of the month
.br
3 party 1 hr Mail invitations
.br
4 party 1 hr Select a caterer
.br
6 party 59 mins Print invitations
.br
.br
8 tasks
.br
$ task 1 modify bg:
.br
Modified 1 task.
.RE
Taskwarrior supports 256 colors on certain terminal emulators, and this shows
the range of colors available. Note that your terminal may show fewer colors.
@ -3124,7 +3081,7 @@ $ task help
.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, and has been modified and supplemented by Paul Beckingham.