Version number and release date for 2.3.0

Minor documentation updates
taskshell
2014-01-15 23:41:22 +01:00 · 2014-01-15 23:28:07 +01:00 · 2014-01-15 16:20:33 -05:00 · 2014-01-12 16:34:28 -05:00 · 2014-01-12 16:31:07 -05:00 · 2014-01-12 16:30:22 -05:00
662 changed files with 42812 additions and 10366 deletions
--- a/.gitignore
+++ b/.gitignore
@@ -2,10 +2,12 @@ cmake.h
 auto.h
 commit.h
 Makefile
-*/*task
+src/task
-*/*libtask.a
+src/libtask.a
-*/*/libcommands.a
+src/commands/libcommands.a
-*/*/libcolumns.a
+src/columns/libcolumns.a
 src/shell/libtasksh.a
 src/shell/tasksh
 *~
 .*.swp
 package-config/osx/binary/task
@@ -16,4 +18,5 @@ install_manifest.txt
 _CPack_Packages
 CPackConfig.cmake
 CPackSourceConfig.cmake
-doc/misc/tutorial
+patches
 *.exe
--- a/67
+++ b/67
@@ -2,14 +2,16 @@ The development of taskwarrior was made possible by the significant
 contributions of the following people:
  Paul Beckingham    (Principal Author)
-  Federico Hernandez (Package Maintainer & Contributing Author)
+  Federico Hernandez (Principal Author)
  David J Patrick    (Designer)
  John Florian       (Contributing Author)
  Cory Donnelly      (Contributing Author)
  Johannes Schlatow  (Contributing Author)
-  Dirk Deimeke       (Technical Advisor & Marketing)
+  Dirk Deimeke       (Technical Advisor & Evangelist)
  Wim Schuermann     (Contributing Author)
  Owen Clarke        (Contributing Author)
  Louis-Claude Canon (Contributing Author)
  Scott Kostyshak    (Contributing Author)
 The following submitted code, packages or analysis, and deserve special thanks:
@@ -69,6 +71,29 @@ The following submitted code, packages or analysis, and deserve special thanks:
  Steve Rader
  Luke Macken
  Sam Stuck
  Christoph Robbert
  Oleksii Tsai
  Jörg Plate
  Markus Kuhn
  Erik Wenzel
  Štěpán Henek
  Haitham Gad
  Fidel Mato
  Justin Forest
  Vincent Petithory
  Rainer Müller
  Jakub Wilk
  Russell Steicke
  YBSAR
  Tullio Facchinetti
  Thomas Sullivan
  Martin Natano
  kili
  jasper
  Aaron Bieber
  John West
  Jeroen Budts
  Zed Jorarard
 Thanks to the following, who submitted detailed bug reports and excellent
 suggestions:
@@ -129,4 +154,40 @@ suggestions:
  Philipp Woelfel
  Tuomas Toivola
  Adam Gibbins
-
+  Ali Mousavi
  Victor Roetman
  Andy Spiegl
  Ethan Schoonover
  Paul Kishimoto
  Jeff Schroeder
  Bryan Kam
  Nicholas Rabenau
  Bruno Bigras
  Hyde Stevenson
  Martin U
  Christoph Lange
  Stephen Hay
  Vlad Zhivotnev
  Stanley G
  Marek Vitek
  Rene Vergara
  Stéphane Pezennec
  Jim B
  Robert Gill
  Robin Björklin
  Jake Bell
  Florian Hollerweger
  Thomas Sullivan
  Tim None
  trHD
  Benjamin Weber
  alparo
  Roy Zuo
  Friedrich Heusler
  Ben Armstrong
  XTaran
  John West
  Dmitriy Matrosov
  Michele Santullo
  Scott Kroll
  Kosta H
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -2,29 +2,44 @@ cmake_minimum_required (VERSION 2.8)
 set(CMAKE_LEGACY_CYGWIN_WIN32 0) # Remove when CMake >= 2.8.4 is required
 include (CheckFunctionExists)
 include (CheckStructHasMember)
 set (HAVE_CMAKE true)
 project (task)
-set (PROJECT_VERSION "2.0.0")
+set (PROJECT_VERSION "2.3.0")
 SET (TASK_MAN1DIR share/man/man1 CACHE STRING "Installation directory for man pages, section 1")
 SET (TASK_MAN5DIR share/man/man5 CACHE STRING "Installation directory for man pages, section 5")
 SET (TASK_DOCDIR  share/doc/task CACHE STRING "Installation directory for doc files")
 SET (TASK_BINDIR  bin            CACHE STRING "Installation directory for the binary")
 if (${CMAKE_SYSTEM_NAME} MATCHES "Linux")
  set (LINUX true)
 elseif (${CMAKE_SYSTEM_NAME} MATCHES "Darwin")
  set (DARWIN true)
 elseif (${CMAKE_SYSTEM_NAME} MATCHES "kFreeBSD")
  set (KFREEBSD true)
 elseif (${CMAKE_SYSTEM_NAME} MATCHES "FreeBSD")
  set (FREEBSD true)
 elseif (${CMAKE_SYSTEM_NAME} MATCHES "OpenBSD")
  set (OPENBSD true)
 elseif (${CMAKE_SYSTEM_NAME} MATCHES "NetBSD")
  set (NETBSD true)
 elseif (${CMAKE_SYSTEM_NAME} MATCHES "SunOS")
  set (SOLARIS true)
 elseif (${CMAKE_SYSTEM_NAME} STREQUAL "GNU")
  set (GNUHURD true)
 else (${CMAKE_SYSTEM_NAME} MATCHES "Linux")
  set (UNKNOWN true)
 endif (${CMAKE_SYSTEM_NAME} MATCHES "Linux")
 if (FREEBSD)
 SET (TASK_MAN1DIR man/man1 CACHE STRING "Installation directory for man pages, section 1")
 SET (TASK_MAN5DIR man/man5 CACHE STRING "Installation directory for man pages, section 5")
 else (FREEBSD)
 SET (TASK_MAN1DIR share/man/man1 CACHE STRING "Installation directory for man pages, section 1")
 SET (TASK_MAN5DIR share/man/man5 CACHE STRING "Installation directory for man pages, section 5")
 endif (FREEBSD)
 SET (TASK_DOCDIR  share/doc/task CACHE STRING "Installation directory for doc files")
 SET (TASK_RCDIR "${TASK_DOCDIR}/rc" CACHE STRING "Installation directory for configuration files")
 SET (TASK_BINDIR  bin            CACHE STRING "Installation directory for the binary")
 message ("-- Looking for SHA1 references")
 if (EXISTS ${CMAKE_SOURCE_DIR}/.git/index)
  set (HAVE_COMMIT true)
@@ -44,14 +59,13 @@ set (PACKAGE_TARNAME "${PACKAGE}")
 set (PACKAGE_VERSION "${VERSION}")
 set (PACKAGE_STRING "${PACKAGE} ${VERSION}")
-message ("-- Looking for Lua51")
+message ("-- Looking for GnuTLS")
-find_package (Lua51)
+find_package (GnuTLS)
-if (LUA51_FOUND)
+if (GNUTLS_FOUND)
-  message ("-- Found Lua51: ${LUA_LIBRARIES}")
+  set (HAVE_LIBGNUTLS true)
-  set (HAVE_LIBLUA true)
+  set (TASK_INCLUDE_DIRS ${TASK_INCLUDE_DIRS} ${GNUTLS_INCLUDE_DIR})
-  set (TASK_INCLUDE_DIRS ${TASK_INCLUDE_DIRS} ${LUA_INCLUDE_DIR})
+  set (TASK_LIBRARIES    ${TASK_LIBRARIES}    ${GNUTLS_LIBRARIES})
-  set (TASK_LIBRARIES    ${TASK_LIBRARIES}    ${LUA_LIBRARIES})
+endif (GNUTLS_FOUND)
 endif (LUA51_FOUND)
 #message ("-- Looking for pthread")
 #find_path (PTHREAD_INCLUDE_DIR pthread.h)
@@ -63,35 +77,62 @@ endif (LUA51_FOUND)
 #  set (TASK_LIBRARIES    ${TASK_LIBRARIES}    ${PTHREAD_LIBRARIES})
 #endif (PTHREAD_INCLUDE_DIR AND PTHREAD_LIBRARY)
-check_function_exists (random  HAVE_RANDOM)
+# include the readline library finder module
-check_function_exists (srandom HAVE_SRANDOM)
+set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} "${CMAKE_SOURCE_DIR}/cmake/Modules")
 # find readline
 message ("-- Looking for GNU Readline")
 find_package (Readline)
 if (READLINE_FOUND)
  set (HAVE_READLINE true)
  set (TASK_INCLUDE_DIRS ${TASK_INCLUDE_DIRS} ${READLINE_INCLUDE_DIR})
  set (TASK_LIBRARIES    ${TASK_LIBRARIES}    ${READLINE_LIBRARIES})
 endif (READLINE_FOUND)
 check_function_exists (timegm  HAVE_TIMEGM)
 check_function_exists (get_current_dir_name HAVE_GET_CURRENT_DIR_NAME)
 check_function_exists (wordexp HAVE_WORDEXP)
 check_struct_has_member ("struct tm" tm_gmtoff time.h HAVE_TM_GMTOFF)
 check_struct_has_member ("struct stat" st_birthtime "sys/types.h;sys/stat.h" HAVE_ST_BIRTHTIME)
 message ("-- Looking for libuuid")
-if (DARWIN)
+if (DARWIN OR FREEBSD)
-  # Apple includes the uuid functions in their libc, rather than libuuid
+  # Apple and FreeBSD include the uuid functions in their libc, rather than libuuid
  set (HAVE_UUID true)
  check_function_exists (uuid_unparse_lower HAVE_UUID_UNPARSE_LOWER)
-else (DARWIN)
+else (DARWIN OR FREEBSD)
  find_path    (UUID_INCLUDE_DIR   uuid/uuid.h)
  find_library (UUID_LIBRARY NAMES uuid)
  if (UUID_INCLUDE_DIR AND UUID_LIBRARY)
    set (HAVE_UUID true)
    set (TASK_INCLUDE_DIRS ${TASK_INCLUDE_DIRS} ${UUID_INCLUDE_DIR})
    set (TASK_LIBRARIES    ${TASK_LIBRARIES}    ${UUID_LIBRARY})
    # Look for uuid_unparse_lower
    set (CMAKE_REQUIRED_INCLUDES  ${CMAKE_REQUIRED_INCLUDES}  ${UUID_INCLUDE_DIR})
    set (CMAKE_REQUIRED_LIBRARIES ${CMAKE_REQUIRED_LIBRARIES} ${UUID_LIBRARY})
    check_function_exists (uuid_unparse_lower HAVE_UUID_UNPARSE_LOWER)
  else (UUID_INCLUDE_DIR AND UUID_LIBRARY)
    message (FATAL_ERROR "-- libuuid not found.")
  endif (UUID_INCLUDE_DIR AND UUID_LIBRARY)
-endif (DARWIN)
+endif (DARWIN OR FREEBSD)
-if (HAVE_UUID AND HAVE_UUID_UNPARSE_LOWER)
+if (HAVE_UUID_UNPARSE_LOWER)
  message ("-- Found libuuid")
-elseif (HAVE_UUID AND NOT HAVE_UUID_UNPARSE_LOWER)
+else (HAVE_UUID_UNPARSE_LOWER)
  message ("-- Found libuuid, using internal uuid_unparse_lower")
-else (HAVE_UUID AND HAVE_UUID_UNPARSE_LOWER)
+endif (HAVE_UUID_UNPARSE_LOWER)
-  message ("-- libuuid not found, using internal uuid")
+
-endif (HAVE_UUID AND HAVE_UUID_UNPARSE_LOWER)
+# Set the package language.
 if (LANGUAGE)
  set (PACKAGE_LANGUAGE ${LANGUAGE})
 else (LANGUAGE)
  set (PACKAGE_LANGUAGE 1)
 endif (LANGUAGE)
 set (LANGUAGE_EN_US 1)
 set (LANGUAGE_ES_ES 2)
 set (LANGUAGE_DE_DE 3)
 set (LANGUAGE_FR_FR 4)
 set (LANGUAGE_IT_IT 5)
 message ("-- Configuring cmake.h")
 configure_file (
@@ -101,12 +142,16 @@ configure_file (
 add_subdirectory (src)
 add_subdirectory (src/commands)
 add_subdirectory (src/columns)
 add_subdirectory (src/shell)
 add_subdirectory (doc)
 add_subdirectory (i18n)
 add_subdirectory (scripts)
-if (EXISTS test)
+if (EXISTS ${CMAKE_SOURCE_DIR}/test)
  add_subdirectory (test EXCLUDE_FROM_ALL)
-endif (EXISTS test)
+endif (EXISTS ${CMAKE_SOURCE_DIR}/test)
 if (EXISTS performance)
  add_subdirectory (performance EXCLUDE_FROM_ALL)
 endif (EXISTS performance)
 set (doc_FILES NEWS ChangeLog README INSTALL AUTHORS COPYING)
 foreach (doc_FILE ${doc_FILES})
@@ -118,8 +163,9 @@ endforeach (doc_FILE)
 set (CPACK_SOURCE_GENERATOR "TGZ")
 set (CPACK_SOURCE_PACKAGE_FILE_NAME ${PACKAGE_NAME}-${PACKAGE_VERSION})
 set (CPACK_SOURCE_IGNORE_FILES  "CMakeCache" "CMakeFiles" "CPackConfig" "CPackSourceConfig"
-                                "_CPack_Packages" "cmake_install" "install_manifest"
+                                "_CPack_Packages" "cmake_install" "install_manifest" "Makefile$"
-                                "Makefile$" "test" "package-config" "misc/*"
+                                "test" "package-config" "misc/*" "src/task$" "src/libtask.a"
-                                "src/task$" "src/libtask.a" "auto.h$"
+                                "src/columns/libcolumns.a" "src/commands/libcommands.a"
                                "src/shell/tasksh$" "src/shell/libtasksh.a" "auto.h$"
                                "/\\.gitignore" "/\\.git/" "swp$")
 include (CPack)
--- a/2
+++ b/2
@@ -1,6 +1,6 @@
 taskwarrior - a command line task list manager.
-Copyright 2006-2012, Paul Beckingham, Federico Hernandez.
+Copyright 2006-2014, Paul Beckingham, Federico Hernandez.
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal
--- a/386
+++ b/386
@@ -1,7 +1,387 @@
 ------ current release ---------------------------
-2.0.0 (2012-03-17)
+2.3.0 (2014-01-15)
 Features
 + #328 Replaced the 'shell' command with a standalone 'tasksh' binary, which
   includes GNU readline support (thanks to Haitham Gad).
 + #934 support for 'reserved.lines' to accommodate multi-line
   shell prompts when used in conjunction with 'limit:page' (thanks to Robert
   Gill).
 + #1226 A new French translation has begun, and will continue to be a work in
   progress for a while (thanks to YBSA R).
 + #1227 A new 'verify_l10n' utility ensures the localizations are in sync
   (thanks to Wim Schuermann).
 + #1250 Support out-of-tree test runs (thanks to Jakub Wilk).
 + #1256 Supports default values for UDA fields (thanks to Thomas Sullivan).
 + #1297 The task₋sync(5) man pages is rewritten with examples.
 + #1339 The configuration file now supports JSON encoding of Unicode
   characters, by specifying \uNNNN.
 + #1385 Need a way to configure the trust of self-signed certificates.
 + #1423 sync vs. push, pull, merge collision avoidance.
 + #1473 Make TASK_RCDIR customizable (thanks to Jakub Wilk).
 + Stores un-synched transactions in <data.location>/backlog.data.
 + Adds a new 'synchronize' command to sync data with a Taskserver.
 + Adds a new 'initialize' synchronize command argument that uploads all pending
   tasks for first-time initialization.
 + Adds a new 'sync' verbosity token, which will remind when a backlog builds
   up and needs a sync.
 + Supports IPv4 and IPv6 server addresses.
 + Began fr-FR localization.
 + Complete it-IT localization.
 + Merged three l10n utility scripts into one tools, scripts/utils/l10n, which
   will help the translation effort.
 + The 'due' urgency component now uses seconds, not days, in the calculation.
 + The 'debug.tls' configuration variable takes an integer which corresponds to
   the GnuTLS log level.  For debugging.
 + File format 2 (used in version 0.9.3 - 1.5.0) is no longer supported.
 + Migrated column processing code into Task.cpp for future use within each
   individual column object.  Legacy code left in Task.cpp for column objects
   that are not yet modified.
 + ColPriority.cpp - Migration of column modification code out of Task.cpp and
   into the individual column object.
 + Now requires libuuid (thanks to Martin Natano).
 + New '_get' is a DOM accessor helper command.
 + New virtual tags (WEEK, MONTH, YEAR, PARENT).
 + Added the 'remaining' format for all date columns.
 + Protects against interrupt during critical DB commit and sync operations.
 + The 'push', 'pull' and 'merge' commands now generate a 'deprecated' message.
 + Rewritten task-sync(5) man page, listing sync options and setup guidelines..
 + Now properly uses the libc version of uuid_create and uuid_to_string for
   FreeBSD (thanks to Pietro Cerutti).
 + Performance improvements:
   + Optimizes indexing into pending.data for direct task access.
   + Improved I/O performance with better defaults for buffer sizes.
 Bugs
 + #1195 Random seed not random enough - removed all random number code (thanks
   to Jakub Wilk).
 + #1196 Now builds on Hurd (thanks to Jakub Wilk).
 + #1197 Now 'tasksh' recognizes Ctrl-D to exit.
 + #1200 Directory d_type==DT_UNKNOWN is now handled correctly (thanks to Jakub
   Wilk).
 + #1211 The 'dateformat' settings now default to the ISO-8601 standard of
   'Y-M-D' (thanks to Robin Björklin).
 + #1222 The 'summary' report now obeys the 'color.label' setting (thanks to
   Steve Rader).
 + #1235 The 'shell' command can now start in non-interactive mode without a
   .taskrc file (thanks to Haitham Gad).
 + #1247 Tests now create a local dir, rather than use the insecure /tmp dir
   (thanks to Jakub Wilk).
 + #1248 Merge tests no longer connect to takwarrior.org (thank to Jakub Wilk).
 + #1249 Build system now recognizes GNU/Hurd and GNU/kFreeBSD (thanks to Jakub
   Wilk).
 + #1263 The 'waiting' report properly lists only pending tasks with a wait date
   (thanks to Fidel Mato).
 + #1268 Edit doesn't accept changes, if task has completed dependency (thanks
   to Dmitriy Matrosov, Michele Santullo).
 + #1270 The 'undo' command is now properly removing backlog entries.
 + #1273 Query with negative relative date differs greatly from absolute date
   in past (thanks to John West).
 + #1279 Assorted corrections to the task-ref.pdf document (thanks to Benjamin
   Weber).
 + #1286 Cannot use "sow", "som", etc in "entry.after", "end.after" filters
   (thanks to Jake Bell).
 + #1300 Encode/decode pairing is now properly balanced.
 + #1305 Commit hash now available in tarball builds (thanks to Ben Boeckel).
 + #1352 Terminal crashes when using taskwarrior's zsh completion (thanks to
   Ivan Freitas, XTaran).
 + #1356 Command reference now mentions /from/to/g.
 + #1381 Invalid JSON exported by Task 2.3.0-beta1 (thanks to Kosta H).
 + #1387 ZSH Auto-Completion dates are not current (thanks to Benjamin Weber).
 + #1388 Updated task(1) man pages with import/export script examples (thanks to
   Benjamin Weber).
 + #1410 Incomplete Date Synonym List in man task (thanks to Benjamin Weber).
 + #1414 Client does not verify SSL certificates (thanks to Scott Kroll).
 + #1415 Client should not require a SSL certificate if the server has a trusted
   certificate (thanks to Scott Kroll).
 + #1476 Unicode indicators increase column width (thanks to Paul Kishimoto).
 + #1477 Pre-compiled static library (*.a) in source tarball (thanks to Jakub
   Wilk);
 + #1478 pri_sort.t failure (thanks to Jakub Wilk).
 + #1479 bug_annual.t failure (thanks to Jakub Wilk).
 + Fixed bug so that 'limit:page' now considers footnote messages.
 + Fixed bug where specifying an ID of 0 yielded all completed/deleted tasks
   (thanks to greenskeleton).
 + Fixed rc.nag documentation (thanks to Jeroen Budts).
 + Fixed bug where task edit incorrectly claimed duration UDA was modified.
 ------ old releases ------------------------------
 2.2.0 (2013-04-07) 05f7948f7e70d7be3642bdc336faace52eaa9dfb
 Features
 + Added Feature #685, which provides a 'blocking' report, and new color rule
   (thanks to Michelle Crane).
 + Added Feature #953, which includes the total number of blocked and blocking
   tasks to the 'statistics' command output (thanks to T. Charles Yun).
 + Added Feature #1039, which adds new date shortcuts, 'socm' and 'eocm',
   meaning start and end of current month (thanks to Thomas Sullivan,
   Louis-Claude Canon).
 + Added Feature #1061, which allows the 'columns' command to use a search
   string for the column name (thanks to Uli Martens).
 + Added Feature #1069, which gives a clearer error when a UDA
   is added without the uda.<uda-name>.type variable.
 + Added Feature #1099, which supports the 'color.uda.<uda-name>' color rule
   (thanks to Florian Hollerweger).
 + Added Feature #1124, which provides a '_show' command that displays all
   configuration defaults and settings, for use by third-party software (thanks
   to Jake Bell).
 + Added feature #1147, applying patch to display duration of each activity
   session (thanks to Justin Forest).
 + The 'projects' command now outputs abstract parents and reduces
   repetition by not printing parent names in front of children names.
 + Added framework for testing bash autocompletion.
 + New helper command '_aliases' for autocompletion purposes.
 + Stop consider new tasks after quitting a bulk change.
 + Removed deprecated 'fg:' and 'bg:' attributes.
 + The 'diagnostics' command now reports libuuid details.
 + New characters for parsing and formating dates ('n', 's' and 'v').
 + Virtual tags (BLOCKED, UNBLOCKED, BLOCKING, DUE, DUETODAY, OVERDUE, TODAY,
   ACTIVE, SCHEDULED, CHILD, UNTIL, WAITING and ANNOTATED).
 + New 'modified' attribute, which contains the most recent modification date,
   if a modification has occurred.
 + Fixed the mechanism used for selecting translations (thanks to Fidel Mato).
 + Added new export script: export-tsv.pl.
 + Added the configuration variable 'print.empty.columns'.
 + The 'push' and 'pull' commands now properly distinguish between a missing
   transport utility and other errors (thanks to Russell Steicke).
 + Removed support for Lua extensions.
 + Added tips.fr-FR (thanks to YBSAR).
 + Added tips.es-ES (thanks to Fidel Mato).
 Bugs
 + Fixed bug #642, so that the default 'data.location=~/.task' preserves the
   '~', leading to more portable .taskrc files (thanks to alparo).
 + Fixed bug #947, #1031, which kept expanding aliases after the '--' operator
   (thanks to Jim B).
 + Fixed bug #1038, which prints blank lines with bulk changes and when the
   verbose attributes does not specify it. Lines do a better separation between
   each changes also.
 + Fixed bug #1042, where the 'diagnostics' command failed to detect missing
   external utilities on Solaris and NetBSD.
 + Fixed bug #1043, where aliases were not recognized by bash autocompletion.
 + Fixed bug #1044, where 'task projects' considers newly deleted tasks and
   provides an incorrect summary.
 + Fixed bug #1047, which caused extra commas in exported JSON when UDA orphans
   were present (thanks to Thomas Sullivan).
 + Fixed bug #1048, which segfaulted rather than complain about syntax (thanks
   to Bryce Harrington, Štěpán Henek).
 + Fixed bug #1053, where ' characters were not escaped by export-csv.pl (thanks
   to John Florian).
 + Fixed bug #1056, where CmdSummary did not print abstract parents.
 + Fixed bug #1059, where CmdEdit was running garbage collection.
 + Fixed bug #1060, where an error was not thrown correctly.
 + Fixed bug #1063, so that numeric UDA fields are now sortable (thanks to Max
   Muller).
 + Fixed bug #1065, where CmdShow issued messages in incorrect situations.
 + Partially fixed #1083, which showed 'task 0 ...' when modifying a non-
   pending task (thanks to Aikido Guy).
 + Fixed bug #1087, which gave incorrect task/line counts under certain
   conditions.
 + Fixed bug #1091, allowing filters to use 'urgency.over:4.5'.
 + Fixed bug #1110, which did not treat 'status:Completed' the same
   as 'status:completed' (thanks to Aikido Guy).
 + Fixed bug #1118, which dropped changes after edits were rejected (thanks to
   Ben Boeckel).
 + Fixed bug #1123, which caused the undo of a 'log' command to corrupt the data
   file (thanks to Tim None).
 + Fixed bug #1128, which caused 'age' columns to be right-justified instead of
   left-justified (thanks to Steve Rader).
 + Fixed bug #1136, #1177, which incorrectly line-wrapped tasks with annotations
   (thanks to Steve Rader, T. Charles Yun).
 + Fixed bug #1135, #1137, which caused file locks to be non-blocking (thanks
   to Steve Rader).
 + Fixed bug #1150, which referenced deprecated features in the tutorial man
   page (thanks to Benjamin Weber).
 + Fixed bug #1154, which now allows priorities to be specified in any case.
 + Fixed bug #1178, which included binary libraries in the released source
   package (thanks to Jakub Wilk).
 + Fixed bug #1181, where single-character columns were often rendered using
   widths larger than 1 (thanks to Max Muller).
 + Fixed bug #1183, correcting error message typos (thanks to Jakub Wilk).
 + Fixed bug #1184, correcting man page formatting (thanks to Jakub Wilk).
 + Fixed bug #1185, correcting man page install location for out-of-tree
   builds (thanks to Jakub Wilk).
 + Fixed bug #1189, which caused wide Asian UTF8 characters to be measured as
   narrow characters (thanks to Roy Zuo).
 + Fixed bug #1191, which kept file locks active for longer than necessary,
   and caused the 'execute' command to be considered a 'write' command.
 + Fixed bug #1192, which failed to expand braces internally, as POSIX /bin/sh
   does not do {} expansion, thereby causing push/pull errors (thanks to Russell
   Steicke).
 + Fixed bug #1194, so that $HOME has precedence over the passwd db when looking
   for the user's home directory (thanks to Jakub Wilk).
 + Fixed bug #1199, where 'stat' was used instead of 'lstat' (thanks to Jakub
   Wilk).
 + Fixed bug #1200, where directory removal didn't handle d_type==DT_UNKNOWN
   (thanks to Jakub Wilk).
 + Fixed bug #1209, spelling mistake in reference page (thanks to Friedrich
   Heusler).
 + Fixed bug #1210 so that widths are taken from localized strings instead of
   hardcoded.
 + Fixed bug #1218 so that description columns minimum width is calculated
   correctly.
 + Improved hyphenation by splitting on commas (even if no whitespace after).
   Leads to better output of, for example, 'task show', where comma-separated
   lists are common.
 + No more bash completion of, for example, 'projABC:', or of 'proj:' if
   abbreviation.minimum is greater than 4.
 + Fixed bug where shadow files are not properly created when there is a missing
   .taskrc file (thanks to Pietro Cerutti).
 + Fixed bug with 'socm' date calculation that failed on some days, by
   simplifying the implementation.
 + Fix a bug where 'print.empty.columns=no' resulted in never printing the
   project column.
 + Integrated latest UTF8 character width calculations from Markus Kuhn.
 + Fixed bug where localized UTF8 strings were not properly substr'd (thanks to
   Fidel Mato).
 + Fixed a bug where the bash completion script was causing gc() to be run.
 + Fixed manpages that were not installed when running an out-of-source build
   (thanks to Vincent Petithory).
 + Added missing localized confirmation strings (thanks to Rainer Müller).
 + Fixed bug that added an extra newline after setting the terminal title
   (thanks to Rainer Müller).
 + Fixed a bug where the terminal title was tried to be set without a tty
   (thanks to Rainer Müller).
 + Fixed hook tests to work on released code (thanks to Jakub Wilk).
 + Fixed bug where arguments passed to 'task execute' needed double escaping.
 + Fixed a bug so that the report filter order is preserved, to enable an
   optimization that was being skipped.
 2.1.2 (2012-09-18) 1e3176ed70d2b50faf03838d0df279b2a4ae93b2
 Bugs
 + Bug fix release regarding #1104, which causes duplicate UUIDs during
   the merge command.
 + Fixed bug where shadow files are not properly created when there is a missing
   .taskrc file (thanks to Pietro Cerutti).
 2.1.1 (2012-07-24) 46c5f8b826838ce96d9df7fcd3039de3c43483dd
 Bugs
 + Fixed bug that caused misplaced commas in JSON export (thanks to greenskeleton).
 + Fixed bug #1036, which prevents 'until' attributes to be modified for
   non-recurring tasks (thanks to Stéphane Pezennec).
 2.1.0 (2012-07-23) a413331c9450b48065f94639e7ab0455eaa74293
 Features
 + Feature #164, #325, #339, #435, #553, #554, #975, User Defined Attributes.
 + Feature #457, #922, tasks may now be given an 'until' date, after which they
   expire and are deleted.
 + Feature #516, which allows the duplication of completed tasks (thanks to
   Peter De Poorter, Ethan Schoonover).
 + Feature #921, which implements a 'udas' command that describes defined UDAs,
   and a '_udas' for completion purposes.  Also detects UDA orphans.
 + Applied patch for feature #1005, which prevents the update-holidays.pl script
   from creating duplicate holidays (thanks to Jörg Plate).
 + Added the new 'indented' format for the 'project' attribute.
 + The 'projects' report now uses 'project.indented' format.
 + The 'summary' report now uses 'project.indented' format.
 + Applied patch to allow ID ranges and UUIDs when editing dependencies (thanks
   to Louis-Claude Canon).
 + Supports 'scheduled' date for tasks, which represent the earliest opportunity
   to work on a task.
 + Performance improvements:
   + Added parse-free convenience functions
   + Filter optimization: with no 'OR' or 'XOR' operators, no UUIDS but with IDs
     the completed.data file is not referenced.
   + Reduced excessive number of sort columns on certain reports
   + Speed boost for 'next' report.
 + Similar helper subcommands for 'uuids' as for there is for 'ids' (_uuids and
   _zshuuids).
 + Possible to specify the date format when editing with 'dateformat.edit'.
 + Possible to specify the date format when showing information about a task
   with 'dateformat.info'.
 + Bash script improvement (column names are now completed).
 + Feature #1013, output error, header, footnote and debug messages on standard error.
 + Feature #1026, command line overrides are now applied before and after the
   creation of the default rc file and data directory, which allows for
   programmatic initialization without keystroke synthesis (thanks to Nicholas
   Rabenau).
 + Feature #1033 allows UDAs to contribute to urgency (thanks to Max Muller).
 + Color error messages with a specific configuration variable 'color.error'.
 Bugs
 + Fixed bug #734, which allows a sequence of IDs to work when modifying the
   attribute "depends" (thanks to Andreas Kalex).
 + Applied patch for bug #919, so the holidays listed on the 'calendar' report
   are sorted (thanks to Jörg Plate).
 + Fixed bug #954, which caused bulk deletions when using a UUID filter term and
   the delete command (thanks to Bryce Harrington).
 + Fixed bug #959, which forces use of dateformat for annotations when using the
   'edit' command (thanks to Louis-Claude Canon).
 + Fixed bug #964, where the 'projects' command showed the wrong priority labels
   (thanks to Ali Mousavi).
 + Fixed bug #967, which did not properly determine character widths for UTF8
   characters (thanks to Victor Roetman, Jörg Plate, Markus Kuhn).
 + Fixed bug #968, improving online documentation or dependencies (thanks to
   Marek Vitek).
 + Fixed bug #972, #1018, which caused a recurrence of "7" to be interpreted as
   "7secs", instead of generating an error (thanks to Vlad Zhivotnev, Stanley G).
 + Fixed bug #973, including 'urgency' in the 'export' output (thanks to Andy
   Spiegl).
 + Fixed bug #986, so that the 'info' report uses the correct date format, also
   applied patch to correct documentation and add unit tests (thanks to
   Louis-Claude Canon).
 + Applied patch for bug #987, so that total active time does not continue to
   accumulate after an active task is completed (thanks to Louis-Claude Canon).
 + Fixed bug #988, updating the documentation so that 'undo.data' usage is more
   clearly stated (thanks to Louis-Claude Canon).
 + Applied patch for bug #991, which removes an obsolete consistency check
   (thanks to Louis-Claude Canon).
 + Fixed bug #995, which mis-parsed UUIDs in filters as other elements (thanks
   to Bryce Harrington).
 + Fixed bug #996, so that verbosity code and documentation are in agreement,
   and that the 'verbose=off' works as intended (thanks to Peter De Poorter,
   Louis-Claude Canon).
 + Fixed bug #997, so that output is correctly controlled by the 'affected'
   verbosity token.
 + Fixed grammar in feedback string (thanks to Uli Martens).
 + Addressed valgrind complaints (thanks to Bryce Harrington).
 + Removed default configuration value for the obsolete 'annotations' setting.
 + Corrected rounding errors on burndown chart bar size calculations (thanks to
   Uli Martens).
 + Fixed bug where '6 months' was interpreted as 180 days, but when rendered
   was shown as '5 months' (thanks to Aikido Guy).
 + Fixed bug where ISO dates were parsed and the TZ was modified, which should
   have no bearing on a Zulu time.
 + Fixed man page typos.
 + Fixed incorrect Lua API return value (thanks to Oleksii Tsai).
 + Fixed bug #956, which prevents 'ids', 'uuids' and helper commands to be used
   directly by external script when a variable is override.
 + Fixed bug #960, which caused tab-completion to fail after any non-ASCII alpha
   characters were used in a description (thanks to Hyde Stevenson).
 + Fixed bug #962 that rename the bash completion script in prevision of future
   2.0 bash release.
 + Fixed bug #990, which prevents color precedence to be applied correctly for
   tagged tasks.
 + Fixed bug #1001, which caused a segv (thanks to Bryce Harrington).
 + Fixed bug #872, #945, #1006, #1024, which caused words like the German 'im'
   and 'des' in a description to be expanded into 'imask' and 'description'
   (thanks to Michelle Crane, Louis-Claude Canon, Stephen Hay and Martin U).
 + Fixed bug #1008, which failed to remove tasks with the special tag '+nocal'
   from the calendar report output with 'calendar.details=full' set (thanks to
   Bryan Kam).
 + Fixed bug #1012, which failed to install add-on scripts with execute
   permission.
 + Fixed bug #1016, which caused segfaults when importing JSON with annotations
   that lack description or entry date (thanks to Nicholas Rabenau).
 + Fixed bug #1017, which exported invalid JSON when there were no tasks (thanks
   to Nicholas Rabenau).
 + Fixed bug #1022, where dependencies were note released when a blocking task
   was completed (thanks to Arkady Grudzinsky).
 + Fixed bug #1023, which applied default.project and default.priority during
   modification (thanks to Christoph Lange).
 + Fixed bug #1028, so that UDA durations are stored in seconds, not in raw form
   (thank to Uli Martens).
 + Fixed bug #1030, which defines a portable implementation of timegm and removes
   the use of tm_gmtoff for non GNU/BSD platforms.
 + Fixed bug #1032, which prevented negative urgency coefficients from working
   for projects and tags.
 2.0.0 (2012-03-17) 03799eba9f230e48c4fa6d6ebddabe91bef7998f
 # Untracked Features, biggest first.
 + autoconf eliminated.
@@ -306,8 +686,6 @@
 + Fixed problem where 'project' was not supported as a verbosity token (thanks
   to Adam Gibbins).
 ------ old releases ------------------------------
 1.9.4 (03/03/2011) b9bae255f4fa03970eced3ac0876935271d1d7a1
 + Added burndown charts - 'burndown.daily', 'burndown.weekly',
   'burndown.monthly', that use 'color.burndown.pending', 'color.burndown.started'
--- a/117
+++ b/117
@@ -1,22 +1,77 @@
-This file is intended to convey the current efforts, priorities and needs of the
+General Statement
-codebase.  It is for developers looking for a way to start contributing.
+  This file is intended to convey the current efforts, priorities and needs of
  the codebase.  It is for anyone looking for a way to start contributing.
  While this is biased towards developers, anyone can contribute, and everyone
  is encouraged to do so.  Here are many ways to contribute that may not be
  immediately obvious to you:
  - Use Taskwarrior, become familiar with it, and make suggestions.  There are
    always ongoing discussions about new features and changes to existing
    features.  Join us in the forums.
  - Join us in the #taskwarrior IRC channel on freenode.net.  Some great ideas,
    suggestions, testing and discussions have taken place there.  It is also the
    quickest way to get help, or confirm a bug.
  - Review documentation: there are man pages, wiki articles, tutorials and so
    on, and these may contain errors, or they may not convey ideas in the best
    way.  Perhaps you can help improve it.
  - Take a look at the bug database, and help triage the bug list.  This is a
    review process that involves confirming bugs, providing additional data,
    information or analysis.  Bug triage is very useful and much needed.
  - Fix a bug.  For this you'll need C++ and Git skills, but this is one of
    the largest ways you can contribute.  We welcome all bug fixes, provided
    the work is done well and doesn't create other problems or introduce new
    dependencies.
  - Add unit tests.  Unit tests are possibly the most useful contributions of
    all, because they not only improve the quality of the code, but prevent
    future regressions.  Plus, broken tests are a great motivator for us to fix
    the causal bug.
  - Add a feature.  Well, let's be very clear about this: adding a feature is
    not usually well-received, and if you add a feature and send a patch, it
    will most likely be rejected.  The reason for this is that there are many
    efforts under way, in various code branches.  There is a very good chance
    that the feature you add is either already in progress, or being done in a
    way that is more fitting when considering other work in progress.  So if
    you want to add a feature, please don't.  Start by talking to us, and find
    out what is currently under way or planned.  You might find that we've
    already rejected such a feature for some very good reasons.  So please
    check first, so we don't duplicate effort or waste anyone's time.
  - Donate some server time to the testing effort, by participating in the
    continuous integration of all changes, with our Flod software.  See this
    page for an example:  http://tasktools.org/tinderbox
    Ask us about running a Flod satellite, we're always looking for exotic
    platforms to test on.
  - Spread the word.  Help others become more effective at managing tasks.
  - Encouragement.  Tell us what works for you, and what doesn't.  It's all
    good.
  Following are specific areas that could use some attention.
 Deprecated Code
  This is code that is going to be phased out soon, and therefore is not worth
  fixing or documenting.  Don't waste your time.
-  - There is no deprecated code at the moment.  I'm sure there will be soon.
+  - Shadow file support in core.  It will migrate to become an external script.
 New Code Needs
-  This is code that needs to be written, usually down at the C++ function level.
+  This is code that needs to be written, usually down at the C++ function/method
  level.
  - Need export_viz.yy script.  Any language.  This would have value as an
    example, or template script serving as a starting-point for anyone who
    needed this format.
  - Need new export_xxx.yy scripts - the more the better.  Any language.
  - The JSON.{h,cpp} code is fast and efficient up to a point, but has a non-
-    linear performance curve, implying a slowdown due to fragmentation.  Fix it.
+    linear performance curve, implying a slowdown due to fragmentation.  Find
    it, fix it.
  - Need a function that can optimize color codes.  For example, if a string
    contains this:
      <red>one two </red><red>three four</red>
@@ -24,13 +79,26 @@ New Code Needs
      <red>one two three four</red>
    This is only possible if there is nothing between </red> and <red> and the
    colors match.
  - Need an external script that can locate and correct duplicate UUIDs in the
    data file, as found by 'task diag'.  This should check to see if there is
    a suitable UUID generator installed.  This should also be careful to
    properly handle recurring tasks.
  - Need an external implementation equivalent to, or better than the 'shadow
    file' feature.  Simply because shadow file capability *can* be implemented
    outside the core code, we want to make it be that way.
  - Take a look at:
      http://taskwarrior.org/versions/show/42
    This 'extension' release is a collection of all the requested features that
    lie outside of the core product, and will be implemented as external scripts
    by anyone who wishes to participate.
 Documentation Needed
  Various forms of documentation that are needed, or are in need of review or
  update.
  - Wiki/How-To: Date Handling
  - Wiki/How-To: Custom Reports, including performance considerations
  - Wiki/How-To: Aliases, particularly new enhanced aliases
  - Wiki/Features: All sections
@@ -57,6 +125,7 @@ Unit Tests Needed
  code and run the test suite:
     git clone git://tasktools.org:task.git
     cd task.git
     git checkout 2.3.0
     cmake .
     make
     make test
@@ -68,9 +137,10 @@ Unit Tests Needed
     make test
  Either way, a TAP file 'all.log' is written that contains all test results.
-  once this file is created, you can see the failing tests using this script:
+  Once this file is created, you can see the failing tests using this script:
-    task.git/test/problems
+    cd task.git/test
    ./problems
  If you make a habit of running the test suite, consider downloading the
  vramsteg utility to show a colorful progress bar, from:
@@ -82,7 +152,8 @@ Unit Tests Needed
  - The basic.t unit tests are a misnomer, and should be either removed or
    renamed.  We have long talked of 'basic functionality' that includes add,
    delete, done, and list commands.  We need unit tests that prove that basic
-    functionality is working, and it should be called basic.t.
+    functionality is working, and the file containing them should be called
    basic.t.
  - None of the current unit tests remove the 'extensions' directory, and they
    all should.
  - Test propagation of modifications to recurring tasks.
@@ -90,31 +161,37 @@ Unit Tests Needed
  - Need unit tests for each bug in the issue list, if suitable.
  - We have bugs in the unit tests that only manifest on days such as December
    31st.  Clearly there is some bad date math going on, most likely in the
-    tests themselves, rather than in taskwarrior.
+    tests themselves, rather than in Taskwarrior.
-  * Note that running the unit tests require the Perl JSON module to be
+  * Note that running the unit tests requires the Perl JSON module to be
    installed.
  Note that all new unit tests should follow the test/template.t standard.
 Work in Progress
  Things that are currently in flux, which is another way of saying leave it
  alone while it is being worked on.
-  - None.
+  - Command line parser (A3).
  - Expression evaluation (E9).
  - All columns/Col*::validate methods.
  - New columns/Col*::modify methods.
 Current Codebase Condition
  'master' branch:
-    - 1.9.4 release, current, locked.
+    - 2.2.0 Current release, locked.
-  '2.0.0' branch:
+  '2.2.0' branch:
-    - Rapidly approaching completion, and merged to master.
+    - Current release.  Locked.
-  '2.0.1' branch:
+  '2.3.0' branch:
-    - Will be ready for any emergency fixes.
+    - Current development branch with sync features, and new tasksh.
-  '2.1.0' branch:
+  '2.4.0' branch:
-    - Future development effort.
+    - Command line parser rewrite.
 ---
-2012-03-03 Updated text, removed old history info.
+2012-05-12 Added general statement about how to contribute.
 2013-09-09 Updated branch info.
--- a/27
+++ b/27
@@ -26,7 +26,7 @@ Command Line Parsing
 Dispatch
-  Dispatch is simple:  once the command line is parsed, the command is used to
+  Dispatch is simple: once the command line is parsed, the command is used to
  look up a command object, then call its execute method.
  Context stores an associative map of command object pointers indexed by a
@@ -77,7 +77,6 @@ Files
    completed.data
    undo.data
    backlog.data
    synch.key
  The pending.data file aspires to contain only pending, waiting and recurring
  tasks, but this is only correct after a GC, and before any tasks are modified.
@@ -91,12 +90,9 @@ Files
  'merge' command.
  The backlog.data file contains an accumulated set of changes that have not
-  been transmitted to the task server.  It grows unbounded between 'synch'
+  been transmitted to the Taskserver.  It grows unbounded between 'synch'
  commands.
  The synch.key file contains a synch receipt that is used to optimize synch
  operations.
 Filter
  A filter is simply a set of command line arguments, but is only a subset of
@@ -153,15 +149,14 @@ Test Suite
  mostly written in Perl, and utilize the Test::More module to generate TAP
  output.  Some tests are written in C++ and also generate TAP.
-  There are currently around 5,000 unit tests, that take a minute or two to run
+  There are currently over 5,000 unit tests, that take a minute or two to run
  in total.
-  There is a tinderbox that runs on a variable frequency.  As a release
+  Taskwarrior uses flod software to automate continuous integration across
-  approaches, the frequency is boosted so there are always current results to be
+  many platforms. Code changes are automatically detected, propagated, built and
-  found.  Between releases the tinderbox runs daily.  It is intended that this
+  tested on a variety of participating platforms. Grid testing results are here:
  be modified for continuous integration, so it runs once per commit.
-    http://tasktools.org/tinderbox/task.html
+    http://tasktools.org/tinderbox/taskwarrior-2.3.0.html
  When making code changes, it is important that the test suite be run to verify
  that functionality was not broken.
@@ -193,9 +188,9 @@ Patches
    - Conforms to the prevailing coding standards - in other words, it should
      fit right in with the existing code.
-  A patch may be rejected for any of the above reasons, and more.  Bad patches
+  A patch may be rejected for not following the above guidelines, and more.
-  may be accepted and modified depending on work load and mood.  It is possible
+  Bad patches may be accepted and modified depending on work load and mood.  It
-  that a patch may be rejected because it conflicts in some way with plans or
+  is possible that a patch may be rejected because it conflicts in some way with
-  upcoming changes.
+  plans or upcoming changes.
 ---
--- a/45
+++ b/45
@@ -12,8 +12,8 @@ from source.
 More information on cmake can be obtained at http://cmake.org
-Optionally, you might want to have Lua installed, if you wish to write plugins
+It is HIGHLY RECOMMENDED that you build with a library that provides uuid_*
-and modify taskwarrior.
+functions, such as libuuid.
 Basic Installation
@@ -67,16 +67,31 @@ lists them and their defaults plus the CMAKE_INSTALL_PREFIX:
  CMAKE_INSTALL_PREFIX  /usr/local
  TASK_BINDIR           bin
  TASK_DOCDIR           share/doc/task
  TASK_RCDIR            share/doc/task/rc
  TASK_MAN1DIR          share/man/man1
  TASK_MAN5DIR          share/man/man5
 The corresponding TASK_* variables will be combined with CMAKE_INSTALL_PREFIX to
-get absolute installation directoris:
+get absolute installation directories:
-  CMAKE_INSTALL_PREFIZ/TASK_BINDIR   /usr/local/bin
+  CMAKE_INSTALL_PREFIX/TASK_BINDIR   /usr/local/bin
-  CMAKE_INSTALL_PREFIZ/TASK_DOCDIR   /usr/local/share/doc/task
+  CMAKE_INSTALL_PREFIX/TASK_DOCDIR   /usr/local/share/doc/task
-  CMAKE_INSTALL_PREFIZ/TASK_MAN1DIR  /usr/local/share/man/man1
+  CMAKE_INSTALL_PREFIX/TASK_RCDIR    /usr/local/share/doc/task/rc
-  CMAKE_INSTALL_PREFIZ/TASK_MAN5DIR  /usr/local/share/man/man5
+  CMAKE_INSTALL_PREFIX/TASK_MAN1DIR  /usr/local/share/man/man1
  CMAKE_INSTALL_PREFIX/TASK_MAN5DIR  /usr/local/share/man/man5
 Localizations
 -------------
 To make use of a translation, specify a language number, as found in cmake.h:
  $ cmake -DLANGUAGE=2 .
 Currently the defined languages are:
  en-US    1
  es-ES    2
 Uninstallation
@@ -112,11 +127,6 @@ Cygwin
  again, or reinstall Cygwin under your normal Windows login.
 Darwin
  If you're having trouble with Lua, check to see if the include files were
  installed. If you're using fink, this will require the lua51-dev package in
  addition to lua51.
 Darwin, 32bit
  The taskwarrior packages will not work on a 32-bit OSX installation on Core
  Duo hardware.  You will need to build Taskwarrior from source, and use this
@@ -124,16 +134,17 @@ Darwin, 32bit
    cmake -DCMAKE_C_FLAGS=-m32 -DCMAKE_CXX_FLAGS=-m32 -DCMAKE_EXE_LINKER_FLAGS=-m32 .
- See:  http://taskwarrior.org/issues/817
+  See:
-       http://stackoverflow.com/questions/3261909/build-32bit-on-64-bit-linux-using-a-configure-script
+    http://taskwarrior.org/issues/817
-       http://stackoverflow.com/questions/2617508/cmake-gcc-cuda-and-m32-wtf
+    http://stackoverflow.com/questions/3261909/build-32bit-on-64-bit-linux-using-a-configure-script
-       http://stackoverflow.com/questions/6077414/cmake-how-to-set-the-ldflags-in-cmakelists-txt
+    http://stackoverflow.com/questions/2617508/cmake-gcc-cuda-and-m32-wtf
    http://stackoverflow.com/questions/6077414/cmake-how-to-set-the-ldflags-in-cmakelists-txt
 Troubleshooting
 ---------------
-If you've recently made changes to dependencies (by reinstalling Lua, for
+If you've recently made changes to dependencies (by reinstalling them, for
 example) be sure to rerun 'cmake .' before trying to execute 'make' again.
 CMake will run and locate all the necessary pieces for the build, and create
--- a/2
+++ b/2
@@ -1,6 +1,6 @@
 taskwarrior - a command line task list manager.
-Copyright 2006-2012, Paul Beckingham, Federico Hernandez.
+Copyright 2006-2014, Paul Beckingham, Federico Hernandez.
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal
--- a/132
+++ b/132
@@ -1,107 +1,73 @@
-New Features in taskwarrior 2.0.0
+New Features in taskwarrior 2.3.0
-  - New 'ids' command that returns a filtered set of task ID numbers, instead
+  - New Taskserver sync capabilities.
-    of the actual tasks.  Similarly, there is a 'uuids' command.
+  - New shell (tasksh) with Readline support replaces old 'task shell' command.
-  - Attribute modifiers may be prefixed with '~' to return the opposite of a
+  - The 'dateformat' settings now default to the ISO-8601 standard of 'Y-M-D'.
-    filter's results.
+  - Italian translation.
-  - Status attribute can now be used in report.
+  - French translation has begun.
-  - Project names may now contain spaces.
+  - UDA fields now allow default values.
-  - New export-html.pl script.
+  - Now requires libuuid.
-  - Now supports the 'inverse' color attribute.
+  - New virtual tags: WEEK, MONTH, YEAR, PARENT.
-  - Reports may now be sorted by columns that are not displayed (example: ID,
+  - New 'remaining' format for date columns.
-    project, due date and description sorted by urgency).
+  - New '_get' DOM accessor helper command.
-  - Performance enhancements.
+  - New task-sync(5) man page.
  - New 'next' report, that gauges urgency and reports the most urgent tasks.
  - The 'next' report is now the default command.
  - Fine control of verbosity through the 'verbose=' configuration variable.
  - New 'execute' command that runs external scripts/programs.
  - JSON is the new default export format.
  - New 'reports' command that lists reports and their descriptions.
  - New complex aliases.
  - Filtering now available on most read-only commands.
  - The done, delete, start and stop commands now allow modification to the
    task and annotations.
  - New 'columns' command to list the supported columns and formats.
  - New 'eoq' and 'soq' dates to refer to the end and start of the quarter.
  - Urgency now has an 'age' component.
-  Please refer to the ChangeLog file for full details.  There are too many to
+New commands in taskwarrior 2.3.0
  list here.
-New commands in taskwarrior 2.0.0
+  - New 'sync' command to synchronize data with a Taskserver.
  - New 'tasksh' command which replaces the old 'task shell' with an improved
    standalone shell, featuring Readline support.
-  - "ids" command that accepts filters, and returns an ID sequence.
+New configuration options in taskwarrior 2.3.0
-New configuration options in taskwarrior 2.0.0
+  - 'taskd.server' specifies host:port of the Taskserver.
  - 'taskd.credentials' specifies user credentials for the Taskserver.
  - 'taskd.certificate' specifies the Taskserver certificate for authentication.
  - 'taskd.key' specifies the Taskserver key for encryption.
  - 'taskd.ca' specifies the Taskserver CA.
  - 'taskd.trust' overrides certificate checking.
  - 'taskd.ciphers' overrides default cipher selection.
  - 'debug.tls' shows TLS log information, for debugging.
  - The configuration file supports JSON encoding of unicode characters \uNNNN.
-  - Now includes Belarus, Czech Republic and Japanese holiday data.  Please note
+Newly deprecated features in taskwarrior 2.3.0
    that the holiday file names now include a full locale.  For example:
    'holidays.en-US.rc' instead of 'holidays-US.rc'.
  - The old 'curses' configuration variable is renamed to 'detection', but
    retains the original meaning, which is whether or not to auto-detect the
    dimensions of the terminal window.
  - Extension system now controlled by the 'extensions' configuration variable.
  - Two new solarized color themes.
  - New 'dependency.indicator' for the 'depends.indicator' report field format.
  - New 'indent.annotation' for the description.default field format.
  - New 'color.label' for report column labels.
  - New 'verbose=...' support for individual verbosity settings.
  - New 'avoidlastcolumn' support for Cygwin users.
  - New 'patterns' enables/disables command line pattern support.
  - New 'expressions' enables/disables command line expression support.
  - New 'dom' enables/disables DOM support for the command line.
  - New 'json.array' determines whether 'query' command output is enclosed by
    '[...]'.
  - New 'regex' control determines whether substitutions use Regular Expressions
    or simple text patterns.
  - New 'exit.on.missing.db' control causes an exit if the ~/.task directory
    (or override) is missing.
  - New 'color.completed' and 'color.deleted' color rules.
  - New 'abbreviation.minimum' setting controls how short an abbreviated
    command or value may be.
  - New 'hyphenate' setting controls whether long lines are hyphenated when
    broken during text-wrapping.
  - New 'defaultheight' setting overrides the assumed 24 lines when 'detection'
    is disabled.  This setting only affects charts.
  - New 'urgency.age.coefficient' and 'urgency.age.max' settings control the new
    age component to the urgency value.
-Newly deprecated features in taskwarrior 2.0.0
+  - File format 2 (used in version 0.9.3 - 1.5.0) is no longer supported.
  - The 'push', 'pull' and 'merge' commands will be removed in version 2.4.0
    The new 'sync' command, in conjunction with the Taskserver is the new sync
    mechanism.
  - The 'diagnostics' command no longer generates 1000 UUIDs as a uniqueness
    test, because libuuid is now mandatory.
-  - The 'next' configuration variable has been removed.
+Known Issues
-  - Use of 'fg:' and 'bg:' attributes are deprecated.
+
-  - Use of 'echo.command' configuration variable.  Use verbosity token
+  - There is a zsh bug (fixed, but not necessarily updated in your OS) that can
-    'affected' instead.
+    cause the terminal to crash when completion is invoked.  See the issue for
-  - Use of 'edit.verbose' configuration variable.  Use verbosity token 'edit'
+    full details:
-    instead.
+    http://taskwarrior.org/issues/1352
  - Use of 'export.ical.class' configuration variable.  Value is now specified
    in the scripts/add-ons/export-ical.pl script.
  - Use of 'report.<name>.limit' configuration variable.  This is now handled
    in the report filter as 'limit:<tasks>'.
  - Use of 't', '+', 'enable' and 'enabled' in configuration values to mean
    'on/yes/true'.
 ---
 Taskwarrior has been built and tested on the following configurations:
-  * OS X 10.7 Lion, 10.6 Snow Leopard and 10.5 Leopard
+  * OS X 10.9 Mavericks, 10.8 Mountain Lion
-  * Fedora 14 Laughlin, 13 Goddard
+  * Fedora 19 Schrodinger's Cat and 18 Spherical Cow
-  * Ubuntu 10.10 Maverick Meerkat, 10.04 Lucid Lynx
+  * Ubuntu 10.04 Lucid Lynx, 13.04 Raring Ringtail and 13.10 Saucy Salamander
-  * Debian Sid
+  * Debian 7.0 Wheezy (stable) and 6.0 Squeeze (oldstable) plus Sid (testing)
-  * Slackware 12.2
+  * Slackware 13.37
  * Arch Linux
  * Gentoo Linux
  * Sabayon Linux
  * SliTaz Linux
  * CRUX Linux
-  * SuSE 11.3
+  * SuSE
  * derivatives/customizations/flavors of the above Linux distributions
  * Solaris 10 and 8
-  * OpenBSD 4.5
+  * OpenBSD
  * FreeBSD
  * NetBSD
-  * Cygwin 1.7 and 1.5
+  * Cygwin 1.7
  * Haiku R1/alpha1
 ---
--- a/17
+++ b/17
@@ -1,3 +1,18 @@
                         *** Disclaimer ***
                       *** during ongoing ***
                        *** development ***
 The development branch is a work in progress and may not pass all quality tests,
 therefore it may harm your data.  While we welcome bug reports from the
 development branch, we do not guarantee proper or timely fixes.
      Broken functionality may arise from ongoing development work.
                        Make proper backups.
       Be aware that using the development branch involves risks.
 ---
 Thank you for taking a look at taskwarrior!
@@ -22,5 +37,5 @@ Consider joining taskwarrior.org and participating in the future of taskwarrior.
 ---
-taskwarrior is released under the MIT license. For details check the LICENSE
+Taskwarrior is released under the MIT license. For details check the LICENSE
 file.
--- a/cmake.h.in
+++ b/cmake.h.in
@@ -1,6 +1,7 @@
 /* cmake.h.in. Creates cmake.h during a cmake run */
-#define L10N                                           // Localization complete.
+/* Product identification */
 #define PRODUCT_TASKWARRIOR 1
 /* Package information */
 #define PACKAGE           "${PACKAGE}"
@@ -12,16 +13,15 @@
 #define PACKAGE_STRING    "${PACKAGE_STRING}"
 /* Installation details */
-#define TASK_RCDIR "${CMAKE_INSTALL_PREFIX}/${TASK_DOCDIR}/rc"
+#define TASK_RCDIR "${CMAKE_INSTALL_PREFIX}/${TASK_RCDIR}"
 /* Localization */
-#define PACKAGE_LANGUAGE  1
+#define PACKAGE_LANGUAGE  ${PACKAGE_LANGUAGE}
-#define LANGUAGE_EN_US 1
+#define LANGUAGE_EN_US ${LANGUAGE_EN_US}
-
+#define LANGUAGE_ES_ES ${LANGUAGE_ES_ES}
-/*
+#define LANGUAGE_FR_FR ${LANGUAGE_FR_FR}
-Override PACKAGE_LANGUAGE, then
+#define LANGUAGE_DE_DE ${LANGUAGE_DE_DE}
-#define LANGUAGE_XX_YY 2
+#define LANGUAGE_IT_IT ${LANGUAGE_IT_IT}
 */
 /* git information */
 #cmakedefine HAVE_COMMIT
@@ -36,31 +36,40 @@ Override PACKAGE_LANGUAGE, then
 #cmakedefine CYGWIN
 #cmakedefine FREEBSD
 #cmakedefine OPENBSD
 #cmakedefine NETBSD
 #cmakedefine HAIKU
 #cmakedefine SOLARIS
-#cmakedefine WIN32
+#cmakedefine KFREEBSD
 #cmakedefine GNUHURD
 #cmakedefine UNKNOWN
-/* Found the lua library */
+/* Found the GnuTLS library */
-#cmakedefine HAVE_LIBLUA
+#cmakedefine HAVE_LIBGNUTLS
 /* Found the Readline library */
 #cmakedefine HAVE_READLINE
 /* Found the pthread library */
 #cmakedefine HAVE_LIBPTHREAD
-/* Found the readline library */
+/* Found tm_gmtoff */
-#cmakedefine HAVE_READLINE
+#cmakedefine HAVE_TM_GMTOFF
 #cmakedefine HAVE_LIBREADLINE
-/* Found random */
+/* Found timegm */
-#cmakedefine HAVE_RANDOM
+#cmakedefine HAVE_TIMEGM
-/* Found srandom */
+/* Found st.st_birthtime struct member */
-#cmakedefine HAVE_SRANDOM
+#cmakedefine HAVE_ST_BIRTHTIME
-/* Found the uuid library */
+/* Found get_current_dir_name */
-#cmakedefine HAVE_UUID
+#cmakedefine HAVE_GET_CURRENT_DIR_NAME
 /* Found uuid_unparse_lower in the uuid library */
 #cmakedefine HAVE_UUID_UNPARSE_LOWER
 /* Found wordexp.h */
 #cmakedefine HAVE_WORDEXP
 /* Undefine this to eliminate the execute command */
 #define HAVE_EXECUTE 1
--- a/cmake/Modules/FindReadline.cmake
+++ b/cmake/Modules/FindReadline.cmake
@@ -0,0 +1,81 @@
 # - Find the readline library
 # This module defines
 #  READLINE_INCLUDE_DIR, path to readline/readline.h, etc.
 #  READLINE_LIBRARIES, the libraries required to use READLINE.
 #  READLINE_FOUND, If false, do not try to use READLINE.
 # also defined, but not for general use are
 # READLINE_readline_LIBRARY, where to find the READLINE library.
 # READLINE_ncurses_LIBRARY, where to find the ncurses library [might not be defined]
 # Apple readline does not support readline hooks
 # So we look for another one by default
 IF (APPLE OR FREEBSD)
  FIND_PATH (READLINE_INCLUDE_DIR NAMES readline/readline.h PATHS
    /usr/include/
    /sw/include
    /opt/local/include
    /opt/include
    /usr/local/include
    NO_DEFAULT_PATH
    )
 ENDIF (APPLE OR FREEBSD)
 FIND_PATH (READLINE_INCLUDE_DIR NAMES readline/readline.h)
 # Apple readline does not support readline hooks
 # So we look for another one by default
 IF (APPLE OR FREEBSD)
  FIND_LIBRARY (READLINE_readline_LIBRARY NAMES readline PATHS
    /usr/lib
    /sw/lib
    /opt/local/lib
    /opt/lib
    /usr/local/lib
    NO_DEFAULT_PATH
    )
 ENDIF (APPLE OR FREEBSD)
 FIND_LIBRARY (READLINE_readline_LIBRARY NAMES readline)
 # Sometimes readline really needs ncurses
 IF (APPLE OR FREEBSD)
  FIND_LIBRARY (READLINE_ncurses_LIBRARY NAMES ncurses PATHS
    /usr/lib
    /sw/lib
    /opt/local/lib
    /opt/lib
    /usr/local/lib
    /usr/lib
    NO_DEFAULT_PATH
    )
 ENDIF (APPLE OR FREEBSD)
 FIND_LIBRARY (READLINE_ncurses_LIBRARY NAMES ncurses)
 MARK_AS_ADVANCED (
  READLINE_INCLUDE_DIR
  READLINE_readline_LIBRARY
  READLINE_ncurses_LIBRARY
  )
 SET (READLINE_FOUND "NO" )
 IF (READLINE_INCLUDE_DIR)
  IF (READLINE_readline_LIBRARY)
    SET (READLINE_FOUND "YES" )
    SET (READLINE_LIBRARIES
      ${READLINE_readline_LIBRARY} 
      )
    # some readline libraries depend on ncurses
    IF (READLINE_ncurses_LIBRARY)
      SET (READLINE_LIBRARIES ${READLINE_LIBRARIES} ${READLINE_ncurses_LIBRARY})
    ENDIF (READLINE_ncurses_LIBRARY)
  ENDIF (READLINE_readline_LIBRARY)
 ENDIF (READLINE_INCLUDE_DIR)
 IF (READLINE_FOUND)
  MESSAGE (STATUS "Found readline library")
 ELSE (READLINE_FOUND)
  IF (READLINE_FIND_REQUIRED)
    MESSAGE (FATAL_ERROR "Could not find readline -- please give some paths to CMake")
  ENDIF (READLINE_FIND_REQUIRED)
 ENDIF (READLINE_FOUND)
--- a/commit.h.in
+++ b/commit.h.in
@@ -1,5 +1,4 @@
 /* commit.h.in. Creates commit.h during a cmake run */
 #define L10N                                           // Localization complete.
 /* git information */
 #define COMMIT "${COMMIT}"
--- a/doc/CMakeLists.txt
+++ b/doc/CMakeLists.txt
@@ -1,15 +1,15 @@
 cmake_minimum_required (VERSION 2.8)
 message ("-- Configuring man pages")
-set (man_FILES task-color.5 task-faq.5 task-sync.5 task-tutorial.5 task.1 taskrc.5)
+set (man_FILES task-color.5 task-faq.5 task-sync.5 task-tutorial.5 taskrc.5 task.1 tasksh.1)
 foreach (man_FILE ${man_FILES})
  configure_file (
    man/${man_FILE}.in
    man/${man_FILE})
 endforeach (man_FILE)
-install (DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/man/   DESTINATION ${TASK_MAN1DIR}
+install (DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/man/   DESTINATION ${TASK_MAN1DIR}
                                                      FILES_MATCHING PATTERN "*.1")
-install (DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/man/   DESTINATION ${TASK_MAN5DIR}
+install (DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/man/   DESTINATION ${TASK_MAN5DIR}
                                                      FILES_MATCHING PATTERN "*.5")
 install (DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/rc     DESTINATION ${TASK_DOCDIR})
--- a/doc/man/.gitignore
+++ b/doc/man/.gitignore
@@ -4,3 +4,4 @@ task-sync.5
 task-tutorial.5
 task.1
 taskrc.5
 tasksh.1
--- a/doc/man/task-color.5.in
+++ b/doc/man/task-color.5.in
@@ -1,4 +1,4 @@
-.TH task-color 5 2012-03-17 "${PACKAGE_STRING}" "User Manuals"
+.TH task-color 5 2014-01-15 "${PACKAGE_STRING}" "User Manuals"
 .SH NAME
 task-color \- A color tutorial for the taskwarrior command line todo manager.
@@ -243,12 +243,12 @@ be a visual mess.  Beware!
 The precedence for the color rules is determined by the configuration
 variable 'rule.precedence.color', which by default contains:
-    due.today,active,blocked,overdue,due,keyword,project,tag,recurring,pri,tagged,completed,deleted
+    due.today,active,blocking,blocked,overdue,due,scheduled,keyword.,project.,tag.,uda.,recurring,pri.,tagged,completed,deleted
 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.
-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
 for the 'color.tag.*' and 'color.project.*' rules.
@@ -265,7 +265,7 @@ your .taskrc file (note that your installation may use a slightly different path
 from the example):
 .RS
-include /usr/local/share/doc/task/rc/dark-256.theme
+include ${CMAKE_INSTALL_PREFIX}/${TASK_RCDIR}/dark-256.theme
 .RE
 You can use any of the standard taskwarrior themes:
@@ -304,13 +304,14 @@ Better yet, create your own, and share it.  We will gladly host the theme file
 on <http://taskwarrior.org>.
 .SH "CREDITS & COPYRIGHTS"
-Copyright (C) 2006 \- 2012 P. Beckingham, F. Hernandez.
+Copyright (C) 2006 \- 2014 P. Beckingham, F. Hernandez.
 Taskwarrior is distributed under the MIT license. See
 http://www.opensource.org/licenses/mit-license.php for more information.
 .SH SEE ALSO
 .BR task(1),
 .BR tasksh(1),
 .BR taskrc(5),
 .BR task-faq(5),
 .BR task-tutorial(5),
--- a/doc/man/task-faq.5.in
+++ b/doc/man/task-faq.5.in
@@ -1,11 +1,11 @@
-.TH task-faq 5 2012-03-17 "${PACKAGE_STRING}" "User Manuals"
+.TH task-faq 5 2014-01-15 "${PACKAGE_STRING}" "User Manuals"
 .SH NAME
 task-faq \- A FAQ for the task(1) command line todo manager.
 .SH WELCOME
-Welcome to the taskwarrior FAQ.  If you have would like to see a question answered
+Welcome to the taskwarrior FAQ.  If you would like to see a question answered
-here, please send us a note at <support@taskwarrior.org>.
+here, please send us a note to <support@taskwarrior.org>.
 .TP
 .B Q: When I redirect the output to a file, I lose all the colors.  How do I fix this?
@@ -20,7 +20,7 @@ or by temporarily overriding the value on the command line:
    task ... rc._forcecolor=on
-There is an additional problem using pagers such as 'less' and 'more', because
+There is an additional problem when using pagers such as 'less' and 'more', because
 color control codes are stripped.  When using less, these options will preserve
 the color codes:
@@ -72,9 +72,9 @@ reason to back up your task data files!
 .TP
 .B Q: Can I have two separate versions of taskwarrior installed?  How?
 Yes, and here is one simple way to do that.  Install the older version of
-taskwarrior, and then rename the 'task' binary to something like 't194' to
+taskwarrior, and then rename the 'task' binary to something like 't230' to
 reflect the version number.  Then install the newer version, which will be
-named 'task'.  Now you have 't194' and 'task' both installed, both using the
+named 'task'.  Now you have 't230' and 'task' both installed, both using the
 same configuration and data.
 Note that the older version will not be aware of any new configuration settings
@@ -86,6 +86,9 @@ Note also that the man pages will overwrite, which is why it is suggested that
 the older version be installed first, so that you benefit from improved
 documentation.
 Is this a good idea?  Not really.  You should be using the latest software
 whenever possible, enjoying the benefits of enhancements and bug fixes.
 .TP
 .B Q: How do I build a Darwin 32bit version of task
 The taskwarrior packages will not work on a 32-bit OSX installation on Core
@@ -112,7 +115,7 @@ required.
 .TP
 .B Q: Do colors work under Cygwin?
 They do, but only in a limited way. You can use regular foreground colors
-(black, red, green ...) and you can regular background colors (on_black, on_red,
+(black, red, green ...) and regular background colors (on_black, on_red,
 on_green ...), but underline and bold are not supported.
 If you run the command:
@@ -159,11 +162,6 @@ new file, then this command lists only the defaults.
 Note that this is a good way to learn about new configuration settings,
 particularly if your .taskrc file was created by an older version.
 .TP
 .B Q: Do I need to back up my taskwarrior data?
 Yes you do, like all your other files.  You should back up all the files in your
 ~/.task directory, and your ~/.taskrc file too.
 .TP
 .B Q: Can I share my tasks between different machines?
 Yes, you can.  Most people have success with a DropBox - a free and secure file
@@ -174,37 +172,31 @@ folder, by modifying the:
 configuration variable.  Check out DropBox at http://www.dropbox.com.
 You might also want to share the same .taskrc file. You can do this by putting
 an alias in the .bashrc file along the lines of
    alias task="task rc:/home/username/Dropbox/mysharedtaskrc"
 .TP
 .B Q: I don't want to use dropbox. Is there another way to synchronize my tasks?
-Of course. Especially if you want to modify tasks offline on both machines and
+Yes.  Get a Taskserver account, and sync tasks between all your machines and
-synchronize them later on. For this purpose there is a 'merge' command which is
+devices.  See task-sync(5).
 is able to insert the modifications you made to one of your task databases into
 a second database.
 Here is a basic example of the procedure:
    task merge ssh://user@myremotehost/.task/
    task push ssh://user@myremotehost/.task/
 The first command fetches the undo.data file from the remote system, reads the
 changes made and updates the local database. When this merge command completes,
 you should copy all the local .data files to the remote system either by using
 the push command explicitly or by activating the merge.autopush feature in the 
 ~/.taskrc file. This way you ensure that both systems are fully synchronized.
 .TP
 .B Q: The undo.data file gets very large - do I need it?
-You need it if you want the undo capability, or the merge capability mentioned
+You need it if you want the undo capability.  But if it gets large, you can
-above.  But if it gets large, you can certainly truncate it to save space, just
+certainly truncate it to save space, just be careful to delete lines from the
-be careful to delete lines from the top of the file, up to and including a
+top of the file, up to and including a separator '---'.  The simplest way is to
-separator '---'.  The simplest way is to simply delete the undo.data file.  Note
+simply delete the undo.data file.  Note that it does not slow down taskwarrior
-that it does not slow down taskwarrior, because it is never read until you want
+in performance-sensitive areas, because it is typically not read until you want
-to undo.  Otherwise taskwarrior only appends to the file.
+to undo, or report total active time in the 'info' command.  Taskwarrior
 generally only appends to the file.
-It is not recommended that you delete the undo.data file.
+It is not recommended that you delete the undo.data file, as it limits
 functionality.
 .TP
-.B Q: How do I know whether my terminal support 256 colors?
+.B Q: How do I know whether my terminal supports 256 colors?
 You will need to make sure your TERM environment variable is set to xterm-color,
 otherwise the easiest way is to just try it!  With version 1.9 or later, you
 simply run
@@ -253,7 +245,8 @@ Taskwarrior does this to always show you the smallest numbers it can.  The idea
 is that if your tasks are numbered 1 - 33, for example, those are easy to type
 in.  If instead task kept a rolling sequence number, after a while your tasks
 might be numbered 481 - 513, which makes it more likely to enter one
-incorrectly, because there are more digits.
+incorrectly, because there are more digits, and humans have difficulty with
 longer numbers.
 When you run a report (such as "list"), the numbers are assigned before display.
 For example, you can do this:
@@ -274,7 +267,7 @@ efficiency.
 .TP
 .B Q: How do I list tasks that are either priority 'H' or 'M', but not 'L'?
-Taskwarrior's filters are all by default combined with and implicit logical AND
+Taskwarrior's filters are all by default combined with an implicit logical AND
 operator, so if you were to try this:
    task priority:H priority:M list
@@ -323,15 +316,13 @@ non-exact match:
 This will remove the second annotation - the first non-exact match.
 .TP
-.B Q: Why Lua as an extension language?
+.B Q: How do I show tasks completed on a certain day?
-Lua has many positive attributes:
+The day in question has to be boxed by a range, like this:
- - Lua is written using tight, fast, standard C
+    task end.after:3/29/2013 end.before:3/30/2013 completed
 - Lua is a breeze to integrate into any product
 - The Lua source code is beautifully written
 - Lua is a small language
-Guile, Scheme and Neko were also considered.
+Note that a single date, such as 3/29/2012 does not refer to a whole day, but
 to a single point in time, 3/20/2012 0:00:00.
 .TP
 .B Q: How can I help?
@@ -348,13 +339,14 @@ There are lots of ways.  Here are some:
 - Fix bugs
 .SH "CREDITS & COPYRIGHTS"
-Copyright (C) 2006 \- 2012 P. Beckingham, F. Hernandez.
+Copyright (C) 2006 \- 2014 P. Beckingham, F. Hernandez.
 Taskwarrior is distributed under the MIT license. See
 http://www.opensource.org/licenses/mit-license.php for more information.
 .SH SEE ALSO
 .BR task(1),
 .BR tasksh(1),
 .BR taskrc(5),
 .BR task-tutorial(5),
 .BR task-color(5),
--- a/doc/man/task-sync.5.in
+++ b/doc/man/task-sync.5.in
@@ -1,372 +1,159 @@
-.TH task-sync 5 2012-03-17 "${PACKAGE_STRING}" "User Manuals"
+.TH task-sync 5 2014-01-15 "${PACKAGE_STRING}" "User Manuals"
 .SH NAME
-task-sync \- A tutorial for the task(1) data synchronization capabilities.
+task-sync \- A discussion and tutorial for the various task(1) data
 synchronization capabilities.
-.SH DESCRIPTION
+.SH INTRODUCTION
-Taskwarrior has built-in support for synchronization, which can be used to keep
+Taskwarrior has several sync options, external and internal.  If you wish to
-two task databases up to date, regardless of which one is used.  This capability
+sync your data, choose one method only; mixing methods is only going to lead to
-can also be used to keep a backup copy of your task database on another machine.
+problems.  Each of the methods discussed have their own strengths.
-Taskwarrior can use various protocols for transferring the data.
+.SH ALTERNATIVES
-
+There are three alternatives for syncing data, which are:
 .SH HOW IT WORKS
 If you were to manually attempt to keep two separate task databases up to date,
 you would need to inspect both databases, and detect changes that occurred in
 each one.  Those changes would need to be migrated to the other database, while
 being careful not to miss a change, and not to confuse an 'add' in one with
 a 'delete' in the other.
 The synchronization feature does just this.  It can transfer task databases,
 compare tasks, and apply changes where necessary.
 .SH NEW COMMANDS
 Taskwarrior has 'pull', 'push' and 'merge' commands which perform the steps
 necessary to move files around and combine them.  In the common use case, you
 would only need to use the 'merge' command.  These commands take an argument
 that is a URI, which indicates where the remote database resides.
 To be clear, the local database always refers to your ~/.task directory (unless
 overridden), and the remote database is always specified by URI.
 .SH MERGE
 The merge command will fetch task data via URI and combine it with the local
 task database.  The syntax is:
 1) Version control systems, such as git, hg, svn
 .br
-.RS
+2) File hosting systems, such as DropBox
 task merge [<URI>]
 .RE
 The URI is optional if the
 .B merge.default.uri
 configuration variable is set.  The URI may point to a different directory, or
 it may be a different computer.  Here is an example of the merge command:
 .br
-.RS
+3) Using the Taskserver and the 'sync' command
 $ task merge ~/work/
 .RE
 This URI (~/work/) is a path name, which means the remote database is on the
 same computer.  Taskwarrior will fetch the data from the URI, and merge it with
 your local data in ~/.task.
-When complete, you will be asked whether you would like to push the combined
+.SH OPTION 1: VERSION CONTROL SYSTEMS
-data back to the remote location specified by the URI.  This is useful if you
+There are several good, distributed VCS systems (git, hg, ...) and centralized
-are keeping two task databases synchronized, but it can be turned off.  See
+VCS systems (svn ...), and they function in a similar fashion for our purposes.
 CONFIGURATION.
-Note that a merge operation is not atomically reversible.  You could however
+Setup is straightforward.  You place your .task directory under revision
-run the 'task undo' command repeatedly to undo the effects.
+control.  You then need to perform a regular commit/push/pull/update to make
-
+sure that the data is propagated when needed.  You can even do this using shell
-.SH PUSH
+scripts so that every task command is preceded by a 'pull' and followed by a
-The push command will copy the local task database to the specified URI.  The
+'push'.
 syntax is:
 Strengths:
 .br
-.RS
+  - Good data transport mechanisms
 task push [<URI>]
 .RE
 The URI is optional if the
 .B push.default.uri
 configuration variable is set.  This command is useful for making backup copies
 of your task database.
 Note that the task files at the location specified by the URI are simply
 overwritten, so don't expect any merging to occur.  Misused, push can be
 dangerous.
 .SH PULL
 The pull command will copy a task database from a URI to the local task database
 (~/.task by default).  The syntax is:
 .br
-.RS
+  - Secure transport options
 task pull [<URI>]
 .RE
 The URI is optional if the
 .B pull.default.uri
 configuration variable is set.  This command is useful for restoring a backup
 copy of your task database.
 Note that your local task database files will be simply overwritten by the files
 obtained from the location specified by the URI, so don't expect any merging to
 occur.  Misused, pull can be dangerous.
 .SH URI TYPES
 The most basic URI is a path name on the local machine.  An example would be:
 Weaknesses:
 .br
-.RS
+  - You need proficiency with VCS tools
 /home/bob/.task/
 .RE
 All the other URIs allow access to remote machines.  The first uses SSH and scp
 (either form can be used):
 .br
-.RS
+  - You will need to manually resolve conflicts frequently
 ssh://[user@]host[:port]/absolute/path/to/.task/
 .br
-[user@]host:/absolute/path/to/.task/
+  - You need to provide the mechanism for making sure copies are up to date
 .RE
 In both cases paths are considered to be absolute. You can specify paths relative to the
 users home directory as follows:
 .SH OPTION 2: FILE HOSTING SERVICES
 There are many file hosting services, such as DropBox, Amazon S3, Google Drive,
 SkyDrive and more.  This technique involves storing your .task directory in a
 shared directory under the control of the file hosting services.
 Syncing happens quickly, although it is possible to run into conflict situations
 when there is no network connectivity, and the tasks are modified in two
 separate locations.  This is because the file hosting service knows only about
 files, and it has no idea how to merge tasks.  Avoid this problem by never
 modifying the same task on two machines, without an intervening sync.
 Setup simply involves creating the directory and modifying your data.location
 configuration variable like this:
    $ task config data.location /path/to/shared/directory
 Strengths:
 .br
-.RS
+  - Always secure
 ssh://[user@]host[:port]/.task/
 .br
-[user@]host:.task/
+  - Good client support
 .RE
 or even shorter
 .br
-.RS
+  - Easy setup
 [user@]host:.task/
 .RE
 Remark: Since taskwarrior simply calls the scp binary you can specify very much anything
 that scp would accept, e.g. host configurations from ~/.ssh/config or ~username
 expansion:
 .br
-.RS
+  - Transparent use
-ssh://configured-host/~[username]/.task/
+
 Weaknesses:
 .br
-configured-host:~[username]/.task/
+  - Tasks are not properly merged
 .RE
-Rsync is another supported protocol that minimizes network traffic, by a clever
+.SH OPTION 3: TASKSERVER
-algorithm that doesn't copy files that have not changed:
+The Taskserver was designed for this purpose to be secure, fast and conflict
 free, allowing data interchange between assorted Taskwarrior clients, and
 tolerant of network connectivity problems.
 There is a 'sync' command built in to Taskwarrior, and with a server account
 and client configuration, syncing is done on demand.
 Setup is a matter of creating an account on a Taskserver (see your Taskserver
 provider or operate your own - see
 http://taskwarrior.org/projects/taskwarrior/wiki/Server_setup)
 Once you have an account, you'll receive a certificate, key and a password.
 You'll need to put the certificate and key somewhere like this:
    $ cp <name>.cert.pem ~/.task
    $ cp <name>.key.pem ~/.task
 Then you configure Taskwarrior, using the account details:
    $ task config taskd.certificate ~/.task/<name>.cert.pem
    $ task config taskd.key         ~/.task/<name>.key.pem
    $ task config taskd.credentials <organization>/<name>/<password>
    $ task config taskd.server      <server domain>:<port>
 If you are using a private server, you are likely also using a self-signed
 certificate, which means you will need one of the following additional entries:
    $ task config taskd.ca          ~/.task/ca.cert.pem
 The CA (Certificate Authority) will be used to verify the server certificate.
 Alternatively, you can override the cert verification process using:
    $ task config taskd.trust       yes
 This is an insecure option that should be used with caution, because it directs
 Taskwarrior to trust any certificate.
 After setup, you run a one-time sync initialization, like this:
    $ task sync initialize
 This will make sure your client and the server are properly in sync to begin
 with.  From this point on, you never run the 'initialize' command again, just
 go about your business, and when you want to sync, run this:
    $ task sync
 You'll see a summary of how many tasks were uploaded and downloaded.  You can
 safely run the command as often as you like.  When there are no changes to sync,
 nothing happens.  If you do not have connectivity, your task changes accumulate
 so that when you next run 'sync' with proper connectivity, the changes are
 properly handled, in the right order.
 Strengths:
 .br
-.RS
+  - Always secure
 rsync://[user@]host.xz[:port]/path/to/.task/
 .RE
 Curl supports several protocols that can transfer data using HTTP, HTTPS and
 FTP:
 .br
-.RS
+  - Minimal bandwidth
 http://host[:port]/path/to/.task/
 .br
-https://host[:port]/path/to/.task/
+  - Tolerates connectivity outage
 Weaknesses:
 .br
-ftp://[user@]host[:port]/path/to/.task/
+  - You need to manage your own server, or gain access to a hosted server.
 .RE
 You can use single quotes to encapsulate user names that contain delimiting
 characters like '@', '/' or ':', e.g.:
 .br
 .RS
 ssh://'user@name'@host/
 .RE
 Remember to escape the quotes on your shell:
 .br
 .RS
 $ task push ftp://\'user@name\':host/
 .RE
 .SH CONFLICTS
 When modifications on the local and remote machine conflict, for example if
 both machines change the project name of the same task to different values,
 then Taskwarrior automatically selects the most recent change.  Thus, there
 are no conflicts.
 .SH EXAMPLE - Backup on another machine
 One very good use of 'push' is to make backup copies of your task database in
 another location.  Suppose your task database is kept in the usual place, in
 the ~/.task directory, and you wanted to make a backup copy in ~/backup.  You
 would use this command:
 .br
 .RS
 $ task push ~/backup/
 .RE
 This would copy the files in ~/.task to ~/backup, overwriting the files that
 were already in ~/backup.  To backup your files to another machine, you could
 use:
 .br
 .RS
 $ task push user@host:backup
 .RE
 This could be improved by setting the
 .B push.default.uri
 configuration variable and then relying on the default, like this:
 .br
 .RS
 $ task config push.default.uri user@host:backup
 .RE
 and then you need only run the push command:
 .br
 .RS
 $ task push
 .RE
 and the default push URI will be used.  If you wanted to restore a backup, you
 simply use the pull command instead:
 .br
 .RS
 $ task pull user@host:backup
 .RE
 This can be simplified by setting the
 .B pull.default.uri
 configuration variable and then relying on the default, like this:
 .br
 .RS
 $ task config pull.default.uri user@host:backup
 .RE
 Note that pull and push will blindly overwrite the task files without any
 merging.  Be careful.
 .SH EXAMPLE - Keeping two task databases synchronized
 The most common synchronization will be to keep two task databases synchronized
 on different machines.  Here is a full example, including setup that illustrates
 this.
 Suppose there are two machines, named 'local' and 'remote', for simplicity.
 Taskwarrior is installed on both machines.  The different machines are
 indicated here by the prompt.  Suppose Alice enters two tasks on her local
 machine:
 .br
 .RS
 local> task add Deliver the new budget proposal due:tuesday
 .br
 local> task add Set up a meeting with Bob
 .RE
 Then later adds a task on the remote machine:
 .br
 .RS
 remote> task add Present the budget proposal at the big meeting due:thursday
 .RE
 Now on the local machine, Alice merges the two task databases:
 .br
 .RS
 local> task merge alice@remote:.task
 .br
 Would you like to push the changes to 'alice@remote:.task'?  Y
 .RE
 Taskwarrior has combined the two task databases on local, then pushed the
 changes back to remote.  Now suppose Alice changes the due date for task 1
 on remote:
 .br
 .RS
 remote> task 1 due:wednesday
 .RE
 Now on the local machine, Alice sets up a default URI and autopush:
 .br
 .RS
 local> task config merge.default.uri alice@remote:.task
 .br
 local> task config merge.autopush yes
 .RE
 Now Alice can simply run merge to make sure that the new due date is copied to
 the local machine:
 .br
 .RS
 local> task merge
 .RE
 This time the URI is determined automatically, and after the merge the files are
 pushed back to the remote machine.  In a similar way, the remote machine can
 also be configured to merge from the local machine and push back to it.  Then it
 is just a matter of Alice remembering to merge now and then, from either
 machine, to have her data in two (or even more) places.
 .SH CONFIGURATION
 By setting these configuration variables, it is possible to simplify the
 synchronization commands, by relying on the defaults or alias names.
 .br
 .B merge.autopush=yes|no|ask
 .RS
 This controls whether the automatic push after a merge is performed, not
 performed, or whether the user is asked every time.  The default value is 'ask'.
 .RE
 .br
 .B merge.default.uri=<uri>
 .RS
 Sets a default URI so that just the 'task merge' command be run without the
 need to retype the URI every time. You can also use this configuration scheme
 to set alias names, e.g. set merge.desktop.uri and run 'task merge desktop'.
 .RE
 .br
 .B push.default.uri=<uri>
 .RS
 Sets a default URI so that just the 'task push' command be run without the
 need to retype the URI every time. You can also use this configuration scheme
 to set alias names, e.g. set push.desktop.uri and run 'task push desktop'.
 .RE
 .br
 .B pull.default.uri=<uri>
 .RS
 Sets a default URI so that just the 'task pull' command be run without the
 need to retype the URI every time. You can also use this configuration scheme
 to set alias names, e.g. set pull.desktop.uri and run 'task pull desktop'.
 .RE
 Note that, when using SSH/scp, hostnames will be expanded due to the ssh 
 configuration file ~/.ssh/config.
 .SH EXTERNAL DEPENDENCIES
 Depending on the URI protocols used, the utilities 'scp', 'rsync' and 'curl'
 must be installed and accessible via the $PATH environment variable.
 If you have deleted your ~/.task/undo.data file to save space, you will be
 unable to merge.  The change transactions stored in the undo.data file are
 used for synchronization.
 .SH "CREDITS & COPYRIGHTS"
-Copyright (C) 2006 \- 2012 P. Beckingham, F. Hernandez.
+Copyright (C) 2006 \- 2014 P. Beckingham, F. Hernandez.
 The sync capabilities were written by J. Schlatow.
 Parts copyright (C) 2010 - 2012 J. Schlatow.
 Taskwarrior is distributed under the MIT license. See
 http://www.opensource.org/licenses/mit-license.php for more information.
 .SH SEE ALSO
 .BR task(1),
 .BR tasksh(1),
 .BR taskrc(5),
 .BR task-faq(5),
 .BR task-color(5),
 .BR task-tutorial(5),
 .BR ssh_config(5)
 For more information regarding task, the following may be referenced:
--- a/doc/man/task-tutorial.5.in
+++ b/doc/man/task-tutorial.5.in
@@ -1,4 +1,4 @@
-.TH task-tutorial 5 2012-03-17 "${PACKAGE_STRING}" "User Manuals"
+.TH task-tutorial 5 2014-01-15 "${PACKAGE_STRING}" "User Manuals"
 .SH NAME
 task-tutorial \- A tutorial for the task(1) command line todo manager.
@@ -359,7 +359,7 @@ just single words associated with the task.  I can go to the print shop at the
 mall, and do all the invitation tasks, so let's tag them all.
 .RS
-$ task 3,5,6 modfy +mall
+$ task 3,5,6 modify +mall
 .br
 .br
@@ -681,6 +681,7 @@ $ task 1 annotate the 13th looks good
 Annotated 1 with 'the 13th looks good'.
 .br
 $ task 1 annotate or the 14th
 .br
 Annotated 1 with 'or the 14th'
 .br
 $ task list
@@ -716,64 +717,6 @@ ID Project Pri Due Active Age     Description
 8 tasks
 .RE
 You can choose to display annotations in different ways.
 .RS
 $ task rc.annotations:full list
 .br
 .br
 ID Project Pri Due Active Age     Description
 .br
 -- ------- --- --- ------ ------- ---------------------------------
 .br
 1 party   H              49 mins Select a free weekend in November
 .br
                                  10/16/2010 the 13th looks good
 .br
                                  10/16/2010 or the 14th
 .br
 .br
 1 task
 .br
 Configuration override annotations:full
 .br
 $ task rc.annotations:sparse list
 .br
 .br
 ID Project Pri Due Active Age     Description
 .br
 -- ------- --- --- ------ ------- ----------------------------------
 .br
 1 party   H              49 mins +Select a free weekend in November
 .br
                                  10/16/2010 or the 14th
 .br
 .br
 1 task
 .br
 Configuration override annotations:sparse
 .br
 $ task rc.annotations:none list
 .br
 .br
 ID Project Pri Due Active Age     Description
 .br
 -- ------- --- --- ------ ------- ----------------------------------
 .br
 1 party   H              49 mins +Select a free weekend in November
 .br
 .br
 1 task
 .br
 Configuration override annotations:none
 .RE
 Annotations can be removed by providing a matching pattern.
 .RS
@@ -809,8 +752,6 @@ alias.ghistory                  ghistory.monthly
 alias.history                   history.monthly
 .br
 alias.rm                        delete
 .br
 annotations                     full
 .br
 ...
 .br
@@ -1155,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.
@@ -1342,6 +1240,8 @@ color.due                 red
 .br
 color.due.today           red
 .br
 color.error               yellow
 .br
 color.footnote            yellow
 .br
 color.header              yellow
@@ -1386,19 +1286,19 @@ theme into the configuration file, you can see some striking effects.  For a
 blue theme, add this line to your .taskrc file:
 .RS
-include /usr/local/share/doc/task/rc/dark-blue-256.theme
+include ${CMAKE_INSTALL_PREFIX}/${TASK_RCDIR}/dark-blue-256.theme
 .RE
 For a red theme:
 .RS
-include /usr/local/share/doc/task/rc/dark-red-256.theme
+include ${CMAKE_INSTALL_PREFIX}/${TASK_RCDIR}/dark-red-256.theme
 .RE
 For a general dark theme:
 .RS
-include /usr/local/share/doc/task/rc/dark-256.theme
+include ${CMAKE_INSTALL_PREFIX}/${TASK_RCDIR}/dark-256.theme
 .RE
 Here are two color rules that specify a dark blue background for all tasks that
@@ -1597,7 +1497,7 @@ used most.  You can create your own, or use one of the samples to show holidays
 on the calendar.  Try adding this line to your ~/.taskrc file:
 .RS
-include /usr/local/share/doc/task/rc/holidays.en-US.rc
+include ${CMAKE_INSTALL_PREFIX}/${TASK_RCDIR}/holidays.en-US.rc
 .RE
 Then:
@@ -1954,95 +1854,6 @@ Deleting recurring task 14 'Pay taxes'.
 Deleting recurring task 15 'Pay taxes'.
 .RE
 .SH SHELL
 You can use the shell command to create a more immersive environment.  Any task
 command you run outside the shell can also be run inside the shell, without the
 need to prefix every command with "task".
 .RS
 $ task shell
 .br
 task 1.9.4 shell
 .br
 .br
 Enter any task command (such as 'list'), or hit 'Enter'.
 .br
 There is no need to include the 'task' command itself.
 .br
 Enter 'quit' to end the session.
 .br
 .br
 task>
 .br
 task> projects
 .br
 .br
 Project Tasks Pri:None Pri:L Pri:M Pri:H
 .br
 ------- ----- -------- ----- ----- -----
 .br
            7        7     0     0     0
 .br
 home        2        2     0     0     0
 .br
 party       6        3     0     0     3
 .br
 .br
 3 projects (15 tasks)
 .br
 task> tags
 .br
 .br
 Tag  Count
 .br
 mall     2
 .br
 .br
 1 tag (15 tasks)
 .br
 task> list
 .br
 .br
 ID Project Pri Due        Active Age   Description
 .br
 -- ------- --- ---------- ------ ----- ------------------------------------
 .br
 2 party   H   10/17/2010        2 hrs Select and book a venue
 .br
                                       2010/10/16 11:20 Started task
 .br
                                       2010/10/16 11:21 Stopped task
 .br
 5 party   H   10/22/2010        2 hrs Design invitations
 .br
 1 party   H   10/31/2010        2 hrs Select a free weekend in November
 .br
                                       2010/10/16 00:00 the 13th looks good
 .br
 9 home        10/31/2010         1 hr Pay rent at the end of the month
 .br
 8                                1 hr Select some Music for after dinner
 .br
 3 party                         2 hrs Mail invitations
 .br
 4 party                         2 hrs Select a caterer
 .br
 6 party                         2 hrs Print invitations
 .br
 .br
 8 tasks
 .br
 task> quit
 .RE
 .SH SPECIAL TAGS
 You've seen tags, but there are also 'special tags' that have effects on
 individual tasks.  The 'nocolor' special tag causes the color rules to be
@@ -3270,7 +3081,7 @@ $ task help
 .RE
 .SH "CREDITS & COPYRIGHTS"
-Copyright (C) 2006 \- 2012 P. Beckingham, F. Hernandez.
+Copyright (C) 2006 \- 2014 P. Beckingham, F. Hernandez.
 This man page was originally written by Federico Hernandez, and has been modified and supplemented by Paul Beckingham.
@@ -3279,6 +3090,7 @@ http://www.opensource.org/licenses/mit-license.php for more information.
 .SH SEE ALSO
 .BR task(1),
 .BR tasksh(1),
 .BR taskrc(5),
 .BR task-faq(5),
 .BR task-color(5),
--- a/doc/man/task.1.in
+++ b/doc/man/task.1.in
@@ -1,4 +1,4 @@
-.TH task 1 2012-03-17 "${PACKAGE_STRING}" "User Manuals"
+.TH task 1 2014-01-15 "${PACKAGE_STRING}" "User Manuals"
 .SH NAME
 task \- A command line todo manager.
@@ -18,17 +18,15 @@ At the core, taskwarrior is a list processing program. You add text and
 additional related parameters and redisplay the information in a nice way.  It
 turns into a todo list program when you add due dates and recurrence. It turns
 into an organized todo list program when you add priorities, tags (one word
-descriptors), project groups, etc.  Taskwarrior turns into an organized to do
+descriptors), project groups, etc.
 list program when you modify the configuration file to have the output displayed
 the way you want to see it.
 .SH FILTER
 The <filter> consists of zero or more search criteria that select tasks.  For
-example, to list all tasks belonging to the 'Home' project:
+example, to list all pending tasks belonging to the 'Home' project:
  task project:Home list
-You can specify multiple filter terms, each of which further restrict the
+You can specify multiple filter terms, each of which further restricts the
 result:
  task project:Home +weekend garden list
@@ -41,7 +39,7 @@ In this example, 'garden' is translated internally to:
 as a convenient shortcut.  The 'contains' here is an attribute modifier, which
 is used to exert more control over the filter than simply absence or presence.
-See 'ATTRIBUTE MODIFIERS' for a complete list of modifiers.
+See the section 'ATTRIBUTE MODIFIERS' below for a complete list of modifiers.
 Note that a filter may have zero terms, which means that all tasks apply to the
 command.  This can be dangerous, and this special case is confirmed, and
@@ -69,7 +67,8 @@ The parentheses isolate the logical term from any default command filter or
 implicit report filter which would be combined with an implicit 'and'.
 A filter may target specific tasks using ID or UUID numbers.  To specify
-multiple tasks use one of these forms:
+multiple tasks use one of these forms (comma or space-separated list of ID
 numbers, UUID numbers or ID ranges):
  task 1,2,3                                    delete
  task 1-3                                      info
@@ -92,7 +91,8 @@ Taskwarrior supports different kinds of commands.  There are read commands,
 write commands, miscellaneous commands and script helper commands.  Read
 commands do not allow modification of tasks.  Write commands can alter almost
 any aspect of a task.  Script helper commands are provided to help you write
-add-on scripts, for example, shell completion.
+add-on scripts, for example, shell completion (only minimal output is
 generated, as with verbose=nothing).
 .SH READ SUBCOMMANDS
@@ -121,7 +121,11 @@ Shows all tasks matching the filter, including parents of recurring tasks.
 .TP
 .B task <filter> blocked
-Shows all tasks matching the filter, that have dependencies on other tasks.
+Shows all tasks matching the filter, that are currently blocked by other tasks.
 .TP
 .B task <filter> blocking
 Shows all tasks matching the filter, that block other tasks.
 .TP
 .B task <filter> burndown.daily
@@ -140,8 +144,8 @@ Shows a graphical burndown chart, by month.
 .B task calendar [due|<month> <year>|<year>] [y]
 Shows a monthly calendar with due tasks marked.  Shows one horizontal line of
 months.  If the 'y' argument is provided, will show at least one complete year.
-If a year is provided, such as '2012', then that full year is shown.  If both
+If a year is provided, such as '2014', then that full year is shown.  If both
-a month and a year are specified ('6 2012') then the months displayed begin at
+a month and a year are specified ('6 2014') then the months displayed begin at
 the specified month and year.  If the 'due' argument is provided, will show
 the starting month of the earliest due task.
@@ -151,9 +155,10 @@ Displays all possible colors, a named sample, or a legend containing all
 currently defined colors.
 .TP
-.B task columns
+.B task columns [substring]
 Displays all supported columns and formatting styles.  Useful when creating
-custom reports.
+custom reports.  If a substring is provided, only matching column names are
 shown.
 .TP
 .B task <filter> completed
@@ -168,7 +173,18 @@ Displays only a count of tasks matching the filter.
 Exports all tasks in the JSON format.  Redirect the output to a file, if you
 wish to save it, or pipe it to another command or script to convert it to
 another format. The standard task release comes with a few example scripts,
-such as export-yaml.pl.
+such as:
  export-csv.pl
  export-sql.py
  export-xml.py
  export-yaml.pl
  export-html.pl
  export-tsv.pl
  export-xml.rb
  export-ical.pl
  export-xml.pl
  export-yad.pl
 .TP
 .B task <filter> ghistory.annual
@@ -198,7 +214,7 @@ Applies the filter then extracts only the task IDs and presents them as
 a range, for example: 1-4,12.  This is useful as input to a task command,
 to achieve this:
-	task $(task project:Home ids) modify priority:H
+  task $(task project:Home ids) modify priority:H
 This example first gets the IDs for the project:Home filter, then sets
 the priority to H for each of those tasks.  This can also be achieved directly:
@@ -209,17 +225,23 @@ This command is mainly of use to external scripts.
 .TP
 .B task <filter> uuids
-Applies the filter then extracts only the task UUIDs and presents them as
+Applies the filter on all tasks (even deleted and completed tasks)
 then extracts only the task UUIDs and presents them as
 a comma-separated list.  This is useful as input to a task command, to achieve
 this:
-	task $(task project:Home status:completed uuids) modify status:pending
+  task $(task project:Home status:completed uuids) modify status:pending
 This example first gets the UUIDs for the project:Home and status:completed
-filter, then makes each of those tasks pending again.
+filters, then makes each of those tasks pending again.
 This command is mainly of use to external scripts.
 .TP
 .B task udas
 Shows a list of UDAs that are defined, including their name, type, label and
 allowed values.  Also shows UDA usage and any orphan UDAs.
 .TP
 .B task <filter> information
 Shows all data and metadata for the specified tasks.  This is the only means of
@@ -250,6 +272,12 @@ Shows the newest tasks matching the filter.
 Shows a page of the most urgent tasks, sorted by urgency, which is a calculated
 value.
 .TP
 .B task <filter> ready
 Shows a page of the most urgent ready tasks, sorted by urgency.  A ready task is
 one that is either unscheduled, or has a scheduled date that is past and has no
 wait date.
 .TP
 .B task <filter> oldest
 Shows the oldest tasks matching the filter.
@@ -269,7 +297,8 @@ Shows all recurring tasks matching the filter.
 .TP
 .B task <filter> unblocked
-Shows all tasks that do not have dependencies, matching the filter.
+Shows all tasks that are not currently blocked by other tasks, matching the
 filter.
 .TP
 .B task <filter> waiting
@@ -317,29 +346,15 @@ provided for exceptional circumstances.  Use carefully.
 .TP
 .B task import <file> [<file> ...]
 Imports tasks in the JSON format.  The standard task release comes with a few
-example scripts, such as import-yaml.pl.
+example scripts, such as:
  import-todo.sh.pl
  import-yaml.pl
 .TP
 .B task log <mods>
 Adds a new task that is already completed, to the task list.
 .TP
 .B task merge <URL>
 Merges two task databases by comparing the modifications that are stored in the
 undo.data files. The location of the second undo.data file must be passed on as
 argument. URL may have the following syntaxes:
 	ssh://[user@]host.xz[:port]/path/to/.task/
 	rsync://[user@]host.xz[:port]/path/to/.task/
 	[user@]host.xz:path/to/.task/
 	/path/to/local/.task/
 You can set aliases for frequently used URLs in the .taskrc. Further
 documentation can be found in task-sync(5) man page.
 .TP
 .B task <filter> modify <mods>
 Modifies the existing task with provided information.
@@ -348,17 +363,6 @@ Modifies the existing task with provided information.
 .B task <filter> prepend <mods>
 Prepends description text to an existing task.
 .TP
 .B task pull <URL>
 Overwrites the task database with those files found at the URL.
 (See 'merge' command for valid URL syntax.)
 .TP
 .B task push <URL>
 Pushes the task database to a remote another location for distributing the
 changes made by the merge command.
 (See 'merge' command for valid URL syntax.)
 .TP
 .B task <filter> start <mods>
 Marks the specified tasks as started.
@@ -419,13 +423,9 @@ Displays the Taskwarrior logo.
 Lists all supported reports.  This includes the built-in reports, and any custom
 reports you have defined.
 .TP
 .B task shell
 Launches an interactive shell with all the task commands available.
 .TP
 .B task show [all | substring]
-Shows all the current settings in the taskwarrior configuration file.  If a
+Shows all the current settings.  If a
 substring is specified just the settings containing that substring will be
 displayed.
@@ -439,7 +439,9 @@ Shows a report of aggregated task status by project.
 .TP
 .B task <filter> tags
-Show a list of all tags used.  Any special tags used are highlighted.
+Show a list of all tags used.  Any special tags used are highlighted.  Note that
 virtual tags are not listed - they don't really exist, and are just a convenient
 notation for other task metadata.
 .TP
 .B task timesheet [weeks]
@@ -455,6 +457,10 @@ Shows the taskwarrior version number.
 .SH HELPER SUBCOMMANDS
 .TP
 .B task _aliases
 Generates a list of all aliases, for autocompletion purposes.
 .TP
 .B task _columns
 Displays only a list of supported columns.
@@ -471,6 +477,20 @@ Lists all supported configuration variables, for completion purposes.
 .B task <filter> _ids
 Shows only the IDs of matching tasks, in the form of a list.
 .TP
 .B task _show
 Shows the combined defaults and overrides of the configuration settings, for use
 by third-party applications.
 .TP
 .B task <filter> _uuids
 Shows only the UUIDs of matching tasks among all tasks (even deleted and
 completed tasks), in the form of a list.
 .TP
 .B task _udas
 Shows only defined UDA names, in the form of a list.
 .TP
 .B task <filter> _projects
 Shows only a list of all project names used.
@@ -495,12 +515,34 @@ Generates a list of all commands, for zsh autocompletion purposes.
 .B task <filter> _zshids
 Shows the IDs and descriptions of matching tasks.
 .TP
 .B task <filter> _zshuuids
 Shows the UUIDs and descriptions of matching tasks.
 .TP
 .B task _get <DOM> [<DOM> ...]
 Accesses and displays the DOM reference(s).  Used to extract individual values
 from tasks, or the system.  Supported DOM references are:
  rc.<name>
  context.program
  context.args
  context.width
  context.height
  system.version
  system.os
  <id>.<attribute>
  <uuid>.<attribute>
 Note that the 'rc.<name>' reference may need to be escaped using '--' to prevent
 the reference from being interpreted as an override.
 .SH ATTRIBUTES AND METADATA
 .TP
 .B ID
-Tasks can be specified uniquely by IDs, which are simply the index of the
+Tasks can be specified uniquely by IDs, which are simply the indexes of the
-task in the data file.  The ID of a task may therefore change, but only when
+tasks in the data file.  The ID of a task may therefore change, but only when
 a command is run that displays IDs.  When modifying tasks, it is safe to
 rely on the last displayed ID.  Always run a report to check you have the right
 ID for a task. IDs can be given to task as a sequence, for example,
@@ -514,7 +556,7 @@ Tags are arbitrary words associated with a task. Use + to add a tag and - to
 remove a tag from a task. A task can have any quantity of tags.
 Certain tags (called 'special tags'), can be used to affect the way tasks are
-treated.  For example, is a task has the special tag 'nocolor', then it is
+treated.  For example, if a task has the special tag 'nocolor', then it is
 exempt from all color rules.  The supported special tags are:
    +nocolor     Disable color rules processing for this task
@@ -522,6 +564,31 @@ exempt from all color rules.  The supported special tags are:
    +nocal       This task will not appear on the calendar
    +next        Elevates task so it appears on 'next' report
 There are also virtual tags, which represent task metadata in tag form.  These
 tags do not exist, but can be used to filter tasks.  The supported virtual tags
 are:
    BLOCKED      Matches if the task is blocked
    UNBLOCKED    Matches if the task is not blocked
    BLOCKING     Matches if the task is blocking
    DUE          Matches if the task is due
    DUETODAY     Matches if the task is due today
    TODAY        Matches if the task is due today
    WEEK         Matches if the task is due this week
    MONTH        Matches if the task is due this month
    YEAR         Matches if the task is due this year
    OVERDUE      Matches if the task is overdue
    ACTIVE       Matches if the task is started
    SCHEDULED    Matches if the task is scheduled
    PARENT       Matches if the task is a parent
    CHILD        Matches if the task has a parent
    UNTIL        Matches if the task expires
    WAITING      Matches if the task is waiting
    ANNOTATED    Matches if the task has annotations
 You can use +BLOCKED to filter blocked tasks, or -BLOCKED for unblocked tasks.
 Similarly, -BLOCKED is equivalent to +UNBLOCKED.
 .TP
 .B project:<project-name>
 Specifies the project to which a task is related to.
@@ -539,16 +606,12 @@ Specifies the due-date of a task.
 Specifies the frequency of a recurrence of a task.
 .TP
-.B until:<end-date-of-recurrence>
+.B scheduled:<ready-date>
-Specifies the Recurrence end-date of a task.
+Specifies the date after which a task can be accomplished.
 .TP
-.B fg:<color-spec>
+.B until:<expiration date of task>
-Specifies foreground color. Deprecated.
+Specifies the expiration date of a task, after which it will be deleted.
 .TP
 .B bg:<color-spec>
 Specifies background color. Deprecated.
 .TP
 .B limit:<number-of-rows>
@@ -565,13 +628,13 @@ Date until task becomes pending.
 .B depends:<id1,id2 ...>
 Declares this task to be dependent on id1 and id2.  This means that the tasks
 id1 and id2 should be completed before this task.  Consequently, this task will
-then show up on the 'blocked' report.
+then show up on the 'blocked' report.  It accepts a comma-separated list of ID
 numbers, UUID numbers and ID ranges.  When prefixing any element of this list
 by '-', the specified tasks are removed from the dependency list.
 .TP
 .B entry:<entry-date>
-For report purposes, specifies the date that a task was created.  The entry
+For report purposes, specifies the date that a task was created.
 attribute cannot be directly specified using task add, and should not be edited
 after creating the task.
 .SH ATTRIBUTE MODIFIERS
 Attribute modifiers improve filters.  Supported modifiers are:
@@ -705,7 +768,7 @@ For example:
  task '( due < eom or priority != L )'  list
 Note that the parentheses are required when using a logical operator other than
-the 'and' operator.  The reason is that some report contains filters that must
+the 'and' operator.  The reason is that some reports contain filters that must
 be combined with the command line.  Consider this example:
  task project:Home or project:Garden list
@@ -754,7 +817,7 @@ Taskwarrior reads dates from the command line and displays dates in the
 reports.  The expected and desired date format is determined by the
 configuration variable
 .I dateformat
-in the taskwarrior configuration file.
+.
 .RS
 .TP
@@ -763,10 +826,12 @@ task ... due:7/14/2008
 .TP
 ISO-8601
-task ... due:20120314T223000Z
+task ... due:20130314T223000Z
 .TP
 Relative wording
 task ... due:now
 .br
 task ... due:today
 .br
 task ... due:yesterday
@@ -784,7 +849,7 @@ task ... due:1day
 task ... due:9hrs
 .TP
-Start of (work) week (Monday), calendar week (Sunday or Monday), month, quarter and year
+Start of next (work) week (Monday), calendar week (Sunday or Monday), month, quarter and year
 .br
 task ... due:sow
 .br
@@ -799,7 +864,7 @@ task ... due:soq
 task ... due:soy
 .TP
-End of (work) week (Friday), calendar week (Saturday or Sunday), month, quarter and year
+End of current (work) week (Friday), calendar week (Saturday or Sunday), month, quarter and year
 .br
 task ... due:eow
 .br
@@ -825,6 +890,22 @@ This sets the wait date to 1/18/2038.
 .TP
 Next occurring weekday
 task ... due:fri
 .TP
 Predictable holidays
 task ... due:goodfriday
 .br
 task ... due:easter
 .br
 task ... due:eastermonday
 .br
 task ... due:ascension
 .br
 task ... due:pentecost
 .br
 task ... due:midsommar
 .br
 task ... due:midsommarafton
 .RE
 .SS FREQUENCIES
@@ -945,7 +1026,8 @@ Taskwarrior stores its configuration in a file in the user's home directory:
 .B task rc:<path-to-alternate-file> ...
 Specifies an alternate configuration file.
-.TP TASKRC=/tmp/.taskrc task ..
+.TP
 .B TASKRC=/tmp/.taskrc task ..
 The environment variable overrides the default and the command line
 specification of the .taskrc file.
@@ -995,19 +1077,20 @@ The file that contains the tasks that are not yet done.
 .TP
 ~/.task/completed.data
-The file that contains the completed "done" tasks.
+The file that contains the completed ("done") tasks.
 .TP
 ~/.task/undo.data
-The file that contains the information to the "undo" command.
+The file that contains information needed by the "undo" command.
 .SH "CREDITS & COPYRIGHTS"
-Copyright (C) 2006 \- 2012 P. Beckingham, F. Hernandez.
+Copyright (C) 2006 \- 2014 P. Beckingham, F. Hernandez.
 Taskwarrior is distributed under the MIT license. See
 http://www.opensource.org/licenses/mit-license.php for more information.
 .SH SEE ALSO
 .BR tasksh(1),
 .BR taskrc(5),
 .BR task-tutorial(5),
 .BR task-faq(5),
--- a/doc/man/taskrc.5.in
+++ b/doc/man/taskrc.5.in
@@ -1,4 +1,4 @@
-.TH taskrc 5 2012-03-17 "${PACKAGE_STRING}" "User Manuals"
+.TH taskrc 5 2014-01-15 "${PACKAGE_STRING}" "User Manuals"
 .SH NAME
 taskrc \- Configuration file for the task(1) command
@@ -28,7 +28,7 @@ attribute when running task:
 $ task rc:<directory-path>/.taskrc ...
 .RE
-or usign the TASKRC environment variable:
+or using the TASKRC environment variable:
 .RS
 $ TASKRC=/tmp/.taskrc task ...
@@ -80,6 +80,8 @@ The hash mark, or pound sign ("#") is used as a comment character. It can be
 used to annotate the configuration file. All text after the character to the end
 of the line is ignored.
 The configuration file supports UTF8 as well as JSON encoding, such as \\uNNNN.
 Note that taskwarrior is flexible about the values used to represent Boolean
 items.  You can use "on", "yes", "y", "1" and "true".
 Anything else means "off".
@@ -89,7 +91,7 @@ You can edit your .taskrc file by hand if you wish, or you can use the 'config'
 command.  To permanently set a value in your .taskrc file, use this command:
 .RS
-$ task config nag "You have higher priority tasks!"
+$ task config nag "You have more urgent tasks."
 .RE
 To delete an entry, use this command:
@@ -129,9 +131,9 @@ ones containing just the relevant configuration data like colors, etc.
 There are two excellent uses of includes in your .taskrc, shown here:
 .RS
-include /usr/local/share/doc/task/rc/holidays.en-US.rc
+include ${CMAKE_INSTALL_PREFIX}/${TASK_RCDIR}/holidays.en-US.rc
 .br
-include /usr/local/share/doc/task/rc/dark-16.theme
+include ${CMAKE_INSTALL_PREFIX}/${TASK_RCDIR}/dark-16.theme
 .RE
 This includes two standard files that are distributed with taskwarrior, which
@@ -139,15 +141,15 @@ define a set of US holidays, and set up a 16-color theme to use, to color the
 reports and calendar.
 .SH ENVIRONMENT VARIABLES
-These environmant variables override defaults and command line arguments.
+These environment variables override defaults and command line arguments.
 .TP
 .B TASKDATA=~/.task
-The overrides the default path for the taskwarrior data files.
+This overrides the default path for the taskwarrior data files.
 .TP
 .B TASKRC=~/.taskrc
-The overrides the default RC file.
+This overrides the default RC file.
 .SH CONFIGURATION VARIABLES
 Valid variable names and their default values are:
@@ -194,14 +196,14 @@ using, for text wrapping.
 .TP
 .B defaultwidth=80
 The width of output used when auto-detection support is not available. Defaults
-to 80.  If set to 0, is interpreted as infinite width, therefore with no
+to 80.  If set to 0, it is interpreted as infinite width, therefore with no
-word-wrapping; useful when redirecting report output to a file for subsequent
+word-wrapping; this is useful when redirecting report output to a file for subsequent
 handling.
 .TP
 .B defaultheight=24
 The height of output used when auto-detection support is not available. Defaults
-to 24.  If set to 0, is interpreted as infinite height.  Useful when redirecting
+to 24.  If set to 0, it is interpreted as infinite height. This is useful when redirecting
 charts to a file for subsequent handling.
 .TP
@@ -230,18 +232,22 @@ that you would see a smaller, more compact representation of the task, with no
 help text.  Deprecated - use verbosity token 'edit'.
 .TP
-.B locale=en-US.UTF8
+.B reserved.lines=1
-Locale to be used by Taskwarrior for synchronization with the task server.  The
+This is the number of lines reserved at the bottom of the screen for the shell
-default value is currently blank.
+prompt.  This is only referenced when 'limit:page' is used.
 .SS MISCELLANEOUS
 .TP
-.B verbose=on|off|list...
+.B verbose=on|off|nothing|list...
-When set to on (the default), helpful explanatory comments are added to all
+When set to "on" (the default), helpful explanatory comments are added to all
-output from Taskwarrior.  Setting this to off means that you would see minimal
+output from Taskwarrior.  Setting this to "off" means that you would see regular
 output.
 The special value "nothing" can be used to eliminate all optional output, which
 results in only the formatted data being shown, with nothing else.  This output
 is most readily parsed and used by shell scripts.
 Alternatively, you can specify a comma-separated list of verbosity tokens that
 control specific occasions when output is generated.  This list may contain:
@@ -254,15 +260,30 @@ control specific occasions when output is generated.  This list may contain:
    edit       Used the verbose template for the 'edit' command
    special    Feedback when applying special tags
    project    Feedback about project status changes
    sync       Feedback about the need for sync
 Note that the "on" setting is equivalent to all the tokens being specified,
-and the "off" setting is equivalent to none of the tokens being specified.
+and the "nothing" setting is equivalent to none of the tokens being specified.
 Here are the shortcut equivalents:
    verbose=on
    verbose=blank,header,footnote,label,new-id,affected,edit,special,project,sync
    verbose=off
    verbose=blank,label,new-id,edit
    verbose=nothing
    verbose=
 Those additional comments are sent to the standard error for header, footnote
 and project.  The others are sent to standard output.
 .TP
 .B confirmation=yes
 May be "yes" or "no", and determines whether taskwarrior will ask for
 confirmation before deleting a task, performing bulk changes, or the undo
-command.  The default value is "yes".  Consider leaving this setting as "no",
+command.  The default value is "yes".  Consider leaving this setting as "yes",
 for safety.
 .TP
@@ -290,7 +311,7 @@ Controls padding between columns of the report output.  Default is "1".
 .TP
 .B bulk=3
-Is a number, defaulting to 3.  When this number or greater tasks are modified
+Is a number, defaulting to 3.  When this number or greater of tasks are modified
 in a single command, confirmation will be required, unless the
 .B confirmation
 variable is "no".
@@ -298,11 +319,11 @@ variable is "no".
 This is useful for preventing large-scale unintended changes.
 .TP
-.B nag=You have higher priority tasks.
+.B nag=You have more urgent tasks.
 This may be a string of text, or blank. It is used as a prompt when a task is
 started or completed that is not considered high priority.  Default value is:
-You have higher priority tasks.  It is a gentle reminder that you are
+You have more urgent tasks.  It is a gentle reminder that you are contradicting
-contradicting your own priority settings.
+your own priority settings.
 .TP
 .B complete.all.projects=yes
@@ -312,7 +333,7 @@ default value is "no".
 .TP
 .B list.all.projects=yes
-May be yes or no, and determines whether 'projects' command lists all the project
+May be yes or no, and determines whether the 'projects' command lists all the project
 names you have used, or just the ones used in active tasks.  The default value is
 "no".
@@ -328,6 +349,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
@@ -380,11 +406,6 @@ $ task rc._forcecolor=yes list > file
 .RE
 .RE
 .TP
 .B shell.prompt=task>
 The task shell command uses this value as a prompt.  You can change it to any
 string you like.
 .TP
 .B active.indicator=*
 The character or string to show in the start.active column.  Defaults to *.
@@ -439,6 +460,10 @@ debug output can be useful.  It can also help explain how the command line is
 being parsed, but the information is displayed in a developer-friendly, not a
 user-friendly way.
 .TP
 .B debug.tls=0
 Controls the GnuTLS log level.  For 'sync' debugging.
 .TP
 .B alias.rm=delete
 Taskwarrior supports command aliases.  This alias provides an alternate name
@@ -454,57 +479,79 @@ Enables the extension system.  Defaults to on.
 .SS DATES
 .TP
-.B dateformat=m/d/Y
+.B dateformat=Y-M-D
 .TP
-.B dateformat.report=m/d/Y
+.B dateformat.report=
 .TP
 .B dateformat.holiday=YMD
 .TP
-.B dateformat.annotation=m/d/Y
+.B dateformat.edit=Y-M-D H:N:S
 .TP
-.B report.X.dateformat=m/d/Y
+.B dateformat.info=Y-M-D H:N:S
-This is a string of characters that define how taskwarrior formats date values.
+.TP
 .B dateformat.annotation=
 .TP
 .B report.X.dateformat=Y-M-D
 This is a string of characters that defines how taskwarrior formats date values.
 The precedence order for the configuration variable is report.X.dateformat then
-dateformat.report then dateformat.  While report.X.dateformat only formats the
+dateformat.report then dateformat for formating the due dates in reports.
-due date in reports, dateformat.report formats the due date both in reports
+If both report.X.dateformat and dateformat.report are not set then dateformat
-and "task info".  If both of these are not set then dateformat will be applied
+will be applied
-to the due date.  Entered dates as well as all other displayed dates in reports
+to the date.  Entered dates as well as all other displayed dates in reports
 are formatted according to dateformat.
-The default value is: m/d/Y.  The string should contain the characters:
+The default value is the ISO-8601 standard: Y-M-D.  The string can contain the
 characters:
 .RS
 .RS
-m  minimal-digit month,   for example 1 or 12
+m  minimal-digit month,    for example 1 or 12
 .br
-d  minimal-digit day,     for example 1 or 30
+d  minimal-digit day,      for example 1 or 30
 .br
-y  two-digit year,        for example 09
+y  two-digit year,         for example 09 or 12
 .br
-D  two-digit day,         for example 01 or 30
+D  two-digit day,          for example 01 or 30
 .br
-M  two-digit month,       for example 01 or 12
+M  two-digit month,        for example 01 or 12
 .br
-Y  four-digit year,       for example 2009
+Y  four-digit year,        for example 2009 or 2014
 .br
-a  short name of weekday, for example Mon or Wed
+a  short name of weekday,  for example Mon or Wed
 .br
-A  long name of weekday,  for example Monday or Wednesday
+A  long name of weekday,   for example Monday or Wednesday
 .br
-b  short name of month,   for example Jan or Aug
+b  short name of month,    for example Jan or Aug
 .br
-B  long name of month,    for example January or August
+B  long name of month,     for example January or August
 .br
-V  weeknumber,            for example 03 or 37
+v  minimal-digit week,     for example 3 or 37
 .br
-H  two-digit hour,        for example 03 or 11
+V  two-digit week,         for example 03 or 37
 .br
-N  two-digit minutes,     for example 05 or 42
+h  minimal-digit hour,     for example 3 or 21
 .br
-S  two-digit seconds,     for example 07 or 47
+n  minimal-digit minutes,  for example 5 or 42
 .br
 s  minimal-digit seconds,  for example 7 or 47
 .br
 H  two-digit hour,         for example 03 or 21
 .br
 N  two-digit minutes,      for example 05 or 42
 .br
 S  two-digit seconds,      for example 07 or 47
 .br
 J  three-digit Julian day, for example 023 or 365
 .br
 j  Julian day,             for example 23 or 365
 .RE
 .RE
 .RS
 The characters 'v', 'V', 'a' and 'A' can only be used for formatting printed
 dates (not to parse them).
 .RE
 .RS
 The string may also contain other characters to act as spacers, or formatting.
 Examples for other values of dateformat:
@@ -528,17 +575,33 @@ Examples for other values of dateformat.report:
 .RS
 .RS
 .br
-a D b Y (V)  would do an output as "Fri 24 Jul 2009 (30)"
+a D b Y (V)   would do an output as "Fri 24 Jul 2009 (30)"
 .br
-A, B D, Y    would do an output as "Friday, July 24, 2009"
+A, B D, Y     would do an output as "Friday, July 24, 2009"
 .br
-vV a Y-M-D   would do an output as "v30 Fri 2009-07-24"
+wV a Y-M-D    would do an output as "w30 Fri 2009-07-24"
 .br
-yMD.HN       would do an output as "110124.2342"
+yMD.HN        would do an output as "110124.2342"
 .br
-m/d/Y H:N    would do an output as "1/24/2011 10:42"
+m/d/Y H:N     would do an output as "1/24/2011 10:42"
 .br
-a D b Y H:N:S would do and output as "Mon 24 Jan 2011 11:19:42"
+a D b Y H:N:S would do an output as "Mon 24 Jan 2011 11:19:42"
 .RE
 .RE
 .RS
 Undefined fields are put to their minimal valid values (1 for month and day and
 0 for hour, minutes and seconds) when there is at least one more global date
 field that is set.  Otherwise, they are set to the corresponding values of
 "now".  For example:
 .RE
 .RS
 .RS
 .br
 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, 2013 (inferred) at 20:40
 .RE
 .RE
@@ -569,7 +632,7 @@ is "sparse".
 .TP
 .B calendar.details.report=list
-The report to run when displaying the details of tasks with due date when
+The report to run when displaying the details of tasks with due dates when
 running the "task calendar" command.  The default value is "list".
 .TP
@@ -661,7 +724,7 @@ be included like this:
 .RS
 .RS
 .br
-include /usr/local/share/doc/task/rc/holidays.en-US.rc
+include ${CMAKE_INSTALL_PREFIX}/${TASK_RCDIR}/holidays.en-US.rc
 .RE
 .RE
@@ -716,6 +779,12 @@ Task is due today
 .B color.active
 Task is started, therefore active.
 .br
 .B color.scheduled
 Task is scheduled, therefore ready for work.
 .br
 .B color.blocking
 Task is blocking another in a dependency.
 .br
 .B color.blocked
 Task is blocked by a dependency.
 .br
@@ -787,6 +856,16 @@ 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 task that has the user defined attribute X.
 .RE
 .TP
 .B color.error=green
 Colors any of the error messages.
 .RE
 .TP
 .B color.header=green
 Colors any of the messages printed prior to the report output.
@@ -901,16 +980,16 @@ a change that is to be reverted.
 .br
 .B color.sync.rejected=red
 .RS
-Colors the output of the merge command.
+Colors the output of the sync command.
 .RE
 .TP
-.B rule.precedence.color=due.today,active,blocked,overdue,due,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
-wildcard values (color.tag.XXX) is shortened to 'tag', which places all specific
+wildcard value (color.tag.XXX) is shortened to 'tag.', which places all
-tag rules at the same precedence, again for brevity.
+specific tag rules at the same precedence, again for brevity.
 .RE
 .TP
@@ -927,47 +1006,51 @@ has a configurable coefficient.  Those coefficients are:
 .TP
 .B urgency.next.coefficient=15.0
 .RS
-Urgency coefficients for 'next' special tag
+Urgency coefficient for 'next' special tag
 .RE
 .B urgency.blocking.coefficient=8.0
 .RS
-Urgency coefficients for blocking tasks
+Urgency coefficient for blocking tasks
 .RE
 .B urgency.blocked.coefficient=-5.0
 .RS
-Urgency coefficients for blocked tasks
+Urgency coefficient for blocked tasks
 .RE
 .B urgency.due.coefficient=12.0
 .RS
-Urgency coefficients for due dates
+Urgency coefficient for due dates
 .RE
 .B urgency.priority.coefficient=6.0
 .RS
-Urgency coefficients for priorities
+Urgency coefficient for priorities
 .RE
 .B urgency.waiting.coefficient=-3.0
 .RS
-Urgency coefficients for waiting status
+Urgency coefficient for waiting status
 .RE
 .B urgency.active.coefficient=4.0
 .RS
-Urgency coefficients for active tasks
+Urgency coefficient for active tasks
 .RE
 .B urgency.scheduled.coefficient=5.0
 .RS
 Urgency coefficient for scheduled tasks
 .RE
 .B urgency.project.coefficient=1.0
 .RS
-Urgency coefficients for projects
+Urgency coefficient for projects
 .RE
 .B urgency.tags.coefficient=1.0
 .RS
-Urgency coefficients for tags
+Urgency coefficient for tags
 .RE
 .B urgency.annotations.coefficient=1.0
 .RS
-Urgency coefficients for annotations
+Urgency coefficient for annotations
 .RE
 .B urgency.age.coefficient=2.0
 .RS
-Urgency coefficients for the age of tasks
+Urgency coefficient for the age of tasks
 .RE
 .B urgency.age.max=365
 .RS
@@ -981,6 +1064,10 @@ Specific tag coefficient.
 .RS
 Specific project coefficient.
 .RE
 .B urgency.uda.<name>.coefficient=...
 .RS
 Presence/absence of UDA data.
 .RE
 The coefficients reflect the relative importance of the various terms in the
 urgency calculation.  These are default values, and may be modified to suit your
@@ -1015,31 +1102,6 @@ shadow.notify=on
 When this value is set to "on", taskwarrior will display a message whenever the
 shadow file is updated by some task command.
 .SS PUSH/PULL/MERGE
 See the 'man task-synch' page for more details regarding usage.
 .TP
 .B merge.autopush=yes|no|ask
 .RS
 Determines post-merge behavior regarding automatic push.
 .RE
 .B merge.default.uri
 .RS
 Default merge URI.
 .RE
 .B pull.default.uri
 .RS
 Default pull URI.
 .RE
 .B push.default.uri
 .RS
 Default push URI.
 .RE
 .SS DEFAULTS
 .TP
@@ -1063,6 +1125,13 @@ Provides a default due date for the
 .I task add
 command, if you don't specify one.  The default is blank.
 .TP
 .B
 uda.<name>.default=...
 Provides default values for UDA fields when using the
 .I task add
 command, if you don't specify values.  The default is blank.
 .TP
 .B
 default.command=next
@@ -1110,11 +1179,8 @@ The description for report X when running the "task help" command.
 .TP
 .B report.X.columns
-The columns that will be used when generating the report X. Valid columns are:
+This is a comma-separated list of columns and formatting specifiers.  See the
-id, uuid, status, project, priority, priority_long, entry, start, end, due,
+command 'task columns' for a full list of options and examples.
 countdown, countdown_compact, age, age_compact, active, tags, depends,
 description_only, description, recur, recurrence_indicator, tag_indicator and
 wait.  The IDs are separated by commas.
 .TP
 .B report.X.labels
@@ -1128,7 +1194,7 @@ specified by using the column ids post-fixed by a "+" for ascending sort order
 or a "-" for descending sort order. The sort IDs are separated by commas.
 For example:
-    report.list.sort=due+,priority-,active-,project+
+    report.list.sort=due+,priority-,start.active-,project+
 .TP
 .B report.X.filter
@@ -1156,8 +1222,7 @@ An optional value to a report limiting the number of displayed tasks in the
 generated report.  Deprecated.
 .TP
-Taskwarrior comes with a number of predefined reports in its default
+Taskwarrior comes with a number of predefined reports, which are:
 configuration file. These reports are:
 .TP
 .B next
@@ -1165,7 +1230,7 @@ Lists the most important tasks.
 .TP
 .B long
-Lists all task, all data, matching the specified criteria.
+Lists all pending tasks and all data, matching the specified criteria.
 .TP
 .B list
@@ -1213,10 +1278,118 @@ Lists all tasks matching the specified criteria.
 .TP
 .B blocked
-List all tasks that have dependencies.
+Lists all tasks that have dependencies.
 .SS USER DEFINED ATTRIBUTES
 User defined attributes (UDAs) are an extension mechanism that allows you to
 define new attributes for Taskwarrior to store and display.  One such example is
 an 'estimate' attribute that could be used to store time estimates associated
 with a task.  This 'estimate' attribute is not built in to Taskwarrior, but with
 a few simple configuration settings you can instruct Taskwarrior to store this
 item, and provide access to it for custom reports and filters.
 This allows you to augment Taskwarrior to accommodate your workflow, or bend the
 rules and use Taskwarrior to store and synch data that is not necessarily
 task-related.
 One important restriction is that because this is an open system that allows
 the definition of any new attribute, Taskwarrior cannot understand the meaning
 of that attribute.  So while Taskwarrior will faithfully store, modify, report,
 sort and filter your UDA, it does not understand anything about it.  For example
 if you define a UDA named 'estimate', Taskwarrior will not know that this value
 is weeks, hours, minutes, money, or some other resource count.
 .TP
 .B uda.<name>.type=string|numeric|date|duration
 .RS
 Defines a UDA called '<name>', of the specified type.
 .RE
 .TP
 .B uda.<name>.label=<column heading>
 .RS
 Provides a default report label for the UDA called '<name>'.
 .RE
 .TP
 .B uda.<name>.values=A,B,C
 .RS
 For type 'string' UDAs only, this provides a comma-separated list of acceptable
 values.  In this example, the '<name>' UDA may only contain values 'A', 'B',
 or 'C', but may also contain no value.
 .RE
 .TP
 .B Example 'estimate' UDA
 This example shows an 'estimate' UDA that stores specific values for the size
 of a task.
 .RS
 .B uda.estimate.type=string
 .br
 .B uda.estimate.label=Size Estimate
 .br
 .B uda.estimate.values=trivial,small,medium,large,huge
 .RE
 .SS SYNC
 These configuration settings are used to connect and sync tasks with the task
 server.
 .TP
 .B taskd.server=<host>:<port>
 .RS
 Specifies the hostname and port of the Taskserver.  Hostname may be an IPv4 or
 IPv6 address, or domain.  Port is an integer.
 .RE
 .TP
 .B taskd.credentials=<organization>/<user>/<key>
 .RS
 User identification for the Taskserver, which includes a private key.
 .RE
 .TP
 .B taskd.certificate=<path>
 .RS
 Specifies the path to the client certificate used for identification with the
 Taskserver.
 .RE
 .TP
 .B taskd.key=<path>
 .RS
 Specifies the path to the client key used for encrypted communication with the
 Taskserver.
 .RE
 .TP
 .B taskd.ca=<path>
 .RS
 Specifies the path to the CA certificate in the event that your Taskserver is
 using a self-signed certificate.  Optional.
 .RE
 .TP
 .B taskd.trust=yes|no
 .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.
 .RE
 .TP
 .B taskd.ciphers=NORMAL
 Override of the cipher selection.  The set of ciphers used by TLS may be
 controlled by both server and client.  There must be some overlap between
 client and server supported ciphers, or communication cannot occur.
 Default is "NORMAL".  See GnuTLS documentation for full details.
 .RE
 .SH "CREDITS & COPYRIGHTS"
-Copyright (C) 2006 \- 2012 P. Beckingham, F. Hernandez.
+Copyright (C) 2006 \- 2014 P. Beckingham, F. Hernandez.
 This man page was originally written by Federico Hernandez.
@@ -1225,6 +1398,7 @@ http://www.opensource.org/licenses/mit-license.php for more information.
 .SH SEE ALSO
 .BR task(1),
 .BR tasksh(1),
 .BR task-tutorial(5),
 .BR task-faq(5),
 .BR task-color(5),
--- a/doc/man/tasksh.1.in
+++ b/doc/man/tasksh.1.in
@@ -0,0 +1,185 @@
 .TH tasksh 1 2014-01-15 "${PACKAGE_STRING}" "User Manuals"
 .SH NAME
 tasksh \- Interactive taskwarrior shell
 .SH SYNOPSIS
 .B tasksh [<commands-file>]
 .br
 .B tasksh --version
 .br
 .B tasksh --help
 .SH DESCRIPTION
 The tasksh program can be used to create a more immersive task environment.
 Any task command you run outside the shell can also be run inside the shell,
 without the need to prefix every command with "task".
 .br
 Moreover, task commands can be written in a file which can be passed or
 redirected to tasksh for batch execution.
 .RS
 $ tasksh
 .br
 .B task 2.3.0
 shell
 .br
 .br
 Enter any task command (such as 'list'), or hit 'Enter'.
 .br
 There is no need to include the 'task' command itself.
 .br
 Enter 'quit' to end the session.
 .br
 .br
 task> projects
 .br
 .br
 Project Tasks Pri:None Pri:L Pri:M Pri:H
 .br
 ------- ----- -------- ----- ----- -----
 .br
            7        7     0     0     0
 .br
 home        2        2     0     0     0
 .br
 party       6        3     0     0     3
 .br
 .br
 3 projects (15 tasks)
 .br
 task> tags
 .br
 .br
 Tag  Count
 .br
 mall     2
 .br
 .br
 1 tag (15 tasks)
 .br
 task> list
 .br
 .br
 ID Project Pri Due        Active Age   Description
 .br
 ---------------------------------------------------------------------
 .br
 2 party   H   10/17/2010        2 hrs Select and book a venue
 .br
 5 party   H   10/22/2010        2 hrs Design invitations
 .br
 9 home        10/31/2010         1 hr Pay rent
 .br
 3 party                         2 hrs Mail invitations
 .br
 4 party                         2 hrs Select a caterer
 .br
 6 party                         2 hrs Print invitations
 .br
 .br
 8 tasks
 .br
 task> quit
 .br
 $
 .br
 $ cat task.commands
 .br
 add foo
 .br
 add bar
 .br
 $ tasksh task.commands
 .br
 task 2.3.0 shell
 .br
 .br
 Enter any task command (such as 'list'), or hit 'Enter'.
 .br
 There is no need to include the 'task' command itself.
 .br
 Enter 'quit' to end the session.
 .br
 .br
 task> add foo
 .br
 Created task 8.
 .br
 task> add bar
 .br
 Created task 9.
 .br
 $
 .br
 $ cat task.commands | tasksh
 .br
 task 2.3.0 shell
 .br
 .br
 Enter any task command (such as 'list'), or hit 'Enter'.
 .br
 There is no need to include the 'task' command itself.
 .br
 Enter 'quit' to end the session.
 .br
 .br
 task> add foo
 .br
 Created task 8.
 .br
 task> add bar
 .br
 Created task 9.
 .br
 .RE
 .SH "CREDITS & COPYRIGHTS"
 Copyright (C) 2006 \- 2014 P. Beckingham, F. Hernandez.
 This man page was originally written by Federico Hernandez.
 Taskwarrior is distributed under the MIT license. See
 http://www.opensource.org/licenses/mit-license.php for more information.
 .SH SEE ALSO
 .BR task(1),
 .BR task-tutorial(5),
 .BR taskrc(5),
 .BR task-faq(5),
 .BR task-color(5),
 .BR task-sync(5)
 For more information regarding taskwarrior, see the following:
 .TP
 The official site at
 <http://taskwarrior.org>
 .TP
 The official code repository at
 <git://tasktools.org/task.git/>
 .TP
 You can contact the project by emailing
 <support@taskwarrior.org>
 .SH REPORTING BUGS
 .TP
 Bugs in taskwarrior may be reported to the issue-tracker at
 <http://taskwarrior.org>
--- a/doc/misc/tutorial/01_intro/script.txt
+++ b/doc/misc/tutorial/01_intro/script.txt
@@ -0,0 +1,65 @@
 [Make window 116x32 for movie recording, light text, dark background]
 On the left are the typed commands.  On the right is the audio track.  Where the
 left and right are aligned, the audio should match the commands.
 ---------------------------------------- Intro -----------------------------------------------------
 # Hi.                                    Hello, and welcome to Taskwarrior.  This is the first of
                                         many tutorials, and covers first-time use.
                                         As a first-time user, you are going to need a configuration
                                         file and a data directory.  Taskwarrior will create both of
                                         these for you, in your home directory, the first time you
                                         run taskwarrior.
 task version                             Answer 'yes' to the question.  After creating the missing
                                         file and directory, you'll see the current version
                                         displayed.
 cat ~/.taskrc                            The configuration file contains very little.  This is
                                         because Taskwarrior has a built-in set of sensible defaults
                                         and the configuration file just contains overrides to those
                                         defaults.
 ls -l ~/.task                            The task data directory is empty.  That's because we have
                                         added no tasks.  Typically you won't need to look in that
                                         directory.
                                         ---
                                         Let's get started with tasks.  Here is the 30-second
                                         tutorial on basic takwarrior usage.
 task add Read task documents later       We Add two tasks.
 task add priority:H Pay bills            
                                         Easy. Do you see that second one has a High priority?
 task ls                                  Now let's look at those tasks.  They are ordered by
                                         priority. Let's mark number 2 as done:
 task 2 done
 task ls
                                         Task 2 is now gone.  Now we can delete that remaining task,
                                         because, well, why bother now we are already using task:
 task 1 delete
 task ls
                                         And that's all you *need* to know.  These four commands
                                         will allow you to use taskwarrior effectively.  If you are
                                         new to taskwarrior, it is recommended that you stop here,
                                         and go manage your task lists.  We don't want you to be
                                         overwhelmed, when what you really need is a way to
                                         organize and get things done.
                                         When you are comfortable with basic taskwarrior usage,
                                         there are many other features you can learn about.  While
                                         you are not expected to learn all of them, or even find
                                         them useful, you might just find exactly what you need.
 ---------------------------------------- End -------------------------------------------------------
--- a/doc/misc/tutorial/02_help/script.txt
+++ b/doc/misc/tutorial/02_help/script.txt
@@ -0,0 +1,55 @@
 [Make window 116x32 for movie recording, light text, dark background]
 On the left are the typed commands.  On the right is the audio track.  Where the
 left and right are aligned, the audio should match the commands.
 ---------------------------------------- Help ------------------------------------------------------
                                         There are several forms of help available.  We will look at
                                         the various options.
 # http//taskwarrior.org                  If you find you have any questions, you can get answers in
                                         several ways.  The website has user forums, issue tracking
                                         and online documentation, including this tutorial.
                                         There is also a command reference PDF that we recommend
                                         you download and use.  It shows all the supported commands
                                         and options at a glance.
 # IRC #taskwarrior                       You can join the Taskwarrior IRC channel to pose questions,
                                         or join in the discussion.
 # support@taskwarrior.org                Or you can submit your request by email.  The various
                                         support options are all volunteer-run.
 task help                                There is a built in help page which summarizes commands,
                                         reports and other details.
 man task                                 Finally, you have several man pages installed that contain
                                         all the written documentation, including this tutorial.
                                         The main man page offers syntax and command help.
 man taskrc                               The taskrc page describes all the supported configuration
                                         options (and there are many), which you can use to
                                         customize the behavior of taskwarrior.
 man task-color                           Use of color, color rules and themes are described in the
                                         task color page.
 man task-tutorial                        The tutorial faq is simply an aggregated collection of all
                                         the tutorials.
 man task-sync                            This page describes the various sync alternatives, with
                                         examples to help you keep your tasks lists up to date.
                                         ---
                                         If you find a bug, or even suspect you found a bug, please
                                         let us know.  Ideally you would send an email to
                                         support@taskwarrior.org, describe the problem, and include
 task diagnostics                         information about your installation.  The 'diagnostics'
                                         command provides the details we might need to diagnose the
                                         problem.
 ---------------------------------------- End -------------------------------------------------------
--- a/doc/misc/tutorial/NN_configuration/script.txt
+++ b/doc/misc/tutorial/NN_configuration/script.txt
@@ -0,0 +1,64 @@
 [Make window 116x32 for movie recording, light text, dark background]
 On the left are the typed commands.  On the right is the audio track.  Where the
 left and right are aligned, the audio should match the commands.
 ---------------------------------------- Configuration ---------------------------------------------
 cat ~/.taskrc                            The taskwarrior configuration file is minimal.  This means
                                         it contains only what is needed to override the default
                                         settings.  Initially you see that the config file contains
                                         just one setting which points to your data directory.
 task show                                The 'show' command displays all the configuration settings
                                         with their current values.  These are all described in the
                                         taskrc man page.
 task show hyph                           You can provide a pattern, to limit the results to only
                                         settings that match the pattern.
 task config hypenate off                 The config command is used to modify the configuration,
                                         here we are turning off hyphenation.  Notice that changes
                                         require confirmation.
 task show hyph                           Now when we look at the setting, we see that it is now
                                         highlighted to indicate that it not longer has the default
                                         value.
 task config hyphenate on                 We can turn that setting back on.
 task config hyphenate                    Alternatively we can just remove the setting, and rely on
                                         the default.  This is a better choice because it de-
                                         clutters your configuration file.
 task config answer 42                    In this example, we set the configuration variable 'answer'
                                         to have a value of 42.
 task show answer                         The 'show' command indicates that the setting is not
                                         recognized.  This could indicate a mistake with the setting
                                         name.  It is harmless to have unrecognized settings, but
                                         also pointless.
 task config answer ''                    Specifying an empty value using quotes is how you would
                                         set a blank value without restoring default settings.
 task config answer                       In this case, deleting the setting is correct.
                                         ---
 task rc.hyphenate=off list               A very powerful feature is the ability to override the
                                         configuration variables temporarily.  Here we are running
                                         the 'list' report with hyphenation temporarily disabled.
 task rc.data.location=/other/path list   You can also override the data directory to use a different
                                         task list ...
 task rc:~/.other_taskrc list             Or you can override the configuration file completely.
 TASKDATA=/other/path task list           The TASKDATA environment variable can also be used to
                                         specify an alternate data directory, and ...
 TASKRC=~/.other_taskrc list              The TASKRC variable can override the configuration file.
 ---------------------------------------- End -------------------------------------------------------
--- a/doc/misc/tutorial/README
+++ b/doc/misc/tutorial/README
@@ -0,0 +1,34 @@
 This is an outline of the tutorial contents.  The numbered directories indicate
 the general order in which the tutorials should be viewed, because the commands
 used build on prior knowledge.
 The non-numbered directories just represent the sections of the old tutorial.
 Because of the old 15-minute limit on video size, the old tutorial was broken
 into two parts, and edited down so that it fit.  This new effort avoids this by
 having many, smaller sections that explore features at a greater depth.
 01_intro
  First time use
    Setup
    version
  30-second Tutorial
    add
    ls
    done
    delete
 02_help
  Support options
    Web site
    Command Reference 
    IRC
    Email
    Man pages
    Reporting bugs
 NN_configuration
  show command
  config command
  rc overrides
  TASKDATA, TASKRC
--- a/doc/misc/tutorial/active/run.200
+++ b/doc/misc/tutorial/active/run.200
@@ -0,0 +1,520 @@
 #! /bin/bash
 rm -f /Users/paul/.task/pending.data /Users/paul/.task/completed.data /Users/paul/.task/undo.data
 echo 'data.location=~/.task' > /Users/paul/.taskrc
 echo 'color=off' >> /Users/paul/.taskrc
 echo 'color.summary.background=on gray3' >> /Users/paul/.taskrc
 echo '#include /usr/local/share/doc/task/rc/dark-blue-256.theme' >> /Users/paul/.taskrc
 echo '#include /usr/local/share/doc/task/rc/dark-red-256.theme' >> /Users/paul/.taskrc
 echo '#include /usr/local/share/doc/task/rc/dark-256.theme' >> /Users/paul/.taskrc
 # 1 Intro
 # 2 Basic usage
 echo Basic usage --------------------------------------------------------------
 echo $ task add Select a free weekend in November
 task add Select a free weekend in November
 echo $ task add Select and book a venue
 task add Select and book a venue
 echo $ task add Come up with a guest list
 task add Come up with a guest list
 echo $ task add Mail invitations
 task add Mail invitations
 echo $ task add Select a caterer
 task add Select a caterer
 echo $ task list
 task list
 echo $ task log Order a special cake
 task log Order a special cake
 echo $ task 4 duplicate /Mail/Design/
 task 4 duplicate /Mail/Design/
 echo $ task 4 duplicate /Mail/Print/
 task 4 duplicate /Mail/Print/
 echo $ task list
 task list
 echo $ task 3 done
 task 3 done
 echo $ task list
 task list
 # 3 Projects
 echo Projects --------------------------------------------------------------
 echo $ task add Pay teh rent on teh 31st
 task add Pay teh rent on teh 31st
 echo $ task 7 /teh/the/g
 task 7 /teh/the/g
 echo $ task list
 task list
 echo $ task 7 project:home
 task 7 project:home
 echo $ task 1-6 project:party
 echo 'All' | task 1-6 project:party
 echo $ task projects
 task projects
 echo $ task list project:home
 task list project:home
 echo $ task li pro:par
 task li pro:par
 # 4 Priorities
 echo Priorities --------------------------------------------------------------
 echo $ task 1-3,5 priority:H
 echo 'All' | task 1-3,5 priority:H
 echo $ task list
 task list
 echo $ task 3 pri:
 task 3 pri:
 # 5 Tags
 echo Tags --------------------------------------------------------------
 echo $ task list
 task list
 echo $ task 3,5,6 +mall
 echo 'All' | task 3,5,6 +mall
 echo $ task long
 task long
 echo $ task list +mall
 task list +mall
 echo $ task 3 -mall
 task 3 -mall
 # 6 Modifications
 echo Modifications --------------------------------------------------------------
 echo $ task 7 Pay rent at the end of the month
 echo 'Yes' | task 7 Pay rent at the end of the month
 echo $ task add music
 task add music
 echo $ task 8 prepend Select some
 task 8 prepend Select some
 echo $ task 8 append for after dinner
 task 8 append for after dinner
 echo $ task list
 task list
 echo $ task edit
 #task edit
 echo $ task add Hire a band?
 #task add Hire a band?
 echo $ task add Hire a band\?
 #task add Hire a band\?
 echo $ task add "Hire a band?"
 #task add "Hire a band?"
 echo $ task add -- Hire a band\? +dj
 task add -- Hire a band\? +dj
 echo $ task undo
 echo 'y' | task undo
 echo $ task 1 delete
 echo 'y' | task 1 delete
 echo $ task undo
 echo 'y' | task undo
 # 7 Info
 echo Info --------------------------------------------------------------
 echo $ task 1 info
 task 1 info
 echo $ task stats
 task stats
 # 8 Annotations
 echo Annotations --------------------------------------------------------------
 echo $ task 1 annotate the 13 looks good
 task 1 annotate the 13 looks good
 sleep 1
 echo $ task 1 annotate or the 14th
 task 1 annotate or the 14th
 echo $ task list
 task list
 echo $ task list rc.annotations:full
 task list rc.annotations:full
 echo $ task list rc.annotations:sparse
 task list rc.annotations:sparse
 echo $ task list rc.annotations:none
 task list rc.annotations:none
 echo $ task 1 denotate 14th
 task 1 denotate 14th
 echo $ task list
 task list
 # 9 Configuration
 echo Configuration --------------------------------------------------------------
 echo $ task show
 task show
 echo $ task config answer forty-two
 echo 'y' | task config answer forty-two
 echo $ task show answer
 task show answer
 echo $ task config answer
 echo 'y' | task config answer
 echo $ task rc.report.list.sort=description+ list
 task rc.report.list.sort=description+ list
 # 10 Defaults
 echo Defaults --------------------------------------------------------------
 echo $ task config default.command list
 echo 'y' | task config default.command list
 echo $ task 
 task 
 echo $ task config default.priority H
 echo 'y' | task config default.priority H
 echo $ task config default.project Work
 echo 'y' | task config default.project Work
 echo $ task add New task
 task add New task
 echo $ task list
 task list
 echo $ task undo
 echo 'y' | task undo
 echo $ task config default.priority
 echo 'y' | task config default.priority
 echo $ task config default.project
 echo 'y' | task config default.project
 # 11 Aliases
 echo Aliases --------------------------------------------------------------
 echo $ task config alias.zzz list
 echo 'y' | task config alias.zzz list
 echo $ task zzz
 task zzz
 echo $ task z
 task z
 # 12 Color
 echo Color --------------------------------------------------------------
 echo $ task config color on
 echo 'y' | task config color on
 echo $ task list
 task list
 echo $ task 1 bg:on_red
 task 1 bg:on_red
 echo $ task list
 task list
 echo $ task 1 bg:
 task 1 bg:
 echo $ task color
 task color
 echo $ task color white on red
 task color white on red
 echo $ task color legend
 task color legend
 echo vi ~/.taskrc # include /usr/local/share/doc/task/rc/dark-blue-256.theme
 #vi ~/.taskrc # include /usr/local/share/doc/task/rc/dark-blue-256.theme
 echo 'include /usr/local/share/doc/task/rc/dark-blue-256.theme' >> x
 echo $ task color legend
 task color legend
 echo $ task list
 task list
 echo vi ~/.taskrc # include /usr/local/share/doc/task/rc/dark-red-256.theme
 #vi ~/.taskrc # include /usr/local/share/doc/task/rc/dark-red-256.theme
 sed 's/blue/red/' x >x2 && mv x2 x
 echo $ task color legend
 task color legend
 echo $ task list
 task list
 echo vi ~/.taskrc # include /usr/local/share/doc/task/rc/dark-256.theme
 #vi ~/.taskrc # include /usr/local/share/doc/task/rc/dark-256.theme
 sed 's/red-//' x >x2 && mv x2 x
 echo $ task list
 task list
 echo $ task "rc.color.project.party=on rgb001" rc.color.keyword.invit=bold list
 task "rc.color.project.party=on rgb001" rc.color.keyword.invit=bold list
 echo $ man task-color
 #man task-color
 # 13 Active tasks
 echo Active tasks --------------------------------------------------------------
 echo $ task 2 start
 task 2 start
 echo $ task list
 task list
 echo $ task active
 task active
 echo $ task 2 stop
 task 2 stop
 echo $ task config journal.time on
 task config journal.time on
 echo $ task config rc.dateformat.xxx xxx
 task config rc.dateformat.xxx xxx
 echo $ task config dateformat.annotation 'Y/m/d H:N'
 task config dateformat.annotation 'Y/m/d H:N'
 echo $ task 2 start
 task 2 start
 echo $ task list venue
 task list venue
 echo $ task 2 stop
 task 2 stop
 echo $ task list venue
 task list venue
 # 14 Due dates
 echo Due dates --------------------------------------------------------------
 echo $ task 1 due:7/31/2010
 task 1 due:7/31/2010
 echo $ task 1 due:2wks
 task 1 due:2wks
 echo $ task 1 due:-2wks
 task 1 due:-2wks
 echo $ task 1 due:eom
 task 1 due:eom
 echo $ task 2 due:8th
 task 2 due:8th
 echo $ task 2 due:sunday
 task 2 due:sunday
 echo $ task 5 due:eow
 task 5 due:eow
 echo $ task list
 task list
 echo $ task overdue
 task overdue
 echo $ task rc.dateformat.report:Y-M-DTH:N:SZ list
 task rc.dateformat.report:Y-M-DTH:N:SZ list
 # 15 Calendar
 echo Calendar --------------------------------------------------------------
 echo $ task calendar
 task calendar
 echo $ vi ~/.taskrc # include /usr/local/share/doc/task/rc/holidays-US.rc
 #vi ~/.taskrc # include /usr/local/share/doc/task/rc/holidays-US.rc
 echo 'include /usr/local/share/doc/task/rc/holidays-US.rc' >> x
 echo $ task calendar
 task calendar
 echo $ task cal 2010
 task cal 2010
 echo $ task rc.calendar.details:full cal
 task rc.calendar.details:full cal
 echo $ task rc.calendar.holidays:full cal
 task rc.calendar.holidays:full cal
 # 16 Recurrence
 echo Recurrence --------------------------------------------------------------
 echo $ task 7 info
 task 7 info
 echo $ task 7 due:eom recur:monthly
 task 7 due:eom recur:monthly
 echo $ task 7
 task 7
 echo $ task 7 until:eoy
 task 7 until:eoy
 echo $ task recurring
 task recurring
 echo $ task add Pay taxes due:4/15/2007 recur:yearly
 task add Pay taxes due:4/15/2007 recur:yearly
 echo $ task long
 task long
 echo $ task 11 delete
 printf "y\ny\n" | task 11 delete      # y, y
 echo $ task list
 task list
 # 17 Special tags
 echo Special tags --------------------------------------------------------------
 echo $ task 6 +nocolor
 task 6 +nocolor
 echo $ task list
 task list
 echo $ task tags
 task tags
 echo $ task 6 -nocolor
 task 6 -nocolor
 # 18 Waiting
 echo Waiting --------------------------------------------------------------
 echo $ task add Look for new apartment due:eoy
 task add Look for new apartment due:eoy
 echo $ task list
 task list
 echo $ task 10 wait:12/1/2010
 task 10 wait:12/1/2010
 echo $ task list
 task list
 echo $ task waiting
 task waiting
 echo $ task add Do something in a few seconds
 task add Do something in a few seconds
 echo $ task 11 wait:5s
 task 11 wait:5s
 echo $ task list
 task list
 sleep 5
 echo $ task list
 task list
 echo $ task 11 rc.confirmation:no delete
 task 11 rc.confirmation:no delete
 # 19 Dependencies
 echo Dependencies --------------------------------------------------------------
 echo $ task list pro:party
 task list pro:party
 echo $ task 3 depends:6
 task 3 depends:6
 echo $ task 6 dep:5
 task 6 dep:5
 echo $ task 2 dep:1
 task 2 dep:1
 echo $ task 5 dep:1,2
 task 5 dep:1,2
 echo $ task 4 dep:1
 task 4 dep:1
 echo $ task long pro:party
 task long pro:party
 echo $ task 5 dep:-1
 task 5 dep:-1
 echo $ task blocked
 task blocked
 echo $ task unblocked
 task  unblocked
 echo $ task 1 info
 task  1 info
 echo $ task 2 info
 task  2 info
 echo $ task 2 done
 echo 'y' | task  2 done
 echo $ task 1 info
 task  1 info
 # 20 Reports
 echo Reports --------------------------------------------------------------
 echo $ task minimal
 task  minimal
 echo $ task ls
 task  ls
 echo $ task list
 task  list
 echo $ task long
 task  long
 echo $ task all
 task  all
 echo $ task completed
 task  completed
 echo $ task recurring
 task  recurring
 echo $ task waiting
 task  waiting
 echo $ task blocked
 task  blocked
 echo $ task oldest
 task  oldest
 echo $ task newest
 task  newest
 echo $ task timesheet
 task  timesheet
 echo $ task next
 task  next
 # 21 Custom report
 echo Custom report --------------------------------------------------------------
 echo 'report.foo.description=My own report'     >> x
 echo 'report.foo.columns=id,entry,description'  >> x
 echo 'report.foo.labels=ID,Entered,Description' >> x
 echo 'report.foo.sort=entry+,description+'      >> x
 echo 'report.foo.filter=status:pending'         >> x
 echo 'task help | grep foo'
 task  help | grep foo
 echo $ task show report.foo
 task  show report.foo
 echo $ task foo
 task  foo
 # 22 Charts
 echo Charts --------------------------------------------------------------
 echo $ task history
 task history
 echo $ task history.annual
 task history.annual
 echo $ task ghistory
 task ghistory
 echo $ task ghistory.annual
 task ghistory.annual
 echo $ task summary
 task summary
 # 23 Advanced filters
 echo Advanced filters --------------------------------------------------------------
 echo $ task list
 task  list
 echo $ task list invit
 task  list invit
 echo $ task list description.contains:invit
 task  list description.contains:invit
 echo $ task list desc.word:the
 task  list desc.word:the
 echo $ task list desc.noword:invitations
 task  list desc.noword:invitations
 echo $ task list pro:party
 task  list pro:party
 echo $ task list pro.is:party
 task  list pro.is:party
 echo $ task list pro.not:party
 task  list pro.not:party
 echo $ task list pro:party priority.over:L
 task  list pro:party priority.over:L
 echo $ task list pro:party limit:2
 task  list pro:party limit:2
 echo $ task list limit:page
 task  list limit:page
 echo $ task all status:pending
 task  all status:pending
 echo $ task all status:waiting
 task  all status:waiting
 # 24 Import/export
 echo Import/export --------------------------------------------------------------
 echo $ task export.csv
 task  export.csv
 echo $ task export.csv venue
 task  export.csv venue
 echo $ task export.vcalendar venue
 task  export.vcalendar venue
 echo $ task export.yaml venue
 task  export.yaml venue
 cat <<EOF >file.text
 Remember to read the task man page
 EOF
 cat file.text
 echo $ task import file.text
 printf "y\n" | task  import file.text
 cat <<EOF >file.yaml
 %YAML 1.1
 ---
  task:
    description: Visit http://taskwarrior.org
    due: 1281844800
    entry: 1281289630
    priority: H
    project: work
    status: pending
    uuid: 23afada0-a446-8d5a-c213-30d99d52c4b0
 ...
 EOF
 cat file.yaml
 echo $ task import file.yaml
 printf "y\n" | task  import file.yaml
 echo $ task new limit:2
 task  new limit:2
 # 25 Help
 echo Help --------------------------------------------------------------
 echo $ task help
 task  help
 echo $ man task
 #man task
 echo $ man taskrc
 #man taskrc
 echo $ man task-color
 #man task-color
 echo $ man task-tutorial
 #man task-tutorial
 echo $ man task-faq
 #man task-faq
 echo $ man task-sync
 #man task-sync
 # 26 Wrap up
 echo Wrap up --------------------------------------------------------------
 echo $ task version
 task  version
 exit
--- a/doc/misc/tutorial/active/script.200.txt
+++ b/doc/misc/tutorial/active/script.200.txt
@@ -0,0 +1,43 @@
 [Make window 116x32 for movie recording, light text, dark background]
 This is the script from which a 2.0-specific movie will be made.  On the left
 are the typed commands, and on the right is the voice track.
 It is intended that the left and right be combined and the result will be a new
 task-tutorial.5 man page.
 ---------------------------------------- Active tasks ----------------------------------------------
 task 2 start                             I'm selecting a venue, so let's indicate that task 2 is
 task list                                active by starting it.  See how active tasks are affected
                                         by the color rules.
 task active                              There is an active report that shows only active tasks, and
 task 2 stop                              you can mark any active task as inactive, by stopping it.
 task config journal.time on (y)          There is a journalling feature that records the start and
 task config dateformat.annotation 'Y/m/d H:N' (y)
 task 2 start                             stop times as annotations.  We'll turn that on, and add
 task list venue                          the time to the annotation date format.
 task 2 stop
 task list venue
 ---------------------------------------- End -------------------------------------------------------
 task list
 task 2 start
 task 2 info
 sleep 4
 task 2 info
 task 2 stop
 task 2 start
 sleep 2
 task 2 stop
 task 2 info
--- a/doc/misc/tutorial/aliases/run.200
+++ b/doc/misc/tutorial/aliases/run.200
@@ -0,0 +1,520 @@
 #! /bin/bash
 rm -f /Users/paul/.task/pending.data /Users/paul/.task/completed.data /Users/paul/.task/undo.data
 echo 'data.location=~/.task' > /Users/paul/.taskrc
 echo 'color=off' >> /Users/paul/.taskrc
 echo 'color.summary.background=on gray3' >> /Users/paul/.taskrc
 echo '#include /usr/local/share/doc/task/rc/dark-blue-256.theme' >> /Users/paul/.taskrc
 echo '#include /usr/local/share/doc/task/rc/dark-red-256.theme' >> /Users/paul/.taskrc
 echo '#include /usr/local/share/doc/task/rc/dark-256.theme' >> /Users/paul/.taskrc
 # 1 Intro
 # 2 Basic usage
 echo Basic usage --------------------------------------------------------------
 echo $ task add Select a free weekend in November
 task add Select a free weekend in November
 echo $ task add Select and book a venue
 task add Select and book a venue
 echo $ task add Come up with a guest list
 task add Come up with a guest list
 echo $ task add Mail invitations
 task add Mail invitations
 echo $ task add Select a caterer
 task add Select a caterer
 echo $ task list
 task list
 echo $ task log Order a special cake
 task log Order a special cake
 echo $ task 4 duplicate /Mail/Design/
 task 4 duplicate /Mail/Design/
 echo $ task 4 duplicate /Mail/Print/
 task 4 duplicate /Mail/Print/
 echo $ task list
 task list
 echo $ task 3 done
 task 3 done
 echo $ task list
 task list
 # 3 Projects
 echo Projects --------------------------------------------------------------
 echo $ task add Pay teh rent on teh 31st
 task add Pay teh rent on teh 31st
 echo $ task 7 /teh/the/g
 task 7 /teh/the/g
 echo $ task list
 task list
 echo $ task 7 project:home
 task 7 project:home
 echo $ task 1-6 project:party
 echo 'All' | task 1-6 project:party
 echo $ task projects
 task projects
 echo $ task list project:home
 task list project:home
 echo $ task li pro:par
 task li pro:par
 # 4 Priorities
 echo Priorities --------------------------------------------------------------
 echo $ task 1-3,5 priority:H
 echo 'All' | task 1-3,5 priority:H
 echo $ task list
 task list
 echo $ task 3 pri:
 task 3 pri:
 # 5 Tags
 echo Tags --------------------------------------------------------------
 echo $ task list
 task list
 echo $ task 3,5,6 +mall
 echo 'All' | task 3,5,6 +mall
 echo $ task long
 task long
 echo $ task list +mall
 task list +mall
 echo $ task 3 -mall
 task 3 -mall
 # 6 Modifications
 echo Modifications --------------------------------------------------------------
 echo $ task 7 Pay rent at the end of the month
 echo 'Yes' | task 7 Pay rent at the end of the month
 echo $ task add music
 task add music
 echo $ task 8 prepend Select some
 task 8 prepend Select some
 echo $ task 8 append for after dinner
 task 8 append for after dinner
 echo $ task list
 task list
 echo $ task edit
 #task edit
 echo $ task add Hire a band?
 #task add Hire a band?
 echo $ task add Hire a band\?
 #task add Hire a band\?
 echo $ task add "Hire a band?"
 #task add "Hire a band?"
 echo $ task add -- Hire a band\? +dj
 task add -- Hire a band\? +dj
 echo $ task undo
 echo 'y' | task undo
 echo $ task 1 delete
 echo 'y' | task 1 delete
 echo $ task undo
 echo 'y' | task undo
 # 7 Info
 echo Info --------------------------------------------------------------
 echo $ task 1 info
 task 1 info
 echo $ task stats
 task stats
 # 8 Annotations
 echo Annotations --------------------------------------------------------------
 echo $ task 1 annotate the 13 looks good
 task 1 annotate the 13 looks good
 sleep 1
 echo $ task 1 annotate or the 14th
 task 1 annotate or the 14th
 echo $ task list
 task list
 echo $ task list rc.annotations:full
 task list rc.annotations:full
 echo $ task list rc.annotations:sparse
 task list rc.annotations:sparse
 echo $ task list rc.annotations:none
 task list rc.annotations:none
 echo $ task 1 denotate 14th
 task 1 denotate 14th
 echo $ task list
 task list
 # 9 Configuration
 echo Configuration --------------------------------------------------------------
 echo $ task show
 task show
 echo $ task config answer forty-two
 echo 'y' | task config answer forty-two
 echo $ task show answer
 task show answer
 echo $ task config answer
 echo 'y' | task config answer
 echo $ task rc.report.list.sort=description+ list
 task rc.report.list.sort=description+ list
 # 10 Defaults
 echo Defaults --------------------------------------------------------------
 echo $ task config default.command list
 echo 'y' | task config default.command list
 echo $ task 
 task 
 echo $ task config default.priority H
 echo 'y' | task config default.priority H
 echo $ task config default.project Work
 echo 'y' | task config default.project Work
 echo $ task add New task
 task add New task
 echo $ task list
 task list
 echo $ task undo
 echo 'y' | task undo
 echo $ task config default.priority
 echo 'y' | task config default.priority
 echo $ task config default.project
 echo 'y' | task config default.project
 # 11 Aliases
 echo Aliases --------------------------------------------------------------
 echo $ task config alias.zzz list
 echo 'y' | task config alias.zzz list
 echo $ task zzz
 task zzz
 echo $ task z
 task z
 # 12 Color
 echo Color --------------------------------------------------------------
 echo $ task config color on
 echo 'y' | task config color on
 echo $ task list
 task list
 echo $ task 1 bg:on_red
 task 1 bg:on_red
 echo $ task list
 task list
 echo $ task 1 bg:
 task 1 bg:
 echo $ task color
 task color
 echo $ task color white on red
 task color white on red
 echo $ task color legend
 task color legend
 echo vi ~/.taskrc # include /usr/local/share/doc/task/rc/dark-blue-256.theme
 #vi ~/.taskrc # include /usr/local/share/doc/task/rc/dark-blue-256.theme
 echo 'include /usr/local/share/doc/task/rc/dark-blue-256.theme' >> x
 echo $ task color legend
 task color legend
 echo $ task list
 task list
 echo vi ~/.taskrc # include /usr/local/share/doc/task/rc/dark-red-256.theme
 #vi ~/.taskrc # include /usr/local/share/doc/task/rc/dark-red-256.theme
 sed 's/blue/red/' x >x2 && mv x2 x
 echo $ task color legend
 task color legend
 echo $ task list
 task list
 echo vi ~/.taskrc # include /usr/local/share/doc/task/rc/dark-256.theme
 #vi ~/.taskrc # include /usr/local/share/doc/task/rc/dark-256.theme
 sed 's/red-//' x >x2 && mv x2 x
 echo $ task list
 task list
 echo $ task "rc.color.project.party=on rgb001" rc.color.keyword.invit=bold list
 task "rc.color.project.party=on rgb001" rc.color.keyword.invit=bold list
 echo $ man task-color
 #man task-color
 # 13 Active tasks
 echo Active tasks --------------------------------------------------------------
 echo $ task 2 start
 task 2 start
 echo $ task list
 task list
 echo $ task active
 task active
 echo $ task 2 stop
 task 2 stop
 echo $ task config journal.time on
 task config journal.time on
 echo $ task config rc.dateformat.xxx xxx
 task config rc.dateformat.xxx xxx
 echo $ task config dateformat.annotation 'Y/m/d H:N'
 task config dateformat.annotation 'Y/m/d H:N'
 echo $ task 2 start
 task 2 start
 echo $ task list venue
 task list venue
 echo $ task 2 stop
 task 2 stop
 echo $ task list venue
 task list venue
 # 14 Due dates
 echo Due dates --------------------------------------------------------------
 echo $ task 1 due:7/31/2010
 task 1 due:7/31/2010
 echo $ task 1 due:2wks
 task 1 due:2wks
 echo $ task 1 due:-2wks
 task 1 due:-2wks
 echo $ task 1 due:eom
 task 1 due:eom
 echo $ task 2 due:8th
 task 2 due:8th
 echo $ task 2 due:sunday
 task 2 due:sunday
 echo $ task 5 due:eow
 task 5 due:eow
 echo $ task list
 task list
 echo $ task overdue
 task overdue
 echo $ task rc.dateformat.report:Y-M-DTH:N:SZ list
 task rc.dateformat.report:Y-M-DTH:N:SZ list
 # 15 Calendar
 echo Calendar --------------------------------------------------------------
 echo $ task calendar
 task calendar
 echo $ vi ~/.taskrc # include /usr/local/share/doc/task/rc/holidays-US.rc
 #vi ~/.taskrc # include /usr/local/share/doc/task/rc/holidays-US.rc
 echo 'include /usr/local/share/doc/task/rc/holidays-US.rc' >> x
 echo $ task calendar
 task calendar
 echo $ task cal 2010
 task cal 2010
 echo $ task rc.calendar.details:full cal
 task rc.calendar.details:full cal
 echo $ task rc.calendar.holidays:full cal
 task rc.calendar.holidays:full cal
 # 16 Recurrence
 echo Recurrence --------------------------------------------------------------
 echo $ task 7 info
 task 7 info
 echo $ task 7 due:eom recur:monthly
 task 7 due:eom recur:monthly
 echo $ task 7
 task 7
 echo $ task 7 until:eoy
 task 7 until:eoy
 echo $ task recurring
 task recurring
 echo $ task add Pay taxes due:4/15/2007 recur:yearly
 task add Pay taxes due:4/15/2007 recur:yearly
 echo $ task long
 task long
 echo $ task 11 delete
 printf "y\ny\n" | task 11 delete      # y, y
 echo $ task list
 task list
 # 17 Special tags
 echo Special tags --------------------------------------------------------------
 echo $ task 6 +nocolor
 task 6 +nocolor
 echo $ task list
 task list
 echo $ task tags
 task tags
 echo $ task 6 -nocolor
 task 6 -nocolor
 # 18 Waiting
 echo Waiting --------------------------------------------------------------
 echo $ task add Look for new apartment due:eoy
 task add Look for new apartment due:eoy
 echo $ task list
 task list
 echo $ task 10 wait:12/1/2010
 task 10 wait:12/1/2010
 echo $ task list
 task list
 echo $ task waiting
 task waiting
 echo $ task add Do something in a few seconds
 task add Do something in a few seconds
 echo $ task 11 wait:5s
 task 11 wait:5s
 echo $ task list
 task list
 sleep 5
 echo $ task list
 task list
 echo $ task 11 rc.confirmation:no delete
 task 11 rc.confirmation:no delete
 # 19 Dependencies
 echo Dependencies --------------------------------------------------------------
 echo $ task list pro:party
 task list pro:party
 echo $ task 3 depends:6
 task 3 depends:6
 echo $ task 6 dep:5
 task 6 dep:5
 echo $ task 2 dep:1
 task 2 dep:1
 echo $ task 5 dep:1,2
 task 5 dep:1,2
 echo $ task 4 dep:1
 task 4 dep:1
 echo $ task long pro:party
 task long pro:party
 echo $ task 5 dep:-1
 task 5 dep:-1
 echo $ task blocked
 task blocked
 echo $ task unblocked
 task  unblocked
 echo $ task 1 info
 task  1 info
 echo $ task 2 info
 task  2 info
 echo $ task 2 done
 echo 'y' | task  2 done
 echo $ task 1 info
 task  1 info
 # 20 Reports
 echo Reports --------------------------------------------------------------
 echo $ task minimal
 task  minimal
 echo $ task ls
 task  ls
 echo $ task list
 task  list
 echo $ task long
 task  long
 echo $ task all
 task  all
 echo $ task completed
 task  completed
 echo $ task recurring
 task  recurring
 echo $ task waiting
 task  waiting
 echo $ task blocked
 task  blocked
 echo $ task oldest
 task  oldest
 echo $ task newest
 task  newest
 echo $ task timesheet
 task  timesheet
 echo $ task next
 task  next
 # 21 Custom report
 echo Custom report --------------------------------------------------------------
 echo 'report.foo.description=My own report'     >> x
 echo 'report.foo.columns=id,entry,description'  >> x
 echo 'report.foo.labels=ID,Entered,Description' >> x
 echo 'report.foo.sort=entry+,description+'      >> x
 echo 'report.foo.filter=status:pending'         >> x
 echo 'task help | grep foo'
 task  help | grep foo
 echo $ task show report.foo
 task  show report.foo
 echo $ task foo
 task  foo
 # 22 Charts
 echo Charts --------------------------------------------------------------
 echo $ task history
 task history
 echo $ task history.annual
 task history.annual
 echo $ task ghistory
 task ghistory
 echo $ task ghistory.annual
 task ghistory.annual
 echo $ task summary
 task summary
 # 23 Advanced filters
 echo Advanced filters --------------------------------------------------------------
 echo $ task list
 task  list
 echo $ task list invit
 task  list invit
 echo $ task list description.contains:invit
 task  list description.contains:invit
 echo $ task list desc.word:the
 task  list desc.word:the
 echo $ task list desc.noword:invitations
 task  list desc.noword:invitations
 echo $ task list pro:party
 task  list pro:party
 echo $ task list pro.is:party
 task  list pro.is:party
 echo $ task list pro.not:party
 task  list pro.not:party
 echo $ task list pro:party priority.over:L
 task  list pro:party priority.over:L
 echo $ task list pro:party limit:2
 task  list pro:party limit:2
 echo $ task list limit:page
 task  list limit:page
 echo $ task all status:pending
 task  all status:pending
 echo $ task all status:waiting
 task  all status:waiting
 # 24 Import/export
 echo Import/export --------------------------------------------------------------
 echo $ task export.csv
 task  export.csv
 echo $ task export.csv venue
 task  export.csv venue
 echo $ task export.vcalendar venue
 task  export.vcalendar venue
 echo $ task export.yaml venue
 task  export.yaml venue
 cat <<EOF >file.text
 Remember to read the task man page
 EOF
 cat file.text
 echo $ task import file.text
 printf "y\n" | task  import file.text
 cat <<EOF >file.yaml
 %YAML 1.1
 ---
  task:
    description: Visit http://taskwarrior.org
    due: 1281844800
    entry: 1281289630
    priority: H
    project: work
    status: pending
    uuid: 23afada0-a446-8d5a-c213-30d99d52c4b0
 ...
 EOF
 cat file.yaml
 echo $ task import file.yaml
 printf "y\n" | task  import file.yaml
 echo $ task new limit:2
 task  new limit:2
 # 25 Help
 echo Help --------------------------------------------------------------
 echo $ task help
 task  help
 echo $ man task
 #man task
 echo $ man taskrc
 #man taskrc
 echo $ man task-color
 #man task-color
 echo $ man task-tutorial
 #man task-tutorial
 echo $ man task-faq
 #man task-faq
 echo $ man task-sync
 #man task-sync
 # 26 Wrap up
 echo Wrap up --------------------------------------------------------------
 echo $ task version
 task  version
 exit
--- a/doc/misc/tutorial/aliases/script.200.txt
+++ b/doc/misc/tutorial/aliases/script.200.txt
@@ -0,0 +1,24 @@
 [Make window 116x32 for movie recording, light text, dark background]
 This is the script from which a 2.0-specific movie will be made.  On the left
 are the typed commands, and on the right is the voice track.
 It is intended that the left and right be combined and the result will be a new
 task-tutorial.5 man page.
 ---------------------------------------- Aliases ---------------------------------------------------
 task config alias.zzz list               You can create aliases to effectively rename commands.
 task zzz
 task z                                   You can abbreviate those, too.
 ---------------------------------------- End -------------------------------------------------------
 Complex aliases, including fragments that can be used in other contexts.
 task config pf project:foo
 task list pf
--- a/doc/misc/tutorial/annotations/run.200
+++ b/doc/misc/tutorial/annotations/run.200
@@ -0,0 +1,520 @@
 #! /bin/bash
 rm -f /Users/paul/.task/pending.data /Users/paul/.task/completed.data /Users/paul/.task/undo.data
 echo 'data.location=~/.task' > /Users/paul/.taskrc
 echo 'color=off' >> /Users/paul/.taskrc
 echo 'color.summary.background=on gray3' >> /Users/paul/.taskrc
 echo '#include /usr/local/share/doc/task/rc/dark-blue-256.theme' >> /Users/paul/.taskrc
 echo '#include /usr/local/share/doc/task/rc/dark-red-256.theme' >> /Users/paul/.taskrc
 echo '#include /usr/local/share/doc/task/rc/dark-256.theme' >> /Users/paul/.taskrc
 # 1 Intro
 # 2 Basic usage
 echo Basic usage --------------------------------------------------------------
 echo $ task add Select a free weekend in November
 task add Select a free weekend in November
 echo $ task add Select and book a venue
 task add Select and book a venue
 echo $ task add Come up with a guest list
 task add Come up with a guest list
 echo $ task add Mail invitations
 task add Mail invitations
 echo $ task add Select a caterer
 task add Select a caterer
 echo $ task list
 task list
 echo $ task log Order a special cake
 task log Order a special cake
 echo $ task 4 duplicate /Mail/Design/
 task 4 duplicate /Mail/Design/
 echo $ task 4 duplicate /Mail/Print/
 task 4 duplicate /Mail/Print/
 echo $ task list
 task list
 echo $ task 3 done
 task 3 done
 echo $ task list
 task list
 # 3 Projects
 echo Projects --------------------------------------------------------------
 echo $ task add Pay teh rent on teh 31st
 task add Pay teh rent on teh 31st
 echo $ task 7 /teh/the/g
 task 7 /teh/the/g
 echo $ task list
 task list
 echo $ task 7 project:home
 task 7 project:home
 echo $ task 1-6 project:party
 echo 'All' | task 1-6 project:party
 echo $ task projects
 task projects
 echo $ task list project:home
 task list project:home
 echo $ task li pro:par
 task li pro:par
 # 4 Priorities
 echo Priorities --------------------------------------------------------------
 echo $ task 1-3,5 priority:H
 echo 'All' | task 1-3,5 priority:H
 echo $ task list
 task list
 echo $ task 3 pri:
 task 3 pri:
 # 5 Tags
 echo Tags --------------------------------------------------------------
 echo $ task list
 task list
 echo $ task 3,5,6 +mall
 echo 'All' | task 3,5,6 +mall
 echo $ task long
 task long
 echo $ task list +mall
 task list +mall
 echo $ task 3 -mall
 task 3 -mall
 # 6 Modifications
 echo Modifications --------------------------------------------------------------
 echo $ task 7 Pay rent at the end of the month
 echo 'Yes' | task 7 Pay rent at the end of the month
 echo $ task add music
 task add music
 echo $ task 8 prepend Select some
 task 8 prepend Select some
 echo $ task 8 append for after dinner
 task 8 append for after dinner
 echo $ task list
 task list
 echo $ task edit
 #task edit
 echo $ task add Hire a band?
 #task add Hire a band?
 echo $ task add Hire a band\?
 #task add Hire a band\?
 echo $ task add "Hire a band?"
 #task add "Hire a band?"
 echo $ task add -- Hire a band\? +dj
 task add -- Hire a band\? +dj
 echo $ task undo
 echo 'y' | task undo
 echo $ task 1 delete
 echo 'y' | task 1 delete
 echo $ task undo
 echo 'y' | task undo
 # 7 Info
 echo Info --------------------------------------------------------------
 echo $ task 1 info
 task 1 info
 echo $ task stats
 task stats
 # 8 Annotations
 echo Annotations --------------------------------------------------------------
 echo $ task 1 annotate the 13 looks good
 task 1 annotate the 13 looks good
 sleep 1
 echo $ task 1 annotate or the 14th
 task 1 annotate or the 14th
 echo $ task list
 task list
 echo $ task list rc.annotations:full
 task list rc.annotations:full
 echo $ task list rc.annotations:sparse
 task list rc.annotations:sparse
 echo $ task list rc.annotations:none
 task list rc.annotations:none
 echo $ task 1 denotate 14th
 task 1 denotate 14th
 echo $ task list
 task list
 # 9 Configuration
 echo Configuration --------------------------------------------------------------
 echo $ task show
 task show
 echo $ task config answer forty-two
 echo 'y' | task config answer forty-two
 echo $ task show answer
 task show answer
 echo $ task config answer
 echo 'y' | task config answer
 echo $ task rc.report.list.sort=description+ list
 task rc.report.list.sort=description+ list
 # 10 Defaults
 echo Defaults --------------------------------------------------------------
 echo $ task config default.command list
 echo 'y' | task config default.command list
 echo $ task 
 task 
 echo $ task config default.priority H
 echo 'y' | task config default.priority H
 echo $ task config default.project Work
 echo 'y' | task config default.project Work
 echo $ task add New task
 task add New task
 echo $ task list
 task list
 echo $ task undo
 echo 'y' | task undo
 echo $ task config default.priority
 echo 'y' | task config default.priority
 echo $ task config default.project
 echo 'y' | task config default.project
 # 11 Aliases
 echo Aliases --------------------------------------------------------------
 echo $ task config alias.zzz list
 echo 'y' | task config alias.zzz list
 echo $ task zzz
 task zzz
 echo $ task z
 task z
 # 12 Color
 echo Color --------------------------------------------------------------
 echo $ task config color on
 echo 'y' | task config color on
 echo $ task list
 task list
 echo $ task 1 bg:on_red
 task 1 bg:on_red
 echo $ task list
 task list
 echo $ task 1 bg:
 task 1 bg:
 echo $ task color
 task color
 echo $ task color white on red
 task color white on red
 echo $ task color legend
 task color legend
 echo vi ~/.taskrc # include /usr/local/share/doc/task/rc/dark-blue-256.theme
 #vi ~/.taskrc # include /usr/local/share/doc/task/rc/dark-blue-256.theme
 echo 'include /usr/local/share/doc/task/rc/dark-blue-256.theme' >> x
 echo $ task color legend
 task color legend
 echo $ task list
 task list
 echo vi ~/.taskrc # include /usr/local/share/doc/task/rc/dark-red-256.theme
 #vi ~/.taskrc # include /usr/local/share/doc/task/rc/dark-red-256.theme
 sed 's/blue/red/' x >x2 && mv x2 x
 echo $ task color legend
 task color legend
 echo $ task list
 task list
 echo vi ~/.taskrc # include /usr/local/share/doc/task/rc/dark-256.theme
 #vi ~/.taskrc # include /usr/local/share/doc/task/rc/dark-256.theme
 sed 's/red-//' x >x2 && mv x2 x
 echo $ task list
 task list
 echo $ task "rc.color.project.party=on rgb001" rc.color.keyword.invit=bold list
 task "rc.color.project.party=on rgb001" rc.color.keyword.invit=bold list
 echo $ man task-color
 #man task-color
 # 13 Active tasks
 echo Active tasks --------------------------------------------------------------
 echo $ task 2 start
 task 2 start
 echo $ task list
 task list
 echo $ task active
 task active
 echo $ task 2 stop
 task 2 stop
 echo $ task config journal.time on
 task config journal.time on
 echo $ task config rc.dateformat.xxx xxx
 task config rc.dateformat.xxx xxx
 echo $ task config dateformat.annotation 'Y/m/d H:N'
 task config dateformat.annotation 'Y/m/d H:N'
 echo $ task 2 start
 task 2 start
 echo $ task list venue
 task list venue
 echo $ task 2 stop
 task 2 stop
 echo $ task list venue
 task list venue
 # 14 Due dates
 echo Due dates --------------------------------------------------------------
 echo $ task 1 due:7/31/2010
 task 1 due:7/31/2010
 echo $ task 1 due:2wks
 task 1 due:2wks
 echo $ task 1 due:-2wks
 task 1 due:-2wks
 echo $ task 1 due:eom
 task 1 due:eom
 echo $ task 2 due:8th
 task 2 due:8th
 echo $ task 2 due:sunday
 task 2 due:sunday
 echo $ task 5 due:eow
 task 5 due:eow
 echo $ task list
 task list
 echo $ task overdue
 task overdue
 echo $ task rc.dateformat.report:Y-M-DTH:N:SZ list
 task rc.dateformat.report:Y-M-DTH:N:SZ list
 # 15 Calendar
 echo Calendar --------------------------------------------------------------
 echo $ task calendar
 task calendar
 echo $ vi ~/.taskrc # include /usr/local/share/doc/task/rc/holidays-US.rc
 #vi ~/.taskrc # include /usr/local/share/doc/task/rc/holidays-US.rc
 echo 'include /usr/local/share/doc/task/rc/holidays-US.rc' >> x
 echo $ task calendar
 task calendar
 echo $ task cal 2010
 task cal 2010
 echo $ task rc.calendar.details:full cal
 task rc.calendar.details:full cal
 echo $ task rc.calendar.holidays:full cal
 task rc.calendar.holidays:full cal
 # 16 Recurrence
 echo Recurrence --------------------------------------------------------------
 echo $ task 7 info
 task 7 info
 echo $ task 7 due:eom recur:monthly
 task 7 due:eom recur:monthly
 echo $ task 7
 task 7
 echo $ task 7 until:eoy
 task 7 until:eoy
 echo $ task recurring
 task recurring
 echo $ task add Pay taxes due:4/15/2007 recur:yearly
 task add Pay taxes due:4/15/2007 recur:yearly
 echo $ task long
 task long
 echo $ task 11 delete
 printf "y\ny\n" | task 11 delete      # y, y
 echo $ task list
 task list
 # 17 Special tags
 echo Special tags --------------------------------------------------------------
 echo $ task 6 +nocolor
 task 6 +nocolor
 echo $ task list
 task list
 echo $ task tags
 task tags
 echo $ task 6 -nocolor
 task 6 -nocolor
 # 18 Waiting
 echo Waiting --------------------------------------------------------------
 echo $ task add Look for new apartment due:eoy
 task add Look for new apartment due:eoy
 echo $ task list
 task list
 echo $ task 10 wait:12/1/2010
 task 10 wait:12/1/2010
 echo $ task list
 task list
 echo $ task waiting
 task waiting
 echo $ task add Do something in a few seconds
 task add Do something in a few seconds
 echo $ task 11 wait:5s
 task 11 wait:5s
 echo $ task list
 task list
 sleep 5
 echo $ task list
 task list
 echo $ task 11 rc.confirmation:no delete
 task 11 rc.confirmation:no delete
 # 19 Dependencies
 echo Dependencies --------------------------------------------------------------
 echo $ task list pro:party
 task list pro:party
 echo $ task 3 depends:6
 task 3 depends:6
 echo $ task 6 dep:5
 task 6 dep:5
 echo $ task 2 dep:1
 task 2 dep:1
 echo $ task 5 dep:1,2
 task 5 dep:1,2
 echo $ task 4 dep:1
 task 4 dep:1
 echo $ task long pro:party
 task long pro:party
 echo $ task 5 dep:-1
 task 5 dep:-1
 echo $ task blocked
 task blocked
 echo $ task unblocked
 task  unblocked
 echo $ task 1 info
 task  1 info
 echo $ task 2 info
 task  2 info
 echo $ task 2 done
 echo 'y' | task  2 done
 echo $ task 1 info
 task  1 info
 # 20 Reports
 echo Reports --------------------------------------------------------------
 echo $ task minimal
 task  minimal
 echo $ task ls
 task  ls
 echo $ task list
 task  list
 echo $ task long
 task  long
 echo $ task all
 task  all
 echo $ task completed
 task  completed
 echo $ task recurring
 task  recurring
 echo $ task waiting
 task  waiting
 echo $ task blocked
 task  blocked
 echo $ task oldest
 task  oldest
 echo $ task newest
 task  newest
 echo $ task timesheet
 task  timesheet
 echo $ task next
 task  next
 # 21 Custom report
 echo Custom report --------------------------------------------------------------
 echo 'report.foo.description=My own report'     >> x
 echo 'report.foo.columns=id,entry,description'  >> x
 echo 'report.foo.labels=ID,Entered,Description' >> x
 echo 'report.foo.sort=entry+,description+'      >> x
 echo 'report.foo.filter=status:pending'         >> x
 echo 'task help | grep foo'
 task  help | grep foo
 echo $ task show report.foo
 task  show report.foo
 echo $ task foo
 task  foo
 # 22 Charts
 echo Charts --------------------------------------------------------------
 echo $ task history
 task history
 echo $ task history.annual
 task history.annual
 echo $ task ghistory
 task ghistory
 echo $ task ghistory.annual
 task ghistory.annual
 echo $ task summary
 task summary
 # 23 Advanced filters
 echo Advanced filters --------------------------------------------------------------
 echo $ task list
 task  list
 echo $ task list invit
 task  list invit
 echo $ task list description.contains:invit
 task  list description.contains:invit
 echo $ task list desc.word:the
 task  list desc.word:the
 echo $ task list desc.noword:invitations
 task  list desc.noword:invitations
 echo $ task list pro:party
 task  list pro:party
 echo $ task list pro.is:party
 task  list pro.is:party
 echo $ task list pro.not:party
 task  list pro.not:party
 echo $ task list pro:party priority.over:L
 task  list pro:party priority.over:L
 echo $ task list pro:party limit:2
 task  list pro:party limit:2
 echo $ task list limit:page
 task  list limit:page
 echo $ task all status:pending
 task  all status:pending
 echo $ task all status:waiting
 task  all status:waiting
 # 24 Import/export
 echo Import/export --------------------------------------------------------------
 echo $ task export.csv
 task  export.csv
 echo $ task export.csv venue
 task  export.csv venue
 echo $ task export.vcalendar venue
 task  export.vcalendar venue
 echo $ task export.yaml venue
 task  export.yaml venue
 cat <<EOF >file.text
 Remember to read the task man page
 EOF
 cat file.text
 echo $ task import file.text
 printf "y\n" | task  import file.text
 cat <<EOF >file.yaml
 %YAML 1.1
 ---
  task:
    description: Visit http://taskwarrior.org
    due: 1281844800
    entry: 1281289630
    priority: H
    project: work
    status: pending
    uuid: 23afada0-a446-8d5a-c213-30d99d52c4b0
 ...
 EOF
 cat file.yaml
 echo $ task import file.yaml
 printf "y\n" | task  import file.yaml
 echo $ task new limit:2
 task  new limit:2
 # 25 Help
 echo Help --------------------------------------------------------------
 echo $ task help
 task  help
 echo $ man task
 #man task
 echo $ man taskrc
 #man taskrc
 echo $ man task-color
 #man task-color
 echo $ man task-tutorial
 #man task-tutorial
 echo $ man task-faq
 #man task-faq
 echo $ man task-sync
 #man task-sync
 # 26 Wrap up
 echo Wrap up --------------------------------------------------------------
 echo $ task version
 task  version
 exit
--- a/doc/misc/tutorial/annotations/script.200.txt
+++ b/doc/misc/tutorial/annotations/script.200.txt
@@ -0,0 +1,27 @@
 [Make window 116x32 for movie recording, light text, dark background]
 This is the script from which a 2.0-specific movie will be made.  On the left
 are the typed commands, and on the right is the voice track.
 It is intended that the left and right be combined and the result will be a new
 task-tutorial.5 man page.
 ---------------------------------------- Annotations -----------------------------------------------
 task 1 annotate the 12th looks good      Annotations are little notes that can be added to a task.
 task 1 annotate or the 13th              There can be any number, and each has a time stamp.
 task list
 task list rc.annotations:full            You can choose to display annotations in different ways.
 task list rc.annotations:sparse
 task list rc.annotations:none
 task 1 denotate 13th                     Annotations can be removed by providing a matching pattern.
 task list
 ---------------------------------------- End -------------------------------------------------------
 Remove rc.annotations.*
 Illustrate different annotation formats.
 Searching in annotations
--- a/doc/misc/tutorial/calendar/run.200
+++ b/doc/misc/tutorial/calendar/run.200
@@ -0,0 +1,520 @@
 #! /bin/bash
 rm -f /Users/paul/.task/pending.data /Users/paul/.task/completed.data /Users/paul/.task/undo.data
 echo 'data.location=~/.task' > /Users/paul/.taskrc
 echo 'color=off' >> /Users/paul/.taskrc
 echo 'color.summary.background=on gray3' >> /Users/paul/.taskrc
 echo '#include /usr/local/share/doc/task/rc/dark-blue-256.theme' >> /Users/paul/.taskrc
 echo '#include /usr/local/share/doc/task/rc/dark-red-256.theme' >> /Users/paul/.taskrc
 echo '#include /usr/local/share/doc/task/rc/dark-256.theme' >> /Users/paul/.taskrc
 # 1 Intro
 # 2 Basic usage
 echo Basic usage --------------------------------------------------------------
 echo $ task add Select a free weekend in November
 task add Select a free weekend in November
 echo $ task add Select and book a venue
 task add Select and book a venue
 echo $ task add Come up with a guest list
 task add Come up with a guest list
 echo $ task add Mail invitations
 task add Mail invitations
 echo $ task add Select a caterer
 task add Select a caterer
 echo $ task list
 task list
 echo $ task log Order a special cake
 task log Order a special cake
 echo $ task 4 duplicate /Mail/Design/
 task 4 duplicate /Mail/Design/
 echo $ task 4 duplicate /Mail/Print/
 task 4 duplicate /Mail/Print/
 echo $ task list
 task list
 echo $ task 3 done
 task 3 done
 echo $ task list
 task list
 # 3 Projects
 echo Projects --------------------------------------------------------------
 echo $ task add Pay teh rent on teh 31st
 task add Pay teh rent on teh 31st
 echo $ task 7 /teh/the/g
 task 7 /teh/the/g
 echo $ task list
 task list
 echo $ task 7 project:home
 task 7 project:home
 echo $ task 1-6 project:party
 echo 'All' | task 1-6 project:party
 echo $ task projects
 task projects
 echo $ task list project:home
 task list project:home
 echo $ task li pro:par
 task li pro:par
 # 4 Priorities
 echo Priorities --------------------------------------------------------------
 echo $ task 1-3,5 priority:H
 echo 'All' | task 1-3,5 priority:H
 echo $ task list
 task list
 echo $ task 3 pri:
 task 3 pri:
 # 5 Tags
 echo Tags --------------------------------------------------------------
 echo $ task list
 task list
 echo $ task 3,5,6 +mall
 echo 'All' | task 3,5,6 +mall
 echo $ task long
 task long
 echo $ task list +mall
 task list +mall
 echo $ task 3 -mall
 task 3 -mall
 # 6 Modifications
 echo Modifications --------------------------------------------------------------
 echo $ task 7 Pay rent at the end of the month
 echo 'Yes' | task 7 Pay rent at the end of the month
 echo $ task add music
 task add music
 echo $ task 8 prepend Select some
 task 8 prepend Select some
 echo $ task 8 append for after dinner
 task 8 append for after dinner
 echo $ task list
 task list
 echo $ task edit
 #task edit
 echo $ task add Hire a band?
 #task add Hire a band?
 echo $ task add Hire a band\?
 #task add Hire a band\?
 echo $ task add "Hire a band?"
 #task add "Hire a band?"
 echo $ task add -- Hire a band\? +dj
 task add -- Hire a band\? +dj
 echo $ task undo
 echo 'y' | task undo
 echo $ task 1 delete
 echo 'y' | task 1 delete
 echo $ task undo
 echo 'y' | task undo
 # 7 Info
 echo Info --------------------------------------------------------------
 echo $ task 1 info
 task 1 info
 echo $ task stats
 task stats
 # 8 Annotations
 echo Annotations --------------------------------------------------------------
 echo $ task 1 annotate the 13 looks good
 task 1 annotate the 13 looks good
 sleep 1
 echo $ task 1 annotate or the 14th
 task 1 annotate or the 14th
 echo $ task list
 task list
 echo $ task list rc.annotations:full
 task list rc.annotations:full
 echo $ task list rc.annotations:sparse
 task list rc.annotations:sparse
 echo $ task list rc.annotations:none
 task list rc.annotations:none
 echo $ task 1 denotate 14th
 task 1 denotate 14th
 echo $ task list
 task list
 # 9 Configuration
 echo Configuration --------------------------------------------------------------
 echo $ task show
 task show
 echo $ task config answer forty-two
 echo 'y' | task config answer forty-two
 echo $ task show answer
 task show answer
 echo $ task config answer
 echo 'y' | task config answer
 echo $ task rc.report.list.sort=description+ list
 task rc.report.list.sort=description+ list
 # 10 Defaults
 echo Defaults --------------------------------------------------------------
 echo $ task config default.command list
 echo 'y' | task config default.command list
 echo $ task 
 task 
 echo $ task config default.priority H
 echo 'y' | task config default.priority H
 echo $ task config default.project Work
 echo 'y' | task config default.project Work
 echo $ task add New task
 task add New task
 echo $ task list
 task list
 echo $ task undo
 echo 'y' | task undo
 echo $ task config default.priority
 echo 'y' | task config default.priority
 echo $ task config default.project
 echo 'y' | task config default.project
 # 11 Aliases
 echo Aliases --------------------------------------------------------------
 echo $ task config alias.zzz list
 echo 'y' | task config alias.zzz list
 echo $ task zzz
 task zzz
 echo $ task z
 task z
 # 12 Color
 echo Color --------------------------------------------------------------
 echo $ task config color on
 echo 'y' | task config color on
 echo $ task list
 task list
 echo $ task 1 bg:on_red
 task 1 bg:on_red
 echo $ task list
 task list
 echo $ task 1 bg:
 task 1 bg:
 echo $ task color
 task color
 echo $ task color white on red
 task color white on red
 echo $ task color legend
 task color legend
 echo vi ~/.taskrc # include /usr/local/share/doc/task/rc/dark-blue-256.theme
 #vi ~/.taskrc # include /usr/local/share/doc/task/rc/dark-blue-256.theme
 echo 'include /usr/local/share/doc/task/rc/dark-blue-256.theme' >> x
 echo $ task color legend
 task color legend
 echo $ task list
 task list
 echo vi ~/.taskrc # include /usr/local/share/doc/task/rc/dark-red-256.theme
 #vi ~/.taskrc # include /usr/local/share/doc/task/rc/dark-red-256.theme
 sed 's/blue/red/' x >x2 && mv x2 x
 echo $ task color legend
 task color legend
 echo $ task list
 task list
 echo vi ~/.taskrc # include /usr/local/share/doc/task/rc/dark-256.theme
 #vi ~/.taskrc # include /usr/local/share/doc/task/rc/dark-256.theme
 sed 's/red-//' x >x2 && mv x2 x
 echo $ task list
 task list
 echo $ task "rc.color.project.party=on rgb001" rc.color.keyword.invit=bold list
 task "rc.color.project.party=on rgb001" rc.color.keyword.invit=bold list
 echo $ man task-color
 #man task-color
 # 13 Active tasks
 echo Active tasks --------------------------------------------------------------
 echo $ task 2 start
 task 2 start
 echo $ task list
 task list
 echo $ task active
 task active
 echo $ task 2 stop
 task 2 stop
 echo $ task config journal.time on
 task config journal.time on
 echo $ task config rc.dateformat.xxx xxx
 task config rc.dateformat.xxx xxx
 echo $ task config dateformat.annotation 'Y/m/d H:N'
 task config dateformat.annotation 'Y/m/d H:N'
 echo $ task 2 start
 task 2 start
 echo $ task list venue
 task list venue
 echo $ task 2 stop
 task 2 stop
 echo $ task list venue
 task list venue
 # 14 Due dates
 echo Due dates --------------------------------------------------------------
 echo $ task 1 due:7/31/2010
 task 1 due:7/31/2010
 echo $ task 1 due:2wks
 task 1 due:2wks
 echo $ task 1 due:-2wks
 task 1 due:-2wks
 echo $ task 1 due:eom
 task 1 due:eom
 echo $ task 2 due:8th
 task 2 due:8th
 echo $ task 2 due:sunday
 task 2 due:sunday
 echo $ task 5 due:eow
 task 5 due:eow
 echo $ task list
 task list
 echo $ task overdue
 task overdue
 echo $ task rc.dateformat.report:Y-M-DTH:N:SZ list
 task rc.dateformat.report:Y-M-DTH:N:SZ list
 # 15 Calendar
 echo Calendar --------------------------------------------------------------
 echo $ task calendar
 task calendar
 echo $ vi ~/.taskrc # include /usr/local/share/doc/task/rc/holidays-US.rc
 #vi ~/.taskrc # include /usr/local/share/doc/task/rc/holidays-US.rc
 echo 'include /usr/local/share/doc/task/rc/holidays-US.rc' >> x
 echo $ task calendar
 task calendar
 echo $ task cal 2010
 task cal 2010
 echo $ task rc.calendar.details:full cal
 task rc.calendar.details:full cal
 echo $ task rc.calendar.holidays:full cal
 task rc.calendar.holidays:full cal
 # 16 Recurrence
 echo Recurrence --------------------------------------------------------------
 echo $ task 7 info
 task 7 info
 echo $ task 7 due:eom recur:monthly
 task 7 due:eom recur:monthly
 echo $ task 7
 task 7
 echo $ task 7 until:eoy
 task 7 until:eoy
 echo $ task recurring
 task recurring
 echo $ task add Pay taxes due:4/15/2007 recur:yearly
 task add Pay taxes due:4/15/2007 recur:yearly
 echo $ task long
 task long
 echo $ task 11 delete
 printf "y\ny\n" | task 11 delete      # y, y
 echo $ task list
 task list
 # 17 Special tags
 echo Special tags --------------------------------------------------------------
 echo $ task 6 +nocolor
 task 6 +nocolor
 echo $ task list
 task list
 echo $ task tags
 task tags
 echo $ task 6 -nocolor
 task 6 -nocolor
 # 18 Waiting
 echo Waiting --------------------------------------------------------------
 echo $ task add Look for new apartment due:eoy
 task add Look for new apartment due:eoy
 echo $ task list
 task list
 echo $ task 10 wait:12/1/2010
 task 10 wait:12/1/2010
 echo $ task list
 task list
 echo $ task waiting
 task waiting
 echo $ task add Do something in a few seconds
 task add Do something in a few seconds
 echo $ task 11 wait:5s
 task 11 wait:5s
 echo $ task list
 task list
 sleep 5
 echo $ task list
 task list
 echo $ task 11 rc.confirmation:no delete
 task 11 rc.confirmation:no delete
 # 19 Dependencies
 echo Dependencies --------------------------------------------------------------
 echo $ task list pro:party
 task list pro:party
 echo $ task 3 depends:6
 task 3 depends:6
 echo $ task 6 dep:5
 task 6 dep:5
 echo $ task 2 dep:1
 task 2 dep:1
 echo $ task 5 dep:1,2
 task 5 dep:1,2
 echo $ task 4 dep:1
 task 4 dep:1
 echo $ task long pro:party
 task long pro:party
 echo $ task 5 dep:-1
 task 5 dep:-1
 echo $ task blocked
 task blocked
 echo $ task unblocked
 task  unblocked
 echo $ task 1 info
 task  1 info
 echo $ task 2 info
 task  2 info
 echo $ task 2 done
 echo 'y' | task  2 done
 echo $ task 1 info
 task  1 info
 # 20 Reports
 echo Reports --------------------------------------------------------------
 echo $ task minimal
 task  minimal
 echo $ task ls
 task  ls
 echo $ task list
 task  list
 echo $ task long
 task  long
 echo $ task all
 task  all
 echo $ task completed
 task  completed
 echo $ task recurring
 task  recurring
 echo $ task waiting
 task  waiting
 echo $ task blocked
 task  blocked
 echo $ task oldest
 task  oldest
 echo $ task newest
 task  newest
 echo $ task timesheet
 task  timesheet
 echo $ task next
 task  next
 # 21 Custom report
 echo Custom report --------------------------------------------------------------
 echo 'report.foo.description=My own report'     >> x
 echo 'report.foo.columns=id,entry,description'  >> x
 echo 'report.foo.labels=ID,Entered,Description' >> x
 echo 'report.foo.sort=entry+,description+'      >> x
 echo 'report.foo.filter=status:pending'         >> x
 echo 'task help | grep foo'
 task  help | grep foo
 echo $ task show report.foo
 task  show report.foo
 echo $ task foo
 task  foo
 # 22 Charts
 echo Charts --------------------------------------------------------------
 echo $ task history
 task history
 echo $ task history.annual
 task history.annual
 echo $ task ghistory
 task ghistory
 echo $ task ghistory.annual
 task ghistory.annual
 echo $ task summary
 task summary
 # 23 Advanced filters
 echo Advanced filters --------------------------------------------------------------
 echo $ task list
 task  list
 echo $ task list invit
 task  list invit
 echo $ task list description.contains:invit
 task  list description.contains:invit
 echo $ task list desc.word:the
 task  list desc.word:the
 echo $ task list desc.noword:invitations
 task  list desc.noword:invitations
 echo $ task list pro:party
 task  list pro:party
 echo $ task list pro.is:party
 task  list pro.is:party
 echo $ task list pro.not:party
 task  list pro.not:party
 echo $ task list pro:party priority.over:L
 task  list pro:party priority.over:L
 echo $ task list pro:party limit:2
 task  list pro:party limit:2
 echo $ task list limit:page
 task  list limit:page
 echo $ task all status:pending
 task  all status:pending
 echo $ task all status:waiting
 task  all status:waiting
 # 24 Import/export
 echo Import/export --------------------------------------------------------------
 echo $ task export.csv
 task  export.csv
 echo $ task export.csv venue
 task  export.csv venue
 echo $ task export.vcalendar venue
 task  export.vcalendar venue
 echo $ task export.yaml venue
 task  export.yaml venue
 cat <<EOF >file.text
 Remember to read the task man page
 EOF
 cat file.text
 echo $ task import file.text
 printf "y\n" | task  import file.text
 cat <<EOF >file.yaml
 %YAML 1.1
 ---
  task:
    description: Visit http://taskwarrior.org
    due: 1281844800
    entry: 1281289630
    priority: H
    project: work
    status: pending
    uuid: 23afada0-a446-8d5a-c213-30d99d52c4b0
 ...
 EOF
 cat file.yaml
 echo $ task import file.yaml
 printf "y\n" | task  import file.yaml
 echo $ task new limit:2
 task  new limit:2
 # 25 Help
 echo Help --------------------------------------------------------------
 echo $ task help
 task  help
 echo $ man task
 #man task
 echo $ man taskrc
 #man taskrc
 echo $ man task-color
 #man task-color
 echo $ man task-tutorial
 #man task-tutorial
 echo $ man task-faq
 #man task-faq
 echo $ man task-sync
 #man task-sync
 # 26 Wrap up
 echo Wrap up --------------------------------------------------------------
 echo $ task version
 task  version
 exit
--- a/doc/misc/tutorial/calendar/script.200.txt
+++ b/doc/misc/tutorial/calendar/script.200.txt
@@ -0,0 +1,29 @@
 [Make window 116x32 for movie recording, light text, dark background]
 This is the script from which a 2.0-specific movie will be made.  On the left
 are the typed commands, and on the right is the voice track.
 It is intended that the left and right be combined and the result will be a new
 task-tutorial.5 man page.
 ---------------------------------------- Calendar --------------------------------------------------
 task calendar                            When tasks have due dates, you can see them on the calendar.
 vi ~/.taskrc
 # include /usr/local/share/doc/task/rc/holidays-US.rc
 task calendar
                                         Taskwarrior provides sample holiday files.  You can create
                                         your own, or use one of the samples to show holidays on the
                                         calendar.
 task cal 2010                            You can see the whole year.
 task rc.calendar.details:full cal        You can see the tasks with due dates also.
 task rc.calendar.holidays:full cal       And you can see the holidays.
 ---------------------------------------- End -------------------------------------------------------
 Include 'ln -s `which task` cal' trick
--- a/doc/misc/tutorial/charts/run.200
+++ b/doc/misc/tutorial/charts/run.200
@@ -0,0 +1,520 @@
 #! /bin/bash
 rm -f /Users/paul/.task/pending.data /Users/paul/.task/completed.data /Users/paul/.task/undo.data
 echo 'data.location=~/.task' > /Users/paul/.taskrc
 echo 'color=off' >> /Users/paul/.taskrc
 echo 'color.summary.background=on gray3' >> /Users/paul/.taskrc
 echo '#include /usr/local/share/doc/task/rc/dark-blue-256.theme' >> /Users/paul/.taskrc
 echo '#include /usr/local/share/doc/task/rc/dark-red-256.theme' >> /Users/paul/.taskrc
 echo '#include /usr/local/share/doc/task/rc/dark-256.theme' >> /Users/paul/.taskrc
 # 1 Intro
 # 2 Basic usage
 echo Basic usage --------------------------------------------------------------
 echo $ task add Select a free weekend in November
 task add Select a free weekend in November
 echo $ task add Select and book a venue
 task add Select and book a venue
 echo $ task add Come up with a guest list
 task add Come up with a guest list
 echo $ task add Mail invitations
 task add Mail invitations
 echo $ task add Select a caterer
 task add Select a caterer
 echo $ task list
 task list
 echo $ task log Order a special cake
 task log Order a special cake
 echo $ task 4 duplicate /Mail/Design/
 task 4 duplicate /Mail/Design/
 echo $ task 4 duplicate /Mail/Print/
 task 4 duplicate /Mail/Print/
 echo $ task list
 task list
 echo $ task 3 done
 task 3 done
 echo $ task list
 task list
 # 3 Projects
 echo Projects --------------------------------------------------------------
 echo $ task add Pay teh rent on teh 31st
 task add Pay teh rent on teh 31st
 echo $ task 7 /teh/the/g
 task 7 /teh/the/g
 echo $ task list
 task list
 echo $ task 7 project:home
 task 7 project:home
 echo $ task 1-6 project:party
 echo 'All' | task 1-6 project:party
 echo $ task projects
 task projects
 echo $ task list project:home
 task list project:home
 echo $ task li pro:par
 task li pro:par
 # 4 Priorities
 echo Priorities --------------------------------------------------------------
 echo $ task 1-3,5 priority:H
 echo 'All' | task 1-3,5 priority:H
 echo $ task list
 task list
 echo $ task 3 pri:
 task 3 pri:
 # 5 Tags
 echo Tags --------------------------------------------------------------
 echo $ task list
 task list
 echo $ task 3,5,6 +mall
 echo 'All' | task 3,5,6 +mall
 echo $ task long
 task long
 echo $ task list +mall
 task list +mall
 echo $ task 3 -mall
 task 3 -mall
 # 6 Modifications
 echo Modifications --------------------------------------------------------------
 echo $ task 7 Pay rent at the end of the month
 echo 'Yes' | task 7 Pay rent at the end of the month
 echo $ task add music
 task add music
 echo $ task 8 prepend Select some
 task 8 prepend Select some
 echo $ task 8 append for after dinner
 task 8 append for after dinner
 echo $ task list
 task list
 echo $ task edit
 #task edit
 echo $ task add Hire a band?
 #task add Hire a band?
 echo $ task add Hire a band\?
 #task add Hire a band\?
 echo $ task add "Hire a band?"
 #task add "Hire a band?"
 echo $ task add -- Hire a band\? +dj
 task add -- Hire a band\? +dj
 echo $ task undo
 echo 'y' | task undo
 echo $ task 1 delete
 echo 'y' | task 1 delete
 echo $ task undo
 echo 'y' | task undo
 # 7 Info
 echo Info --------------------------------------------------------------
 echo $ task 1 info
 task 1 info
 echo $ task stats
 task stats
 # 8 Annotations
 echo Annotations --------------------------------------------------------------
 echo $ task 1 annotate the 13 looks good
 task 1 annotate the 13 looks good
 sleep 1
 echo $ task 1 annotate or the 14th
 task 1 annotate or the 14th
 echo $ task list
 task list
 echo $ task list rc.annotations:full
 task list rc.annotations:full
 echo $ task list rc.annotations:sparse
 task list rc.annotations:sparse
 echo $ task list rc.annotations:none
 task list rc.annotations:none
 echo $ task 1 denotate 14th
 task 1 denotate 14th
 echo $ task list
 task list
 # 9 Configuration
 echo Configuration --------------------------------------------------------------
 echo $ task show
 task show
 echo $ task config answer forty-two
 echo 'y' | task config answer forty-two
 echo $ task show answer
 task show answer
 echo $ task config answer
 echo 'y' | task config answer
 echo $ task rc.report.list.sort=description+ list
 task rc.report.list.sort=description+ list
 # 10 Defaults
 echo Defaults --------------------------------------------------------------
 echo $ task config default.command list
 echo 'y' | task config default.command list
 echo $ task 
 task 
 echo $ task config default.priority H
 echo 'y' | task config default.priority H
 echo $ task config default.project Work
 echo 'y' | task config default.project Work
 echo $ task add New task
 task add New task
 echo $ task list
 task list
 echo $ task undo
 echo 'y' | task undo
 echo $ task config default.priority
 echo 'y' | task config default.priority
 echo $ task config default.project
 echo 'y' | task config default.project
 # 11 Aliases
 echo Aliases --------------------------------------------------------------
 echo $ task config alias.zzz list
 echo 'y' | task config alias.zzz list
 echo $ task zzz
 task zzz
 echo $ task z
 task z
 # 12 Color
 echo Color --------------------------------------------------------------
 echo $ task config color on
 echo 'y' | task config color on
 echo $ task list
 task list
 echo $ task 1 bg:on_red
 task 1 bg:on_red
 echo $ task list
 task list
 echo $ task 1 bg:
 task 1 bg:
 echo $ task color
 task color
 echo $ task color white on red
 task color white on red
 echo $ task color legend
 task color legend
 echo vi ~/.taskrc # include /usr/local/share/doc/task/rc/dark-blue-256.theme
 #vi ~/.taskrc # include /usr/local/share/doc/task/rc/dark-blue-256.theme
 echo 'include /usr/local/share/doc/task/rc/dark-blue-256.theme' >> x
 echo $ task color legend
 task color legend
 echo $ task list
 task list
 echo vi ~/.taskrc # include /usr/local/share/doc/task/rc/dark-red-256.theme
 #vi ~/.taskrc # include /usr/local/share/doc/task/rc/dark-red-256.theme
 sed 's/blue/red/' x >x2 && mv x2 x
 echo $ task color legend
 task color legend
 echo $ task list
 task list
 echo vi ~/.taskrc # include /usr/local/share/doc/task/rc/dark-256.theme
 #vi ~/.taskrc # include /usr/local/share/doc/task/rc/dark-256.theme
 sed 's/red-//' x >x2 && mv x2 x
 echo $ task list
 task list
 echo $ task "rc.color.project.party=on rgb001" rc.color.keyword.invit=bold list
 task "rc.color.project.party=on rgb001" rc.color.keyword.invit=bold list
 echo $ man task-color
 #man task-color
 # 13 Active tasks
 echo Active tasks --------------------------------------------------------------
 echo $ task 2 start
 task 2 start
 echo $ task list
 task list
 echo $ task active
 task active
 echo $ task 2 stop
 task 2 stop
 echo $ task config journal.time on
 task config journal.time on
 echo $ task config rc.dateformat.xxx xxx
 task config rc.dateformat.xxx xxx
 echo $ task config dateformat.annotation 'Y/m/d H:N'
 task config dateformat.annotation 'Y/m/d H:N'
 echo $ task 2 start
 task 2 start
 echo $ task list venue
 task list venue
 echo $ task 2 stop
 task 2 stop
 echo $ task list venue
 task list venue
 # 14 Due dates
 echo Due dates --------------------------------------------------------------
 echo $ task 1 due:7/31/2010
 task 1 due:7/31/2010
 echo $ task 1 due:2wks
 task 1 due:2wks
 echo $ task 1 due:-2wks
 task 1 due:-2wks
 echo $ task 1 due:eom
 task 1 due:eom
 echo $ task 2 due:8th
 task 2 due:8th
 echo $ task 2 due:sunday
 task 2 due:sunday
 echo $ task 5 due:eow
 task 5 due:eow
 echo $ task list
 task list
 echo $ task overdue
 task overdue
 echo $ task rc.dateformat.report:Y-M-DTH:N:SZ list
 task rc.dateformat.report:Y-M-DTH:N:SZ list
 # 15 Calendar
 echo Calendar --------------------------------------------------------------
 echo $ task calendar
 task calendar
 echo $ vi ~/.taskrc # include /usr/local/share/doc/task/rc/holidays-US.rc
 #vi ~/.taskrc # include /usr/local/share/doc/task/rc/holidays-US.rc
 echo 'include /usr/local/share/doc/task/rc/holidays-US.rc' >> x
 echo $ task calendar
 task calendar
 echo $ task cal 2010
 task cal 2010
 echo $ task rc.calendar.details:full cal
 task rc.calendar.details:full cal
 echo $ task rc.calendar.holidays:full cal
 task rc.calendar.holidays:full cal
 # 16 Recurrence
 echo Recurrence --------------------------------------------------------------
 echo $ task 7 info
 task 7 info
 echo $ task 7 due:eom recur:monthly
 task 7 due:eom recur:monthly
 echo $ task 7
 task 7
 echo $ task 7 until:eoy
 task 7 until:eoy
 echo $ task recurring
 task recurring
 echo $ task add Pay taxes due:4/15/2007 recur:yearly
 task add Pay taxes due:4/15/2007 recur:yearly
 echo $ task long
 task long
 echo $ task 11 delete
 printf "y\ny\n" | task 11 delete      # y, y
 echo $ task list
 task list
 # 17 Special tags
 echo Special tags --------------------------------------------------------------
 echo $ task 6 +nocolor
 task 6 +nocolor
 echo $ task list
 task list
 echo $ task tags
 task tags
 echo $ task 6 -nocolor
 task 6 -nocolor
 # 18 Waiting
 echo Waiting --------------------------------------------------------------
 echo $ task add Look for new apartment due:eoy
 task add Look for new apartment due:eoy
 echo $ task list
 task list
 echo $ task 10 wait:12/1/2010
 task 10 wait:12/1/2010
 echo $ task list
 task list
 echo $ task waiting
 task waiting
 echo $ task add Do something in a few seconds
 task add Do something in a few seconds
 echo $ task 11 wait:5s
 task 11 wait:5s
 echo $ task list
 task list
 sleep 5
 echo $ task list
 task list
 echo $ task 11 rc.confirmation:no delete
 task 11 rc.confirmation:no delete
 # 19 Dependencies
 echo Dependencies --------------------------------------------------------------
 echo $ task list pro:party
 task list pro:party
 echo $ task 3 depends:6
 task 3 depends:6
 echo $ task 6 dep:5
 task 6 dep:5
 echo $ task 2 dep:1
 task 2 dep:1
 echo $ task 5 dep:1,2
 task 5 dep:1,2
 echo $ task 4 dep:1
 task 4 dep:1
 echo $ task long pro:party
 task long pro:party
 echo $ task 5 dep:-1
 task 5 dep:-1
 echo $ task blocked
 task blocked
 echo $ task unblocked
 task  unblocked
 echo $ task 1 info
 task  1 info
 echo $ task 2 info
 task  2 info
 echo $ task 2 done
 echo 'y' | task  2 done
 echo $ task 1 info
 task  1 info
 # 20 Reports
 echo Reports --------------------------------------------------------------
 echo $ task minimal
 task  minimal
 echo $ task ls
 task  ls
 echo $ task list
 task  list
 echo $ task long
 task  long
 echo $ task all
 task  all
 echo $ task completed
 task  completed
 echo $ task recurring
 task  recurring
 echo $ task waiting
 task  waiting
 echo $ task blocked
 task  blocked
 echo $ task oldest
 task  oldest
 echo $ task newest
 task  newest
 echo $ task timesheet
 task  timesheet
 echo $ task next
 task  next
 # 21 Custom report
 echo Custom report --------------------------------------------------------------
 echo 'report.foo.description=My own report'     >> x
 echo 'report.foo.columns=id,entry,description'  >> x
 echo 'report.foo.labels=ID,Entered,Description' >> x
 echo 'report.foo.sort=entry+,description+'      >> x
 echo 'report.foo.filter=status:pending'         >> x
 echo 'task help | grep foo'
 task  help | grep foo
 echo $ task show report.foo
 task  show report.foo
 echo $ task foo
 task  foo
 # 22 Charts
 echo Charts --------------------------------------------------------------
 echo $ task history
 task history
 echo $ task history.annual
 task history.annual
 echo $ task ghistory
 task ghistory
 echo $ task ghistory.annual
 task ghistory.annual
 echo $ task summary
 task summary
 # 23 Advanced filters
 echo Advanced filters --------------------------------------------------------------
 echo $ task list
 task  list
 echo $ task list invit
 task  list invit
 echo $ task list description.contains:invit
 task  list description.contains:invit
 echo $ task list desc.word:the
 task  list desc.word:the
 echo $ task list desc.noword:invitations
 task  list desc.noword:invitations
 echo $ task list pro:party
 task  list pro:party
 echo $ task list pro.is:party
 task  list pro.is:party
 echo $ task list pro.not:party
 task  list pro.not:party
 echo $ task list pro:party priority.over:L
 task  list pro:party priority.over:L
 echo $ task list pro:party limit:2
 task  list pro:party limit:2
 echo $ task list limit:page
 task  list limit:page
 echo $ task all status:pending
 task  all status:pending
 echo $ task all status:waiting
 task  all status:waiting
 # 24 Import/export
 echo Import/export --------------------------------------------------------------
 echo $ task export.csv
 task  export.csv
 echo $ task export.csv venue
 task  export.csv venue
 echo $ task export.vcalendar venue
 task  export.vcalendar venue
 echo $ task export.yaml venue
 task  export.yaml venue
 cat <<EOF >file.text
 Remember to read the task man page
 EOF
 cat file.text
 echo $ task import file.text
 printf "y\n" | task  import file.text
 cat <<EOF >file.yaml
 %YAML 1.1
 ---
  task:
    description: Visit http://taskwarrior.org
    due: 1281844800
    entry: 1281289630
    priority: H
    project: work
    status: pending
    uuid: 23afada0-a446-8d5a-c213-30d99d52c4b0
 ...
 EOF
 cat file.yaml
 echo $ task import file.yaml
 printf "y\n" | task  import file.yaml
 echo $ task new limit:2
 task  new limit:2
 # 25 Help
 echo Help --------------------------------------------------------------
 echo $ task help
 task  help
 echo $ man task
 #man task
 echo $ man taskrc
 #man taskrc
 echo $ man task-color
 #man task-color
 echo $ man task-tutorial
 #man task-tutorial
 echo $ man task-faq
 #man task-faq
 echo $ man task-sync
 #man task-sync
 # 26 Wrap up
 echo Wrap up --------------------------------------------------------------
 echo $ task version
 task  version
 exit
--- a/doc/misc/tutorial/charts/script.200.txt
+++ b/doc/misc/tutorial/charts/script.200.txt
@@ -0,0 +1,27 @@
 [Make window 116x32 for movie recording, light text, dark background]
 This is the script from which a 2.0-specific movie will be made.  On the left
 are the typed commands, and on the right is the voice track.
 It is intended that the left and right be combined and the result will be a new
 task-tutorial.5 man page.
 ---------------------------------------- Charts ----------------------------------------------------
 task history                             The history report gives monthly totals of tasks added,
 task history.annual                      completed and deleted.  There is also an annual version.
 task ghistory                            There is a graphical monthly...
 task ghistory.annual                     and annual version.
 task summary                             There is a project summary report that shows progress in
                                         all the projects.
 ---------------------------------------- End -------------------------------------------------------
 burndown.m
 burndown.w
 burndown.d
--- a/doc/misc/tutorial/color/run.200
+++ b/doc/misc/tutorial/color/run.200
@@ -0,0 +1,520 @@
 #! /bin/bash
 rm -f /Users/paul/.task/pending.data /Users/paul/.task/completed.data /Users/paul/.task/undo.data
 echo 'data.location=~/.task' > /Users/paul/.taskrc
 echo 'color=off' >> /Users/paul/.taskrc
 echo 'color.summary.background=on gray3' >> /Users/paul/.taskrc
 echo '#include /usr/local/share/doc/task/rc/dark-blue-256.theme' >> /Users/paul/.taskrc
 echo '#include /usr/local/share/doc/task/rc/dark-red-256.theme' >> /Users/paul/.taskrc
 echo '#include /usr/local/share/doc/task/rc/dark-256.theme' >> /Users/paul/.taskrc
 # 1 Intro
 # 2 Basic usage
 echo Basic usage --------------------------------------------------------------
 echo $ task add Select a free weekend in November
 task add Select a free weekend in November
 echo $ task add Select and book a venue
 task add Select and book a venue
 echo $ task add Come up with a guest list
 task add Come up with a guest list
 echo $ task add Mail invitations
 task add Mail invitations
 echo $ task add Select a caterer
 task add Select a caterer
 echo $ task list
 task list
 echo $ task log Order a special cake
 task log Order a special cake
 echo $ task 4 duplicate /Mail/Design/
 task 4 duplicate /Mail/Design/
 echo $ task 4 duplicate /Mail/Print/
 task 4 duplicate /Mail/Print/
 echo $ task list
 task list
 echo $ task 3 done
 task 3 done
 echo $ task list
 task list
 # 3 Projects
 echo Projects --------------------------------------------------------------
 echo $ task add Pay teh rent on teh 31st
 task add Pay teh rent on teh 31st
 echo $ task 7 /teh/the/g
 task 7 /teh/the/g
 echo $ task list
 task list
 echo $ task 7 project:home
 task 7 project:home
 echo $ task 1-6 project:party
 echo 'All' | task 1-6 project:party
 echo $ task projects
 task projects
 echo $ task list project:home
 task list project:home
 echo $ task li pro:par
 task li pro:par
 # 4 Priorities
 echo Priorities --------------------------------------------------------------
 echo $ task 1-3,5 priority:H
 echo 'All' | task 1-3,5 priority:H
 echo $ task list
 task list
 echo $ task 3 pri:
 task 3 pri:
 # 5 Tags
 echo Tags --------------------------------------------------------------
 echo $ task list
 task list
 echo $ task 3,5,6 +mall
 echo 'All' | task 3,5,6 +mall
 echo $ task long
 task long
 echo $ task list +mall
 task list +mall
 echo $ task 3 -mall
 task 3 -mall
 # 6 Modifications
 echo Modifications --------------------------------------------------------------
 echo $ task 7 Pay rent at the end of the month
 echo 'Yes' | task 7 Pay rent at the end of the month
 echo $ task add music
 task add music
 echo $ task 8 prepend Select some
 task 8 prepend Select some
 echo $ task 8 append for after dinner
 task 8 append for after dinner
 echo $ task list
 task list
 echo $ task edit
 #task edit
 echo $ task add Hire a band?
 #task add Hire a band?
 echo $ task add Hire a band\?
 #task add Hire a band\?
 echo $ task add "Hire a band?"
 #task add "Hire a band?"
 echo $ task add -- Hire a band\? +dj
 task add -- Hire a band\? +dj
 echo $ task undo
 echo 'y' | task undo
 echo $ task 1 delete
 echo 'y' | task 1 delete
 echo $ task undo
 echo 'y' | task undo
 # 7 Info
 echo Info --------------------------------------------------------------
 echo $ task 1 info
 task 1 info
 echo $ task stats
 task stats
 # 8 Annotations
 echo Annotations --------------------------------------------------------------
 echo $ task 1 annotate the 13 looks good
 task 1 annotate the 13 looks good
 sleep 1
 echo $ task 1 annotate or the 14th
 task 1 annotate or the 14th
 echo $ task list
 task list
 echo $ task list rc.annotations:full
 task list rc.annotations:full
 echo $ task list rc.annotations:sparse
 task list rc.annotations:sparse
 echo $ task list rc.annotations:none
 task list rc.annotations:none
 echo $ task 1 denotate 14th
 task 1 denotate 14th
 echo $ task list
 task list
 # 9 Configuration
 echo Configuration --------------------------------------------------------------
 echo $ task show
 task show
 echo $ task config answer forty-two
 echo 'y' | task config answer forty-two
 echo $ task show answer
 task show answer
 echo $ task config answer
 echo 'y' | task config answer
 echo $ task rc.report.list.sort=description+ list
 task rc.report.list.sort=description+ list
 # 10 Defaults
 echo Defaults --------------------------------------------------------------
 echo $ task config default.command list
 echo 'y' | task config default.command list
 echo $ task 
 task 
 echo $ task config default.priority H
 echo 'y' | task config default.priority H
 echo $ task config default.project Work
 echo 'y' | task config default.project Work
 echo $ task add New task
 task add New task
 echo $ task list
 task list
 echo $ task undo
 echo 'y' | task undo
 echo $ task config default.priority
 echo 'y' | task config default.priority
 echo $ task config default.project
 echo 'y' | task config default.project
 # 11 Aliases
 echo Aliases --------------------------------------------------------------
 echo $ task config alias.zzz list
 echo 'y' | task config alias.zzz list
 echo $ task zzz
 task zzz
 echo $ task z
 task z
 # 12 Color
 echo Color --------------------------------------------------------------
 echo $ task config color on
 echo 'y' | task config color on
 echo $ task list
 task list
 echo $ task 1 bg:on_red
 task 1 bg:on_red
 echo $ task list
 task list
 echo $ task 1 bg:
 task 1 bg:
 echo $ task color
 task color
 echo $ task color white on red
 task color white on red
 echo $ task color legend
 task color legend
 echo vi ~/.taskrc # include /usr/local/share/doc/task/rc/dark-blue-256.theme
 #vi ~/.taskrc # include /usr/local/share/doc/task/rc/dark-blue-256.theme
 echo 'include /usr/local/share/doc/task/rc/dark-blue-256.theme' >> x
 echo $ task color legend
 task color legend
 echo $ task list
 task list
 echo vi ~/.taskrc # include /usr/local/share/doc/task/rc/dark-red-256.theme
 #vi ~/.taskrc # include /usr/local/share/doc/task/rc/dark-red-256.theme
 sed 's/blue/red/' x >x2 && mv x2 x
 echo $ task color legend
 task color legend
 echo $ task list
 task list
 echo vi ~/.taskrc # include /usr/local/share/doc/task/rc/dark-256.theme
 #vi ~/.taskrc # include /usr/local/share/doc/task/rc/dark-256.theme
 sed 's/red-//' x >x2 && mv x2 x
 echo $ task list
 task list
 echo $ task "rc.color.project.party=on rgb001" rc.color.keyword.invit=bold list
 task "rc.color.project.party=on rgb001" rc.color.keyword.invit=bold list
 echo $ man task-color
 #man task-color
 # 13 Active tasks
 echo Active tasks --------------------------------------------------------------
 echo $ task 2 start
 task 2 start
 echo $ task list
 task list
 echo $ task active
 task active
 echo $ task 2 stop
 task 2 stop
 echo $ task config journal.time on
 task config journal.time on
 echo $ task config rc.dateformat.xxx xxx
 task config rc.dateformat.xxx xxx
 echo $ task config dateformat.annotation 'Y/m/d H:N'
 task config dateformat.annotation 'Y/m/d H:N'
 echo $ task 2 start
 task 2 start
 echo $ task list venue
 task list venue
 echo $ task 2 stop
 task 2 stop
 echo $ task list venue
 task list venue
 # 14 Due dates
 echo Due dates --------------------------------------------------------------
 echo $ task 1 due:7/31/2010
 task 1 due:7/31/2010
 echo $ task 1 due:2wks
 task 1 due:2wks
 echo $ task 1 due:-2wks
 task 1 due:-2wks
 echo $ task 1 due:eom
 task 1 due:eom
 echo $ task 2 due:8th
 task 2 due:8th
 echo $ task 2 due:sunday
 task 2 due:sunday
 echo $ task 5 due:eow
 task 5 due:eow
 echo $ task list
 task list
 echo $ task overdue
 task overdue
 echo $ task rc.dateformat.report:Y-M-DTH:N:SZ list
 task rc.dateformat.report:Y-M-DTH:N:SZ list
 # 15 Calendar
 echo Calendar --------------------------------------------------------------
 echo $ task calendar
 task calendar
 echo $ vi ~/.taskrc # include /usr/local/share/doc/task/rc/holidays-US.rc
 #vi ~/.taskrc # include /usr/local/share/doc/task/rc/holidays-US.rc
 echo 'include /usr/local/share/doc/task/rc/holidays-US.rc' >> x
 echo $ task calendar
 task calendar
 echo $ task cal 2010
 task cal 2010
 echo $ task rc.calendar.details:full cal
 task rc.calendar.details:full cal
 echo $ task rc.calendar.holidays:full cal
 task rc.calendar.holidays:full cal
 # 16 Recurrence
 echo Recurrence --------------------------------------------------------------
 echo $ task 7 info
 task 7 info
 echo $ task 7 due:eom recur:monthly
 task 7 due:eom recur:monthly
 echo $ task 7
 task 7
 echo $ task 7 until:eoy
 task 7 until:eoy
 echo $ task recurring
 task recurring
 echo $ task add Pay taxes due:4/15/2007 recur:yearly
 task add Pay taxes due:4/15/2007 recur:yearly
 echo $ task long
 task long
 echo $ task 11 delete
 printf "y\ny\n" | task 11 delete      # y, y
 echo $ task list
 task list
 # 17 Special tags
 echo Special tags --------------------------------------------------------------
 echo $ task 6 +nocolor
 task 6 +nocolor
 echo $ task list
 task list
 echo $ task tags
 task tags
 echo $ task 6 -nocolor
 task 6 -nocolor
 # 18 Waiting
 echo Waiting --------------------------------------------------------------
 echo $ task add Look for new apartment due:eoy
 task add Look for new apartment due:eoy
 echo $ task list
 task list
 echo $ task 10 wait:12/1/2010
 task 10 wait:12/1/2010
 echo $ task list
 task list
 echo $ task waiting
 task waiting
 echo $ task add Do something in a few seconds
 task add Do something in a few seconds
 echo $ task 11 wait:5s
 task 11 wait:5s
 echo $ task list
 task list
 sleep 5
 echo $ task list
 task list
 echo $ task 11 rc.confirmation:no delete
 task 11 rc.confirmation:no delete
 # 19 Dependencies
 echo Dependencies --------------------------------------------------------------
 echo $ task list pro:party
 task list pro:party
 echo $ task 3 depends:6
 task 3 depends:6
 echo $ task 6 dep:5
 task 6 dep:5
 echo $ task 2 dep:1
 task 2 dep:1
 echo $ task 5 dep:1,2
 task 5 dep:1,2
 echo $ task 4 dep:1
 task 4 dep:1
 echo $ task long pro:party
 task long pro:party
 echo $ task 5 dep:-1
 task 5 dep:-1
 echo $ task blocked
 task blocked
 echo $ task unblocked
 task  unblocked
 echo $ task 1 info
 task  1 info
 echo $ task 2 info
 task  2 info
 echo $ task 2 done
 echo 'y' | task  2 done
 echo $ task 1 info
 task  1 info
 # 20 Reports
 echo Reports --------------------------------------------------------------
 echo $ task minimal
 task  minimal
 echo $ task ls
 task  ls
 echo $ task list
 task  list
 echo $ task long
 task  long
 echo $ task all
 task  all
 echo $ task completed
 task  completed
 echo $ task recurring
 task  recurring
 echo $ task waiting
 task  waiting
 echo $ task blocked
 task  blocked
 echo $ task oldest
 task  oldest
 echo $ task newest
 task  newest
 echo $ task timesheet
 task  timesheet
 echo $ task next
 task  next
 # 21 Custom report
 echo Custom report --------------------------------------------------------------
 echo 'report.foo.description=My own report'     >> x
 echo 'report.foo.columns=id,entry,description'  >> x
 echo 'report.foo.labels=ID,Entered,Description' >> x
 echo 'report.foo.sort=entry+,description+'      >> x
 echo 'report.foo.filter=status:pending'         >> x
 echo 'task help | grep foo'
 task  help | grep foo
 echo $ task show report.foo
 task  show report.foo
 echo $ task foo
 task  foo
 # 22 Charts
 echo Charts --------------------------------------------------------------
 echo $ task history
 task history
 echo $ task history.annual
 task history.annual
 echo $ task ghistory
 task ghistory
 echo $ task ghistory.annual
 task ghistory.annual
 echo $ task summary
 task summary
 # 23 Advanced filters
 echo Advanced filters --------------------------------------------------------------
 echo $ task list
 task  list
 echo $ task list invit
 task  list invit
 echo $ task list description.contains:invit
 task  list description.contains:invit
 echo $ task list desc.word:the
 task  list desc.word:the
 echo $ task list desc.noword:invitations
 task  list desc.noword:invitations
 echo $ task list pro:party
 task  list pro:party
 echo $ task list pro.is:party
 task  list pro.is:party
 echo $ task list pro.not:party
 task  list pro.not:party
 echo $ task list pro:party priority.over:L
 task  list pro:party priority.over:L
 echo $ task list pro:party limit:2
 task  list pro:party limit:2
 echo $ task list limit:page
 task  list limit:page
 echo $ task all status:pending
 task  all status:pending
 echo $ task all status:waiting
 task  all status:waiting
 # 24 Import/export
 echo Import/export --------------------------------------------------------------
 echo $ task export.csv
 task  export.csv
 echo $ task export.csv venue
 task  export.csv venue
 echo $ task export.vcalendar venue
 task  export.vcalendar venue
 echo $ task export.yaml venue
 task  export.yaml venue
 cat <<EOF >file.text
 Remember to read the task man page
 EOF
 cat file.text
 echo $ task import file.text
 printf "y\n" | task  import file.text
 cat <<EOF >file.yaml
 %YAML 1.1
 ---
  task:
    description: Visit http://taskwarrior.org
    due: 1281844800
    entry: 1281289630
    priority: H
    project: work
    status: pending
    uuid: 23afada0-a446-8d5a-c213-30d99d52c4b0
 ...
 EOF
 cat file.yaml
 echo $ task import file.yaml
 printf "y\n" | task  import file.yaml
 echo $ task new limit:2
 task  new limit:2
 # 25 Help
 echo Help --------------------------------------------------------------
 echo $ task help
 task  help
 echo $ man task
 #man task
 echo $ man taskrc
 #man taskrc
 echo $ man task-color
 #man task-color
 echo $ man task-tutorial
 #man task-tutorial
 echo $ man task-faq
 #man task-faq
 echo $ man task-sync
 #man task-sync
 # 26 Wrap up
 echo Wrap up --------------------------------------------------------------
 echo $ task version
 task  version
 exit
--- a/doc/misc/tutorial/color/script.200.txt
+++ b/doc/misc/tutorial/color/script.200.txt
@@ -0,0 +1,70 @@
 [Make window 116x32 for movie recording, light text, dark background]
 This is the script from which a 2.0-specific movie will be made.  On the left
 are the typed commands, and on the right is the voice track.
 It is intended that the left and right be combined and the result will be a new
 task-tutorial.5 man page.
 ---------------------------------------- Color -----------------------------------------------------
 task config color on                     All the examples so far have been shown with color turned
 task list                                off.  How about some color?
                                         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
 task 1 "bg:on red"                       Here is an example of an explicit override to the color
 task list                                rules where a specific task is given a red background.
 task 1 bg:                               Note that the quotes are necessary, otherwise the shell
                                         will consider "bg:on" and "red" to be separate arugments.
 task color                               Taskwarrior supports 256 colors on certain terminal
                                         emulators, and this shows the range of colors available.
 task color white on red                  This is how to show a color sample.
 task color legend                        Or samples of all the active color settings.
                                         Themes are a simple way to use coordinated color schemes
                                         so by including a color theme into the configuration file,
                                         you can see some striking effects.
                                         A blue theme.
 # include /usr/local/share/doc/task/rc/dark-blue-256.theme
 vi ~/.taskrc
 task color legend
 task list
                                         A red theme.
 # include /usr/local/share/doc/task/rc/dark-red-256.theme
 vi ~/.taskrc
 task color legend
 task list
                                         A general dark theme.
 # include /usr/local/share/doc/task/rc/dark-256.theme
 vi ~/.taskrc
 task list
                                         Here is are two color rules that specify a dark blue
                                         background for all tasks that are part of the 'party'
                                         project, and uses bold to identify any tasks with the
                                         keyword 'invitations' in the description.
 task "rc.color.project.party=on rgb001" rc.color.keyword.invit=bold list
 man task-color                           There is a man page with a writeup of all the color
                                         capabilities.
 ---------------------------------------- End -------------------------------------------------------
 Remove bg: and fg: because they are deprecated.
 Demonstrate different themes.
 More color rules.
 Mention rc.color.precedence.
--- a/doc/misc/tutorial/custom/run.200
+++ b/doc/misc/tutorial/custom/run.200
@@ -0,0 +1,520 @@
 #! /bin/bash
 rm -f /Users/paul/.task/pending.data /Users/paul/.task/completed.data /Users/paul/.task/undo.data
 echo 'data.location=~/.task' > /Users/paul/.taskrc
 echo 'color=off' >> /Users/paul/.taskrc
 echo 'color.summary.background=on gray3' >> /Users/paul/.taskrc
 echo '#include /usr/local/share/doc/task/rc/dark-blue-256.theme' >> /Users/paul/.taskrc
 echo '#include /usr/local/share/doc/task/rc/dark-red-256.theme' >> /Users/paul/.taskrc
 echo '#include /usr/local/share/doc/task/rc/dark-256.theme' >> /Users/paul/.taskrc
 # 1 Intro
 # 2 Basic usage
 echo Basic usage --------------------------------------------------------------
 echo $ task add Select a free weekend in November
 task add Select a free weekend in November
 echo $ task add Select and book a venue
 task add Select and book a venue
 echo $ task add Come up with a guest list
 task add Come up with a guest list
 echo $ task add Mail invitations
 task add Mail invitations
 echo $ task add Select a caterer
 task add Select a caterer
 echo $ task list
 task list
 echo $ task log Order a special cake
 task log Order a special cake
 echo $ task 4 duplicate /Mail/Design/
 task 4 duplicate /Mail/Design/
 echo $ task 4 duplicate /Mail/Print/
 task 4 duplicate /Mail/Print/
 echo $ task list
 task list
 echo $ task 3 done
 task 3 done
 echo $ task list
 task list
 # 3 Projects
 echo Projects --------------------------------------------------------------
 echo $ task add Pay teh rent on teh 31st
 task add Pay teh rent on teh 31st
 echo $ task 7 /teh/the/g
 task 7 /teh/the/g
 echo $ task list
 task list
 echo $ task 7 project:home
 task 7 project:home
 echo $ task 1-6 project:party
 echo 'All' | task 1-6 project:party
 echo $ task projects
 task projects
 echo $ task list project:home
 task list project:home
 echo $ task li pro:par
 task li pro:par
 # 4 Priorities
 echo Priorities --------------------------------------------------------------
 echo $ task 1-3,5 priority:H
 echo 'All' | task 1-3,5 priority:H
 echo $ task list
 task list
 echo $ task 3 pri:
 task 3 pri:
 # 5 Tags
 echo Tags --------------------------------------------------------------
 echo $ task list
 task list
 echo $ task 3,5,6 +mall
 echo 'All' | task 3,5,6 +mall
 echo $ task long
 task long
 echo $ task list +mall
 task list +mall
 echo $ task 3 -mall
 task 3 -mall
 # 6 Modifications
 echo Modifications --------------------------------------------------------------
 echo $ task 7 Pay rent at the end of the month
 echo 'Yes' | task 7 Pay rent at the end of the month
 echo $ task add music
 task add music
 echo $ task 8 prepend Select some
 task 8 prepend Select some
 echo $ task 8 append for after dinner
 task 8 append for after dinner
 echo $ task list
 task list
 echo $ task edit
 #task edit
 echo $ task add Hire a band?
 #task add Hire a band?
 echo $ task add Hire a band\?
 #task add Hire a band\?
 echo $ task add "Hire a band?"
 #task add "Hire a band?"
 echo $ task add -- Hire a band\? +dj
 task add -- Hire a band\? +dj
 echo $ task undo
 echo 'y' | task undo
 echo $ task 1 delete
 echo 'y' | task 1 delete
 echo $ task undo
 echo 'y' | task undo
 # 7 Info
 echo Info --------------------------------------------------------------
 echo $ task 1 info
 task 1 info
 echo $ task stats
 task stats
 # 8 Annotations
 echo Annotations --------------------------------------------------------------
 echo $ task 1 annotate the 13 looks good
 task 1 annotate the 13 looks good
 sleep 1
 echo $ task 1 annotate or the 14th
 task 1 annotate or the 14th
 echo $ task list
 task list
 echo $ task list rc.annotations:full
 task list rc.annotations:full
 echo $ task list rc.annotations:sparse
 task list rc.annotations:sparse
 echo $ task list rc.annotations:none
 task list rc.annotations:none
 echo $ task 1 denotate 14th
 task 1 denotate 14th
 echo $ task list
 task list
 # 9 Configuration
 echo Configuration --------------------------------------------------------------
 echo $ task show
 task show
 echo $ task config answer forty-two
 echo 'y' | task config answer forty-two
 echo $ task show answer
 task show answer
 echo $ task config answer
 echo 'y' | task config answer
 echo $ task rc.report.list.sort=description+ list
 task rc.report.list.sort=description+ list
 # 10 Defaults
 echo Defaults --------------------------------------------------------------
 echo $ task config default.command list
 echo 'y' | task config default.command list
 echo $ task 
 task 
 echo $ task config default.priority H
 echo 'y' | task config default.priority H
 echo $ task config default.project Work
 echo 'y' | task config default.project Work
 echo $ task add New task
 task add New task
 echo $ task list
 task list
 echo $ task undo
 echo 'y' | task undo
 echo $ task config default.priority
 echo 'y' | task config default.priority
 echo $ task config default.project
 echo 'y' | task config default.project
 # 11 Aliases
 echo Aliases --------------------------------------------------------------
 echo $ task config alias.zzz list
 echo 'y' | task config alias.zzz list
 echo $ task zzz
 task zzz
 echo $ task z
 task z
 # 12 Color
 echo Color --------------------------------------------------------------
 echo $ task config color on
 echo 'y' | task config color on
 echo $ task list
 task list
 echo $ task 1 bg:on_red
 task 1 bg:on_red
 echo $ task list
 task list
 echo $ task 1 bg:
 task 1 bg:
 echo $ task color
 task color
 echo $ task color white on red
 task color white on red
 echo $ task color legend
 task color legend
 echo vi ~/.taskrc # include /usr/local/share/doc/task/rc/dark-blue-256.theme
 #vi ~/.taskrc # include /usr/local/share/doc/task/rc/dark-blue-256.theme
 echo 'include /usr/local/share/doc/task/rc/dark-blue-256.theme' >> x
 echo $ task color legend
 task color legend
 echo $ task list
 task list
 echo vi ~/.taskrc # include /usr/local/share/doc/task/rc/dark-red-256.theme
 #vi ~/.taskrc # include /usr/local/share/doc/task/rc/dark-red-256.theme
 sed 's/blue/red/' x >x2 && mv x2 x
 echo $ task color legend
 task color legend
 echo $ task list
 task list
 echo vi ~/.taskrc # include /usr/local/share/doc/task/rc/dark-256.theme
 #vi ~/.taskrc # include /usr/local/share/doc/task/rc/dark-256.theme
 sed 's/red-//' x >x2 && mv x2 x
 echo $ task list
 task list
 echo $ task "rc.color.project.party=on rgb001" rc.color.keyword.invit=bold list
 task "rc.color.project.party=on rgb001" rc.color.keyword.invit=bold list
 echo $ man task-color
 #man task-color
 # 13 Active tasks
 echo Active tasks --------------------------------------------------------------
 echo $ task 2 start
 task 2 start
 echo $ task list
 task list
 echo $ task active
 task active
 echo $ task 2 stop
 task 2 stop
 echo $ task config journal.time on
 task config journal.time on
 echo $ task config rc.dateformat.xxx xxx
 task config rc.dateformat.xxx xxx
 echo $ task config dateformat.annotation 'Y/m/d H:N'
 task config dateformat.annotation 'Y/m/d H:N'
 echo $ task 2 start
 task 2 start
 echo $ task list venue
 task list venue
 echo $ task 2 stop
 task 2 stop
 echo $ task list venue
 task list venue
 # 14 Due dates
 echo Due dates --------------------------------------------------------------
 echo $ task 1 due:7/31/2010
 task 1 due:7/31/2010
 echo $ task 1 due:2wks
 task 1 due:2wks
 echo $ task 1 due:-2wks
 task 1 due:-2wks
 echo $ task 1 due:eom
 task 1 due:eom
 echo $ task 2 due:8th
 task 2 due:8th
 echo $ task 2 due:sunday
 task 2 due:sunday
 echo $ task 5 due:eow
 task 5 due:eow
 echo $ task list
 task list
 echo $ task overdue
 task overdue
 echo $ task rc.dateformat.report:Y-M-DTH:N:SZ list
 task rc.dateformat.report:Y-M-DTH:N:SZ list
 # 15 Calendar
 echo Calendar --------------------------------------------------------------
 echo $ task calendar
 task calendar
 echo $ vi ~/.taskrc # include /usr/local/share/doc/task/rc/holidays-US.rc
 #vi ~/.taskrc # include /usr/local/share/doc/task/rc/holidays-US.rc
 echo 'include /usr/local/share/doc/task/rc/holidays-US.rc' >> x
 echo $ task calendar
 task calendar
 echo $ task cal 2010
 task cal 2010
 echo $ task rc.calendar.details:full cal
 task rc.calendar.details:full cal
 echo $ task rc.calendar.holidays:full cal
 task rc.calendar.holidays:full cal
 # 16 Recurrence
 echo Recurrence --------------------------------------------------------------
 echo $ task 7 info
 task 7 info
 echo $ task 7 due:eom recur:monthly
 task 7 due:eom recur:monthly
 echo $ task 7
 task 7
 echo $ task 7 until:eoy
 task 7 until:eoy
 echo $ task recurring
 task recurring
 echo $ task add Pay taxes due:4/15/2007 recur:yearly
 task add Pay taxes due:4/15/2007 recur:yearly
 echo $ task long
 task long
 echo $ task 11 delete
 printf "y\ny\n" | task 11 delete      # y, y
 echo $ task list
 task list
 # 17 Special tags
 echo Special tags --------------------------------------------------------------
 echo $ task 6 +nocolor
 task 6 +nocolor
 echo $ task list
 task list
 echo $ task tags
 task tags
 echo $ task 6 -nocolor
 task 6 -nocolor
 # 18 Waiting
 echo Waiting --------------------------------------------------------------
 echo $ task add Look for new apartment due:eoy
 task add Look for new apartment due:eoy
 echo $ task list
 task list
 echo $ task 10 wait:12/1/2010
 task 10 wait:12/1/2010
 echo $ task list
 task list
 echo $ task waiting
 task waiting
 echo $ task add Do something in a few seconds
 task add Do something in a few seconds
 echo $ task 11 wait:5s
 task 11 wait:5s
 echo $ task list
 task list
 sleep 5
 echo $ task list
 task list
 echo $ task 11 rc.confirmation:no delete
 task 11 rc.confirmation:no delete
 # 19 Dependencies
 echo Dependencies --------------------------------------------------------------
 echo $ task list pro:party
 task list pro:party
 echo $ task 3 depends:6
 task 3 depends:6
 echo $ task 6 dep:5
 task 6 dep:5
 echo $ task 2 dep:1
 task 2 dep:1
 echo $ task 5 dep:1,2
 task 5 dep:1,2
 echo $ task 4 dep:1
 task 4 dep:1
 echo $ task long pro:party
 task long pro:party
 echo $ task 5 dep:-1
 task 5 dep:-1
 echo $ task blocked
 task blocked
 echo $ task unblocked
 task  unblocked
 echo $ task 1 info
 task  1 info
 echo $ task 2 info
 task  2 info
 echo $ task 2 done
 echo 'y' | task  2 done
 echo $ task 1 info
 task  1 info
 # 20 Reports
 echo Reports --------------------------------------------------------------
 echo $ task minimal
 task  minimal
 echo $ task ls
 task  ls
 echo $ task list
 task  list
 echo $ task long
 task  long
 echo $ task all
 task  all
 echo $ task completed
 task  completed
 echo $ task recurring
 task  recurring
 echo $ task waiting
 task  waiting
 echo $ task blocked
 task  blocked
 echo $ task oldest
 task  oldest
 echo $ task newest
 task  newest
 echo $ task timesheet
 task  timesheet
 echo $ task next
 task  next
 # 21 Custom report
 echo Custom report --------------------------------------------------------------
 echo 'report.foo.description=My own report'     >> x
 echo 'report.foo.columns=id,entry,description'  >> x
 echo 'report.foo.labels=ID,Entered,Description' >> x
 echo 'report.foo.sort=entry+,description+'      >> x
 echo 'report.foo.filter=status:pending'         >> x
 echo 'task help | grep foo'
 task  help | grep foo
 echo $ task show report.foo
 task  show report.foo
 echo $ task foo
 task  foo
 # 22 Charts
 echo Charts --------------------------------------------------------------
 echo $ task history
 task history
 echo $ task history.annual
 task history.annual
 echo $ task ghistory
 task ghistory
 echo $ task ghistory.annual
 task ghistory.annual
 echo $ task summary
 task summary
 # 23 Advanced filters
 echo Advanced filters --------------------------------------------------------------
 echo $ task list
 task  list
 echo $ task list invit
 task  list invit
 echo $ task list description.contains:invit
 task  list description.contains:invit
 echo $ task list desc.word:the
 task  list desc.word:the
 echo $ task list desc.noword:invitations
 task  list desc.noword:invitations
 echo $ task list pro:party
 task  list pro:party
 echo $ task list pro.is:party
 task  list pro.is:party
 echo $ task list pro.not:party
 task  list pro.not:party
 echo $ task list pro:party priority.over:L
 task  list pro:party priority.over:L
 echo $ task list pro:party limit:2
 task  list pro:party limit:2
 echo $ task list limit:page
 task  list limit:page
 echo $ task all status:pending
 task  all status:pending
 echo $ task all status:waiting
 task  all status:waiting
 # 24 Import/export
 echo Import/export --------------------------------------------------------------
 echo $ task export.csv
 task  export.csv
 echo $ task export.csv venue
 task  export.csv venue
 echo $ task export.vcalendar venue
 task  export.vcalendar venue
 echo $ task export.yaml venue
 task  export.yaml venue
 cat <<EOF >file.text
 Remember to read the task man page
 EOF
 cat file.text
 echo $ task import file.text
 printf "y\n" | task  import file.text
 cat <<EOF >file.yaml
 %YAML 1.1
 ---
  task:
    description: Visit http://taskwarrior.org
    due: 1281844800
    entry: 1281289630
    priority: H
    project: work
    status: pending
    uuid: 23afada0-a446-8d5a-c213-30d99d52c4b0
 ...
 EOF
 cat file.yaml
 echo $ task import file.yaml
 printf "y\n" | task  import file.yaml
 echo $ task new limit:2
 task  new limit:2
 # 25 Help
 echo Help --------------------------------------------------------------
 echo $ task help
 task  help
 echo $ man task
 #man task
 echo $ man taskrc
 #man taskrc
 echo $ man task-color
 #man task-color
 echo $ man task-tutorial
 #man task-tutorial
 echo $ man task-faq
 #man task-faq
 echo $ man task-sync
 #man task-sync
 # 26 Wrap up
 echo Wrap up --------------------------------------------------------------
 echo $ task version
 task  version
 exit
--- a/doc/misc/tutorial/custom/script.200.txt
+++ b/doc/misc/tutorial/custom/script.200.txt
@@ -0,0 +1,37 @@
 [Make window 116x32 for movie recording, light text, dark background]
 This is the script from which a 2.0-specific movie will be made.  On the left
 are the typed commands, and on the right is the voice track.
 It is intended that the left and right be combined and the result will be a new
 task-tutorial.5 man page.
 ---------------------------------------- Custom Report ---------------------------------------------
                                         You can even define your own custom report.  Let's quickly
                                         create a custom report - we'll call it foo - and I can
                                         choose from a long list of fields to include in the report,
                                         but I want to see the ID, the date when I entered the task,
                                         and the description.  I can specify the labels for those
                                         columns, the sort order of the report, and I can filter.
 cat >> ~/.taskrc
 report.foo.description=My own report
 report.foo.columns=id,entry,description
 report.foo.labels=ID,Entered,Description
 report.foo.sort=entry+,description+
 report.foo.filter=status:pending
 task help | grep foo                     Custom reports also show up on the help output.
 task show report.foo                     I can inspect the configuration.
 task foo                                 And they can be run just like the other reports.
 ---------------------------------------- End -------------------------------------------------------
 Mention all reports are custom reports.
 Show 'reports' command
--- a/doc/misc/tutorial/defaults/run.200
+++ b/doc/misc/tutorial/defaults/run.200
@@ -0,0 +1,520 @@
 #! /bin/bash
 rm -f /Users/paul/.task/pending.data /Users/paul/.task/completed.data /Users/paul/.task/undo.data
 echo 'data.location=~/.task' > /Users/paul/.taskrc
 echo 'color=off' >> /Users/paul/.taskrc
 echo 'color.summary.background=on gray3' >> /Users/paul/.taskrc
 echo '#include /usr/local/share/doc/task/rc/dark-blue-256.theme' >> /Users/paul/.taskrc
 echo '#include /usr/local/share/doc/task/rc/dark-red-256.theme' >> /Users/paul/.taskrc
 echo '#include /usr/local/share/doc/task/rc/dark-256.theme' >> /Users/paul/.taskrc
 # 1 Intro
 # 2 Basic usage
 echo Basic usage --------------------------------------------------------------
 echo $ task add Select a free weekend in November
 task add Select a free weekend in November
 echo $ task add Select and book a venue
 task add Select and book a venue
 echo $ task add Come up with a guest list
 task add Come up with a guest list
 echo $ task add Mail invitations
 task add Mail invitations
 echo $ task add Select a caterer
 task add Select a caterer
 echo $ task list
 task list
 echo $ task log Order a special cake
 task log Order a special cake
 echo $ task 4 duplicate /Mail/Design/
 task 4 duplicate /Mail/Design/
 echo $ task 4 duplicate /Mail/Print/
 task 4 duplicate /Mail/Print/
 echo $ task list
 task list
 echo $ task 3 done
 task 3 done
 echo $ task list
 task list
 # 3 Projects
 echo Projects --------------------------------------------------------------
 echo $ task add Pay teh rent on teh 31st
 task add Pay teh rent on teh 31st
 echo $ task 7 /teh/the/g
 task 7 /teh/the/g
 echo $ task list
 task list
 echo $ task 7 project:home
 task 7 project:home
 echo $ task 1-6 project:party
 echo 'All' | task 1-6 project:party
 echo $ task projects
 task projects
 echo $ task list project:home
 task list project:home
 echo $ task li pro:par
 task li pro:par
 # 4 Priorities
 echo Priorities --------------------------------------------------------------
 echo $ task 1-3,5 priority:H
 echo 'All' | task 1-3,5 priority:H
 echo $ task list
 task list
 echo $ task 3 pri:
 task 3 pri:
 # 5 Tags
 echo Tags --------------------------------------------------------------
 echo $ task list
 task list
 echo $ task 3,5,6 +mall
 echo 'All' | task 3,5,6 +mall
 echo $ task long
 task long
 echo $ task list +mall
 task list +mall
 echo $ task 3 -mall
 task 3 -mall
 # 6 Modifications
 echo Modifications --------------------------------------------------------------
 echo $ task 7 Pay rent at the end of the month
 echo 'Yes' | task 7 Pay rent at the end of the month
 echo $ task add music
 task add music
 echo $ task 8 prepend Select some
 task 8 prepend Select some
 echo $ task 8 append for after dinner
 task 8 append for after dinner
 echo $ task list
 task list
 echo $ task edit
 #task edit
 echo $ task add Hire a band?
 #task add Hire a band?
 echo $ task add Hire a band\?
 #task add Hire a band\?
 echo $ task add "Hire a band?"
 #task add "Hire a band?"
 echo $ task add -- Hire a band\? +dj
 task add -- Hire a band\? +dj
 echo $ task undo
 echo 'y' | task undo
 echo $ task 1 delete
 echo 'y' | task 1 delete
 echo $ task undo
 echo 'y' | task undo
 # 7 Info
 echo Info --------------------------------------------------------------
 echo $ task 1 info
 task 1 info
 echo $ task stats
 task stats
 # 8 Annotations
 echo Annotations --------------------------------------------------------------
 echo $ task 1 annotate the 13 looks good
 task 1 annotate the 13 looks good
 sleep 1
 echo $ task 1 annotate or the 14th
 task 1 annotate or the 14th
 echo $ task list
 task list
 echo $ task list rc.annotations:full
 task list rc.annotations:full
 echo $ task list rc.annotations:sparse
 task list rc.annotations:sparse
 echo $ task list rc.annotations:none
 task list rc.annotations:none
 echo $ task 1 denotate 14th
 task 1 denotate 14th
 echo $ task list
 task list
 # 9 Configuration
 echo Configuration --------------------------------------------------------------
 echo $ task show
 task show
 echo $ task config answer forty-two
 echo 'y' | task config answer forty-two
 echo $ task show answer
 task show answer
 echo $ task config answer
 echo 'y' | task config answer
 echo $ task rc.report.list.sort=description+ list
 task rc.report.list.sort=description+ list
 # 10 Defaults
 echo Defaults --------------------------------------------------------------
 echo $ task config default.command list
 echo 'y' | task config default.command list
 echo $ task 
 task 
 echo $ task config default.priority H
 echo 'y' | task config default.priority H
 echo $ task config default.project Work
 echo 'y' | task config default.project Work
 echo $ task add New task
 task add New task
 echo $ task list
 task list
 echo $ task undo
 echo 'y' | task undo
 echo $ task config default.priority
 echo 'y' | task config default.priority
 echo $ task config default.project
 echo 'y' | task config default.project
 # 11 Aliases
 echo Aliases --------------------------------------------------------------
 echo $ task config alias.zzz list
 echo 'y' | task config alias.zzz list
 echo $ task zzz
 task zzz
 echo $ task z
 task z
 # 12 Color
 echo Color --------------------------------------------------------------
 echo $ task config color on
 echo 'y' | task config color on
 echo $ task list
 task list
 echo $ task 1 bg:on_red
 task 1 bg:on_red
 echo $ task list
 task list
 echo $ task 1 bg:
 task 1 bg:
 echo $ task color
 task color
 echo $ task color white on red
 task color white on red
 echo $ task color legend
 task color legend
 echo vi ~/.taskrc # include /usr/local/share/doc/task/rc/dark-blue-256.theme
 #vi ~/.taskrc # include /usr/local/share/doc/task/rc/dark-blue-256.theme
 echo 'include /usr/local/share/doc/task/rc/dark-blue-256.theme' >> x
 echo $ task color legend
 task color legend
 echo $ task list
 task list
 echo vi ~/.taskrc # include /usr/local/share/doc/task/rc/dark-red-256.theme
 #vi ~/.taskrc # include /usr/local/share/doc/task/rc/dark-red-256.theme
 sed 's/blue/red/' x >x2 && mv x2 x
 echo $ task color legend
 task color legend
 echo $ task list
 task list
 echo vi ~/.taskrc # include /usr/local/share/doc/task/rc/dark-256.theme
 #vi ~/.taskrc # include /usr/local/share/doc/task/rc/dark-256.theme
 sed 's/red-//' x >x2 && mv x2 x
 echo $ task list
 task list
 echo $ task "rc.color.project.party=on rgb001" rc.color.keyword.invit=bold list
 task "rc.color.project.party=on rgb001" rc.color.keyword.invit=bold list
 echo $ man task-color
 #man task-color
 # 13 Active tasks
 echo Active tasks --------------------------------------------------------------
 echo $ task 2 start
 task 2 start
 echo $ task list
 task list
 echo $ task active
 task active
 echo $ task 2 stop
 task 2 stop
 echo $ task config journal.time on
 task config journal.time on
 echo $ task config rc.dateformat.xxx xxx
 task config rc.dateformat.xxx xxx
 echo $ task config dateformat.annotation 'Y/m/d H:N'
 task config dateformat.annotation 'Y/m/d H:N'
 echo $ task 2 start
 task 2 start
 echo $ task list venue
 task list venue
 echo $ task 2 stop
 task 2 stop
 echo $ task list venue
 task list venue
 # 14 Due dates
 echo Due dates --------------------------------------------------------------
 echo $ task 1 due:7/31/2010
 task 1 due:7/31/2010
 echo $ task 1 due:2wks
 task 1 due:2wks
 echo $ task 1 due:-2wks
 task 1 due:-2wks
 echo $ task 1 due:eom
 task 1 due:eom
 echo $ task 2 due:8th
 task 2 due:8th
 echo $ task 2 due:sunday
 task 2 due:sunday
 echo $ task 5 due:eow
 task 5 due:eow
 echo $ task list
 task list
 echo $ task overdue
 task overdue
 echo $ task rc.dateformat.report:Y-M-DTH:N:SZ list
 task rc.dateformat.report:Y-M-DTH:N:SZ list
 # 15 Calendar
 echo Calendar --------------------------------------------------------------
 echo $ task calendar
 task calendar
 echo $ vi ~/.taskrc # include /usr/local/share/doc/task/rc/holidays-US.rc
 #vi ~/.taskrc # include /usr/local/share/doc/task/rc/holidays-US.rc
 echo 'include /usr/local/share/doc/task/rc/holidays-US.rc' >> x
 echo $ task calendar
 task calendar
 echo $ task cal 2010
 task cal 2010
 echo $ task rc.calendar.details:full cal
 task rc.calendar.details:full cal
 echo $ task rc.calendar.holidays:full cal
 task rc.calendar.holidays:full cal
 # 16 Recurrence
 echo Recurrence --------------------------------------------------------------
 echo $ task 7 info
 task 7 info
 echo $ task 7 due:eom recur:monthly
 task 7 due:eom recur:monthly
 echo $ task 7
 task 7
 echo $ task 7 until:eoy
 task 7 until:eoy
 echo $ task recurring
 task recurring
 echo $ task add Pay taxes due:4/15/2007 recur:yearly
 task add Pay taxes due:4/15/2007 recur:yearly
 echo $ task long
 task long
 echo $ task 11 delete
 printf "y\ny\n" | task 11 delete      # y, y
 echo $ task list
 task list
 # 17 Special tags
 echo Special tags --------------------------------------------------------------
 echo $ task 6 +nocolor
 task 6 +nocolor
 echo $ task list
 task list
 echo $ task tags
 task tags
 echo $ task 6 -nocolor
 task 6 -nocolor
 # 18 Waiting
 echo Waiting --------------------------------------------------------------
 echo $ task add Look for new apartment due:eoy
 task add Look for new apartment due:eoy
 echo $ task list
 task list
 echo $ task 10 wait:12/1/2010
 task 10 wait:12/1/2010
 echo $ task list
 task list
 echo $ task waiting
 task waiting
 echo $ task add Do something in a few seconds
 task add Do something in a few seconds
 echo $ task 11 wait:5s
 task 11 wait:5s
 echo $ task list
 task list
 sleep 5
 echo $ task list
 task list
 echo $ task 11 rc.confirmation:no delete
 task 11 rc.confirmation:no delete
 # 19 Dependencies
 echo Dependencies --------------------------------------------------------------
 echo $ task list pro:party
 task list pro:party
 echo $ task 3 depends:6
 task 3 depends:6
 echo $ task 6 dep:5
 task 6 dep:5
 echo $ task 2 dep:1
 task 2 dep:1
 echo $ task 5 dep:1,2
 task 5 dep:1,2
 echo $ task 4 dep:1
 task 4 dep:1
 echo $ task long pro:party
 task long pro:party
 echo $ task 5 dep:-1
 task 5 dep:-1
 echo $ task blocked
 task blocked
 echo $ task unblocked
 task  unblocked
 echo $ task 1 info
 task  1 info
 echo $ task 2 info
 task  2 info
 echo $ task 2 done
 echo 'y' | task  2 done
 echo $ task 1 info
 task  1 info
 # 20 Reports
 echo Reports --------------------------------------------------------------
 echo $ task minimal
 task  minimal
 echo $ task ls
 task  ls
 echo $ task list
 task  list
 echo $ task long
 task  long
 echo $ task all
 task  all
 echo $ task completed
 task  completed
 echo $ task recurring
 task  recurring
 echo $ task waiting
 task  waiting
 echo $ task blocked
 task  blocked
 echo $ task oldest
 task  oldest
 echo $ task newest
 task  newest
 echo $ task timesheet
 task  timesheet
 echo $ task next
 task  next
 # 21 Custom report
 echo Custom report --------------------------------------------------------------
 echo 'report.foo.description=My own report'     >> x
 echo 'report.foo.columns=id,entry,description'  >> x
 echo 'report.foo.labels=ID,Entered,Description' >> x
 echo 'report.foo.sort=entry+,description+'      >> x
 echo 'report.foo.filter=status:pending'         >> x
 echo 'task help | grep foo'
 task  help | grep foo
 echo $ task show report.foo
 task  show report.foo
 echo $ task foo
 task  foo
 # 22 Charts
 echo Charts --------------------------------------------------------------
 echo $ task history
 task history
 echo $ task history.annual
 task history.annual
 echo $ task ghistory
 task ghistory
 echo $ task ghistory.annual
 task ghistory.annual
 echo $ task summary
 task summary
 # 23 Advanced filters
 echo Advanced filters --------------------------------------------------------------
 echo $ task list
 task  list
 echo $ task list invit
 task  list invit
 echo $ task list description.contains:invit
 task  list description.contains:invit
 echo $ task list desc.word:the
 task  list desc.word:the
 echo $ task list desc.noword:invitations
 task  list desc.noword:invitations
 echo $ task list pro:party
 task  list pro:party
 echo $ task list pro.is:party
 task  list pro.is:party
 echo $ task list pro.not:party
 task  list pro.not:party
 echo $ task list pro:party priority.over:L
 task  list pro:party priority.over:L
 echo $ task list pro:party limit:2
 task  list pro:party limit:2
 echo $ task list limit:page
 task  list limit:page
 echo $ task all status:pending
 task  all status:pending
 echo $ task all status:waiting
 task  all status:waiting
 # 24 Import/export
 echo Import/export --------------------------------------------------------------
 echo $ task export.csv
 task  export.csv
 echo $ task export.csv venue
 task  export.csv venue
 echo $ task export.vcalendar venue
 task  export.vcalendar venue
 echo $ task export.yaml venue
 task  export.yaml venue
 cat <<EOF >file.text
 Remember to read the task man page
 EOF
 cat file.text
 echo $ task import file.text
 printf "y\n" | task  import file.text
 cat <<EOF >file.yaml
 %YAML 1.1
 ---
  task:
    description: Visit http://taskwarrior.org
    due: 1281844800
    entry: 1281289630
    priority: H
    project: work
    status: pending
    uuid: 23afada0-a446-8d5a-c213-30d99d52c4b0
 ...
 EOF
 cat file.yaml
 echo $ task import file.yaml
 printf "y\n" | task  import file.yaml
 echo $ task new limit:2
 task  new limit:2
 # 25 Help
 echo Help --------------------------------------------------------------
 echo $ task help
 task  help
 echo $ man task
 #man task
 echo $ man taskrc
 #man taskrc
 echo $ man task-color
 #man task-color
 echo $ man task-tutorial
 #man task-tutorial
 echo $ man task-faq
 #man task-faq
 echo $ man task-sync
 #man task-sync
 # 26 Wrap up
 echo Wrap up --------------------------------------------------------------
 echo $ task version
 task  version
 exit
--- a/doc/misc/tutorial/defaults/script.200.txt
+++ b/doc/misc/tutorial/defaults/script.200.txt
@@ -0,0 +1,28 @@
 [Make window 116x32 for movie recording, light text, dark background]
 This is the script from which a 2.0-specific movie will be made.  On the left
 are the typed commands, and on the right is the voice track.
 It is intended that the left and right be combined and the result will be a new
 task-tutorial.5 man page.
 ---------------------------------------- Defaults --------------------------------------------------
 task config default.command list         There is a default command, which can be set to anything,
 task                                     in this case it is set to the 'list' report.  Then running
                                         taskwarrior with no command name runs the default command.
 task config default.priority H           I can also specify a default priority and project, which
 task config default.project Work         means that any tasks added will use them, unless an
 task add New task                        alternative is provided.
 task list
 task undo                                Let's just revert those changes, to clean up.
 task config default.priority
 task config default.project
 ---------------------------------------- End -------------------------------------------------------
--- a/doc/misc/tutorial/dependencies/run.200
+++ b/doc/misc/tutorial/dependencies/run.200
@@ -0,0 +1,520 @@
 #! /bin/bash
 rm -f /Users/paul/.task/pending.data /Users/paul/.task/completed.data /Users/paul/.task/undo.data
 echo 'data.location=~/.task' > /Users/paul/.taskrc
 echo 'color=off' >> /Users/paul/.taskrc
 echo 'color.summary.background=on gray3' >> /Users/paul/.taskrc
 echo '#include /usr/local/share/doc/task/rc/dark-blue-256.theme' >> /Users/paul/.taskrc
 echo '#include /usr/local/share/doc/task/rc/dark-red-256.theme' >> /Users/paul/.taskrc
 echo '#include /usr/local/share/doc/task/rc/dark-256.theme' >> /Users/paul/.taskrc
 # 1 Intro
 # 2 Basic usage
 echo Basic usage --------------------------------------------------------------
 echo $ task add Select a free weekend in November
 task add Select a free weekend in November
 echo $ task add Select and book a venue
 task add Select and book a venue
 echo $ task add Come up with a guest list
 task add Come up with a guest list
 echo $ task add Mail invitations
 task add Mail invitations
 echo $ task add Select a caterer
 task add Select a caterer
 echo $ task list
 task list
 echo $ task log Order a special cake
 task log Order a special cake
 echo $ task 4 duplicate /Mail/Design/
 task 4 duplicate /Mail/Design/
 echo $ task 4 duplicate /Mail/Print/
 task 4 duplicate /Mail/Print/
 echo $ task list
 task list
 echo $ task 3 done
 task 3 done
 echo $ task list
 task list
 # 3 Projects
 echo Projects --------------------------------------------------------------
 echo $ task add Pay teh rent on teh 31st
 task add Pay teh rent on teh 31st
 echo $ task 7 /teh/the/g
 task 7 /teh/the/g
 echo $ task list
 task list
 echo $ task 7 project:home
 task 7 project:home
 echo $ task 1-6 project:party
 echo 'All' | task 1-6 project:party
 echo $ task projects
 task projects
 echo $ task list project:home
 task list project:home
 echo $ task li pro:par
 task li pro:par
 # 4 Priorities
 echo Priorities --------------------------------------------------------------
 echo $ task 1-3,5 priority:H
 echo 'All' | task 1-3,5 priority:H
 echo $ task list
 task list
 echo $ task 3 pri:
 task 3 pri:
 # 5 Tags
 echo Tags --------------------------------------------------------------
 echo $ task list
 task list
 echo $ task 3,5,6 +mall
 echo 'All' | task 3,5,6 +mall
 echo $ task long
 task long
 echo $ task list +mall
 task list +mall
 echo $ task 3 -mall
 task 3 -mall
 # 6 Modifications
 echo Modifications --------------------------------------------------------------
 echo $ task 7 Pay rent at the end of the month
 echo 'Yes' | task 7 Pay rent at the end of the month
 echo $ task add music
 task add music
 echo $ task 8 prepend Select some
 task 8 prepend Select some
 echo $ task 8 append for after dinner
 task 8 append for after dinner
 echo $ task list
 task list
 echo $ task edit
 #task edit
 echo $ task add Hire a band?
 #task add Hire a band?
 echo $ task add Hire a band\?
 #task add Hire a band\?
 echo $ task add "Hire a band?"
 #task add "Hire a band?"
 echo $ task add -- Hire a band\? +dj
 task add -- Hire a band\? +dj
 echo $ task undo
 echo 'y' | task undo
 echo $ task 1 delete
 echo 'y' | task 1 delete
 echo $ task undo
 echo 'y' | task undo
 # 7 Info
 echo Info --------------------------------------------------------------
 echo $ task 1 info
 task 1 info
 echo $ task stats
 task stats
 # 8 Annotations
 echo Annotations --------------------------------------------------------------
 echo $ task 1 annotate the 13 looks good
 task 1 annotate the 13 looks good
 sleep 1
 echo $ task 1 annotate or the 14th
 task 1 annotate or the 14th
 echo $ task list
 task list
 echo $ task list rc.annotations:full
 task list rc.annotations:full
 echo $ task list rc.annotations:sparse
 task list rc.annotations:sparse
 echo $ task list rc.annotations:none
 task list rc.annotations:none
 echo $ task 1 denotate 14th
 task 1 denotate 14th
 echo $ task list
 task list
 # 9 Configuration
 echo Configuration --------------------------------------------------------------
 echo $ task show
 task show
 echo $ task config answer forty-two
 echo 'y' | task config answer forty-two
 echo $ task show answer
 task show answer
 echo $ task config answer
 echo 'y' | task config answer
 echo $ task rc.report.list.sort=description+ list
 task rc.report.list.sort=description+ list
 # 10 Defaults
 echo Defaults --------------------------------------------------------------
 echo $ task config default.command list
 echo 'y' | task config default.command list
 echo $ task 
 task 
 echo $ task config default.priority H
 echo 'y' | task config default.priority H
 echo $ task config default.project Work
 echo 'y' | task config default.project Work
 echo $ task add New task
 task add New task
 echo $ task list
 task list
 echo $ task undo
 echo 'y' | task undo
 echo $ task config default.priority
 echo 'y' | task config default.priority
 echo $ task config default.project
 echo 'y' | task config default.project
 # 11 Aliases
 echo Aliases --------------------------------------------------------------
 echo $ task config alias.zzz list
 echo 'y' | task config alias.zzz list
 echo $ task zzz
 task zzz
 echo $ task z
 task z
 # 12 Color
 echo Color --------------------------------------------------------------
 echo $ task config color on
 echo 'y' | task config color on
 echo $ task list
 task list
 echo $ task 1 bg:on_red
 task 1 bg:on_red
 echo $ task list
 task list
 echo $ task 1 bg:
 task 1 bg:
 echo $ task color
 task color
 echo $ task color white on red
 task color white on red
 echo $ task color legend
 task color legend
 echo vi ~/.taskrc # include /usr/local/share/doc/task/rc/dark-blue-256.theme
 #vi ~/.taskrc # include /usr/local/share/doc/task/rc/dark-blue-256.theme
 echo 'include /usr/local/share/doc/task/rc/dark-blue-256.theme' >> x
 echo $ task color legend
 task color legend
 echo $ task list
 task list
 echo vi ~/.taskrc # include /usr/local/share/doc/task/rc/dark-red-256.theme
 #vi ~/.taskrc # include /usr/local/share/doc/task/rc/dark-red-256.theme
 sed 's/blue/red/' x >x2 && mv x2 x
 echo $ task color legend
 task color legend
 echo $ task list
 task list
 echo vi ~/.taskrc # include /usr/local/share/doc/task/rc/dark-256.theme
 #vi ~/.taskrc # include /usr/local/share/doc/task/rc/dark-256.theme
 sed 's/red-//' x >x2 && mv x2 x
 echo $ task list
 task list
 echo $ task "rc.color.project.party=on rgb001" rc.color.keyword.invit=bold list
 task "rc.color.project.party=on rgb001" rc.color.keyword.invit=bold list
 echo $ man task-color
 #man task-color
 # 13 Active tasks
 echo Active tasks --------------------------------------------------------------
 echo $ task 2 start
 task 2 start
 echo $ task list
 task list
 echo $ task active
 task active
 echo $ task 2 stop
 task 2 stop
 echo $ task config journal.time on
 task config journal.time on
 echo $ task config rc.dateformat.xxx xxx
 task config rc.dateformat.xxx xxx
 echo $ task config dateformat.annotation 'Y/m/d H:N'
 task config dateformat.annotation 'Y/m/d H:N'
 echo $ task 2 start
 task 2 start
 echo $ task list venue
 task list venue
 echo $ task 2 stop
 task 2 stop
 echo $ task list venue
 task list venue
 # 14 Due dates
 echo Due dates --------------------------------------------------------------
 echo $ task 1 due:7/31/2010
 task 1 due:7/31/2010
 echo $ task 1 due:2wks
 task 1 due:2wks
 echo $ task 1 due:-2wks
 task 1 due:-2wks
 echo $ task 1 due:eom
 task 1 due:eom
 echo $ task 2 due:8th
 task 2 due:8th
 echo $ task 2 due:sunday
 task 2 due:sunday
 echo $ task 5 due:eow
 task 5 due:eow
 echo $ task list
 task list
 echo $ task overdue
 task overdue
 echo $ task rc.dateformat.report:Y-M-DTH:N:SZ list
 task rc.dateformat.report:Y-M-DTH:N:SZ list
 # 15 Calendar
 echo Calendar --------------------------------------------------------------
 echo $ task calendar
 task calendar
 echo $ vi ~/.taskrc # include /usr/local/share/doc/task/rc/holidays-US.rc
 #vi ~/.taskrc # include /usr/local/share/doc/task/rc/holidays-US.rc
 echo 'include /usr/local/share/doc/task/rc/holidays-US.rc' >> x
 echo $ task calendar
 task calendar
 echo $ task cal 2010
 task cal 2010
 echo $ task rc.calendar.details:full cal
 task rc.calendar.details:full cal
 echo $ task rc.calendar.holidays:full cal
 task rc.calendar.holidays:full cal
 # 16 Recurrence
 echo Recurrence --------------------------------------------------------------
 echo $ task 7 info
 task 7 info
 echo $ task 7 due:eom recur:monthly
 task 7 due:eom recur:monthly
 echo $ task 7
 task 7
 echo $ task 7 until:eoy
 task 7 until:eoy
 echo $ task recurring
 task recurring
 echo $ task add Pay taxes due:4/15/2007 recur:yearly
 task add Pay taxes due:4/15/2007 recur:yearly
 echo $ task long
 task long
 echo $ task 11 delete
 printf "y\ny\n" | task 11 delete      # y, y
 echo $ task list
 task list
 # 17 Special tags
 echo Special tags --------------------------------------------------------------
 echo $ task 6 +nocolor
 task 6 +nocolor
 echo $ task list
 task list
 echo $ task tags
 task tags
 echo $ task 6 -nocolor
 task 6 -nocolor
 # 18 Waiting
 echo Waiting --------------------------------------------------------------
 echo $ task add Look for new apartment due:eoy
 task add Look for new apartment due:eoy
 echo $ task list
 task list
 echo $ task 10 wait:12/1/2010
 task 10 wait:12/1/2010
 echo $ task list
 task list
 echo $ task waiting
 task waiting
 echo $ task add Do something in a few seconds
 task add Do something in a few seconds
 echo $ task 11 wait:5s
 task 11 wait:5s
 echo $ task list
 task list
 sleep 5
 echo $ task list
 task list
 echo $ task 11 rc.confirmation:no delete
 task 11 rc.confirmation:no delete
 # 19 Dependencies
 echo Dependencies --------------------------------------------------------------
 echo $ task list pro:party
 task list pro:party
 echo $ task 3 depends:6
 task 3 depends:6
 echo $ task 6 dep:5
 task 6 dep:5
 echo $ task 2 dep:1
 task 2 dep:1
 echo $ task 5 dep:1,2
 task 5 dep:1,2
 echo $ task 4 dep:1
 task 4 dep:1
 echo $ task long pro:party
 task long pro:party
 echo $ task 5 dep:-1
 task 5 dep:-1
 echo $ task blocked
 task blocked
 echo $ task unblocked
 task  unblocked
 echo $ task 1 info
 task  1 info
 echo $ task 2 info
 task  2 info
 echo $ task 2 done
 echo 'y' | task  2 done
 echo $ task 1 info
 task  1 info
 # 20 Reports
 echo Reports --------------------------------------------------------------
 echo $ task minimal
 task  minimal
 echo $ task ls
 task  ls
 echo $ task list
 task  list
 echo $ task long
 task  long
 echo $ task all
 task  all
 echo $ task completed
 task  completed
 echo $ task recurring
 task  recurring
 echo $ task waiting
 task  waiting
 echo $ task blocked
 task  blocked
 echo $ task oldest
 task  oldest
 echo $ task newest
 task  newest
 echo $ task timesheet
 task  timesheet
 echo $ task next
 task  next
 # 21 Custom report
 echo Custom report --------------------------------------------------------------
 echo 'report.foo.description=My own report'     >> x
 echo 'report.foo.columns=id,entry,description'  >> x
 echo 'report.foo.labels=ID,Entered,Description' >> x
 echo 'report.foo.sort=entry+,description+'      >> x
 echo 'report.foo.filter=status:pending'         >> x
 echo 'task help | grep foo'
 task  help | grep foo
 echo $ task show report.foo
 task  show report.foo
 echo $ task foo
 task  foo
 # 22 Charts
 echo Charts --------------------------------------------------------------
 echo $ task history
 task history
 echo $ task history.annual
 task history.annual
 echo $ task ghistory
 task ghistory
 echo $ task ghistory.annual
 task ghistory.annual
 echo $ task summary
 task summary
 # 23 Advanced filters
 echo Advanced filters --------------------------------------------------------------
 echo $ task list
 task  list
 echo $ task list invit
 task  list invit
 echo $ task list description.contains:invit
 task  list description.contains:invit
 echo $ task list desc.word:the
 task  list desc.word:the
 echo $ task list desc.noword:invitations
 task  list desc.noword:invitations
 echo $ task list pro:party
 task  list pro:party
 echo $ task list pro.is:party
 task  list pro.is:party
 echo $ task list pro.not:party
 task  list pro.not:party
 echo $ task list pro:party priority.over:L
 task  list pro:party priority.over:L
 echo $ task list pro:party limit:2
 task  list pro:party limit:2
 echo $ task list limit:page
 task  list limit:page
 echo $ task all status:pending
 task  all status:pending
 echo $ task all status:waiting
 task  all status:waiting
 # 24 Import/export
 echo Import/export --------------------------------------------------------------
 echo $ task export.csv
 task  export.csv
 echo $ task export.csv venue
 task  export.csv venue
 echo $ task export.vcalendar venue
 task  export.vcalendar venue
 echo $ task export.yaml venue
 task  export.yaml venue
 cat <<EOF >file.text
 Remember to read the task man page
 EOF
 cat file.text
 echo $ task import file.text
 printf "y\n" | task  import file.text
 cat <<EOF >file.yaml
 %YAML 1.1
 ---
  task:
    description: Visit http://taskwarrior.org
    due: 1281844800
    entry: 1281289630
    priority: H
    project: work
    status: pending
    uuid: 23afada0-a446-8d5a-c213-30d99d52c4b0
 ...
 EOF
 cat file.yaml
 echo $ task import file.yaml
 printf "y\n" | task  import file.yaml
 echo $ task new limit:2
 task  new limit:2
 # 25 Help
 echo Help --------------------------------------------------------------
 echo $ task help
 task  help
 echo $ man task
 #man task
 echo $ man taskrc
 #man taskrc
 echo $ man task-color
 #man task-color
 echo $ man task-tutorial
 #man task-tutorial
 echo $ man task-faq
 #man task-faq
 echo $ man task-sync
 #man task-sync
 # 26 Wrap up
 echo Wrap up --------------------------------------------------------------
 echo $ task version
 task  version
 exit
--- a/doc/misc/tutorial/dependencies/script.200.txt
+++ b/doc/misc/tutorial/dependencies/script.200.txt
@@ -0,0 +1,47 @@
 [Make window 116x32 for movie recording, light text, dark background]
 This is the script from which a 2.0-specific movie will be made.  On the left
 are the typed commands, and on the right is the voice track.
 It is intended that the left and right be combined and the result will be a new
 task-tutorial.5 man page.
 ---------------------------------------- Dependencies ----------------------------------------------
 task list pro:party                      Taskwarrior supports dependencies.  Let's take a look at the
                                         party planning tasks, and assign dependencies.
 task 3 depends:6                         Let's see.  I can't mail invitations until they are printed.
 task 6 dep:5                             I can't print them until I design them.
 task 2 dep:1                             I need to select a weekend before a location.
 task 5 dep:1,2                           Design depends on location and weekend.
 task 4 dep:1                             And the caterer needs to know where.
 task long pro:party                      All my tasks are blocked except task 1.  That makes sense.
 task 5 dep:-1                            Hmm, that double dependency isn't right.
 task blocked                             Here are the blocked tasks.
 task unblocked                           and the opposite, the unblocked tasks.
 task 1 info                              If we look at task 1 closely, we can see that it is blocking
 task 2 info                               2 and 4.  And if we look at task 2, we see that it is
                                         blocked by 1, and blocking 5.
                                         This is called a dependency chain, which is a string of tasks
                                         that are all connected not only by their project, but by
                                         dependencies.
                                         Now we understand that task 1 should be done first, but you
                                         may still violate the laws of physics if you wish. Let's
                                         complete task 2 and see what happens.
 task 2 done  (y)                         Taskwarrior realizes what you are doing, and offers to fix
 task 1 info                              the dependency chain to reflect what you have done.
 ---------------------------------------- End -------------------------------------------------------
 Show color rules.
--- a/doc/misc/tutorial/due/run.200
+++ b/doc/misc/tutorial/due/run.200
@@ -0,0 +1,520 @@
 #! /bin/bash
 rm -f /Users/paul/.task/pending.data /Users/paul/.task/completed.data /Users/paul/.task/undo.data
 echo 'data.location=~/.task' > /Users/paul/.taskrc
 echo 'color=off' >> /Users/paul/.taskrc
 echo 'color.summary.background=on gray3' >> /Users/paul/.taskrc
 echo '#include /usr/local/share/doc/task/rc/dark-blue-256.theme' >> /Users/paul/.taskrc
 echo '#include /usr/local/share/doc/task/rc/dark-red-256.theme' >> /Users/paul/.taskrc
 echo '#include /usr/local/share/doc/task/rc/dark-256.theme' >> /Users/paul/.taskrc
 # 1 Intro
 # 2 Basic usage
 echo Basic usage --------------------------------------------------------------
 echo $ task add Select a free weekend in November
 task add Select a free weekend in November
 echo $ task add Select and book a venue
 task add Select and book a venue
 echo $ task add Come up with a guest list
 task add Come up with a guest list
 echo $ task add Mail invitations
 task add Mail invitations
 echo $ task add Select a caterer
 task add Select a caterer
 echo $ task list
 task list
 echo $ task log Order a special cake
 task log Order a special cake
 echo $ task 4 duplicate /Mail/Design/
 task 4 duplicate /Mail/Design/
 echo $ task 4 duplicate /Mail/Print/
 task 4 duplicate /Mail/Print/
 echo $ task list
 task list
 echo $ task 3 done
 task 3 done
 echo $ task list
 task list
 # 3 Projects
 echo Projects --------------------------------------------------------------
 echo $ task add Pay teh rent on teh 31st
 task add Pay teh rent on teh 31st
 echo $ task 7 /teh/the/g
 task 7 /teh/the/g
 echo $ task list
 task list
 echo $ task 7 project:home
 task 7 project:home
 echo $ task 1-6 project:party
 echo 'All' | task 1-6 project:party
 echo $ task projects
 task projects
 echo $ task list project:home
 task list project:home
 echo $ task li pro:par
 task li pro:par
 # 4 Priorities
 echo Priorities --------------------------------------------------------------
 echo $ task 1-3,5 priority:H
 echo 'All' | task 1-3,5 priority:H
 echo $ task list
 task list
 echo $ task 3 pri:
 task 3 pri:
 # 5 Tags
 echo Tags --------------------------------------------------------------
 echo $ task list
 task list
 echo $ task 3,5,6 +mall
 echo 'All' | task 3,5,6 +mall
 echo $ task long
 task long
 echo $ task list +mall
 task list +mall
 echo $ task 3 -mall
 task 3 -mall
 # 6 Modifications
 echo Modifications --------------------------------------------------------------
 echo $ task 7 Pay rent at the end of the month
 echo 'Yes' | task 7 Pay rent at the end of the month
 echo $ task add music
 task add music
 echo $ task 8 prepend Select some
 task 8 prepend Select some
 echo $ task 8 append for after dinner
 task 8 append for after dinner
 echo $ task list
 task list
 echo $ task edit
 #task edit
 echo $ task add Hire a band?
 #task add Hire a band?
 echo $ task add Hire a band\?
 #task add Hire a band\?
 echo $ task add "Hire a band?"
 #task add "Hire a band?"
 echo $ task add -- Hire a band\? +dj
 task add -- Hire a band\? +dj
 echo $ task undo
 echo 'y' | task undo
 echo $ task 1 delete
 echo 'y' | task 1 delete
 echo $ task undo
 echo 'y' | task undo
 # 7 Info
 echo Info --------------------------------------------------------------
 echo $ task 1 info
 task 1 info
 echo $ task stats
 task stats
 # 8 Annotations
 echo Annotations --------------------------------------------------------------
 echo $ task 1 annotate the 13 looks good
 task 1 annotate the 13 looks good
 sleep 1
 echo $ task 1 annotate or the 14th
 task 1 annotate or the 14th
 echo $ task list
 task list
 echo $ task list rc.annotations:full
 task list rc.annotations:full
 echo $ task list rc.annotations:sparse
 task list rc.annotations:sparse
 echo $ task list rc.annotations:none
 task list rc.annotations:none
 echo $ task 1 denotate 14th
 task 1 denotate 14th
 echo $ task list
 task list
 # 9 Configuration
 echo Configuration --------------------------------------------------------------
 echo $ task show
 task show
 echo $ task config answer forty-two
 echo 'y' | task config answer forty-two
 echo $ task show answer
 task show answer
 echo $ task config answer
 echo 'y' | task config answer
 echo $ task rc.report.list.sort=description+ list
 task rc.report.list.sort=description+ list
 # 10 Defaults
 echo Defaults --------------------------------------------------------------
 echo $ task config default.command list
 echo 'y' | task config default.command list
 echo $ task 
 task 
 echo $ task config default.priority H
 echo 'y' | task config default.priority H
 echo $ task config default.project Work
 echo 'y' | task config default.project Work
 echo $ task add New task
 task add New task
 echo $ task list
 task list
 echo $ task undo
 echo 'y' | task undo
 echo $ task config default.priority
 echo 'y' | task config default.priority
 echo $ task config default.project
 echo 'y' | task config default.project
 # 11 Aliases
 echo Aliases --------------------------------------------------------------
 echo $ task config alias.zzz list
 echo 'y' | task config alias.zzz list
 echo $ task zzz
 task zzz
 echo $ task z
 task z
 # 12 Color
 echo Color --------------------------------------------------------------
 echo $ task config color on
 echo 'y' | task config color on
 echo $ task list
 task list
 echo $ task 1 bg:on_red
 task 1 bg:on_red
 echo $ task list
 task list
 echo $ task 1 bg:
 task 1 bg:
 echo $ task color
 task color
 echo $ task color white on red
 task color white on red
 echo $ task color legend
 task color legend
 echo vi ~/.taskrc # include /usr/local/share/doc/task/rc/dark-blue-256.theme
 #vi ~/.taskrc # include /usr/local/share/doc/task/rc/dark-blue-256.theme
 echo 'include /usr/local/share/doc/task/rc/dark-blue-256.theme' >> x
 echo $ task color legend
 task color legend
 echo $ task list
 task list
 echo vi ~/.taskrc # include /usr/local/share/doc/task/rc/dark-red-256.theme
 #vi ~/.taskrc # include /usr/local/share/doc/task/rc/dark-red-256.theme
 sed 's/blue/red/' x >x2 && mv x2 x
 echo $ task color legend
 task color legend
 echo $ task list
 task list
 echo vi ~/.taskrc # include /usr/local/share/doc/task/rc/dark-256.theme
 #vi ~/.taskrc # include /usr/local/share/doc/task/rc/dark-256.theme
 sed 's/red-//' x >x2 && mv x2 x
 echo $ task list
 task list
 echo $ task "rc.color.project.party=on rgb001" rc.color.keyword.invit=bold list
 task "rc.color.project.party=on rgb001" rc.color.keyword.invit=bold list
 echo $ man task-color
 #man task-color
 # 13 Active tasks
 echo Active tasks --------------------------------------------------------------
 echo $ task 2 start
 task 2 start
 echo $ task list
 task list
 echo $ task active
 task active
 echo $ task 2 stop
 task 2 stop
 echo $ task config journal.time on
 task config journal.time on
 echo $ task config rc.dateformat.xxx xxx
 task config rc.dateformat.xxx xxx
 echo $ task config dateformat.annotation 'Y/m/d H:N'
 task config dateformat.annotation 'Y/m/d H:N'
 echo $ task 2 start
 task 2 start
 echo $ task list venue
 task list venue
 echo $ task 2 stop
 task 2 stop
 echo $ task list venue
 task list venue
 # 14 Due dates
 echo Due dates --------------------------------------------------------------
 echo $ task 1 due:7/31/2010
 task 1 due:7/31/2010
 echo $ task 1 due:2wks
 task 1 due:2wks
 echo $ task 1 due:-2wks
 task 1 due:-2wks
 echo $ task 1 due:eom
 task 1 due:eom
 echo $ task 2 due:8th
 task 2 due:8th
 echo $ task 2 due:sunday
 task 2 due:sunday
 echo $ task 5 due:eow
 task 5 due:eow
 echo $ task list
 task list
 echo $ task overdue
 task overdue
 echo $ task rc.dateformat.report:Y-M-DTH:N:SZ list
 task rc.dateformat.report:Y-M-DTH:N:SZ list
 # 15 Calendar
 echo Calendar --------------------------------------------------------------
 echo $ task calendar
 task calendar
 echo $ vi ~/.taskrc # include /usr/local/share/doc/task/rc/holidays-US.rc
 #vi ~/.taskrc # include /usr/local/share/doc/task/rc/holidays-US.rc
 echo 'include /usr/local/share/doc/task/rc/holidays-US.rc' >> x
 echo $ task calendar
 task calendar
 echo $ task cal 2010
 task cal 2010
 echo $ task rc.calendar.details:full cal
 task rc.calendar.details:full cal
 echo $ task rc.calendar.holidays:full cal
 task rc.calendar.holidays:full cal
 # 16 Recurrence
 echo Recurrence --------------------------------------------------------------
 echo $ task 7 info
 task 7 info
 echo $ task 7 due:eom recur:monthly
 task 7 due:eom recur:monthly
 echo $ task 7
 task 7
 echo $ task 7 until:eoy
 task 7 until:eoy
 echo $ task recurring
 task recurring
 echo $ task add Pay taxes due:4/15/2007 recur:yearly
 task add Pay taxes due:4/15/2007 recur:yearly
 echo $ task long
 task long
 echo $ task 11 delete
 printf "y\ny\n" | task 11 delete      # y, y
 echo $ task list
 task list
 # 17 Special tags
 echo Special tags --------------------------------------------------------------
 echo $ task 6 +nocolor
 task 6 +nocolor
 echo $ task list
 task list
 echo $ task tags
 task tags
 echo $ task 6 -nocolor
 task 6 -nocolor
 # 18 Waiting
 echo Waiting --------------------------------------------------------------
 echo $ task add Look for new apartment due:eoy
 task add Look for new apartment due:eoy
 echo $ task list
 task list
 echo $ task 10 wait:12/1/2010
 task 10 wait:12/1/2010
 echo $ task list
 task list
 echo $ task waiting
 task waiting
 echo $ task add Do something in a few seconds
 task add Do something in a few seconds
 echo $ task 11 wait:5s
 task 11 wait:5s
 echo $ task list
 task list
 sleep 5
 echo $ task list
 task list
 echo $ task 11 rc.confirmation:no delete
 task 11 rc.confirmation:no delete
 # 19 Dependencies
 echo Dependencies --------------------------------------------------------------
 echo $ task list pro:party
 task list pro:party
 echo $ task 3 depends:6
 task 3 depends:6
 echo $ task 6 dep:5
 task 6 dep:5
 echo $ task 2 dep:1
 task 2 dep:1
 echo $ task 5 dep:1,2
 task 5 dep:1,2
 echo $ task 4 dep:1
 task 4 dep:1
 echo $ task long pro:party
 task long pro:party
 echo $ task 5 dep:-1
 task 5 dep:-1
 echo $ task blocked
 task blocked
 echo $ task unblocked
 task  unblocked
 echo $ task 1 info
 task  1 info
 echo $ task 2 info
 task  2 info
 echo $ task 2 done
 echo 'y' | task  2 done
 echo $ task 1 info
 task  1 info
 # 20 Reports
 echo Reports --------------------------------------------------------------
 echo $ task minimal
 task  minimal
 echo $ task ls
 task  ls
 echo $ task list
 task  list
 echo $ task long
 task  long
 echo $ task all
 task  all
 echo $ task completed
 task  completed
 echo $ task recurring
 task  recurring
 echo $ task waiting
 task  waiting
 echo $ task blocked
 task  blocked
 echo $ task oldest
 task  oldest
 echo $ task newest
 task  newest
 echo $ task timesheet
 task  timesheet
 echo $ task next
 task  next
 # 21 Custom report
 echo Custom report --------------------------------------------------------------
 echo 'report.foo.description=My own report'     >> x
 echo 'report.foo.columns=id,entry,description'  >> x
 echo 'report.foo.labels=ID,Entered,Description' >> x
 echo 'report.foo.sort=entry+,description+'      >> x
 echo 'report.foo.filter=status:pending'         >> x
 echo 'task help | grep foo'
 task  help | grep foo
 echo $ task show report.foo
 task  show report.foo
 echo $ task foo
 task  foo
 # 22 Charts
 echo Charts --------------------------------------------------------------
 echo $ task history
 task history
 echo $ task history.annual
 task history.annual
 echo $ task ghistory
 task ghistory
 echo $ task ghistory.annual
 task ghistory.annual
 echo $ task summary
 task summary
 # 23 Advanced filters
 echo Advanced filters --------------------------------------------------------------
 echo $ task list
 task  list
 echo $ task list invit
 task  list invit
 echo $ task list description.contains:invit
 task  list description.contains:invit
 echo $ task list desc.word:the
 task  list desc.word:the
 echo $ task list desc.noword:invitations
 task  list desc.noword:invitations
 echo $ task list pro:party
 task  list pro:party
 echo $ task list pro.is:party
 task  list pro.is:party
 echo $ task list pro.not:party
 task  list pro.not:party
 echo $ task list pro:party priority.over:L
 task  list pro:party priority.over:L
 echo $ task list pro:party limit:2
 task  list pro:party limit:2
 echo $ task list limit:page
 task  list limit:page
 echo $ task all status:pending
 task  all status:pending
 echo $ task all status:waiting
 task  all status:waiting
 # 24 Import/export
 echo Import/export --------------------------------------------------------------
 echo $ task export.csv
 task  export.csv
 echo $ task export.csv venue
 task  export.csv venue
 echo $ task export.vcalendar venue
 task  export.vcalendar venue
 echo $ task export.yaml venue
 task  export.yaml venue
 cat <<EOF >file.text
 Remember to read the task man page
 EOF
 cat file.text
 echo $ task import file.text
 printf "y\n" | task  import file.text
 cat <<EOF >file.yaml
 %YAML 1.1
 ---
  task:
    description: Visit http://taskwarrior.org
    due: 1281844800
    entry: 1281289630
    priority: H
    project: work
    status: pending
    uuid: 23afada0-a446-8d5a-c213-30d99d52c4b0
 ...
 EOF
 cat file.yaml
 echo $ task import file.yaml
 printf "y\n" | task  import file.yaml
 echo $ task new limit:2
 task  new limit:2
 # 25 Help
 echo Help --------------------------------------------------------------
 echo $ task help
 task  help
 echo $ man task
 #man task
 echo $ man taskrc
 #man taskrc
 echo $ man task-color
 #man task-color
 echo $ man task-tutorial
 #man task-tutorial
 echo $ man task-faq
 #man task-faq
 echo $ man task-sync
 #man task-sync
 # 26 Wrap up
 echo Wrap up --------------------------------------------------------------
 echo $ task version
 task  version
 exit
--- a/doc/misc/tutorial/due/script.200.txt
+++ b/doc/misc/tutorial/due/script.200.txt
@@ -0,0 +1,31 @@
 [Make window 116x32 for movie recording, light text, dark background]
 This is the script from which a 2.0-specific movie will be made.  On the left
 are the typed commands, and on the right is the voice track.
 It is intended that the left and right be combined and the result will be a new
 task-tutorial.5 man page.
 ---------------------------------------- Due dates -------------------------------------------------
 task 1 due:7/31/2010                     Due dates can be specified as dates...
 task 1 due:2wks                          as some distance into the future...
 task 1 due:-2wks                         or past...
 task 1 due:eom                           or by mnemonic (end of month)...
 task 2 due:8th                           or by ordinal...
 task 2 due:sunday                        or by day of week...
 task 5 due:eow                           
 task list                                Some of these dates are in the past, so now you see there
 task overdue                             are overdue tasks.  Due dates have different colors for
                                         due, imminent, today and overdue values.
 task rc.dateformat.report:Y-M-DTH:N:SZ list
                                         You can also choose the format - for input and output.
 ---------------------------------------- End -------------------------------------------------------
 Show inputting date+time
 Show alternate rc.due
--- a/doc/misc/tutorial/extra.txt
+++ b/doc/misc/tutorial/extra.txt
@@ -0,0 +1,38 @@
 Calendar trick
  ln -s `which task` ./cal
  ./cal
 Metadata
 Sync
  sync (needs 2.3.0 & Taskserver)
 Logo?
 Version
 Verbosity
  on
  off
  nothing
 Formats
 Next Report
  Usage
  Configuration
  Urgency
  +next special tag
 Setup
  Where the files are
    themes
    external scripts
    TASKDATA=
    TASKRC=
  http://tasktools.org/latest
 Reporting bugs
 Holidays
--- a/doc/misc/tutorial/filters/run.200
+++ b/doc/misc/tutorial/filters/run.200
@@ -0,0 +1,520 @@
 #! /bin/bash
 rm -f /Users/paul/.task/pending.data /Users/paul/.task/completed.data /Users/paul/.task/undo.data
 echo 'data.location=~/.task' > /Users/paul/.taskrc
 echo 'color=off' >> /Users/paul/.taskrc
 echo 'color.summary.background=on gray3' >> /Users/paul/.taskrc
 echo '#include /usr/local/share/doc/task/rc/dark-blue-256.theme' >> /Users/paul/.taskrc
 echo '#include /usr/local/share/doc/task/rc/dark-red-256.theme' >> /Users/paul/.taskrc
 echo '#include /usr/local/share/doc/task/rc/dark-256.theme' >> /Users/paul/.taskrc
 # 1 Intro
 # 2 Basic usage
 echo Basic usage --------------------------------------------------------------
 echo $ task add Select a free weekend in November
 task add Select a free weekend in November
 echo $ task add Select and book a venue
 task add Select and book a venue
 echo $ task add Come up with a guest list
 task add Come up with a guest list
 echo $ task add Mail invitations
 task add Mail invitations
 echo $ task add Select a caterer
 task add Select a caterer
 echo $ task list
 task list
 echo $ task log Order a special cake
 task log Order a special cake
 echo $ task 4 duplicate /Mail/Design/
 task 4 duplicate /Mail/Design/
 echo $ task 4 duplicate /Mail/Print/
 task 4 duplicate /Mail/Print/
 echo $ task list
 task list
 echo $ task 3 done
 task 3 done
 echo $ task list
 task list
 # 3 Projects
 echo Projects --------------------------------------------------------------
 echo $ task add Pay teh rent on teh 31st
 task add Pay teh rent on teh 31st
 echo $ task 7 /teh/the/g
 task 7 /teh/the/g
 echo $ task list
 task list
 echo $ task 7 project:home
 task 7 project:home
 echo $ task 1-6 project:party
 echo 'All' | task 1-6 project:party
 echo $ task projects
 task projects
 echo $ task list project:home
 task list project:home
 echo $ task li pro:par
 task li pro:par
 # 4 Priorities
 echo Priorities --------------------------------------------------------------
 echo $ task 1-3,5 priority:H
 echo 'All' | task 1-3,5 priority:H
 echo $ task list
 task list
 echo $ task 3 pri:
 task 3 pri:
 # 5 Tags
 echo Tags --------------------------------------------------------------
 echo $ task list
 task list
 echo $ task 3,5,6 +mall
 echo 'All' | task 3,5,6 +mall
 echo $ task long
 task long
 echo $ task list +mall
 task list +mall
 echo $ task 3 -mall
 task 3 -mall
 # 6 Modifications
 echo Modifications --------------------------------------------------------------
 echo $ task 7 Pay rent at the end of the month
 echo 'Yes' | task 7 Pay rent at the end of the month
 echo $ task add music
 task add music
 echo $ task 8 prepend Select some
 task 8 prepend Select some
 echo $ task 8 append for after dinner
 task 8 append for after dinner
 echo $ task list
 task list
 echo $ task edit
 #task edit
 echo $ task add Hire a band?
 #task add Hire a band?
 echo $ task add Hire a band\?
 #task add Hire a band\?
 echo $ task add "Hire a band?"
 #task add "Hire a band?"
 echo $ task add -- Hire a band\? +dj
 task add -- Hire a band\? +dj
 echo $ task undo
 echo 'y' | task undo
 echo $ task 1 delete
 echo 'y' | task 1 delete
 echo $ task undo
 echo 'y' | task undo
 # 7 Info
 echo Info --------------------------------------------------------------
 echo $ task 1 info
 task 1 info
 echo $ task stats
 task stats
 # 8 Annotations
 echo Annotations --------------------------------------------------------------
 echo $ task 1 annotate the 13 looks good
 task 1 annotate the 13 looks good
 sleep 1
 echo $ task 1 annotate or the 14th
 task 1 annotate or the 14th
 echo $ task list
 task list
 echo $ task list rc.annotations:full
 task list rc.annotations:full
 echo $ task list rc.annotations:sparse
 task list rc.annotations:sparse
 echo $ task list rc.annotations:none
 task list rc.annotations:none
 echo $ task 1 denotate 14th
 task 1 denotate 14th
 echo $ task list
 task list
 # 9 Configuration
 echo Configuration --------------------------------------------------------------
 echo $ task show
 task show
 echo $ task config answer forty-two
 echo 'y' | task config answer forty-two
 echo $ task show answer
 task show answer
 echo $ task config answer
 echo 'y' | task config answer
 echo $ task rc.report.list.sort=description+ list
 task rc.report.list.sort=description+ list
 # 10 Defaults
 echo Defaults --------------------------------------------------------------
 echo $ task config default.command list
 echo 'y' | task config default.command list
 echo $ task 
 task 
 echo $ task config default.priority H
 echo 'y' | task config default.priority H
 echo $ task config default.project Work
 echo 'y' | task config default.project Work
 echo $ task add New task
 task add New task
 echo $ task list
 task list
 echo $ task undo
 echo 'y' | task undo
 echo $ task config default.priority
 echo 'y' | task config default.priority
 echo $ task config default.project
 echo 'y' | task config default.project
 # 11 Aliases
 echo Aliases --------------------------------------------------------------
 echo $ task config alias.zzz list
 echo 'y' | task config alias.zzz list
 echo $ task zzz
 task zzz
 echo $ task z
 task z
 # 12 Color
 echo Color --------------------------------------------------------------
 echo $ task config color on
 echo 'y' | task config color on
 echo $ task list
 task list
 echo $ task 1 bg:on_red
 task 1 bg:on_red
 echo $ task list
 task list
 echo $ task 1 bg:
 task 1 bg:
 echo $ task color
 task color
 echo $ task color white on red
 task color white on red
 echo $ task color legend
 task color legend
 echo vi ~/.taskrc # include /usr/local/share/doc/task/rc/dark-blue-256.theme
 #vi ~/.taskrc # include /usr/local/share/doc/task/rc/dark-blue-256.theme
 echo 'include /usr/local/share/doc/task/rc/dark-blue-256.theme' >> x
 echo $ task color legend
 task color legend
 echo $ task list
 task list
 echo vi ~/.taskrc # include /usr/local/share/doc/task/rc/dark-red-256.theme
 #vi ~/.taskrc # include /usr/local/share/doc/task/rc/dark-red-256.theme
 sed 's/blue/red/' x >x2 && mv x2 x
 echo $ task color legend
 task color legend
 echo $ task list
 task list
 echo vi ~/.taskrc # include /usr/local/share/doc/task/rc/dark-256.theme
 #vi ~/.taskrc # include /usr/local/share/doc/task/rc/dark-256.theme
 sed 's/red-//' x >x2 && mv x2 x
 echo $ task list
 task list
 echo $ task "rc.color.project.party=on rgb001" rc.color.keyword.invit=bold list
 task "rc.color.project.party=on rgb001" rc.color.keyword.invit=bold list
 echo $ man task-color
 #man task-color
 # 13 Active tasks
 echo Active tasks --------------------------------------------------------------
 echo $ task 2 start
 task 2 start
 echo $ task list
 task list
 echo $ task active
 task active
 echo $ task 2 stop
 task 2 stop
 echo $ task config journal.time on
 task config journal.time on
 echo $ task config rc.dateformat.xxx xxx
 task config rc.dateformat.xxx xxx
 echo $ task config dateformat.annotation 'Y/m/d H:N'
 task config dateformat.annotation 'Y/m/d H:N'
 echo $ task 2 start
 task 2 start
 echo $ task list venue
 task list venue
 echo $ task 2 stop
 task 2 stop
 echo $ task list venue
 task list venue
 # 14 Due dates
 echo Due dates --------------------------------------------------------------
 echo $ task 1 due:7/31/2010
 task 1 due:7/31/2010
 echo $ task 1 due:2wks
 task 1 due:2wks
 echo $ task 1 due:-2wks
 task 1 due:-2wks
 echo $ task 1 due:eom
 task 1 due:eom
 echo $ task 2 due:8th
 task 2 due:8th
 echo $ task 2 due:sunday
 task 2 due:sunday
 echo $ task 5 due:eow
 task 5 due:eow
 echo $ task list
 task list
 echo $ task overdue
 task overdue
 echo $ task rc.dateformat.report:Y-M-DTH:N:SZ list
 task rc.dateformat.report:Y-M-DTH:N:SZ list
 # 15 Calendar
 echo Calendar --------------------------------------------------------------
 echo $ task calendar
 task calendar
 echo $ vi ~/.taskrc # include /usr/local/share/doc/task/rc/holidays-US.rc
 #vi ~/.taskrc # include /usr/local/share/doc/task/rc/holidays-US.rc
 echo 'include /usr/local/share/doc/task/rc/holidays-US.rc' >> x
 echo $ task calendar
 task calendar
 echo $ task cal 2010
 task cal 2010
 echo $ task rc.calendar.details:full cal
 task rc.calendar.details:full cal
 echo $ task rc.calendar.holidays:full cal
 task rc.calendar.holidays:full cal
 # 16 Recurrence
 echo Recurrence --------------------------------------------------------------
 echo $ task 7 info
 task 7 info
 echo $ task 7 due:eom recur:monthly
 task 7 due:eom recur:monthly
 echo $ task 7
 task 7
 echo $ task 7 until:eoy
 task 7 until:eoy
 echo $ task recurring
 task recurring
 echo $ task add Pay taxes due:4/15/2007 recur:yearly
 task add Pay taxes due:4/15/2007 recur:yearly
 echo $ task long
 task long
 echo $ task 11 delete
 printf "y\ny\n" | task 11 delete      # y, y
 echo $ task list
 task list
 # 17 Special tags
 echo Special tags --------------------------------------------------------------
 echo $ task 6 +nocolor
 task 6 +nocolor
 echo $ task list
 task list
 echo $ task tags
 task tags
 echo $ task 6 -nocolor
 task 6 -nocolor
 # 18 Waiting
 echo Waiting --------------------------------------------------------------
 echo $ task add Look for new apartment due:eoy
 task add Look for new apartment due:eoy
 echo $ task list
 task list
 echo $ task 10 wait:12/1/2010
 task 10 wait:12/1/2010
 echo $ task list
 task list
 echo $ task waiting
 task waiting
 echo $ task add Do something in a few seconds
 task add Do something in a few seconds
 echo $ task 11 wait:5s
 task 11 wait:5s
 echo $ task list
 task list
 sleep 5
 echo $ task list
 task list
 echo $ task 11 rc.confirmation:no delete
 task 11 rc.confirmation:no delete
 # 19 Dependencies
 echo Dependencies --------------------------------------------------------------
 echo $ task list pro:party
 task list pro:party
 echo $ task 3 depends:6
 task 3 depends:6
 echo $ task 6 dep:5
 task 6 dep:5
 echo $ task 2 dep:1
 task 2 dep:1
 echo $ task 5 dep:1,2
 task 5 dep:1,2
 echo $ task 4 dep:1
 task 4 dep:1
 echo $ task long pro:party
 task long pro:party
 echo $ task 5 dep:-1
 task 5 dep:-1
 echo $ task blocked
 task blocked
 echo $ task unblocked
 task  unblocked
 echo $ task 1 info
 task  1 info
 echo $ task 2 info
 task  2 info
 echo $ task 2 done
 echo 'y' | task  2 done
 echo $ task 1 info
 task  1 info
 # 20 Reports
 echo Reports --------------------------------------------------------------
 echo $ task minimal
 task  minimal
 echo $ task ls
 task  ls
 echo $ task list
 task  list
 echo $ task long
 task  long
 echo $ task all
 task  all
 echo $ task completed
 task  completed
 echo $ task recurring
 task  recurring
 echo $ task waiting
 task  waiting
 echo $ task blocked
 task  blocked
 echo $ task oldest
 task  oldest
 echo $ task newest
 task  newest
 echo $ task timesheet
 task  timesheet
 echo $ task next
 task  next
 # 21 Custom report
 echo Custom report --------------------------------------------------------------
 echo 'report.foo.description=My own report'     >> x
 echo 'report.foo.columns=id,entry,description'  >> x
 echo 'report.foo.labels=ID,Entered,Description' >> x
 echo 'report.foo.sort=entry+,description+'      >> x
 echo 'report.foo.filter=status:pending'         >> x
 echo 'task help | grep foo'
 task  help | grep foo
 echo $ task show report.foo
 task  show report.foo
 echo $ task foo
 task  foo
 # 22 Charts
 echo Charts --------------------------------------------------------------
 echo $ task history
 task history
 echo $ task history.annual
 task history.annual
 echo $ task ghistory
 task ghistory
 echo $ task ghistory.annual
 task ghistory.annual
 echo $ task summary
 task summary
 # 23 Advanced filters
 echo Advanced filters --------------------------------------------------------------
 echo $ task list
 task  list
 echo $ task list invit
 task  list invit
 echo $ task list description.contains:invit
 task  list description.contains:invit
 echo $ task list desc.word:the
 task  list desc.word:the
 echo $ task list desc.noword:invitations
 task  list desc.noword:invitations
 echo $ task list pro:party
 task  list pro:party
 echo $ task list pro.is:party
 task  list pro.is:party
 echo $ task list pro.not:party
 task  list pro.not:party
 echo $ task list pro:party priority.over:L
 task  list pro:party priority.over:L
 echo $ task list pro:party limit:2
 task  list pro:party limit:2
 echo $ task list limit:page
 task  list limit:page
 echo $ task all status:pending
 task  all status:pending
 echo $ task all status:waiting
 task  all status:waiting
 # 24 Import/export
 echo Import/export --------------------------------------------------------------
 echo $ task export.csv
 task  export.csv
 echo $ task export.csv venue
 task  export.csv venue
 echo $ task export.vcalendar venue
 task  export.vcalendar venue
 echo $ task export.yaml venue
 task  export.yaml venue
 cat <<EOF >file.text
 Remember to read the task man page
 EOF
 cat file.text
 echo $ task import file.text
 printf "y\n" | task  import file.text
 cat <<EOF >file.yaml
 %YAML 1.1
 ---
  task:
    description: Visit http://taskwarrior.org
    due: 1281844800
    entry: 1281289630
    priority: H
    project: work
    status: pending
    uuid: 23afada0-a446-8d5a-c213-30d99d52c4b0
 ...
 EOF
 cat file.yaml
 echo $ task import file.yaml
 printf "y\n" | task  import file.yaml
 echo $ task new limit:2
 task  new limit:2
 # 25 Help
 echo Help --------------------------------------------------------------
 echo $ task help
 task  help
 echo $ man task
 #man task
 echo $ man taskrc
 #man taskrc
 echo $ man task-color
 #man task-color
 echo $ man task-tutorial
 #man task-tutorial
 echo $ man task-faq
 #man task-faq
 echo $ man task-sync
 #man task-sync
 # 26 Wrap up
 echo Wrap up --------------------------------------------------------------
 echo $ task version
 task  version
 exit
--- a/doc/misc/tutorial/filters/script.200.txt
+++ b/doc/misc/tutorial/filters/script.200.txt
@@ -0,0 +1,55 @@
 [Make window 116x32 for movie recording, light text, dark background]
 This is the script from which a 2.0-specific movie will be made.  On the left
 are the typed commands, and on the right is the voice track.
 It is intended that the left and right be combined and the result will be a new
 task-tutorial.5 man page.
 ---------------------------------------- Advanced Filters ------------------------------------------
 task list                                Filters are a very powerful tool.  First here is an
 task list invit                          unfiltered list, which shows all tasks.  Now again, but with
                                         the text 'invit', which acts as a filter on the description
                                         field.
 task list description.contains:invit     This is the equivalent form using attribute modifiers.  In
                                         this example we are filtering on descriptions that contain
                                         the word fragment.  Here we are using the 'contains'
                                         modifier, but there are many others.
 task list desc.word:the                  All tasks containing the whole word 'the'.  See how
                                         annotations are also searched?
 task list desc.noword:invitations        Here is a list of all tasks that do not contain the whole
                                         word 'invitations'.
 task list pro:party                      Here list all tasks in the 'party' project.
 task list pro.is:party                   And the full equivalent.
 task list pro.not:party                  Here list tasks that are not in the 'party' project.  I
                                         could have also used 'isnt' here - there are several
                                         synonyms for modifiers, so that the filter can be written
                                         so that it reads naturally.
 task list pro:party pri.over:L           Here the 'over' modifier is filtering on priorities that
                                         sort higher than 'Low', and also filtering on the 'party'
                                         project.  There are two terms in this filter.
 task list pro:party limit:2              Same again, but only show me the first two tasks.
 task list limit:page                     Now all tasks, but just show the first page of tasks.  I
                                         don't have a page full of tasks here, but you get the idea.
 task all status:pending                  Now you can see how some of the built-in reports work.  The
                                         'list' report is just all tasks, filtered so that only the
                                         pending tasks are shown.
 task all status:waiting                  The 'waiting' report is similarly defined.
 ---------------------------------------- End -------------------------------------------------------
 Show boolean combinations
 Show regexes
 Show substitutions
--- a/doc/misc/tutorial/import_export/run.200
+++ b/doc/misc/tutorial/import_export/run.200
@@ -0,0 +1,520 @@
 #! /bin/bash
 rm -f /Users/paul/.task/pending.data /Users/paul/.task/completed.data /Users/paul/.task/undo.data
 echo 'data.location=~/.task' > /Users/paul/.taskrc
 echo 'color=off' >> /Users/paul/.taskrc
 echo 'color.summary.background=on gray3' >> /Users/paul/.taskrc
 echo '#include /usr/local/share/doc/task/rc/dark-blue-256.theme' >> /Users/paul/.taskrc
 echo '#include /usr/local/share/doc/task/rc/dark-red-256.theme' >> /Users/paul/.taskrc
 echo '#include /usr/local/share/doc/task/rc/dark-256.theme' >> /Users/paul/.taskrc
 # 1 Intro
 # 2 Basic usage
 echo Basic usage --------------------------------------------------------------
 echo $ task add Select a free weekend in November
 task add Select a free weekend in November
 echo $ task add Select and book a venue
 task add Select and book a venue
 echo $ task add Come up with a guest list
 task add Come up with a guest list
 echo $ task add Mail invitations
 task add Mail invitations
 echo $ task add Select a caterer
 task add Select a caterer
 echo $ task list
 task list
 echo $ task log Order a special cake
 task log Order a special cake
 echo $ task 4 duplicate /Mail/Design/
 task 4 duplicate /Mail/Design/
 echo $ task 4 duplicate /Mail/Print/
 task 4 duplicate /Mail/Print/
 echo $ task list
 task list
 echo $ task 3 done
 task 3 done
 echo $ task list
 task list
 # 3 Projects
 echo Projects --------------------------------------------------------------
 echo $ task add Pay teh rent on teh 31st
 task add Pay teh rent on teh 31st
 echo $ task 7 /teh/the/g
 task 7 /teh/the/g
 echo $ task list
 task list
 echo $ task 7 project:home
 task 7 project:home
 echo $ task 1-6 project:party
 echo 'All' | task 1-6 project:party
 echo $ task projects
 task projects
 echo $ task list project:home
 task list project:home
 echo $ task li pro:par
 task li pro:par
 # 4 Priorities
 echo Priorities --------------------------------------------------------------
 echo $ task 1-3,5 priority:H
 echo 'All' | task 1-3,5 priority:H
 echo $ task list
 task list
 echo $ task 3 pri:
 task 3 pri:
 # 5 Tags
 echo Tags --------------------------------------------------------------
 echo $ task list
 task list
 echo $ task 3,5,6 +mall
 echo 'All' | task 3,5,6 +mall
 echo $ task long
 task long
 echo $ task list +mall
 task list +mall
 echo $ task 3 -mall
 task 3 -mall
 # 6 Modifications
 echo Modifications --------------------------------------------------------------
 echo $ task 7 Pay rent at the end of the month
 echo 'Yes' | task 7 Pay rent at the end of the month
 echo $ task add music
 task add music
 echo $ task 8 prepend Select some
 task 8 prepend Select some
 echo $ task 8 append for after dinner
 task 8 append for after dinner
 echo $ task list
 task list
 echo $ task edit
 #task edit
 echo $ task add Hire a band?
 #task add Hire a band?
 echo $ task add Hire a band\?
 #task add Hire a band\?
 echo $ task add "Hire a band?"
 #task add "Hire a band?"
 echo $ task add -- Hire a band\? +dj
 task add -- Hire a band\? +dj
 echo $ task undo
 echo 'y' | task undo
 echo $ task 1 delete
 echo 'y' | task 1 delete
 echo $ task undo
 echo 'y' | task undo
 # 7 Info
 echo Info --------------------------------------------------------------
 echo $ task 1 info
 task 1 info
 echo $ task stats
 task stats
 # 8 Annotations
 echo Annotations --------------------------------------------------------------
 echo $ task 1 annotate the 13 looks good
 task 1 annotate the 13 looks good
 sleep 1
 echo $ task 1 annotate or the 14th
 task 1 annotate or the 14th
 echo $ task list
 task list
 echo $ task list rc.annotations:full
 task list rc.annotations:full
 echo $ task list rc.annotations:sparse
 task list rc.annotations:sparse
 echo $ task list rc.annotations:none
 task list rc.annotations:none
 echo $ task 1 denotate 14th
 task 1 denotate 14th
 echo $ task list
 task list
 # 9 Configuration
 echo Configuration --------------------------------------------------------------
 echo $ task show
 task show
 echo $ task config answer forty-two
 echo 'y' | task config answer forty-two
 echo $ task show answer
 task show answer
 echo $ task config answer
 echo 'y' | task config answer
 echo $ task rc.report.list.sort=description+ list
 task rc.report.list.sort=description+ list
 # 10 Defaults
 echo Defaults --------------------------------------------------------------
 echo $ task config default.command list
 echo 'y' | task config default.command list
 echo $ task 
 task 
 echo $ task config default.priority H
 echo 'y' | task config default.priority H
 echo $ task config default.project Work
 echo 'y' | task config default.project Work
 echo $ task add New task
 task add New task
 echo $ task list
 task list
 echo $ task undo
 echo 'y' | task undo
 echo $ task config default.priority
 echo 'y' | task config default.priority
 echo $ task config default.project
 echo 'y' | task config default.project
 # 11 Aliases
 echo Aliases --------------------------------------------------------------
 echo $ task config alias.zzz list
 echo 'y' | task config alias.zzz list
 echo $ task zzz
 task zzz
 echo $ task z
 task z
 # 12 Color
 echo Color --------------------------------------------------------------
 echo $ task config color on
 echo 'y' | task config color on
 echo $ task list
 task list
 echo $ task 1 bg:on_red
 task 1 bg:on_red
 echo $ task list
 task list
 echo $ task 1 bg:
 task 1 bg:
 echo $ task color
 task color
 echo $ task color white on red
 task color white on red
 echo $ task color legend
 task color legend
 echo vi ~/.taskrc # include /usr/local/share/doc/task/rc/dark-blue-256.theme
 #vi ~/.taskrc # include /usr/local/share/doc/task/rc/dark-blue-256.theme
 echo 'include /usr/local/share/doc/task/rc/dark-blue-256.theme' >> x
 echo $ task color legend
 task color legend
 echo $ task list
 task list
 echo vi ~/.taskrc # include /usr/local/share/doc/task/rc/dark-red-256.theme
 #vi ~/.taskrc # include /usr/local/share/doc/task/rc/dark-red-256.theme
 sed 's/blue/red/' x >x2 && mv x2 x
 echo $ task color legend
 task color legend
 echo $ task list
 task list
 echo vi ~/.taskrc # include /usr/local/share/doc/task/rc/dark-256.theme
 #vi ~/.taskrc # include /usr/local/share/doc/task/rc/dark-256.theme
 sed 's/red-//' x >x2 && mv x2 x
 echo $ task list
 task list
 echo $ task "rc.color.project.party=on rgb001" rc.color.keyword.invit=bold list
 task "rc.color.project.party=on rgb001" rc.color.keyword.invit=bold list
 echo $ man task-color
 #man task-color
 # 13 Active tasks
 echo Active tasks --------------------------------------------------------------
 echo $ task 2 start
 task 2 start
 echo $ task list
 task list
 echo $ task active
 task active
 echo $ task 2 stop
 task 2 stop
 echo $ task config journal.time on
 task config journal.time on
 echo $ task config rc.dateformat.xxx xxx
 task config rc.dateformat.xxx xxx
 echo $ task config dateformat.annotation 'Y/m/d H:N'
 task config dateformat.annotation 'Y/m/d H:N'
 echo $ task 2 start
 task 2 start
 echo $ task list venue
 task list venue
 echo $ task 2 stop
 task 2 stop
 echo $ task list venue
 task list venue
 # 14 Due dates
 echo Due dates --------------------------------------------------------------
 echo $ task 1 due:7/31/2010
 task 1 due:7/31/2010
 echo $ task 1 due:2wks
 task 1 due:2wks
 echo $ task 1 due:-2wks
 task 1 due:-2wks
 echo $ task 1 due:eom
 task 1 due:eom
 echo $ task 2 due:8th
 task 2 due:8th
 echo $ task 2 due:sunday
 task 2 due:sunday
 echo $ task 5 due:eow
 task 5 due:eow
 echo $ task list
 task list
 echo $ task overdue
 task overdue
 echo $ task rc.dateformat.report:Y-M-DTH:N:SZ list
 task rc.dateformat.report:Y-M-DTH:N:SZ list
 # 15 Calendar
 echo Calendar --------------------------------------------------------------
 echo $ task calendar
 task calendar
 echo $ vi ~/.taskrc # include /usr/local/share/doc/task/rc/holidays-US.rc
 #vi ~/.taskrc # include /usr/local/share/doc/task/rc/holidays-US.rc
 echo 'include /usr/local/share/doc/task/rc/holidays-US.rc' >> x
 echo $ task calendar
 task calendar
 echo $ task cal 2010
 task cal 2010
 echo $ task rc.calendar.details:full cal
 task rc.calendar.details:full cal
 echo $ task rc.calendar.holidays:full cal
 task rc.calendar.holidays:full cal
 # 16 Recurrence
 echo Recurrence --------------------------------------------------------------
 echo $ task 7 info
 task 7 info
 echo $ task 7 due:eom recur:monthly
 task 7 due:eom recur:monthly
 echo $ task 7
 task 7
 echo $ task 7 until:eoy
 task 7 until:eoy
 echo $ task recurring
 task recurring
 echo $ task add Pay taxes due:4/15/2007 recur:yearly
 task add Pay taxes due:4/15/2007 recur:yearly
 echo $ task long
 task long
 echo $ task 11 delete
 printf "y\ny\n" | task 11 delete      # y, y
 echo $ task list
 task list
 # 17 Special tags
 echo Special tags --------------------------------------------------------------
 echo $ task 6 +nocolor
 task 6 +nocolor
 echo $ task list
 task list
 echo $ task tags
 task tags
 echo $ task 6 -nocolor
 task 6 -nocolor
 # 18 Waiting
 echo Waiting --------------------------------------------------------------
 echo $ task add Look for new apartment due:eoy
 task add Look for new apartment due:eoy
 echo $ task list
 task list
 echo $ task 10 wait:12/1/2010
 task 10 wait:12/1/2010
 echo $ task list
 task list
 echo $ task waiting
 task waiting
 echo $ task add Do something in a few seconds
 task add Do something in a few seconds
 echo $ task 11 wait:5s
 task 11 wait:5s
 echo $ task list
 task list
 sleep 5
 echo $ task list
 task list
 echo $ task 11 rc.confirmation:no delete
 task 11 rc.confirmation:no delete
 # 19 Dependencies
 echo Dependencies --------------------------------------------------------------
 echo $ task list pro:party
 task list pro:party
 echo $ task 3 depends:6
 task 3 depends:6
 echo $ task 6 dep:5
 task 6 dep:5
 echo $ task 2 dep:1
 task 2 dep:1
 echo $ task 5 dep:1,2
 task 5 dep:1,2
 echo $ task 4 dep:1
 task 4 dep:1
 echo $ task long pro:party
 task long pro:party
 echo $ task 5 dep:-1
 task 5 dep:-1
 echo $ task blocked
 task blocked
 echo $ task unblocked
 task  unblocked
 echo $ task 1 info
 task  1 info
 echo $ task 2 info
 task  2 info
 echo $ task 2 done
 echo 'y' | task  2 done
 echo $ task 1 info
 task  1 info
 # 20 Reports
 echo Reports --------------------------------------------------------------
 echo $ task minimal
 task  minimal
 echo $ task ls
 task  ls
 echo $ task list
 task  list
 echo $ task long
 task  long
 echo $ task all
 task  all
 echo $ task completed
 task  completed
 echo $ task recurring
 task  recurring
 echo $ task waiting
 task  waiting
 echo $ task blocked
 task  blocked
 echo $ task oldest
 task  oldest
 echo $ task newest
 task  newest
 echo $ task timesheet
 task  timesheet
 echo $ task next
 task  next
 # 21 Custom report
 echo Custom report --------------------------------------------------------------
 echo 'report.foo.description=My own report'     >> x
 echo 'report.foo.columns=id,entry,description'  >> x
 echo 'report.foo.labels=ID,Entered,Description' >> x
 echo 'report.foo.sort=entry+,description+'      >> x
 echo 'report.foo.filter=status:pending'         >> x
 echo 'task help | grep foo'
 task  help | grep foo
 echo $ task show report.foo
 task  show report.foo
 echo $ task foo
 task  foo
 # 22 Charts
 echo Charts --------------------------------------------------------------
 echo $ task history
 task history
 echo $ task history.annual
 task history.annual
 echo $ task ghistory
 task ghistory
 echo $ task ghistory.annual
 task ghistory.annual
 echo $ task summary
 task summary
 # 23 Advanced filters
 echo Advanced filters --------------------------------------------------------------
 echo $ task list
 task  list
 echo $ task list invit
 task  list invit
 echo $ task list description.contains:invit
 task  list description.contains:invit
 echo $ task list desc.word:the
 task  list desc.word:the
 echo $ task list desc.noword:invitations
 task  list desc.noword:invitations
 echo $ task list pro:party
 task  list pro:party
 echo $ task list pro.is:party
 task  list pro.is:party
 echo $ task list pro.not:party
 task  list pro.not:party
 echo $ task list pro:party priority.over:L
 task  list pro:party priority.over:L
 echo $ task list pro:party limit:2
 task  list pro:party limit:2
 echo $ task list limit:page
 task  list limit:page
 echo $ task all status:pending
 task  all status:pending
 echo $ task all status:waiting
 task  all status:waiting
 # 24 Import/export
 echo Import/export --------------------------------------------------------------
 echo $ task export.csv
 task  export.csv
 echo $ task export.csv venue
 task  export.csv venue
 echo $ task export.vcalendar venue
 task  export.vcalendar venue
 echo $ task export.yaml venue
 task  export.yaml venue
 cat <<EOF >file.text
 Remember to read the task man page
 EOF
 cat file.text
 echo $ task import file.text
 printf "y\n" | task  import file.text
 cat <<EOF >file.yaml
 %YAML 1.1
 ---
  task:
    description: Visit http://taskwarrior.org
    due: 1281844800
    entry: 1281289630
    priority: H
    project: work
    status: pending
    uuid: 23afada0-a446-8d5a-c213-30d99d52c4b0
 ...
 EOF
 cat file.yaml
 echo $ task import file.yaml
 printf "y\n" | task  import file.yaml
 echo $ task new limit:2
 task  new limit:2
 # 25 Help
 echo Help --------------------------------------------------------------
 echo $ task help
 task  help
 echo $ man task
 #man task
 echo $ man taskrc
 #man taskrc
 echo $ man task-color
 #man task-color
 echo $ man task-tutorial
 #man task-tutorial
 echo $ man task-faq
 #man task-faq
 echo $ man task-sync
 #man task-sync
 # 26 Wrap up
 echo Wrap up --------------------------------------------------------------
 echo $ task version
 task  version
 exit
--- a/doc/misc/tutorial/import_export/script.200.txt
+++ b/doc/misc/tutorial/import_export/script.200.txt
@@ -0,0 +1,35 @@
 [Make window 116x32 for movie recording, light text, dark background]
 This is the script from which a 2.0-specific movie will be made.  On the left
 are the typed commands, and on the right is the voice track.
 It is intended that the left and right be combined and the result will be a new
 task-tutorial.5 man page.
 ---------------------------------------- Import/Export ---------------------------------------------
 task export.csv                          You can export your tasks.  Here you see all tasks being
                                         exported in CSV format.
 task export.csv venue                    Let's just export one task in CSV format...
 task export.vcalendar venue              Or in VCalendar format...
 task export.yaml venue                   Or YAML.
 cat file.text                            I can also import.  Here I am importing simple lines of
 task import file.text                    text.  Taskwarrior recognizes the format and confirms.
 cat file.yaml                            Here is a YAML example.  Taskwarrior can read several
 task import file.yaml                    formats, including old versions of its data files.  Using
                                         YAML, you can round-trip the data without loss.
 task new limit:2                         Here are the imported tasks.
 ---------------------------------------- End -------------------------------------------------------
 Show new export scripts
 Show same script in multiple languages
 Show new import scripts
 Explain that scripts are outside the core product
--- a/doc/misc/tutorial/info/run.200
+++ b/doc/misc/tutorial/info/run.200
@@ -0,0 +1,520 @@
 #! /bin/bash
 rm -f /Users/paul/.task/pending.data /Users/paul/.task/completed.data /Users/paul/.task/undo.data
 echo 'data.location=~/.task' > /Users/paul/.taskrc
 echo 'color=off' >> /Users/paul/.taskrc
 echo 'color.summary.background=on gray3' >> /Users/paul/.taskrc
 echo '#include /usr/local/share/doc/task/rc/dark-blue-256.theme' >> /Users/paul/.taskrc
 echo '#include /usr/local/share/doc/task/rc/dark-red-256.theme' >> /Users/paul/.taskrc
 echo '#include /usr/local/share/doc/task/rc/dark-256.theme' >> /Users/paul/.taskrc
 # 1 Intro
 # 2 Basic usage
 echo Basic usage --------------------------------------------------------------
 echo $ task add Select a free weekend in November
 task add Select a free weekend in November
 echo $ task add Select and book a venue
 task add Select and book a venue
 echo $ task add Come up with a guest list
 task add Come up with a guest list
 echo $ task add Mail invitations
 task add Mail invitations
 echo $ task add Select a caterer
 task add Select a caterer
 echo $ task list
 task list
 echo $ task log Order a special cake
 task log Order a special cake
 echo $ task 4 duplicate /Mail/Design/
 task 4 duplicate /Mail/Design/
 echo $ task 4 duplicate /Mail/Print/
 task 4 duplicate /Mail/Print/
 echo $ task list
 task list
 echo $ task 3 done
 task 3 done
 echo $ task list
 task list
 # 3 Projects
 echo Projects --------------------------------------------------------------
 echo $ task add Pay teh rent on teh 31st
 task add Pay teh rent on teh 31st
 echo $ task 7 /teh/the/g
 task 7 /teh/the/g
 echo $ task list
 task list
 echo $ task 7 project:home
 task 7 project:home
 echo $ task 1-6 project:party
 echo 'All' | task 1-6 project:party
 echo $ task projects
 task projects
 echo $ task list project:home
 task list project:home
 echo $ task li pro:par
 task li pro:par
 # 4 Priorities
 echo Priorities --------------------------------------------------------------
 echo $ task 1-3,5 priority:H
 echo 'All' | task 1-3,5 priority:H
 echo $ task list
 task list
 echo $ task 3 pri:
 task 3 pri:
 # 5 Tags
 echo Tags --------------------------------------------------------------
 echo $ task list
 task list
 echo $ task 3,5,6 +mall
 echo 'All' | task 3,5,6 +mall
 echo $ task long
 task long
 echo $ task list +mall
 task list +mall
 echo $ task 3 -mall
 task 3 -mall
 # 6 Modifications
 echo Modifications --------------------------------------------------------------
 echo $ task 7 Pay rent at the end of the month
 echo 'Yes' | task 7 Pay rent at the end of the month
 echo $ task add music
 task add music
 echo $ task 8 prepend Select some
 task 8 prepend Select some
 echo $ task 8 append for after dinner
 task 8 append for after dinner
 echo $ task list
 task list
 echo $ task edit
 #task edit
 echo $ task add Hire a band?
 #task add Hire a band?
 echo $ task add Hire a band\?
 #task add Hire a band\?
 echo $ task add "Hire a band?"
 #task add "Hire a band?"
 echo $ task add -- Hire a band\? +dj
 task add -- Hire a band\? +dj
 echo $ task undo
 echo 'y' | task undo
 echo $ task 1 delete
 echo 'y' | task 1 delete
 echo $ task undo
 echo 'y' | task undo
 # 7 Info
 echo Info --------------------------------------------------------------
 echo $ task 1 info
 task 1 info
 echo $ task stats
 task stats
 # 8 Annotations
 echo Annotations --------------------------------------------------------------
 echo $ task 1 annotate the 13 looks good
 task 1 annotate the 13 looks good
 sleep 1
 echo $ task 1 annotate or the 14th
 task 1 annotate or the 14th
 echo $ task list
 task list
 echo $ task list rc.annotations:full
 task list rc.annotations:full
 echo $ task list rc.annotations:sparse
 task list rc.annotations:sparse
 echo $ task list rc.annotations:none
 task list rc.annotations:none
 echo $ task 1 denotate 14th
 task 1 denotate 14th
 echo $ task list
 task list
 # 9 Configuration
 echo Configuration --------------------------------------------------------------
 echo $ task show
 task show
 echo $ task config answer forty-two
 echo 'y' | task config answer forty-two
 echo $ task show answer
 task show answer
 echo $ task config answer
 echo 'y' | task config answer
 echo $ task rc.report.list.sort=description+ list
 task rc.report.list.sort=description+ list
 # 10 Defaults
 echo Defaults --------------------------------------------------------------
 echo $ task config default.command list
 echo 'y' | task config default.command list
 echo $ task 
 task 
 echo $ task config default.priority H
 echo 'y' | task config default.priority H
 echo $ task config default.project Work
 echo 'y' | task config default.project Work
 echo $ task add New task
 task add New task
 echo $ task list
 task list
 echo $ task undo
 echo 'y' | task undo
 echo $ task config default.priority
 echo 'y' | task config default.priority
 echo $ task config default.project
 echo 'y' | task config default.project
 # 11 Aliases
 echo Aliases --------------------------------------------------------------
 echo $ task config alias.zzz list
 echo 'y' | task config alias.zzz list
 echo $ task zzz
 task zzz
 echo $ task z
 task z
 # 12 Color
 echo Color --------------------------------------------------------------
 echo $ task config color on
 echo 'y' | task config color on
 echo $ task list
 task list
 echo $ task 1 bg:on_red
 task 1 bg:on_red
 echo $ task list
 task list
 echo $ task 1 bg:
 task 1 bg:
 echo $ task color
 task color
 echo $ task color white on red
 task color white on red
 echo $ task color legend
 task color legend
 echo vi ~/.taskrc # include /usr/local/share/doc/task/rc/dark-blue-256.theme
 #vi ~/.taskrc # include /usr/local/share/doc/task/rc/dark-blue-256.theme
 echo 'include /usr/local/share/doc/task/rc/dark-blue-256.theme' >> x
 echo $ task color legend
 task color legend
 echo $ task list
 task list
 echo vi ~/.taskrc # include /usr/local/share/doc/task/rc/dark-red-256.theme
 #vi ~/.taskrc # include /usr/local/share/doc/task/rc/dark-red-256.theme
 sed 's/blue/red/' x >x2 && mv x2 x
 echo $ task color legend
 task color legend
 echo $ task list
 task list
 echo vi ~/.taskrc # include /usr/local/share/doc/task/rc/dark-256.theme
 #vi ~/.taskrc # include /usr/local/share/doc/task/rc/dark-256.theme
 sed 's/red-//' x >x2 && mv x2 x
 echo $ task list
 task list
 echo $ task "rc.color.project.party=on rgb001" rc.color.keyword.invit=bold list
 task "rc.color.project.party=on rgb001" rc.color.keyword.invit=bold list
 echo $ man task-color
 #man task-color
 # 13 Active tasks
 echo Active tasks --------------------------------------------------------------
 echo $ task 2 start
 task 2 start
 echo $ task list
 task list
 echo $ task active
 task active
 echo $ task 2 stop
 task 2 stop
 echo $ task config journal.time on
 task config journal.time on
 echo $ task config rc.dateformat.xxx xxx
 task config rc.dateformat.xxx xxx
 echo $ task config dateformat.annotation 'Y/m/d H:N'
 task config dateformat.annotation 'Y/m/d H:N'
 echo $ task 2 start
 task 2 start
 echo $ task list venue
 task list venue
 echo $ task 2 stop
 task 2 stop
 echo $ task list venue
 task list venue
 # 14 Due dates
 echo Due dates --------------------------------------------------------------
 echo $ task 1 due:7/31/2010
 task 1 due:7/31/2010
 echo $ task 1 due:2wks
 task 1 due:2wks
 echo $ task 1 due:-2wks
 task 1 due:-2wks
 echo $ task 1 due:eom
 task 1 due:eom
 echo $ task 2 due:8th
 task 2 due:8th
 echo $ task 2 due:sunday
 task 2 due:sunday
 echo $ task 5 due:eow
 task 5 due:eow
 echo $ task list
 task list
 echo $ task overdue
 task overdue
 echo $ task rc.dateformat.report:Y-M-DTH:N:SZ list
 task rc.dateformat.report:Y-M-DTH:N:SZ list
 # 15 Calendar
 echo Calendar --------------------------------------------------------------
 echo $ task calendar
 task calendar
 echo $ vi ~/.taskrc # include /usr/local/share/doc/task/rc/holidays-US.rc
 #vi ~/.taskrc # include /usr/local/share/doc/task/rc/holidays-US.rc
 echo 'include /usr/local/share/doc/task/rc/holidays-US.rc' >> x
 echo $ task calendar
 task calendar
 echo $ task cal 2010
 task cal 2010
 echo $ task rc.calendar.details:full cal
 task rc.calendar.details:full cal
 echo $ task rc.calendar.holidays:full cal
 task rc.calendar.holidays:full cal
 # 16 Recurrence
 echo Recurrence --------------------------------------------------------------
 echo $ task 7 info
 task 7 info
 echo $ task 7 due:eom recur:monthly
 task 7 due:eom recur:monthly
 echo $ task 7
 task 7
 echo $ task 7 until:eoy
 task 7 until:eoy
 echo $ task recurring
 task recurring
 echo $ task add Pay taxes due:4/15/2007 recur:yearly
 task add Pay taxes due:4/15/2007 recur:yearly
 echo $ task long
 task long
 echo $ task 11 delete
 printf "y\ny\n" | task 11 delete      # y, y
 echo $ task list
 task list
 # 17 Special tags
 echo Special tags --------------------------------------------------------------
 echo $ task 6 +nocolor
 task 6 +nocolor
 echo $ task list
 task list
 echo $ task tags
 task tags
 echo $ task 6 -nocolor
 task 6 -nocolor
 # 18 Waiting
 echo Waiting --------------------------------------------------------------
 echo $ task add Look for new apartment due:eoy
 task add Look for new apartment due:eoy
 echo $ task list
 task list
 echo $ task 10 wait:12/1/2010
 task 10 wait:12/1/2010
 echo $ task list
 task list
 echo $ task waiting
 task waiting
 echo $ task add Do something in a few seconds
 task add Do something in a few seconds
 echo $ task 11 wait:5s
 task 11 wait:5s
 echo $ task list
 task list
 sleep 5
 echo $ task list
 task list
 echo $ task 11 rc.confirmation:no delete
 task 11 rc.confirmation:no delete
 # 19 Dependencies
 echo Dependencies --------------------------------------------------------------
 echo $ task list pro:party
 task list pro:party
 echo $ task 3 depends:6
 task 3 depends:6
 echo $ task 6 dep:5
 task 6 dep:5
 echo $ task 2 dep:1
 task 2 dep:1
 echo $ task 5 dep:1,2
 task 5 dep:1,2
 echo $ task 4 dep:1
 task 4 dep:1
 echo $ task long pro:party
 task long pro:party
 echo $ task 5 dep:-1
 task 5 dep:-1
 echo $ task blocked
 task blocked
 echo $ task unblocked
 task  unblocked
 echo $ task 1 info
 task  1 info
 echo $ task 2 info
 task  2 info
 echo $ task 2 done
 echo 'y' | task  2 done
 echo $ task 1 info
 task  1 info
 # 20 Reports
 echo Reports --------------------------------------------------------------
 echo $ task minimal
 task  minimal
 echo $ task ls
 task  ls
 echo $ task list
 task  list
 echo $ task long
 task  long
 echo $ task all
 task  all
 echo $ task completed
 task  completed
 echo $ task recurring
 task  recurring
 echo $ task waiting
 task  waiting
 echo $ task blocked
 task  blocked
 echo $ task oldest
 task  oldest
 echo $ task newest
 task  newest
 echo $ task timesheet
 task  timesheet
 echo $ task next
 task  next
 # 21 Custom report
 echo Custom report --------------------------------------------------------------
 echo 'report.foo.description=My own report'     >> x
 echo 'report.foo.columns=id,entry,description'  >> x
 echo 'report.foo.labels=ID,Entered,Description' >> x
 echo 'report.foo.sort=entry+,description+'      >> x
 echo 'report.foo.filter=status:pending'         >> x
 echo 'task help | grep foo'
 task  help | grep foo
 echo $ task show report.foo
 task  show report.foo
 echo $ task foo
 task  foo
 # 22 Charts
 echo Charts --------------------------------------------------------------
 echo $ task history
 task history
 echo $ task history.annual
 task history.annual
 echo $ task ghistory
 task ghistory
 echo $ task ghistory.annual
 task ghistory.annual
 echo $ task summary
 task summary
 # 23 Advanced filters
 echo Advanced filters --------------------------------------------------------------
 echo $ task list
 task  list
 echo $ task list invit
 task  list invit
 echo $ task list description.contains:invit
 task  list description.contains:invit
 echo $ task list desc.word:the
 task  list desc.word:the
 echo $ task list desc.noword:invitations
 task  list desc.noword:invitations
 echo $ task list pro:party
 task  list pro:party
 echo $ task list pro.is:party
 task  list pro.is:party
 echo $ task list pro.not:party
 task  list pro.not:party
 echo $ task list pro:party priority.over:L
 task  list pro:party priority.over:L
 echo $ task list pro:party limit:2
 task  list pro:party limit:2
 echo $ task list limit:page
 task  list limit:page
 echo $ task all status:pending
 task  all status:pending
 echo $ task all status:waiting
 task  all status:waiting
 # 24 Import/export
 echo Import/export --------------------------------------------------------------
 echo $ task export.csv
 task  export.csv
 echo $ task export.csv venue
 task  export.csv venue
 echo $ task export.vcalendar venue
 task  export.vcalendar venue
 echo $ task export.yaml venue
 task  export.yaml venue
 cat <<EOF >file.text
 Remember to read the task man page
 EOF
 cat file.text
 echo $ task import file.text
 printf "y\n" | task  import file.text
 cat <<EOF >file.yaml
 %YAML 1.1
 ---
  task:
    description: Visit http://taskwarrior.org
    due: 1281844800
    entry: 1281289630
    priority: H
    project: work
    status: pending
    uuid: 23afada0-a446-8d5a-c213-30d99d52c4b0
 ...
 EOF
 cat file.yaml
 echo $ task import file.yaml
 printf "y\n" | task  import file.yaml
 echo $ task new limit:2
 task  new limit:2
 # 25 Help
 echo Help --------------------------------------------------------------
 echo $ task help
 task  help
 echo $ man task
 #man task
 echo $ man taskrc
 #man taskrc
 echo $ man task-color
 #man task-color
 echo $ man task-tutorial
 #man task-tutorial
 echo $ man task-faq
 #man task-faq
 echo $ man task-sync
 #man task-sync
 # 26 Wrap up
 echo Wrap up --------------------------------------------------------------
 echo $ task version
 task  version
 exit
--- a/doc/misc/tutorial/info/script.200.txt
+++ b/doc/misc/tutorial/info/script.200.txt
@@ -0,0 +1,24 @@
 [Make window 116x32 for movie recording, light text, dark background]
 This is the script from which a 2.0-specific movie will be made.  On the left
 are the typed commands, and on the right is the voice track.
 It is intended that the left and right be combined and the result will be a new
 task-tutorial.5 man page.
 ---------------------------------------- Info ------------------------------------------------------
 task 1 info                              During that undo operation, taskwarrior displayed metadata
 task 1                                   that is associated with the task.  You can display this
                                         with the info command, and its shortcut.
 task stats                               There are also statistics that taskwarrior gathers, which
                                         I can display.
 ---------------------------------------- End -------------------------------------------------------
 Show multiple info reports
 Show info using UUID
--- a/doc/misc/tutorial/modifications/run.200
+++ b/doc/misc/tutorial/modifications/run.200
@@ -0,0 +1,520 @@
 #! /bin/bash
 rm -f /Users/paul/.task/pending.data /Users/paul/.task/completed.data /Users/paul/.task/undo.data
 echo 'data.location=~/.task' > /Users/paul/.taskrc
 echo 'color=off' >> /Users/paul/.taskrc
 echo 'color.summary.background=on gray3' >> /Users/paul/.taskrc
 echo '#include /usr/local/share/doc/task/rc/dark-blue-256.theme' >> /Users/paul/.taskrc
 echo '#include /usr/local/share/doc/task/rc/dark-red-256.theme' >> /Users/paul/.taskrc
 echo '#include /usr/local/share/doc/task/rc/dark-256.theme' >> /Users/paul/.taskrc
 # 1 Intro
 # 2 Basic usage
 echo Basic usage --------------------------------------------------------------
 echo $ task add Select a free weekend in November
 task add Select a free weekend in November
 echo $ task add Select and book a venue
 task add Select and book a venue
 echo $ task add Come up with a guest list
 task add Come up with a guest list
 echo $ task add Mail invitations
 task add Mail invitations
 echo $ task add Select a caterer
 task add Select a caterer
 echo $ task list
 task list
 echo $ task log Order a special cake
 task log Order a special cake
 echo $ task 4 duplicate /Mail/Design/
 task 4 duplicate /Mail/Design/
 echo $ task 4 duplicate /Mail/Print/
 task 4 duplicate /Mail/Print/
 echo $ task list
 task list
 echo $ task 3 done
 task 3 done
 echo $ task list
 task list
 # 3 Projects
 echo Projects --------------------------------------------------------------
 echo $ task add Pay teh rent on teh 31st
 task add Pay teh rent on teh 31st
 echo $ task 7 /teh/the/g
 task 7 /teh/the/g
 echo $ task list
 task list
 echo $ task 7 project:home
 task 7 project:home
 echo $ task 1-6 project:party
 echo 'All' | task 1-6 project:party
 echo $ task projects
 task projects
 echo $ task list project:home
 task list project:home
 echo $ task li pro:par
 task li pro:par
 # 4 Priorities
 echo Priorities --------------------------------------------------------------
 echo $ task 1-3,5 priority:H
 echo 'All' | task 1-3,5 priority:H
 echo $ task list
 task list
 echo $ task 3 pri:
 task 3 pri:
 # 5 Tags
 echo Tags --------------------------------------------------------------
 echo $ task list
 task list
 echo $ task 3,5,6 +mall
 echo 'All' | task 3,5,6 +mall
 echo $ task long
 task long
 echo $ task list +mall
 task list +mall
 echo $ task 3 -mall
 task 3 -mall
 # 6 Modifications
 echo Modifications --------------------------------------------------------------
 echo $ task 7 Pay rent at the end of the month
 echo 'Yes' | task 7 Pay rent at the end of the month
 echo $ task add music
 task add music
 echo $ task 8 prepend Select some
 task 8 prepend Select some
 echo $ task 8 append for after dinner
 task 8 append for after dinner
 echo $ task list
 task list
 echo $ task edit
 #task edit
 echo $ task add Hire a band?
 #task add Hire a band?
 echo $ task add Hire a band\?
 #task add Hire a band\?
 echo $ task add "Hire a band?"
 #task add "Hire a band?"
 echo $ task add -- Hire a band\? +dj
 task add -- Hire a band\? +dj
 echo $ task undo
 echo 'y' | task undo
 echo $ task 1 delete
 echo 'y' | task 1 delete
 echo $ task undo
 echo 'y' | task undo
 # 7 Info
 echo Info --------------------------------------------------------------
 echo $ task 1 info
 task 1 info
 echo $ task stats
 task stats
 # 8 Annotations
 echo Annotations --------------------------------------------------------------
 echo $ task 1 annotate the 13 looks good
 task 1 annotate the 13 looks good
 sleep 1
 echo $ task 1 annotate or the 14th
 task 1 annotate or the 14th
 echo $ task list
 task list
 echo $ task list rc.annotations:full
 task list rc.annotations:full
 echo $ task list rc.annotations:sparse
 task list rc.annotations:sparse
 echo $ task list rc.annotations:none
 task list rc.annotations:none
 echo $ task 1 denotate 14th
 task 1 denotate 14th
 echo $ task list
 task list
 # 9 Configuration
 echo Configuration --------------------------------------------------------------
 echo $ task show
 task show
 echo $ task config answer forty-two
 echo 'y' | task config answer forty-two
 echo $ task show answer
 task show answer
 echo $ task config answer
 echo 'y' | task config answer
 echo $ task rc.report.list.sort=description+ list
 task rc.report.list.sort=description+ list
 # 10 Defaults
 echo Defaults --------------------------------------------------------------
 echo $ task config default.command list
 echo 'y' | task config default.command list
 echo $ task 
 task 
 echo $ task config default.priority H
 echo 'y' | task config default.priority H
 echo $ task config default.project Work
 echo 'y' | task config default.project Work
 echo $ task add New task
 task add New task
 echo $ task list
 task list
 echo $ task undo
 echo 'y' | task undo
 echo $ task config default.priority
 echo 'y' | task config default.priority
 echo $ task config default.project
 echo 'y' | task config default.project
 # 11 Aliases
 echo Aliases --------------------------------------------------------------
 echo $ task config alias.zzz list
 echo 'y' | task config alias.zzz list
 echo $ task zzz
 task zzz
 echo $ task z
 task z
 # 12 Color
 echo Color --------------------------------------------------------------
 echo $ task config color on
 echo 'y' | task config color on
 echo $ task list
 task list
 echo $ task 1 bg:on_red
 task 1 bg:on_red
 echo $ task list
 task list
 echo $ task 1 bg:
 task 1 bg:
 echo $ task color
 task color
 echo $ task color white on red
 task color white on red
 echo $ task color legend
 task color legend
 echo vi ~/.taskrc # include /usr/local/share/doc/task/rc/dark-blue-256.theme
 #vi ~/.taskrc # include /usr/local/share/doc/task/rc/dark-blue-256.theme
 echo 'include /usr/local/share/doc/task/rc/dark-blue-256.theme' >> x
 echo $ task color legend
 task color legend
 echo $ task list
 task list
 echo vi ~/.taskrc # include /usr/local/share/doc/task/rc/dark-red-256.theme
 #vi ~/.taskrc # include /usr/local/share/doc/task/rc/dark-red-256.theme
 sed 's/blue/red/' x >x2 && mv x2 x
 echo $ task color legend
 task color legend
 echo $ task list
 task list
 echo vi ~/.taskrc # include /usr/local/share/doc/task/rc/dark-256.theme
 #vi ~/.taskrc # include /usr/local/share/doc/task/rc/dark-256.theme
 sed 's/red-//' x >x2 && mv x2 x
 echo $ task list
 task list
 echo $ task "rc.color.project.party=on rgb001" rc.color.keyword.invit=bold list
 task "rc.color.project.party=on rgb001" rc.color.keyword.invit=bold list
 echo $ man task-color
 #man task-color
 # 13 Active tasks
 echo Active tasks --------------------------------------------------------------
 echo $ task 2 start
 task 2 start
 echo $ task list
 task list
 echo $ task active
 task active
 echo $ task 2 stop
 task 2 stop
 echo $ task config journal.time on
 task config journal.time on
 echo $ task config rc.dateformat.xxx xxx
 task config rc.dateformat.xxx xxx
 echo $ task config dateformat.annotation 'Y/m/d H:N'
 task config dateformat.annotation 'Y/m/d H:N'
 echo $ task 2 start
 task 2 start
 echo $ task list venue
 task list venue
 echo $ task 2 stop
 task 2 stop
 echo $ task list venue
 task list venue
 # 14 Due dates
 echo Due dates --------------------------------------------------------------
 echo $ task 1 due:7/31/2010
 task 1 due:7/31/2010
 echo $ task 1 due:2wks
 task 1 due:2wks
 echo $ task 1 due:-2wks
 task 1 due:-2wks
 echo $ task 1 due:eom
 task 1 due:eom
 echo $ task 2 due:8th
 task 2 due:8th
 echo $ task 2 due:sunday
 task 2 due:sunday
 echo $ task 5 due:eow
 task 5 due:eow
 echo $ task list
 task list
 echo $ task overdue
 task overdue
 echo $ task rc.dateformat.report:Y-M-DTH:N:SZ list
 task rc.dateformat.report:Y-M-DTH:N:SZ list
 # 15 Calendar
 echo Calendar --------------------------------------------------------------
 echo $ task calendar
 task calendar
 echo $ vi ~/.taskrc # include /usr/local/share/doc/task/rc/holidays-US.rc
 #vi ~/.taskrc # include /usr/local/share/doc/task/rc/holidays-US.rc
 echo 'include /usr/local/share/doc/task/rc/holidays-US.rc' >> x
 echo $ task calendar
 task calendar
 echo $ task cal 2010
 task cal 2010
 echo $ task rc.calendar.details:full cal
 task rc.calendar.details:full cal
 echo $ task rc.calendar.holidays:full cal
 task rc.calendar.holidays:full cal
 # 16 Recurrence
 echo Recurrence --------------------------------------------------------------
 echo $ task 7 info
 task 7 info
 echo $ task 7 due:eom recur:monthly
 task 7 due:eom recur:monthly
 echo $ task 7
 task 7
 echo $ task 7 until:eoy
 task 7 until:eoy
 echo $ task recurring
 task recurring
 echo $ task add Pay taxes due:4/15/2007 recur:yearly
 task add Pay taxes due:4/15/2007 recur:yearly
 echo $ task long
 task long
 echo $ task 11 delete
 printf "y\ny\n" | task 11 delete      # y, y
 echo $ task list
 task list
 # 17 Special tags
 echo Special tags --------------------------------------------------------------
 echo $ task 6 +nocolor
 task 6 +nocolor
 echo $ task list
 task list
 echo $ task tags
 task tags
 echo $ task 6 -nocolor
 task 6 -nocolor
 # 18 Waiting
 echo Waiting --------------------------------------------------------------
 echo $ task add Look for new apartment due:eoy
 task add Look for new apartment due:eoy
 echo $ task list
 task list
 echo $ task 10 wait:12/1/2010
 task 10 wait:12/1/2010
 echo $ task list
 task list
 echo $ task waiting
 task waiting
 echo $ task add Do something in a few seconds
 task add Do something in a few seconds
 echo $ task 11 wait:5s
 task 11 wait:5s
 echo $ task list
 task list
 sleep 5
 echo $ task list
 task list
 echo $ task 11 rc.confirmation:no delete
 task 11 rc.confirmation:no delete
 # 19 Dependencies
 echo Dependencies --------------------------------------------------------------
 echo $ task list pro:party
 task list pro:party
 echo $ task 3 depends:6
 task 3 depends:6
 echo $ task 6 dep:5
 task 6 dep:5
 echo $ task 2 dep:1
 task 2 dep:1
 echo $ task 5 dep:1,2
 task 5 dep:1,2
 echo $ task 4 dep:1
 task 4 dep:1
 echo $ task long pro:party
 task long pro:party
 echo $ task 5 dep:-1
 task 5 dep:-1
 echo $ task blocked
 task blocked
 echo $ task unblocked
 task  unblocked
 echo $ task 1 info
 task  1 info
 echo $ task 2 info
 task  2 info
 echo $ task 2 done
 echo 'y' | task  2 done
 echo $ task 1 info
 task  1 info
 # 20 Reports
 echo Reports --------------------------------------------------------------
 echo $ task minimal
 task  minimal
 echo $ task ls
 task  ls
 echo $ task list
 task  list
 echo $ task long
 task  long
 echo $ task all
 task  all
 echo $ task completed
 task  completed
 echo $ task recurring
 task  recurring
 echo $ task waiting
 task  waiting
 echo $ task blocked
 task  blocked
 echo $ task oldest
 task  oldest
 echo $ task newest
 task  newest
 echo $ task timesheet
 task  timesheet
 echo $ task next
 task  next
 # 21 Custom report
 echo Custom report --------------------------------------------------------------
 echo 'report.foo.description=My own report'     >> x
 echo 'report.foo.columns=id,entry,description'  >> x
 echo 'report.foo.labels=ID,Entered,Description' >> x
 echo 'report.foo.sort=entry+,description+'      >> x
 echo 'report.foo.filter=status:pending'         >> x
 echo 'task help | grep foo'
 task  help | grep foo
 echo $ task show report.foo
 task  show report.foo
 echo $ task foo
 task  foo
 # 22 Charts
 echo Charts --------------------------------------------------------------
 echo $ task history
 task history
 echo $ task history.annual
 task history.annual
 echo $ task ghistory
 task ghistory
 echo $ task ghistory.annual
 task ghistory.annual
 echo $ task summary
 task summary
 # 23 Advanced filters
 echo Advanced filters --------------------------------------------------------------
 echo $ task list
 task  list
 echo $ task list invit
 task  list invit
 echo $ task list description.contains:invit
 task  list description.contains:invit
 echo $ task list desc.word:the
 task  list desc.word:the
 echo $ task list desc.noword:invitations
 task  list desc.noword:invitations
 echo $ task list pro:party
 task  list pro:party
 echo $ task list pro.is:party
 task  list pro.is:party
 echo $ task list pro.not:party
 task  list pro.not:party
 echo $ task list pro:party priority.over:L
 task  list pro:party priority.over:L
 echo $ task list pro:party limit:2
 task  list pro:party limit:2
 echo $ task list limit:page
 task  list limit:page
 echo $ task all status:pending
 task  all status:pending
 echo $ task all status:waiting
 task  all status:waiting
 # 24 Import/export
 echo Import/export --------------------------------------------------------------
 echo $ task export.csv
 task  export.csv
 echo $ task export.csv venue
 task  export.csv venue
 echo $ task export.vcalendar venue
 task  export.vcalendar venue
 echo $ task export.yaml venue
 task  export.yaml venue
 cat <<EOF >file.text
 Remember to read the task man page
 EOF
 cat file.text
 echo $ task import file.text
 printf "y\n" | task  import file.text
 cat <<EOF >file.yaml
 %YAML 1.1
 ---
  task:
    description: Visit http://taskwarrior.org
    due: 1281844800
    entry: 1281289630
    priority: H
    project: work
    status: pending
    uuid: 23afada0-a446-8d5a-c213-30d99d52c4b0
 ...
 EOF
 cat file.yaml
 echo $ task import file.yaml
 printf "y\n" | task  import file.yaml
 echo $ task new limit:2
 task  new limit:2
 # 25 Help
 echo Help --------------------------------------------------------------
 echo $ task help
 task  help
 echo $ man task
 #man task
 echo $ man taskrc
 #man taskrc
 echo $ man task-color
 #man task-color
 echo $ man task-tutorial
 #man task-tutorial
 echo $ man task-faq
 #man task-faq
 echo $ man task-sync
 #man task-sync
 # 26 Wrap up
 echo Wrap up --------------------------------------------------------------
 echo $ task version
 task  version
 exit
--- a/doc/misc/tutorial/modifications/script.200.txt
+++ b/doc/misc/tutorial/modifications/script.200.txt
@@ -0,0 +1,48 @@
 [Make window 116x32 for movie recording, light text, dark background]
 This is the script from which a 2.0-specific movie will be made.  On the left
 are the typed commands, and on the right is the voice track.
 It is intended that the left and right be combined and the result will be a new
 task-tutorial.5 man page.
 ---------------------------------------- Modifications ---------------------------------------------
 task 7 Pay rent at the end of the month  Task 7 is not worded correctly, so I can modify that by
                                         specifying a task ID and a new description.  This is also
                                         considered a bulk change, and so requires confirmation.
 task add music                           We'll need music.
 task 8 prepend Select some               I can prepend to that.
 task 8 append for after dinner           I can append to that.
 task list
 task edit                                I can also go straight into an editor and modify anything.
 task add Hire a band?    <---            Sometimes the command will confuse the shell.  In this case,
                                         what would happen if there was a file named 'bands' in the
                                         current directory?  The shell would expand that wildcard,
                                         so to avoid that, you can...
 task add Hire a band\?   <---            escape the wildcard...
 task add "Hire a band?"  <---            or quote the whole description...
 task add -- Hire a band\? +dj            You can also use the minus minus operator which tells
                                         taskwarrior to stop being clever and interpret the rest
                                         of the arguments as a task description.  Otherwise, that
                                         +dj would be interpreted as a tag.
 task undo                                We don't need a band, so the easiest way to get rid of that
                                         task is to undo the last change.  Taskwarrior has a
                                         complete undo stack, so you can undo all the way back to
                                         the beginning.
 task 1 delete                            The undo operation gets rid of the task completely, but I
 task undo                                could also have just deleted the task, then the deletion
                                         itself would be tracked, and also undoable.
 ---------------------------------------- End -------------------------------------------------------
 Show more shell escapes.
 show 'modify' command.
--- a/doc/misc/tutorial/priorities/run.200
+++ b/doc/misc/tutorial/priorities/run.200
@@ -0,0 +1,520 @@
 #! /bin/bash
 rm -f /Users/paul/.task/pending.data /Users/paul/.task/completed.data /Users/paul/.task/undo.data
 echo 'data.location=~/.task' > /Users/paul/.taskrc
 echo 'color=off' >> /Users/paul/.taskrc
 echo 'color.summary.background=on gray3' >> /Users/paul/.taskrc
 echo '#include /usr/local/share/doc/task/rc/dark-blue-256.theme' >> /Users/paul/.taskrc
 echo '#include /usr/local/share/doc/task/rc/dark-red-256.theme' >> /Users/paul/.taskrc
 echo '#include /usr/local/share/doc/task/rc/dark-256.theme' >> /Users/paul/.taskrc
 # 1 Intro
 # 2 Basic usage
 echo Basic usage --------------------------------------------------------------
 echo $ task add Select a free weekend in November
 task add Select a free weekend in November
 echo $ task add Select and book a venue
 task add Select and book a venue
 echo $ task add Come up with a guest list
 task add Come up with a guest list
 echo $ task add Mail invitations
 task add Mail invitations
 echo $ task add Select a caterer
 task add Select a caterer
 echo $ task list
 task list
 echo $ task log Order a special cake
 task log Order a special cake
 echo $ task 4 duplicate /Mail/Design/
 task 4 duplicate /Mail/Design/
 echo $ task 4 duplicate /Mail/Print/
 task 4 duplicate /Mail/Print/
 echo $ task list
 task list
 echo $ task 3 done
 task 3 done
 echo $ task list
 task list
 # 3 Projects
 echo Projects --------------------------------------------------------------
 echo $ task add Pay teh rent on teh 31st
 task add Pay teh rent on teh 31st
 echo $ task 7 /teh/the/g
 task 7 /teh/the/g
 echo $ task list
 task list
 echo $ task 7 project:home
 task 7 project:home
 echo $ task 1-6 project:party
 echo 'All' | task 1-6 project:party
 echo $ task projects
 task projects
 echo $ task list project:home
 task list project:home
 echo $ task li pro:par
 task li pro:par
 # 4 Priorities
 echo Priorities --------------------------------------------------------------
 echo $ task 1-3,5 priority:H
 echo 'All' | task 1-3,5 priority:H
 echo $ task list
 task list
 echo $ task 3 pri:
 task 3 pri:
 # 5 Tags
 echo Tags --------------------------------------------------------------
 echo $ task list
 task list
 echo $ task 3,5,6 +mall
 echo 'All' | task 3,5,6 +mall
 echo $ task long
 task long
 echo $ task list +mall
 task list +mall
 echo $ task 3 -mall
 task 3 -mall
 # 6 Modifications
 echo Modifications --------------------------------------------------------------
 echo $ task 7 Pay rent at the end of the month
 echo 'Yes' | task 7 Pay rent at the end of the month
 echo $ task add music
 task add music
 echo $ task 8 prepend Select some
 task 8 prepend Select some
 echo $ task 8 append for after dinner
 task 8 append for after dinner
 echo $ task list
 task list
 echo $ task edit
 #task edit
 echo $ task add Hire a band?
 #task add Hire a band?
 echo $ task add Hire a band\?
 #task add Hire a band\?
 echo $ task add "Hire a band?"
 #task add "Hire a band?"
 echo $ task add -- Hire a band\? +dj
 task add -- Hire a band\? +dj
 echo $ task undo
 echo 'y' | task undo
 echo $ task 1 delete
 echo 'y' | task 1 delete
 echo $ task undo
 echo 'y' | task undo
 # 7 Info
 echo Info --------------------------------------------------------------
 echo $ task 1 info
 task 1 info
 echo $ task stats
 task stats
 # 8 Annotations
 echo Annotations --------------------------------------------------------------
 echo $ task 1 annotate the 13 looks good
 task 1 annotate the 13 looks good
 sleep 1
 echo $ task 1 annotate or the 14th
 task 1 annotate or the 14th
 echo $ task list
 task list
 echo $ task list rc.annotations:full
 task list rc.annotations:full
 echo $ task list rc.annotations:sparse
 task list rc.annotations:sparse
 echo $ task list rc.annotations:none
 task list rc.annotations:none
 echo $ task 1 denotate 14th
 task 1 denotate 14th
 echo $ task list
 task list
 # 9 Configuration
 echo Configuration --------------------------------------------------------------
 echo $ task show
 task show
 echo $ task config answer forty-two
 echo 'y' | task config answer forty-two
 echo $ task show answer
 task show answer
 echo $ task config answer
 echo 'y' | task config answer
 echo $ task rc.report.list.sort=description+ list
 task rc.report.list.sort=description+ list
 # 10 Defaults
 echo Defaults --------------------------------------------------------------
 echo $ task config default.command list
 echo 'y' | task config default.command list
 echo $ task 
 task 
 echo $ task config default.priority H
 echo 'y' | task config default.priority H
 echo $ task config default.project Work
 echo 'y' | task config default.project Work
 echo $ task add New task
 task add New task
 echo $ task list
 task list
 echo $ task undo
 echo 'y' | task undo
 echo $ task config default.priority
 echo 'y' | task config default.priority
 echo $ task config default.project
 echo 'y' | task config default.project
 # 11 Aliases
 echo Aliases --------------------------------------------------------------
 echo $ task config alias.zzz list
 echo 'y' | task config alias.zzz list
 echo $ task zzz
 task zzz
 echo $ task z
 task z
 # 12 Color
 echo Color --------------------------------------------------------------
 echo $ task config color on
 echo 'y' | task config color on
 echo $ task list
 task list
 echo $ task 1 bg:on_red
 task 1 bg:on_red
 echo $ task list
 task list
 echo $ task 1 bg:
 task 1 bg:
 echo $ task color
 task color
 echo $ task color white on red
 task color white on red
 echo $ task color legend
 task color legend
 echo vi ~/.taskrc # include /usr/local/share/doc/task/rc/dark-blue-256.theme
 #vi ~/.taskrc # include /usr/local/share/doc/task/rc/dark-blue-256.theme
 echo 'include /usr/local/share/doc/task/rc/dark-blue-256.theme' >> x
 echo $ task color legend
 task color legend
 echo $ task list
 task list
 echo vi ~/.taskrc # include /usr/local/share/doc/task/rc/dark-red-256.theme
 #vi ~/.taskrc # include /usr/local/share/doc/task/rc/dark-red-256.theme
 sed 's/blue/red/' x >x2 && mv x2 x
 echo $ task color legend
 task color legend
 echo $ task list
 task list
 echo vi ~/.taskrc # include /usr/local/share/doc/task/rc/dark-256.theme
 #vi ~/.taskrc # include /usr/local/share/doc/task/rc/dark-256.theme
 sed 's/red-//' x >x2 && mv x2 x
 echo $ task list
 task list
 echo $ task "rc.color.project.party=on rgb001" rc.color.keyword.invit=bold list
 task "rc.color.project.party=on rgb001" rc.color.keyword.invit=bold list
 echo $ man task-color
 #man task-color
 # 13 Active tasks
 echo Active tasks --------------------------------------------------------------
 echo $ task 2 start
 task 2 start
 echo $ task list
 task list
 echo $ task active
 task active
 echo $ task 2 stop
 task 2 stop
 echo $ task config journal.time on
 task config journal.time on
 echo $ task config rc.dateformat.xxx xxx
 task config rc.dateformat.xxx xxx
 echo $ task config dateformat.annotation 'Y/m/d H:N'
 task config dateformat.annotation 'Y/m/d H:N'
 echo $ task 2 start
 task 2 start
 echo $ task list venue
 task list venue
 echo $ task 2 stop
 task 2 stop
 echo $ task list venue
 task list venue
 # 14 Due dates
 echo Due dates --------------------------------------------------------------
 echo $ task 1 due:7/31/2010
 task 1 due:7/31/2010
 echo $ task 1 due:2wks
 task 1 due:2wks
 echo $ task 1 due:-2wks
 task 1 due:-2wks
 echo $ task 1 due:eom
 task 1 due:eom
 echo $ task 2 due:8th
 task 2 due:8th
 echo $ task 2 due:sunday
 task 2 due:sunday
 echo $ task 5 due:eow
 task 5 due:eow
 echo $ task list
 task list
 echo $ task overdue
 task overdue
 echo $ task rc.dateformat.report:Y-M-DTH:N:SZ list
 task rc.dateformat.report:Y-M-DTH:N:SZ list
 # 15 Calendar
 echo Calendar --------------------------------------------------------------
 echo $ task calendar
 task calendar
 echo $ vi ~/.taskrc # include /usr/local/share/doc/task/rc/holidays-US.rc
 #vi ~/.taskrc # include /usr/local/share/doc/task/rc/holidays-US.rc
 echo 'include /usr/local/share/doc/task/rc/holidays-US.rc' >> x
 echo $ task calendar
 task calendar
 echo $ task cal 2010
 task cal 2010
 echo $ task rc.calendar.details:full cal
 task rc.calendar.details:full cal
 echo $ task rc.calendar.holidays:full cal
 task rc.calendar.holidays:full cal
 # 16 Recurrence
 echo Recurrence --------------------------------------------------------------
 echo $ task 7 info
 task 7 info
 echo $ task 7 due:eom recur:monthly
 task 7 due:eom recur:monthly
 echo $ task 7
 task 7
 echo $ task 7 until:eoy
 task 7 until:eoy
 echo $ task recurring
 task recurring
 echo $ task add Pay taxes due:4/15/2007 recur:yearly
 task add Pay taxes due:4/15/2007 recur:yearly
 echo $ task long
 task long
 echo $ task 11 delete
 printf "y\ny\n" | task 11 delete      # y, y
 echo $ task list
 task list
 # 17 Special tags
 echo Special tags --------------------------------------------------------------
 echo $ task 6 +nocolor
 task 6 +nocolor
 echo $ task list
 task list
 echo $ task tags
 task tags
 echo $ task 6 -nocolor
 task 6 -nocolor
 # 18 Waiting
 echo Waiting --------------------------------------------------------------
 echo $ task add Look for new apartment due:eoy
 task add Look for new apartment due:eoy
 echo $ task list
 task list
 echo $ task 10 wait:12/1/2010
 task 10 wait:12/1/2010
 echo $ task list
 task list
 echo $ task waiting
 task waiting
 echo $ task add Do something in a few seconds
 task add Do something in a few seconds
 echo $ task 11 wait:5s
 task 11 wait:5s
 echo $ task list
 task list
 sleep 5
 echo $ task list
 task list
 echo $ task 11 rc.confirmation:no delete
 task 11 rc.confirmation:no delete
 # 19 Dependencies
 echo Dependencies --------------------------------------------------------------
 echo $ task list pro:party
 task list pro:party
 echo $ task 3 depends:6
 task 3 depends:6
 echo $ task 6 dep:5
 task 6 dep:5
 echo $ task 2 dep:1
 task 2 dep:1
 echo $ task 5 dep:1,2
 task 5 dep:1,2
 echo $ task 4 dep:1
 task 4 dep:1
 echo $ task long pro:party
 task long pro:party
 echo $ task 5 dep:-1
 task 5 dep:-1
 echo $ task blocked
 task blocked
 echo $ task unblocked
 task  unblocked
 echo $ task 1 info
 task  1 info
 echo $ task 2 info
 task  2 info
 echo $ task 2 done
 echo 'y' | task  2 done
 echo $ task 1 info
 task  1 info
 # 20 Reports
 echo Reports --------------------------------------------------------------
 echo $ task minimal
 task  minimal
 echo $ task ls
 task  ls
 echo $ task list
 task  list
 echo $ task long
 task  long
 echo $ task all
 task  all
 echo $ task completed
 task  completed
 echo $ task recurring
 task  recurring
 echo $ task waiting
 task  waiting
 echo $ task blocked
 task  blocked
 echo $ task oldest
 task  oldest
 echo $ task newest
 task  newest
 echo $ task timesheet
 task  timesheet
 echo $ task next
 task  next
 # 21 Custom report
 echo Custom report --------------------------------------------------------------
 echo 'report.foo.description=My own report'     >> x
 echo 'report.foo.columns=id,entry,description'  >> x
 echo 'report.foo.labels=ID,Entered,Description' >> x
 echo 'report.foo.sort=entry+,description+'      >> x
 echo 'report.foo.filter=status:pending'         >> x
 echo 'task help | grep foo'
 task  help | grep foo
 echo $ task show report.foo
 task  show report.foo
 echo $ task foo
 task  foo
 # 22 Charts
 echo Charts --------------------------------------------------------------
 echo $ task history
 task history
 echo $ task history.annual
 task history.annual
 echo $ task ghistory
 task ghistory
 echo $ task ghistory.annual
 task ghistory.annual
 echo $ task summary
 task summary
 # 23 Advanced filters
 echo Advanced filters --------------------------------------------------------------
 echo $ task list
 task  list
 echo $ task list invit
 task  list invit
 echo $ task list description.contains:invit
 task  list description.contains:invit
 echo $ task list desc.word:the
 task  list desc.word:the
 echo $ task list desc.noword:invitations
 task  list desc.noword:invitations
 echo $ task list pro:party
 task  list pro:party
 echo $ task list pro.is:party
 task  list pro.is:party
 echo $ task list pro.not:party
 task  list pro.not:party
 echo $ task list pro:party priority.over:L
 task  list pro:party priority.over:L
 echo $ task list pro:party limit:2
 task  list pro:party limit:2
 echo $ task list limit:page
 task  list limit:page
 echo $ task all status:pending
 task  all status:pending
 echo $ task all status:waiting
 task  all status:waiting
 # 24 Import/export
 echo Import/export --------------------------------------------------------------
 echo $ task export.csv
 task  export.csv
 echo $ task export.csv venue
 task  export.csv venue
 echo $ task export.vcalendar venue
 task  export.vcalendar venue
 echo $ task export.yaml venue
 task  export.yaml venue
 cat <<EOF >file.text
 Remember to read the task man page
 EOF
 cat file.text
 echo $ task import file.text
 printf "y\n" | task  import file.text
 cat <<EOF >file.yaml
 %YAML 1.1
 ---
  task:
    description: Visit http://taskwarrior.org
    due: 1281844800
    entry: 1281289630
    priority: H
    project: work
    status: pending
    uuid: 23afada0-a446-8d5a-c213-30d99d52c4b0
 ...
 EOF
 cat file.yaml
 echo $ task import file.yaml
 printf "y\n" | task  import file.yaml
 echo $ task new limit:2
 task  new limit:2
 # 25 Help
 echo Help --------------------------------------------------------------
 echo $ task help
 task  help
 echo $ man task
 #man task
 echo $ man taskrc
 #man taskrc
 echo $ man task-color
 #man task-color
 echo $ man task-tutorial
 #man task-tutorial
 echo $ man task-faq
 #man task-faq
 echo $ man task-sync
 #man task-sync
 # 26 Wrap up
 echo Wrap up --------------------------------------------------------------
 echo $ task version
 task  version
 exit
--- a/doc/misc/tutorial/priorities/script.200.txt
+++ b/doc/misc/tutorial/priorities/script.200.txt
@@ -0,0 +1,21 @@
 [Make window 116x32 for movie recording, light text, dark background]
 This is the script from which a 2.0-specific movie will be made.  On the left
 are the typed commands, and on the right is the voice track.
 It is intended that the left and right be combined and the result will be a new
 task-tutorial.5 man page.
 ---------------------------------------- Priorities ------------------------------------------------
 task 1-3,5 priority:H                    Priorities are another way to organize tasks.  You can use
 task list                                priority values of high, medium and low, and taskwarrior
                                         knows these as H, M or L.
 task 3 pri:                              You can remove priorities by specifying a blank value.
 ---------------------------------------- End -------------------------------------------------------
--- a/doc/misc/tutorial/projects/run.200
+++ b/doc/misc/tutorial/projects/run.200
@@ -0,0 +1,520 @@
 #! /bin/bash
 rm -f /Users/paul/.task/pending.data /Users/paul/.task/completed.data /Users/paul/.task/undo.data
 echo 'data.location=~/.task' > /Users/paul/.taskrc
 echo 'color=off' >> /Users/paul/.taskrc
 echo 'color.summary.background=on gray3' >> /Users/paul/.taskrc
 echo '#include /usr/local/share/doc/task/rc/dark-blue-256.theme' >> /Users/paul/.taskrc
 echo '#include /usr/local/share/doc/task/rc/dark-red-256.theme' >> /Users/paul/.taskrc
 echo '#include /usr/local/share/doc/task/rc/dark-256.theme' >> /Users/paul/.taskrc
 # 1 Intro
 # 2 Basic usage
 echo Basic usage --------------------------------------------------------------
 echo $ task add Select a free weekend in November
 task add Select a free weekend in November
 echo $ task add Select and book a venue
 task add Select and book a venue
 echo $ task add Come up with a guest list
 task add Come up with a guest list
 echo $ task add Mail invitations
 task add Mail invitations
 echo $ task add Select a caterer
 task add Select a caterer
 echo $ task list
 task list
 echo $ task log Order a special cake
 task log Order a special cake
 echo $ task 4 duplicate /Mail/Design/
 task 4 duplicate /Mail/Design/
 echo $ task 4 duplicate /Mail/Print/
 task 4 duplicate /Mail/Print/
 echo $ task list
 task list
 echo $ task 3 done
 task 3 done
 echo $ task list
 task list
 # 3 Projects
 echo Projects --------------------------------------------------------------
 echo $ task add Pay teh rent on teh 31st
 task add Pay teh rent on teh 31st
 echo $ task 7 /teh/the/g
 task 7 /teh/the/g
 echo $ task list
 task list
 echo $ task 7 project:home
 task 7 project:home
 echo $ task 1-6 project:party
 echo 'All' | task 1-6 project:party
 echo $ task projects
 task projects
 echo $ task list project:home
 task list project:home
 echo $ task li pro:par
 task li pro:par
 # 4 Priorities
 echo Priorities --------------------------------------------------------------
 echo $ task 1-3,5 priority:H
 echo 'All' | task 1-3,5 priority:H
 echo $ task list
 task list
 echo $ task 3 pri:
 task 3 pri:
 # 5 Tags
 echo Tags --------------------------------------------------------------
 echo $ task list
 task list
 echo $ task 3,5,6 +mall
 echo 'All' | task 3,5,6 +mall
 echo $ task long
 task long
 echo $ task list +mall
 task list +mall
 echo $ task 3 -mall
 task 3 -mall
 # 6 Modifications
 echo Modifications --------------------------------------------------------------
 echo $ task 7 Pay rent at the end of the month
 echo 'Yes' | task 7 Pay rent at the end of the month
 echo $ task add music
 task add music
 echo $ task 8 prepend Select some
 task 8 prepend Select some
 echo $ task 8 append for after dinner
 task 8 append for after dinner
 echo $ task list
 task list
 echo $ task edit
 #task edit
 echo $ task add Hire a band?
 #task add Hire a band?
 echo $ task add Hire a band\?
 #task add Hire a band\?
 echo $ task add "Hire a band?"
 #task add "Hire a band?"
 echo $ task add -- Hire a band\? +dj
 task add -- Hire a band\? +dj
 echo $ task undo
 echo 'y' | task undo
 echo $ task 1 delete
 echo 'y' | task 1 delete
 echo $ task undo
 echo 'y' | task undo
 # 7 Info
 echo Info --------------------------------------------------------------
 echo $ task 1 info
 task 1 info
 echo $ task stats
 task stats
 # 8 Annotations
 echo Annotations --------------------------------------------------------------
 echo $ task 1 annotate the 13 looks good
 task 1 annotate the 13 looks good
 sleep 1
 echo $ task 1 annotate or the 14th
 task 1 annotate or the 14th
 echo $ task list
 task list
 echo $ task list rc.annotations:full
 task list rc.annotations:full
 echo $ task list rc.annotations:sparse
 task list rc.annotations:sparse
 echo $ task list rc.annotations:none
 task list rc.annotations:none
 echo $ task 1 denotate 14th
 task 1 denotate 14th
 echo $ task list
 task list
 # 9 Configuration
 echo Configuration --------------------------------------------------------------
 echo $ task show
 task show
 echo $ task config answer forty-two
 echo 'y' | task config answer forty-two
 echo $ task show answer
 task show answer
 echo $ task config answer
 echo 'y' | task config answer
 echo $ task rc.report.list.sort=description+ list
 task rc.report.list.sort=description+ list
 # 10 Defaults
 echo Defaults --------------------------------------------------------------
 echo $ task config default.command list
 echo 'y' | task config default.command list
 echo $ task 
 task 
 echo $ task config default.priority H
 echo 'y' | task config default.priority H
 echo $ task config default.project Work
 echo 'y' | task config default.project Work
 echo $ task add New task
 task add New task
 echo $ task list
 task list
 echo $ task undo
 echo 'y' | task undo
 echo $ task config default.priority
 echo 'y' | task config default.priority
 echo $ task config default.project
 echo 'y' | task config default.project
 # 11 Aliases
 echo Aliases --------------------------------------------------------------
 echo $ task config alias.zzz list
 echo 'y' | task config alias.zzz list
 echo $ task zzz
 task zzz
 echo $ task z
 task z
 # 12 Color
 echo Color --------------------------------------------------------------
 echo $ task config color on
 echo 'y' | task config color on
 echo $ task list
 task list
 echo $ task 1 bg:on_red
 task 1 bg:on_red
 echo $ task list
 task list
 echo $ task 1 bg:
 task 1 bg:
 echo $ task color
 task color
 echo $ task color white on red
 task color white on red
 echo $ task color legend
 task color legend
 echo vi ~/.taskrc # include /usr/local/share/doc/task/rc/dark-blue-256.theme
 #vi ~/.taskrc # include /usr/local/share/doc/task/rc/dark-blue-256.theme
 echo 'include /usr/local/share/doc/task/rc/dark-blue-256.theme' >> x
 echo $ task color legend
 task color legend
 echo $ task list
 task list
 echo vi ~/.taskrc # include /usr/local/share/doc/task/rc/dark-red-256.theme
 #vi ~/.taskrc # include /usr/local/share/doc/task/rc/dark-red-256.theme
 sed 's/blue/red/' x >x2 && mv x2 x
 echo $ task color legend
 task color legend
 echo $ task list
 task list
 echo vi ~/.taskrc # include /usr/local/share/doc/task/rc/dark-256.theme
 #vi ~/.taskrc # include /usr/local/share/doc/task/rc/dark-256.theme
 sed 's/red-//' x >x2 && mv x2 x
 echo $ task list
 task list
 echo $ task "rc.color.project.party=on rgb001" rc.color.keyword.invit=bold list
 task "rc.color.project.party=on rgb001" rc.color.keyword.invit=bold list
 echo $ man task-color
 #man task-color
 # 13 Active tasks
 echo Active tasks --------------------------------------------------------------
 echo $ task 2 start
 task 2 start
 echo $ task list
 task list
 echo $ task active
 task active
 echo $ task 2 stop
 task 2 stop
 echo $ task config journal.time on
 task config journal.time on
 echo $ task config rc.dateformat.xxx xxx
 task config rc.dateformat.xxx xxx
 echo $ task config dateformat.annotation 'Y/m/d H:N'
 task config dateformat.annotation 'Y/m/d H:N'
 echo $ task 2 start
 task 2 start
 echo $ task list venue
 task list venue
 echo $ task 2 stop
 task 2 stop
 echo $ task list venue
 task list venue
 # 14 Due dates
 echo Due dates --------------------------------------------------------------
 echo $ task 1 due:7/31/2010
 task 1 due:7/31/2010
 echo $ task 1 due:2wks
 task 1 due:2wks
 echo $ task 1 due:-2wks
 task 1 due:-2wks
 echo $ task 1 due:eom
 task 1 due:eom
 echo $ task 2 due:8th
 task 2 due:8th
 echo $ task 2 due:sunday
 task 2 due:sunday
 echo $ task 5 due:eow
 task 5 due:eow
 echo $ task list
 task list
 echo $ task overdue
 task overdue
 echo $ task rc.dateformat.report:Y-M-DTH:N:SZ list
 task rc.dateformat.report:Y-M-DTH:N:SZ list
 # 15 Calendar
 echo Calendar --------------------------------------------------------------
 echo $ task calendar
 task calendar
 echo $ vi ~/.taskrc # include /usr/local/share/doc/task/rc/holidays-US.rc
 #vi ~/.taskrc # include /usr/local/share/doc/task/rc/holidays-US.rc
 echo 'include /usr/local/share/doc/task/rc/holidays-US.rc' >> x
 echo $ task calendar
 task calendar
 echo $ task cal 2010
 task cal 2010
 echo $ task rc.calendar.details:full cal
 task rc.calendar.details:full cal
 echo $ task rc.calendar.holidays:full cal
 task rc.calendar.holidays:full cal
 # 16 Recurrence
 echo Recurrence --------------------------------------------------------------
 echo $ task 7 info
 task 7 info
 echo $ task 7 due:eom recur:monthly
 task 7 due:eom recur:monthly
 echo $ task 7
 task 7
 echo $ task 7 until:eoy
 task 7 until:eoy
 echo $ task recurring
 task recurring
 echo $ task add Pay taxes due:4/15/2007 recur:yearly
 task add Pay taxes due:4/15/2007 recur:yearly
 echo $ task long
 task long
 echo $ task 11 delete
 printf "y\ny\n" | task 11 delete      # y, y
 echo $ task list
 task list
 # 17 Special tags
 echo Special tags --------------------------------------------------------------
 echo $ task 6 +nocolor
 task 6 +nocolor
 echo $ task list
 task list
 echo $ task tags
 task tags
 echo $ task 6 -nocolor
 task 6 -nocolor
 # 18 Waiting
 echo Waiting --------------------------------------------------------------
 echo $ task add Look for new apartment due:eoy
 task add Look for new apartment due:eoy
 echo $ task list
 task list
 echo $ task 10 wait:12/1/2010
 task 10 wait:12/1/2010
 echo $ task list
 task list
 echo $ task waiting
 task waiting
 echo $ task add Do something in a few seconds
 task add Do something in a few seconds
 echo $ task 11 wait:5s
 task 11 wait:5s
 echo $ task list
 task list
 sleep 5
 echo $ task list
 task list
 echo $ task 11 rc.confirmation:no delete
 task 11 rc.confirmation:no delete
 # 19 Dependencies
 echo Dependencies --------------------------------------------------------------
 echo $ task list pro:party
 task list pro:party
 echo $ task 3 depends:6
 task 3 depends:6
 echo $ task 6 dep:5
 task 6 dep:5
 echo $ task 2 dep:1
 task 2 dep:1
 echo $ task 5 dep:1,2
 task 5 dep:1,2
 echo $ task 4 dep:1
 task 4 dep:1
 echo $ task long pro:party
 task long pro:party
 echo $ task 5 dep:-1
 task 5 dep:-1
 echo $ task blocked
 task blocked
 echo $ task unblocked
 task  unblocked
 echo $ task 1 info
 task  1 info
 echo $ task 2 info
 task  2 info
 echo $ task 2 done
 echo 'y' | task  2 done
 echo $ task 1 info
 task  1 info
 # 20 Reports
 echo Reports --------------------------------------------------------------
 echo $ task minimal
 task  minimal
 echo $ task ls
 task  ls
 echo $ task list
 task  list
 echo $ task long
 task  long
 echo $ task all
 task  all
 echo $ task completed
 task  completed
 echo $ task recurring
 task  recurring
 echo $ task waiting
 task  waiting
 echo $ task blocked
 task  blocked
 echo $ task oldest
 task  oldest
 echo $ task newest
 task  newest
 echo $ task timesheet
 task  timesheet
 echo $ task next
 task  next
 # 21 Custom report
 echo Custom report --------------------------------------------------------------
 echo 'report.foo.description=My own report'     >> x
 echo 'report.foo.columns=id,entry,description'  >> x
 echo 'report.foo.labels=ID,Entered,Description' >> x
 echo 'report.foo.sort=entry+,description+'      >> x
 echo 'report.foo.filter=status:pending'         >> x
 echo 'task help | grep foo'
 task  help | grep foo
 echo $ task show report.foo
 task  show report.foo
 echo $ task foo
 task  foo
 # 22 Charts
 echo Charts --------------------------------------------------------------
 echo $ task history
 task history
 echo $ task history.annual
 task history.annual
 echo $ task ghistory
 task ghistory
 echo $ task ghistory.annual
 task ghistory.annual
 echo $ task summary
 task summary
 # 23 Advanced filters
 echo Advanced filters --------------------------------------------------------------
 echo $ task list
 task  list
 echo $ task list invit
 task  list invit
 echo $ task list description.contains:invit
 task  list description.contains:invit
 echo $ task list desc.word:the
 task  list desc.word:the
 echo $ task list desc.noword:invitations
 task  list desc.noword:invitations
 echo $ task list pro:party
 task  list pro:party
 echo $ task list pro.is:party
 task  list pro.is:party
 echo $ task list pro.not:party
 task  list pro.not:party
 echo $ task list pro:party priority.over:L
 task  list pro:party priority.over:L
 echo $ task list pro:party limit:2
 task  list pro:party limit:2
 echo $ task list limit:page
 task  list limit:page
 echo $ task all status:pending
 task  all status:pending
 echo $ task all status:waiting
 task  all status:waiting
 # 24 Import/export
 echo Import/export --------------------------------------------------------------
 echo $ task export.csv
 task  export.csv
 echo $ task export.csv venue
 task  export.csv venue
 echo $ task export.vcalendar venue
 task  export.vcalendar venue
 echo $ task export.yaml venue
 task  export.yaml venue
 cat <<EOF >file.text
 Remember to read the task man page
 EOF
 cat file.text
 echo $ task import file.text
 printf "y\n" | task  import file.text
 cat <<EOF >file.yaml
 %YAML 1.1
 ---
  task:
    description: Visit http://taskwarrior.org
    due: 1281844800
    entry: 1281289630
    priority: H
    project: work
    status: pending
    uuid: 23afada0-a446-8d5a-c213-30d99d52c4b0
 ...
 EOF
 cat file.yaml
 echo $ task import file.yaml
 printf "y\n" | task  import file.yaml
 echo $ task new limit:2
 task  new limit:2
 # 25 Help
 echo Help --------------------------------------------------------------
 echo $ task help
 task  help
 echo $ man task
 #man task
 echo $ man taskrc
 #man taskrc
 echo $ man task-color
 #man task-color
 echo $ man task-tutorial
 #man task-tutorial
 echo $ man task-faq
 #man task-faq
 echo $ man task-sync
 #man task-sync
 # 26 Wrap up
 echo Wrap up --------------------------------------------------------------
 echo $ task version
 task  version
 exit
--- a/doc/misc/tutorial/projects/script.200.txt
+++ b/doc/misc/tutorial/projects/script.200.txt
@@ -0,0 +1,36 @@
 [Make window 116x32 for movie recording, light text, dark background]
 This is the script from which a 2.0-specific movie will be made.  On the left
 are the typed commands, and on the right is the voice track.
 It is intended that the left and right be combined and the result will be a new
 task-tutorial.5 man page.
 ---------------------------------------- Projects --------------------------------------------------
 task add Pay teh rent on teh 31st        Remember to pay the rent at the end of the month.  Oh,
 task 7 /teh/teh/g                        that was sloppy, but it can be fixed with a global
 task list                                substitution.
 task 7 project:home                      We can now use projects to separate home chores from the
                                         party preparation.  Let's assign that last task to the
                                         'home' project.  Note that a task may only belong to one
                                         project.
 task 1-6 project:party                   And we will put those first six tasks in the 'party'
                                         project.  See how we specify a range of tasks?  Taskwarrior
                                         will want to confirm bulk changes like this, but we'll
                                         accept all changes here.
 task projects                            Now that we have multiple projects, as shown here, we can
 task list project:home                   use project as a filter for the list report.  You can see
 task li pro:par                          again that we can abbreviate 'list' and 'project', but when
                                         we abbreviate 'party', we are filtering all the projects
                                         that begin with 'par'.
 ---------------------------------------- End -------------------------------------------------------
 Show project change stats.
--- a/doc/misc/tutorial/recurrence/run.200
+++ b/doc/misc/tutorial/recurrence/run.200
@@ -0,0 +1,520 @@
 #! /bin/bash
 rm -f /Users/paul/.task/pending.data /Users/paul/.task/completed.data /Users/paul/.task/undo.data
 echo 'data.location=~/.task' > /Users/paul/.taskrc
 echo 'color=off' >> /Users/paul/.taskrc
 echo 'color.summary.background=on gray3' >> /Users/paul/.taskrc
 echo '#include /usr/local/share/doc/task/rc/dark-blue-256.theme' >> /Users/paul/.taskrc
 echo '#include /usr/local/share/doc/task/rc/dark-red-256.theme' >> /Users/paul/.taskrc
 echo '#include /usr/local/share/doc/task/rc/dark-256.theme' >> /Users/paul/.taskrc
 # 1 Intro
 # 2 Basic usage
 echo Basic usage --------------------------------------------------------------
 echo $ task add Select a free weekend in November
 task add Select a free weekend in November
 echo $ task add Select and book a venue
 task add Select and book a venue
 echo $ task add Come up with a guest list
 task add Come up with a guest list
 echo $ task add Mail invitations
 task add Mail invitations
 echo $ task add Select a caterer
 task add Select a caterer
 echo $ task list
 task list
 echo $ task log Order a special cake
 task log Order a special cake
 echo $ task 4 duplicate /Mail/Design/
 task 4 duplicate /Mail/Design/
 echo $ task 4 duplicate /Mail/Print/
 task 4 duplicate /Mail/Print/
 echo $ task list
 task list
 echo $ task 3 done
 task 3 done
 echo $ task list
 task list
 # 3 Projects
 echo Projects --------------------------------------------------------------
 echo $ task add Pay teh rent on teh 31st
 task add Pay teh rent on teh 31st
 echo $ task 7 /teh/the/g
 task 7 /teh/the/g
 echo $ task list
 task list
 echo $ task 7 project:home
 task 7 project:home
 echo $ task 1-6 project:party
 echo 'All' | task 1-6 project:party
 echo $ task projects
 task projects
 echo $ task list project:home
 task list project:home
 echo $ task li pro:par
 task li pro:par
 # 4 Priorities
 echo Priorities --------------------------------------------------------------
 echo $ task 1-3,5 priority:H
 echo 'All' | task 1-3,5 priority:H
 echo $ task list
 task list
 echo $ task 3 pri:
 task 3 pri:
 # 5 Tags
 echo Tags --------------------------------------------------------------
 echo $ task list
 task list
 echo $ task 3,5,6 +mall
 echo 'All' | task 3,5,6 +mall
 echo $ task long
 task long
 echo $ task list +mall
 task list +mall
 echo $ task 3 -mall
 task 3 -mall
 # 6 Modifications
 echo Modifications --------------------------------------------------------------
 echo $ task 7 Pay rent at the end of the month
 echo 'Yes' | task 7 Pay rent at the end of the month
 echo $ task add music
 task add music
 echo $ task 8 prepend Select some
 task 8 prepend Select some
 echo $ task 8 append for after dinner
 task 8 append for after dinner
 echo $ task list
 task list
 echo $ task edit
 #task edit
 echo $ task add Hire a band?
 #task add Hire a band?
 echo $ task add Hire a band\?
 #task add Hire a band\?
 echo $ task add "Hire a band?"
 #task add "Hire a band?"
 echo $ task add -- Hire a band\? +dj
 task add -- Hire a band\? +dj
 echo $ task undo
 echo 'y' | task undo
 echo $ task 1 delete
 echo 'y' | task 1 delete
 echo $ task undo
 echo 'y' | task undo
 # 7 Info
 echo Info --------------------------------------------------------------
 echo $ task 1 info
 task 1 info
 echo $ task stats
 task stats
 # 8 Annotations
 echo Annotations --------------------------------------------------------------
 echo $ task 1 annotate the 13 looks good
 task 1 annotate the 13 looks good
 sleep 1
 echo $ task 1 annotate or the 14th
 task 1 annotate or the 14th
 echo $ task list
 task list
 echo $ task list rc.annotations:full
 task list rc.annotations:full
 echo $ task list rc.annotations:sparse
 task list rc.annotations:sparse
 echo $ task list rc.annotations:none
 task list rc.annotations:none
 echo $ task 1 denotate 14th
 task 1 denotate 14th
 echo $ task list
 task list
 # 9 Configuration
 echo Configuration --------------------------------------------------------------
 echo $ task show
 task show
 echo $ task config answer forty-two
 echo 'y' | task config answer forty-two
 echo $ task show answer
 task show answer
 echo $ task config answer
 echo 'y' | task config answer
 echo $ task rc.report.list.sort=description+ list
 task rc.report.list.sort=description+ list
 # 10 Defaults
 echo Defaults --------------------------------------------------------------
 echo $ task config default.command list
 echo 'y' | task config default.command list
 echo $ task 
 task 
 echo $ task config default.priority H
 echo 'y' | task config default.priority H
 echo $ task config default.project Work
 echo 'y' | task config default.project Work
 echo $ task add New task
 task add New task
 echo $ task list
 task list
 echo $ task undo
 echo 'y' | task undo
 echo $ task config default.priority
 echo 'y' | task config default.priority
 echo $ task config default.project
 echo 'y' | task config default.project
 # 11 Aliases
 echo Aliases --------------------------------------------------------------
 echo $ task config alias.zzz list
 echo 'y' | task config alias.zzz list
 echo $ task zzz
 task zzz
 echo $ task z
 task z
 # 12 Color
 echo Color --------------------------------------------------------------
 echo $ task config color on
 echo 'y' | task config color on
 echo $ task list
 task list
 echo $ task 1 bg:on_red
 task 1 bg:on_red
 echo $ task list
 task list
 echo $ task 1 bg:
 task 1 bg:
 echo $ task color
 task color
 echo $ task color white on red
 task color white on red
 echo $ task color legend
 task color legend
 echo vi ~/.taskrc # include /usr/local/share/doc/task/rc/dark-blue-256.theme
 #vi ~/.taskrc # include /usr/local/share/doc/task/rc/dark-blue-256.theme
 echo 'include /usr/local/share/doc/task/rc/dark-blue-256.theme' >> x
 echo $ task color legend
 task color legend
 echo $ task list
 task list
 echo vi ~/.taskrc # include /usr/local/share/doc/task/rc/dark-red-256.theme
 #vi ~/.taskrc # include /usr/local/share/doc/task/rc/dark-red-256.theme
 sed 's/blue/red/' x >x2 && mv x2 x
 echo $ task color legend
 task color legend
 echo $ task list
 task list
 echo vi ~/.taskrc # include /usr/local/share/doc/task/rc/dark-256.theme
 #vi ~/.taskrc # include /usr/local/share/doc/task/rc/dark-256.theme
 sed 's/red-//' x >x2 && mv x2 x
 echo $ task list
 task list
 echo $ task "rc.color.project.party=on rgb001" rc.color.keyword.invit=bold list
 task "rc.color.project.party=on rgb001" rc.color.keyword.invit=bold list
 echo $ man task-color
 #man task-color
 # 13 Active tasks
 echo Active tasks --------------------------------------------------------------
 echo $ task 2 start
 task 2 start
 echo $ task list
 task list
 echo $ task active
 task active
 echo $ task 2 stop
 task 2 stop
 echo $ task config journal.time on
 task config journal.time on
 echo $ task config rc.dateformat.xxx xxx
 task config rc.dateformat.xxx xxx
 echo $ task config dateformat.annotation 'Y/m/d H:N'
 task config dateformat.annotation 'Y/m/d H:N'
 echo $ task 2 start
 task 2 start
 echo $ task list venue
 task list venue
 echo $ task 2 stop
 task 2 stop
 echo $ task list venue
 task list venue
 # 14 Due dates
 echo Due dates --------------------------------------------------------------
 echo $ task 1 due:7/31/2010
 task 1 due:7/31/2010
 echo $ task 1 due:2wks
 task 1 due:2wks
 echo $ task 1 due:-2wks
 task 1 due:-2wks
 echo $ task 1 due:eom
 task 1 due:eom
 echo $ task 2 due:8th
 task 2 due:8th
 echo $ task 2 due:sunday
 task 2 due:sunday
 echo $ task 5 due:eow
 task 5 due:eow
 echo $ task list
 task list
 echo $ task overdue
 task overdue
 echo $ task rc.dateformat.report:Y-M-DTH:N:SZ list
 task rc.dateformat.report:Y-M-DTH:N:SZ list
 # 15 Calendar
 echo Calendar --------------------------------------------------------------
 echo $ task calendar
 task calendar
 echo $ vi ~/.taskrc # include /usr/local/share/doc/task/rc/holidays-US.rc
 #vi ~/.taskrc # include /usr/local/share/doc/task/rc/holidays-US.rc
 echo 'include /usr/local/share/doc/task/rc/holidays-US.rc' >> x
 echo $ task calendar
 task calendar
 echo $ task cal 2010
 task cal 2010
 echo $ task rc.calendar.details:full cal
 task rc.calendar.details:full cal
 echo $ task rc.calendar.holidays:full cal
 task rc.calendar.holidays:full cal
 # 16 Recurrence
 echo Recurrence --------------------------------------------------------------
 echo $ task 7 info
 task 7 info
 echo $ task 7 due:eom recur:monthly
 task 7 due:eom recur:monthly
 echo $ task 7
 task 7
 echo $ task 7 until:eoy
 task 7 until:eoy
 echo $ task recurring
 task recurring
 echo $ task add Pay taxes due:4/15/2007 recur:yearly
 task add Pay taxes due:4/15/2007 recur:yearly
 echo $ task long
 task long
 echo $ task 11 delete
 printf "y\ny\n" | task 11 delete      # y, y
 echo $ task list
 task list
 # 17 Special tags
 echo Special tags --------------------------------------------------------------
 echo $ task 6 +nocolor
 task 6 +nocolor
 echo $ task list
 task list
 echo $ task tags
 task tags
 echo $ task 6 -nocolor
 task 6 -nocolor
 # 18 Waiting
 echo Waiting --------------------------------------------------------------
 echo $ task add Look for new apartment due:eoy
 task add Look for new apartment due:eoy
 echo $ task list
 task list
 echo $ task 10 wait:12/1/2010
 task 10 wait:12/1/2010
 echo $ task list
 task list
 echo $ task waiting
 task waiting
 echo $ task add Do something in a few seconds
 task add Do something in a few seconds
 echo $ task 11 wait:5s
 task 11 wait:5s
 echo $ task list
 task list
 sleep 5
 echo $ task list
 task list
 echo $ task 11 rc.confirmation:no delete
 task 11 rc.confirmation:no delete
 # 19 Dependencies
 echo Dependencies --------------------------------------------------------------
 echo $ task list pro:party
 task list pro:party
 echo $ task 3 depends:6
 task 3 depends:6
 echo $ task 6 dep:5
 task 6 dep:5
 echo $ task 2 dep:1
 task 2 dep:1
 echo $ task 5 dep:1,2
 task 5 dep:1,2
 echo $ task 4 dep:1
 task 4 dep:1
 echo $ task long pro:party
 task long pro:party
 echo $ task 5 dep:-1
 task 5 dep:-1
 echo $ task blocked
 task blocked
 echo $ task unblocked
 task  unblocked
 echo $ task 1 info
 task  1 info
 echo $ task 2 info
 task  2 info
 echo $ task 2 done
 echo 'y' | task  2 done
 echo $ task 1 info
 task  1 info
 # 20 Reports
 echo Reports --------------------------------------------------------------
 echo $ task minimal
 task  minimal
 echo $ task ls
 task  ls
 echo $ task list
 task  list
 echo $ task long
 task  long
 echo $ task all
 task  all
 echo $ task completed
 task  completed
 echo $ task recurring
 task  recurring
 echo $ task waiting
 task  waiting
 echo $ task blocked
 task  blocked
 echo $ task oldest
 task  oldest
 echo $ task newest
 task  newest
 echo $ task timesheet
 task  timesheet
 echo $ task next
 task  next
 # 21 Custom report
 echo Custom report --------------------------------------------------------------
 echo 'report.foo.description=My own report'     >> x
 echo 'report.foo.columns=id,entry,description'  >> x
 echo 'report.foo.labels=ID,Entered,Description' >> x
 echo 'report.foo.sort=entry+,description+'      >> x
 echo 'report.foo.filter=status:pending'         >> x
 echo 'task help | grep foo'
 task  help | grep foo
 echo $ task show report.foo
 task  show report.foo
 echo $ task foo
 task  foo
 # 22 Charts
 echo Charts --------------------------------------------------------------
 echo $ task history
 task history
 echo $ task history.annual
 task history.annual
 echo $ task ghistory
 task ghistory
 echo $ task ghistory.annual
 task ghistory.annual
 echo $ task summary
 task summary
 # 23 Advanced filters
 echo Advanced filters --------------------------------------------------------------
 echo $ task list
 task  list
 echo $ task list invit
 task  list invit
 echo $ task list description.contains:invit
 task  list description.contains:invit
 echo $ task list desc.word:the
 task  list desc.word:the
 echo $ task list desc.noword:invitations
 task  list desc.noword:invitations
 echo $ task list pro:party
 task  list pro:party
 echo $ task list pro.is:party
 task  list pro.is:party
 echo $ task list pro.not:party
 task  list pro.not:party
 echo $ task list pro:party priority.over:L
 task  list pro:party priority.over:L
 echo $ task list pro:party limit:2
 task  list pro:party limit:2
 echo $ task list limit:page
 task  list limit:page
 echo $ task all status:pending
 task  all status:pending
 echo $ task all status:waiting
 task  all status:waiting
 # 24 Import/export
 echo Import/export --------------------------------------------------------------
 echo $ task export.csv
 task  export.csv
 echo $ task export.csv venue
 task  export.csv venue
 echo $ task export.vcalendar venue
 task  export.vcalendar venue
 echo $ task export.yaml venue
 task  export.yaml venue
 cat <<EOF >file.text
 Remember to read the task man page
 EOF
 cat file.text
 echo $ task import file.text
 printf "y\n" | task  import file.text
 cat <<EOF >file.yaml
 %YAML 1.1
 ---
  task:
    description: Visit http://taskwarrior.org
    due: 1281844800
    entry: 1281289630
    priority: H
    project: work
    status: pending
    uuid: 23afada0-a446-8d5a-c213-30d99d52c4b0
 ...
 EOF
 cat file.yaml
 echo $ task import file.yaml
 printf "y\n" | task  import file.yaml
 echo $ task new limit:2
 task  new limit:2
 # 25 Help
 echo Help --------------------------------------------------------------
 echo $ task help
 task  help
 echo $ man task
 #man task
 echo $ man taskrc
 #man taskrc
 echo $ man task-color
 #man task-color
 echo $ man task-tutorial
 #man task-tutorial
 echo $ man task-faq
 #man task-faq
 echo $ man task-sync
 #man task-sync
 # 26 Wrap up
 echo Wrap up --------------------------------------------------------------
 echo $ task version
 task  version
 exit
--- a/doc/misc/tutorial/recurrence/script.200.txt
+++ b/doc/misc/tutorial/recurrence/script.200.txt
@@ -0,0 +1,40 @@
 [Make window 116x32 for movie recording, light text, dark background]
 This is the script from which a 2.0-specific movie will be made.  On the left
 are the typed commands, and on the right is the voice track.
 It is intended that the left and right be combined and the result will be a new
 task-tutorial.5 man page.
 ---------------------------------------- Recurrence ------------------------------------------------
 task 7 info                              Remember the task we added to pay the rent?  We're going to
 task 7 due:eom recur:monthly             need to do that every month.  Recurring tasks allow us to
 task 7                                   set up a single task that keeps coming back, just as you'd
                                         expect.
 task 7 until:eoy                         You can also limit the extent of the recurrence.  Let's make
                                         sure the task doesn't recur after the lease ends.
 task recurring                           And there is a recurring report that shows you only the
                                         recurring tasks.
                                         To illustrate a point, let's set up a recurring annual task
                                         as a reminder to pay taxes, and put the due date in the past.
                                         This will cause task to fill in the gaps, and create a series
                                         of severely overdue tasks.
 task add Pay taxes due:4/15/2007 recur:yearly
 task long
 task 11 delete    # y y                  Deletions to recurring tasks can be escalated to include all
 task list                                the recurrences of a task.
 ---------------------------------------- End -------------------------------------------------------
 Explain parent/child.
 Show rc.recurrence.limit.
 Show propagated changes.
--- a/doc/misc/tutorial/reports/run.200
+++ b/doc/misc/tutorial/reports/run.200
@@ -0,0 +1,520 @@
 #! /bin/bash
 rm -f /Users/paul/.task/pending.data /Users/paul/.task/completed.data /Users/paul/.task/undo.data
 echo 'data.location=~/.task' > /Users/paul/.taskrc
 echo 'color=off' >> /Users/paul/.taskrc
 echo 'color.summary.background=on gray3' >> /Users/paul/.taskrc
 echo '#include /usr/local/share/doc/task/rc/dark-blue-256.theme' >> /Users/paul/.taskrc
 echo '#include /usr/local/share/doc/task/rc/dark-red-256.theme' >> /Users/paul/.taskrc
 echo '#include /usr/local/share/doc/task/rc/dark-256.theme' >> /Users/paul/.taskrc
 # 1 Intro
 # 2 Basic usage
 echo Basic usage --------------------------------------------------------------
 echo $ task add Select a free weekend in November
 task add Select a free weekend in November
 echo $ task add Select and book a venue
 task add Select and book a venue
 echo $ task add Come up with a guest list
 task add Come up with a guest list
 echo $ task add Mail invitations
 task add Mail invitations
 echo $ task add Select a caterer
 task add Select a caterer
 echo $ task list
 task list
 echo $ task log Order a special cake
 task log Order a special cake
 echo $ task 4 duplicate /Mail/Design/
 task 4 duplicate /Mail/Design/
 echo $ task 4 duplicate /Mail/Print/
 task 4 duplicate /Mail/Print/
 echo $ task list
 task list
 echo $ task 3 done
 task 3 done
 echo $ task list
 task list
 # 3 Projects
 echo Projects --------------------------------------------------------------
 echo $ task add Pay teh rent on teh 31st
 task add Pay teh rent on teh 31st
 echo $ task 7 /teh/the/g
 task 7 /teh/the/g
 echo $ task list
 task list
 echo $ task 7 project:home
 task 7 project:home
 echo $ task 1-6 project:party
 echo 'All' | task 1-6 project:party
 echo $ task projects
 task projects
 echo $ task list project:home
 task list project:home
 echo $ task li pro:par
 task li pro:par
 # 4 Priorities
 echo Priorities --------------------------------------------------------------
 echo $ task 1-3,5 priority:H
 echo 'All' | task 1-3,5 priority:H
 echo $ task list
 task list
 echo $ task 3 pri:
 task 3 pri:
 # 5 Tags
 echo Tags --------------------------------------------------------------
 echo $ task list
 task list
 echo $ task 3,5,6 +mall
 echo 'All' | task 3,5,6 +mall
 echo $ task long
 task long
 echo $ task list +mall
 task list +mall
 echo $ task 3 -mall
 task 3 -mall
 # 6 Modifications
 echo Modifications --------------------------------------------------------------
 echo $ task 7 Pay rent at the end of the month
 echo 'Yes' | task 7 Pay rent at the end of the month
 echo $ task add music
 task add music
 echo $ task 8 prepend Select some
 task 8 prepend Select some
 echo $ task 8 append for after dinner
 task 8 append for after dinner
 echo $ task list
 task list
 echo $ task edit
 #task edit
 echo $ task add Hire a band?
 #task add Hire a band?
 echo $ task add Hire a band\?
 #task add Hire a band\?
 echo $ task add "Hire a band?"
 #task add "Hire a band?"
 echo $ task add -- Hire a band\? +dj
 task add -- Hire a band\? +dj
 echo $ task undo
 echo 'y' | task undo
 echo $ task 1 delete
 echo 'y' | task 1 delete
 echo $ task undo
 echo 'y' | task undo
 # 7 Info
 echo Info --------------------------------------------------------------
 echo $ task 1 info
 task 1 info
 echo $ task stats
 task stats
 # 8 Annotations
 echo Annotations --------------------------------------------------------------
 echo $ task 1 annotate the 13 looks good
 task 1 annotate the 13 looks good
 sleep 1
 echo $ task 1 annotate or the 14th
 task 1 annotate or the 14th
 echo $ task list
 task list
 echo $ task list rc.annotations:full
 task list rc.annotations:full
 echo $ task list rc.annotations:sparse
 task list rc.annotations:sparse
 echo $ task list rc.annotations:none
 task list rc.annotations:none
 echo $ task 1 denotate 14th
 task 1 denotate 14th
 echo $ task list
 task list
 # 9 Configuration
 echo Configuration --------------------------------------------------------------
 echo $ task show
 task show
 echo $ task config answer forty-two
 echo 'y' | task config answer forty-two
 echo $ task show answer
 task show answer
 echo $ task config answer
 echo 'y' | task config answer
 echo $ task rc.report.list.sort=description+ list
 task rc.report.list.sort=description+ list
 # 10 Defaults
 echo Defaults --------------------------------------------------------------
 echo $ task config default.command list
 echo 'y' | task config default.command list
 echo $ task 
 task 
 echo $ task config default.priority H
 echo 'y' | task config default.priority H
 echo $ task config default.project Work
 echo 'y' | task config default.project Work
 echo $ task add New task
 task add New task
 echo $ task list
 task list
 echo $ task undo
 echo 'y' | task undo
 echo $ task config default.priority
 echo 'y' | task config default.priority
 echo $ task config default.project
 echo 'y' | task config default.project
 # 11 Aliases
 echo Aliases --------------------------------------------------------------
 echo $ task config alias.zzz list
 echo 'y' | task config alias.zzz list
 echo $ task zzz
 task zzz
 echo $ task z
 task z
 # 12 Color
 echo Color --------------------------------------------------------------
 echo $ task config color on
 echo 'y' | task config color on
 echo $ task list
 task list
 echo $ task 1 bg:on_red
 task 1 bg:on_red
 echo $ task list
 task list
 echo $ task 1 bg:
 task 1 bg:
 echo $ task color
 task color
 echo $ task color white on red
 task color white on red
 echo $ task color legend
 task color legend
 echo vi ~/.taskrc # include /usr/local/share/doc/task/rc/dark-blue-256.theme
 #vi ~/.taskrc # include /usr/local/share/doc/task/rc/dark-blue-256.theme
 echo 'include /usr/local/share/doc/task/rc/dark-blue-256.theme' >> x
 echo $ task color legend
 task color legend
 echo $ task list
 task list
 echo vi ~/.taskrc # include /usr/local/share/doc/task/rc/dark-red-256.theme
 #vi ~/.taskrc # include /usr/local/share/doc/task/rc/dark-red-256.theme
 sed 's/blue/red/' x >x2 && mv x2 x
 echo $ task color legend
 task color legend
 echo $ task list
 task list
 echo vi ~/.taskrc # include /usr/local/share/doc/task/rc/dark-256.theme
 #vi ~/.taskrc # include /usr/local/share/doc/task/rc/dark-256.theme
 sed 's/red-//' x >x2 && mv x2 x
 echo $ task list
 task list
 echo $ task "rc.color.project.party=on rgb001" rc.color.keyword.invit=bold list
 task "rc.color.project.party=on rgb001" rc.color.keyword.invit=bold list
 echo $ man task-color
 #man task-color
 # 13 Active tasks
 echo Active tasks --------------------------------------------------------------
 echo $ task 2 start
 task 2 start
 echo $ task list
 task list
 echo $ task active
 task active
 echo $ task 2 stop
 task 2 stop
 echo $ task config journal.time on
 task config journal.time on
 echo $ task config rc.dateformat.xxx xxx
 task config rc.dateformat.xxx xxx
 echo $ task config dateformat.annotation 'Y/m/d H:N'
 task config dateformat.annotation 'Y/m/d H:N'
 echo $ task 2 start
 task 2 start
 echo $ task list venue
 task list venue
 echo $ task 2 stop
 task 2 stop
 echo $ task list venue
 task list venue
 # 14 Due dates
 echo Due dates --------------------------------------------------------------
 echo $ task 1 due:7/31/2010
 task 1 due:7/31/2010
 echo $ task 1 due:2wks
 task 1 due:2wks
 echo $ task 1 due:-2wks
 task 1 due:-2wks
 echo $ task 1 due:eom
 task 1 due:eom
 echo $ task 2 due:8th
 task 2 due:8th
 echo $ task 2 due:sunday
 task 2 due:sunday
 echo $ task 5 due:eow
 task 5 due:eow
 echo $ task list
 task list
 echo $ task overdue
 task overdue
 echo $ task rc.dateformat.report:Y-M-DTH:N:SZ list
 task rc.dateformat.report:Y-M-DTH:N:SZ list
 # 15 Calendar
 echo Calendar --------------------------------------------------------------
 echo $ task calendar
 task calendar
 echo $ vi ~/.taskrc # include /usr/local/share/doc/task/rc/holidays-US.rc
 #vi ~/.taskrc # include /usr/local/share/doc/task/rc/holidays-US.rc
 echo 'include /usr/local/share/doc/task/rc/holidays-US.rc' >> x
 echo $ task calendar
 task calendar
 echo $ task cal 2010
 task cal 2010
 echo $ task rc.calendar.details:full cal
 task rc.calendar.details:full cal
 echo $ task rc.calendar.holidays:full cal
 task rc.calendar.holidays:full cal
 # 16 Recurrence
 echo Recurrence --------------------------------------------------------------
 echo $ task 7 info
 task 7 info
 echo $ task 7 due:eom recur:monthly
 task 7 due:eom recur:monthly
 echo $ task 7
 task 7
 echo $ task 7 until:eoy
 task 7 until:eoy
 echo $ task recurring
 task recurring
 echo $ task add Pay taxes due:4/15/2007 recur:yearly
 task add Pay taxes due:4/15/2007 recur:yearly
 echo $ task long
 task long
 echo $ task 11 delete
 printf "y\ny\n" | task 11 delete      # y, y
 echo $ task list
 task list
 # 17 Special tags
 echo Special tags --------------------------------------------------------------
 echo $ task 6 +nocolor
 task 6 +nocolor
 echo $ task list
 task list
 echo $ task tags
 task tags
 echo $ task 6 -nocolor
 task 6 -nocolor
 # 18 Waiting
 echo Waiting --------------------------------------------------------------
 echo $ task add Look for new apartment due:eoy
 task add Look for new apartment due:eoy
 echo $ task list
 task list
 echo $ task 10 wait:12/1/2010
 task 10 wait:12/1/2010
 echo $ task list
 task list
 echo $ task waiting
 task waiting
 echo $ task add Do something in a few seconds
 task add Do something in a few seconds
 echo $ task 11 wait:5s
 task 11 wait:5s
 echo $ task list
 task list
 sleep 5
 echo $ task list
 task list
 echo $ task 11 rc.confirmation:no delete
 task 11 rc.confirmation:no delete
 # 19 Dependencies
 echo Dependencies --------------------------------------------------------------
 echo $ task list pro:party
 task list pro:party
 echo $ task 3 depends:6
 task 3 depends:6
 echo $ task 6 dep:5
 task 6 dep:5
 echo $ task 2 dep:1
 task 2 dep:1
 echo $ task 5 dep:1,2
 task 5 dep:1,2
 echo $ task 4 dep:1
 task 4 dep:1
 echo $ task long pro:party
 task long pro:party
 echo $ task 5 dep:-1
 task 5 dep:-1
 echo $ task blocked
 task blocked
 echo $ task unblocked
 task  unblocked
 echo $ task 1 info
 task  1 info
 echo $ task 2 info
 task  2 info
 echo $ task 2 done
 echo 'y' | task  2 done
 echo $ task 1 info
 task  1 info
 # 20 Reports
 echo Reports --------------------------------------------------------------
 echo $ task minimal
 task  minimal
 echo $ task ls
 task  ls
 echo $ task list
 task  list
 echo $ task long
 task  long
 echo $ task all
 task  all
 echo $ task completed
 task  completed
 echo $ task recurring
 task  recurring
 echo $ task waiting
 task  waiting
 echo $ task blocked
 task  blocked
 echo $ task oldest
 task  oldest
 echo $ task newest
 task  newest
 echo $ task timesheet
 task  timesheet
 echo $ task next
 task  next
 # 21 Custom report
 echo Custom report --------------------------------------------------------------
 echo 'report.foo.description=My own report'     >> x
 echo 'report.foo.columns=id,entry,description'  >> x
 echo 'report.foo.labels=ID,Entered,Description' >> x
 echo 'report.foo.sort=entry+,description+'      >> x
 echo 'report.foo.filter=status:pending'         >> x
 echo 'task help | grep foo'
 task  help | grep foo
 echo $ task show report.foo
 task  show report.foo
 echo $ task foo
 task  foo
 # 22 Charts
 echo Charts --------------------------------------------------------------
 echo $ task history
 task history
 echo $ task history.annual
 task history.annual
 echo $ task ghistory
 task ghistory
 echo $ task ghistory.annual
 task ghistory.annual
 echo $ task summary
 task summary
 # 23 Advanced filters
 echo Advanced filters --------------------------------------------------------------
 echo $ task list
 task  list
 echo $ task list invit
 task  list invit
 echo $ task list description.contains:invit
 task  list description.contains:invit
 echo $ task list desc.word:the
 task  list desc.word:the
 echo $ task list desc.noword:invitations
 task  list desc.noword:invitations
 echo $ task list pro:party
 task  list pro:party
 echo $ task list pro.is:party
 task  list pro.is:party
 echo $ task list pro.not:party
 task  list pro.not:party
 echo $ task list pro:party priority.over:L
 task  list pro:party priority.over:L
 echo $ task list pro:party limit:2
 task  list pro:party limit:2
 echo $ task list limit:page
 task  list limit:page
 echo $ task all status:pending
 task  all status:pending
 echo $ task all status:waiting
 task  all status:waiting
 # 24 Import/export
 echo Import/export --------------------------------------------------------------
 echo $ task export.csv
 task  export.csv
 echo $ task export.csv venue
 task  export.csv venue
 echo $ task export.vcalendar venue
 task  export.vcalendar venue
 echo $ task export.yaml venue
 task  export.yaml venue
 cat <<EOF >file.text
 Remember to read the task man page
 EOF
 cat file.text
 echo $ task import file.text
 printf "y\n" | task  import file.text
 cat <<EOF >file.yaml
 %YAML 1.1
 ---
  task:
    description: Visit http://taskwarrior.org
    due: 1281844800
    entry: 1281289630
    priority: H
    project: work
    status: pending
    uuid: 23afada0-a446-8d5a-c213-30d99d52c4b0
 ...
 EOF
 cat file.yaml
 echo $ task import file.yaml
 printf "y\n" | task  import file.yaml
 echo $ task new limit:2
 task  new limit:2
 # 25 Help
 echo Help --------------------------------------------------------------
 echo $ task help
 task  help
 echo $ man task
 #man task
 echo $ man taskrc
 #man taskrc
 echo $ man task-color
 #man task-color
 echo $ man task-tutorial
 #man task-tutorial
 echo $ man task-faq
 #man task-faq
 echo $ man task-sync
 #man task-sync
 # 26 Wrap up
 echo Wrap up --------------------------------------------------------------
 echo $ task version
 task  version
 exit
--- a/doc/misc/tutorial/reports/script.200.txt
+++ b/doc/misc/tutorial/reports/script.200.txt
@@ -0,0 +1,33 @@
 [Make window 116x32 for movie recording, light text, dark background]
 This is the script from which a 2.0-specific movie will be made.  On the left
 are the typed commands, and on the right is the voice track.
 It is intended that the left and right be combined and the result will be a new
 task-tutorial.5 man page.
 ---------------------------------------- Reports ---------------------------------------------------
 task minimal                             Taskwarrior has a good many reports.  There is the bare minimum.
 task ls                                  The simple.
 task list                                The standard.
 task long                                The kitchen sink.
 task all                                 The packrat.
 task completed                           Nostalgia.
 task recurring                           Groundhog day.
 task waiting                             Surprises.
 task blocked                             Wedged.
 task unblocked                           Unencumbered.
 task oldest                              Ancient history.
 task newest                              Contemporary.
 task timesheet                           Corporate.
 task next                                And "what should I work on next?"  This one can be useful
                                         because it pulls a few of the highest priority tasks from
                                         all the projects.  It's the report we should all be using.
 ---------------------------------------- End -------------------------------------------------------
 New 'reports' command.
--- a/doc/misc/tutorial/run.193
+++ b/doc/misc/tutorial/run.193
@@ -0,0 +1,520 @@
 #! /bin/bash
 rm -f /Users/paul/.task/pending.data /Users/paul/.task/completed.data /Users/paul/.task/undo.data
 echo 'data.location=~/.task' > /Users/paul/.taskrc
 echo 'color=off' >> /Users/paul/.taskrc
 echo 'color.summary.background=on gray3' >> /Users/paul/.taskrc
 echo '#include /usr/local/share/doc/task/rc/dark-blue-256.theme' >> /Users/paul/.taskrc
 echo '#include /usr/local/share/doc/task/rc/dark-red-256.theme' >> /Users/paul/.taskrc
 echo '#include /usr/local/share/doc/task/rc/dark-256.theme' >> /Users/paul/.taskrc
 # 1 Intro
 # 2 Basic usage
 echo Basic usage --------------------------------------------------------------
 echo $ task add Select a free weekend in November
 task add Select a free weekend in November
 echo $ task add Select and book a venue
 task add Select and book a venue
 echo $ task add Come up with a guest list
 task add Come up with a guest list
 echo $ task add Mail invitations
 task add Mail invitations
 echo $ task add Select a caterer
 task add Select a caterer
 echo $ task list
 task list
 echo $ task log Order a special cake
 task log Order a special cake
 echo $ task 4 duplicate /Mail/Design/
 task 4 duplicate /Mail/Design/
 echo $ task 4 duplicate /Mail/Print/
 task 4 duplicate /Mail/Print/
 echo $ task list
 task list
 echo $ task 3 done
 task 3 done
 echo $ task list
 task list
 # 3 Projects
 echo Projects --------------------------------------------------------------
 echo $ task add Pay teh rent on teh 31st
 task add Pay teh rent on teh 31st
 echo $ task 7 /teh/the/g
 task 7 /teh/the/g
 echo $ task list
 task list
 echo $ task 7 project:home
 task 7 project:home
 echo $ task 1-6 project:party
 echo 'All' | task 1-6 project:party
 echo $ task projects
 task projects
 echo $ task list project:home
 task list project:home
 echo $ task li pro:par
 task li pro:par
 # 4 Priorities
 echo Priorities --------------------------------------------------------------
 echo $ task 1-3,5 priority:H
 echo 'All' | task 1-3,5 priority:H
 echo $ task list
 task list
 echo $ task 3 pri:
 task 3 pri:
 # 5 Tags
 echo Tags --------------------------------------------------------------
 echo $ task list
 task list
 echo $ task 3,5,6 +mall
 echo 'All' | task 3,5,6 +mall
 echo $ task long
 task long
 echo $ task list +mall
 task list +mall
 echo $ task 3 -mall
 task 3 -mall
 # 6 Modifications
 echo Modifications --------------------------------------------------------------
 echo $ task 7 Pay rent at the end of the month
 echo 'Yes' | task 7 Pay rent at the end of the month
 echo $ task add music
 task add music
 echo $ task 8 prepend Select some
 task 8 prepend Select some
 echo $ task 8 append for after dinner
 task 8 append for after dinner
 echo $ task list
 task list
 echo $ task edit
 #task edit
 echo $ task add Hire a band?
 #task add Hire a band?
 echo $ task add Hire a band\?
 #task add Hire a band\?
 echo $ task add "Hire a band?"
 #task add "Hire a band?"
 echo $ task add -- Hire a band\? +dj
 task add -- Hire a band\? +dj
 echo $ task undo
 echo 'y' | task undo
 echo $ task 1 delete
 echo 'y' | task 1 delete
 echo $ task undo
 echo 'y' | task undo
 # 7 Info
 echo Info --------------------------------------------------------------
 echo $ task 1 info
 task 1 info
 echo $ task stats
 task stats
 # 8 Annotations
 echo Annotations --------------------------------------------------------------
 echo $ task 1 annotate the 13 looks good
 task 1 annotate the 13 looks good
 sleep 1
 echo $ task 1 annotate or the 14th
 task 1 annotate or the 14th
 echo $ task list
 task list
 echo $ task list rc.annotations:full
 task list rc.annotations:full
 echo $ task list rc.annotations:sparse
 task list rc.annotations:sparse
 echo $ task list rc.annotations:none
 task list rc.annotations:none
 echo $ task 1 denotate 14th
 task 1 denotate 14th
 echo $ task list
 task list
 # 9 Configuration
 echo Configuration --------------------------------------------------------------
 echo $ task show
 task show
 echo $ task config answer forty-two
 echo 'y' | task config answer forty-two
 echo $ task show answer
 task show answer
 echo $ task config answer
 echo 'y' | task config answer
 echo $ task rc.report.list.sort=description+ list
 task rc.report.list.sort=description+ list
 # 10 Defaults
 echo Defaults --------------------------------------------------------------
 echo $ task config default.command list
 echo 'y' | task config default.command list
 echo $ task 
 task 
 echo $ task config default.priority H
 echo 'y' | task config default.priority H
 echo $ task config default.project Work
 echo 'y' | task config default.project Work
 echo $ task add New task
 task add New task
 echo $ task list
 task list
 echo $ task undo
 echo 'y' | task undo
 echo $ task config default.priority
 echo 'y' | task config default.priority
 echo $ task config default.project
 echo 'y' | task config default.project
 # 11 Aliases
 echo Aliases --------------------------------------------------------------
 echo $ task config alias.zzz list
 echo 'y' | task config alias.zzz list
 echo $ task zzz
 task zzz
 echo $ task z
 task z
 # 12 Color
 echo Color --------------------------------------------------------------
 echo $ task config color on
 echo 'y' | task config color on
 echo $ task list
 task list
 echo $ task 1 bg:on_red
 task 1 bg:on_red
 echo $ task list
 task list
 echo $ task 1 bg:
 task 1 bg:
 echo $ task color
 task color
 echo $ task color white on red
 task color white on red
 echo $ task color legend
 task color legend
 echo vi ~/.taskrc # include /usr/local/share/doc/task/rc/dark-blue-256.theme
 #vi ~/.taskrc # include /usr/local/share/doc/task/rc/dark-blue-256.theme
 echo 'include /usr/local/share/doc/task/rc/dark-blue-256.theme' >> x
 echo $ task color legend
 task color legend
 echo $ task list
 task list
 echo vi ~/.taskrc # include /usr/local/share/doc/task/rc/dark-red-256.theme
 #vi ~/.taskrc # include /usr/local/share/doc/task/rc/dark-red-256.theme
 sed 's/blue/red/' x >x2 && mv x2 x
 echo $ task color legend
 task color legend
 echo $ task list
 task list
 echo vi ~/.taskrc # include /usr/local/share/doc/task/rc/dark-256.theme
 #vi ~/.taskrc # include /usr/local/share/doc/task/rc/dark-256.theme
 sed 's/red-//' x >x2 && mv x2 x
 echo $ task list
 task list
 echo $ task "rc.color.project.party=on rgb001" rc.color.keyword.invit=bold list
 task "rc.color.project.party=on rgb001" rc.color.keyword.invit=bold list
 echo $ man task-color
 #man task-color
 # 13 Active tasks
 echo Active tasks --------------------------------------------------------------
 echo $ task 2 start
 task 2 start
 echo $ task list
 task list
 echo $ task active
 task active
 echo $ task 2 stop
 task 2 stop
 echo $ task config journal.time on
 task config journal.time on
 echo $ task config rc.dateformat.xxx xxx
 task config rc.dateformat.xxx xxx
 echo $ task config dateformat.annotation 'Y/m/d H:N'
 task config dateformat.annotation 'Y/m/d H:N'
 echo $ task 2 start
 task 2 start
 echo $ task list venue
 task list venue
 echo $ task 2 stop
 task 2 stop
 echo $ task list venue
 task list venue
 # 14 Due dates
 echo Due dates --------------------------------------------------------------
 echo $ task 1 due:7/31/2010
 task 1 due:7/31/2010
 echo $ task 1 due:2wks
 task 1 due:2wks
 echo $ task 1 due:-2wks
 task 1 due:-2wks
 echo $ task 1 due:eom
 task 1 due:eom
 echo $ task 2 due:8th
 task 2 due:8th
 echo $ task 2 due:sunday
 task 2 due:sunday
 echo $ task 5 due:eow
 task 5 due:eow
 echo $ task list
 task list
 echo $ task overdue
 task overdue
 echo $ task rc.dateformat.report:Y-M-DTH:N:SZ list
 task rc.dateformat.report:Y-M-DTH:N:SZ list
 # 15 Calendar
 echo Calendar --------------------------------------------------------------
 echo $ task calendar
 task calendar
 echo $ vi ~/.taskrc # include /usr/local/share/doc/task/rc/holidays-US.rc
 #vi ~/.taskrc # include /usr/local/share/doc/task/rc/holidays-US.rc
 echo 'include /usr/local/share/doc/task/rc/holidays-US.rc' >> x
 echo $ task calendar
 task calendar
 echo $ task cal 2010
 task cal 2010
 echo $ task rc.calendar.details:full cal
 task rc.calendar.details:full cal
 echo $ task rc.calendar.holidays:full cal
 task rc.calendar.holidays:full cal
 # 16 Recurrence
 echo Recurrence --------------------------------------------------------------
 echo $ task 7 info
 task 7 info
 echo $ task 7 due:eom recur:monthly
 task 7 due:eom recur:monthly
 echo $ task 7
 task 7
 echo $ task 7 until:eoy
 task 7 until:eoy
 echo $ task recurring
 task recurring
 echo $ task add Pay taxes due:4/15/2007 recur:yearly
 task add Pay taxes due:4/15/2007 recur:yearly
 echo $ task long
 task long
 echo $ task 11 delete
 printf "y\ny\n" | task 11 delete      # y, y
 echo $ task list
 task list
 # 17 Special tags
 echo Special tags --------------------------------------------------------------
 echo $ task 6 +nocolor
 task 6 +nocolor
 echo $ task list
 task list
 echo $ task tags
 task tags
 echo $ task 6 -nocolor
 task 6 -nocolor
 # 18 Waiting
 echo Waiting --------------------------------------------------------------
 echo $ task add Look for new apartment due:eoy
 task add Look for new apartment due:eoy
 echo $ task list
 task list
 echo $ task 10 wait:12/1/2010
 task 10 wait:12/1/2010
 echo $ task list
 task list
 echo $ task waiting
 task waiting
 echo $ task add Do something in a few seconds
 task add Do something in a few seconds
 echo $ task 11 wait:5s
 task 11 wait:5s
 echo $ task list
 task list
 sleep 5
 echo $ task list
 task list
 echo $ task 11 rc.confirmation:no delete
 task 11 rc.confirmation:no delete
 # 19 Dependencies
 echo Dependencies --------------------------------------------------------------
 echo $ task list pro:party
 task list pro:party
 echo $ task 3 depends:6
 task 3 depends:6
 echo $ task 6 dep:5
 task 6 dep:5
 echo $ task 2 dep:1
 task 2 dep:1
 echo $ task 5 dep:1,2
 task 5 dep:1,2
 echo $ task 4 dep:1
 task 4 dep:1
 echo $ task long pro:party
 task long pro:party
 echo $ task 5 dep:-1
 task 5 dep:-1
 echo $ task blocked
 task blocked
 echo $ task unblocked
 task  unblocked
 echo $ task 1 info
 task  1 info
 echo $ task 2 info
 task  2 info
 echo $ task 2 done
 echo 'y' | task  2 done
 echo $ task 1 info
 task  1 info
 # 20 Reports
 echo Reports --------------------------------------------------------------
 echo $ task minimal
 task  minimal
 echo $ task ls
 task  ls
 echo $ task list
 task  list
 echo $ task long
 task  long
 echo $ task all
 task  all
 echo $ task completed
 task  completed
 echo $ task recurring
 task  recurring
 echo $ task waiting
 task  waiting
 echo $ task blocked
 task  blocked
 echo $ task oldest
 task  oldest
 echo $ task newest
 task  newest
 echo $ task timesheet
 task  timesheet
 echo $ task next
 task  next
 # 21 Custom report
 echo Custom report --------------------------------------------------------------
 echo 'report.foo.description=My own report'     >> x
 echo 'report.foo.columns=id,entry,description'  >> x
 echo 'report.foo.labels=ID,Entered,Description' >> x
 echo 'report.foo.sort=entry+,description+'      >> x
 echo 'report.foo.filter=status:pending'         >> x
 echo 'task help | grep foo'
 task  help | grep foo
 echo $ task show report.foo
 task  show report.foo
 echo $ task foo
 task  foo
 # 22 Charts
 echo Charts --------------------------------------------------------------
 echo $ task history
 task history
 echo $ task history.annual
 task history.annual
 echo $ task ghistory
 task ghistory
 echo $ task ghistory.annual
 task ghistory.annual
 echo $ task summary
 task summary
 # 23 Advanced filters
 echo Advanced filters --------------------------------------------------------------
 echo $ task list
 task  list
 echo $ task list invit
 task  list invit
 echo $ task list description.contains:invit
 task  list description.contains:invit
 echo $ task list desc.word:the
 task  list desc.word:the
 echo $ task list desc.noword:invitations
 task  list desc.noword:invitations
 echo $ task list pro:party
 task  list pro:party
 echo $ task list pro.is:party
 task  list pro.is:party
 echo $ task list pro.not:party
 task  list pro.not:party
 echo $ task list pro:party priority.over:L
 task  list pro:party priority.over:L
 echo $ task list pro:party limit:2
 task  list pro:party limit:2
 echo $ task list limit:page
 task  list limit:page
 echo $ task all status:pending
 task  all status:pending
 echo $ task all status:waiting
 task  all status:waiting
 # 24 Import/export
 echo Import/export --------------------------------------------------------------
 echo $ task export.csv
 task  export.csv
 echo $ task export.csv venue
 task  export.csv venue
 echo $ task export.vcalendar venue
 task  export.vcalendar venue
 echo $ task export.yaml venue
 task  export.yaml venue
 cat <<EOF >file.text
 Remember to read the task man page
 EOF
 cat file.text
 echo $ task import file.text
 printf "y\n" | task  import file.text
 cat <<EOF >file.yaml
 %YAML 1.1
 ---
  task:
    description: Visit http://taskwarrior.org
    due: 1281844800
    entry: 1281289630
    priority: H
    project: work
    status: pending
    uuid: 23afada0-a446-8d5a-c213-30d99d52c4b0
 ...
 EOF
 cat file.yaml
 echo $ task import file.yaml
 printf "y\n" | task  import file.yaml
 echo $ task new limit:2
 task  new limit:2
 # 25 Help
 echo Help --------------------------------------------------------------
 echo $ task help
 task  help
 echo $ man task
 #man task
 echo $ man taskrc
 #man taskrc
 echo $ man task-color
 #man task-color
 echo $ man task-tutorial
 #man task-tutorial
 echo $ man task-faq
 #man task-faq
 echo $ man task-sync
 #man task-sync
 # 26 Wrap up
 echo Wrap up --------------------------------------------------------------
 echo $ task version
 task  version
 exit
--- a/doc/misc/tutorial/run.200
+++ b/doc/misc/tutorial/run.200
@@ -0,0 +1,520 @@
 #! /bin/bash
 rm -f /Users/paul/.task/pending.data /Users/paul/.task/completed.data /Users/paul/.task/undo.data
 echo 'data.location=~/.task' > /Users/paul/.taskrc
 echo 'color=off' >> /Users/paul/.taskrc
 echo 'color.summary.background=on gray3' >> /Users/paul/.taskrc
 echo '#include /usr/local/share/doc/task/rc/dark-blue-256.theme' >> /Users/paul/.taskrc
 echo '#include /usr/local/share/doc/task/rc/dark-red-256.theme' >> /Users/paul/.taskrc
 echo '#include /usr/local/share/doc/task/rc/dark-256.theme' >> /Users/paul/.taskrc
 # 1 Intro
 # 2 Basic usage
 echo Basic usage --------------------------------------------------------------
 echo $ task add Select a free weekend in November
 task add Select a free weekend in November
 echo $ task add Select and book a venue
 task add Select and book a venue
 echo $ task add Come up with a guest list
 task add Come up with a guest list
 echo $ task add Mail invitations
 task add Mail invitations
 echo $ task add Select a caterer
 task add Select a caterer
 echo $ task list
 task list
 echo $ task log Order a special cake
 task log Order a special cake
 echo $ task 4 duplicate /Mail/Design/
 task 4 duplicate /Mail/Design/
 echo $ task 4 duplicate /Mail/Print/
 task 4 duplicate /Mail/Print/
 echo $ task list
 task list
 echo $ task 3 done
 task 3 done
 echo $ task list
 task list
 # 3 Projects
 echo Projects --------------------------------------------------------------
 echo $ task add Pay teh rent on teh 31st
 task add Pay teh rent on teh 31st
 echo $ task 7 /teh/the/g
 task 7 /teh/the/g
 echo $ task list
 task list
 echo $ task 7 project:home
 task 7 project:home
 echo $ task 1-6 project:party
 echo 'All' | task 1-6 project:party
 echo $ task projects
 task projects
 echo $ task list project:home
 task list project:home
 echo $ task li pro:par
 task li pro:par
 # 4 Priorities
 echo Priorities --------------------------------------------------------------
 echo $ task 1-3,5 priority:H
 echo 'All' | task 1-3,5 priority:H
 echo $ task list
 task list
 echo $ task 3 pri:
 task 3 pri:
 # 5 Tags
 echo Tags --------------------------------------------------------------
 echo $ task list
 task list
 echo $ task 3,5,6 +mall
 echo 'All' | task 3,5,6 +mall
 echo $ task long
 task long
 echo $ task list +mall
 task list +mall
 echo $ task 3 -mall
 task 3 -mall
 # 6 Modifications
 echo Modifications --------------------------------------------------------------
 echo $ task 7 Pay rent at the end of the month
 echo 'Yes' | task 7 Pay rent at the end of the month
 echo $ task add music
 task add music
 echo $ task 8 prepend Select some
 task 8 prepend Select some
 echo $ task 8 append for after dinner
 task 8 append for after dinner
 echo $ task list
 task list
 echo $ task edit
 #task edit
 echo $ task add Hire a band?
 #task add Hire a band?
 echo $ task add Hire a band\?
 #task add Hire a band\?
 echo $ task add "Hire a band?"
 #task add "Hire a band?"
 echo $ task add -- Hire a band\? +dj
 task add -- Hire a band\? +dj
 echo $ task undo
 echo 'y' | task undo
 echo $ task 1 delete
 echo 'y' | task 1 delete
 echo $ task undo
 echo 'y' | task undo
 # 7 Info
 echo Info --------------------------------------------------------------
 echo $ task 1 info
 task 1 info
 echo $ task stats
 task stats
 # 8 Annotations
 echo Annotations --------------------------------------------------------------
 echo $ task 1 annotate the 13 looks good
 task 1 annotate the 13 looks good
 sleep 1
 echo $ task 1 annotate or the 14th
 task 1 annotate or the 14th
 echo $ task list
 task list
 echo $ task list rc.annotations:full
 task list rc.annotations:full
 echo $ task list rc.annotations:sparse
 task list rc.annotations:sparse
 echo $ task list rc.annotations:none
 task list rc.annotations:none
 echo $ task 1 denotate 14th
 task 1 denotate 14th
 echo $ task list
 task list
 # 9 Configuration
 echo Configuration --------------------------------------------------------------
 echo $ task show
 task show
 echo $ task config answer forty-two
 echo 'y' | task config answer forty-two
 echo $ task show answer
 task show answer
 echo $ task config answer
 echo 'y' | task config answer
 echo $ task rc.report.list.sort=description+ list
 task rc.report.list.sort=description+ list
 # 10 Defaults
 echo Defaults --------------------------------------------------------------
 echo $ task config default.command list
 echo 'y' | task config default.command list
 echo $ task 
 task 
 echo $ task config default.priority H
 echo 'y' | task config default.priority H
 echo $ task config default.project Work
 echo 'y' | task config default.project Work
 echo $ task add New task
 task add New task
 echo $ task list
 task list
 echo $ task undo
 echo 'y' | task undo
 echo $ task config default.priority
 echo 'y' | task config default.priority
 echo $ task config default.project
 echo 'y' | task config default.project
 # 11 Aliases
 echo Aliases --------------------------------------------------------------
 echo $ task config alias.zzz list
 echo 'y' | task config alias.zzz list
 echo $ task zzz
 task zzz
 echo $ task z
 task z
 # 12 Color
 echo Color --------------------------------------------------------------
 echo $ task config color on
 echo 'y' | task config color on
 echo $ task list
 task list
 echo $ task 1 bg:on_red
 task 1 bg:on_red
 echo $ task list
 task list
 echo $ task 1 bg:
 task 1 bg:
 echo $ task color
 task color
 echo $ task color white on red
 task color white on red
 echo $ task color legend
 task color legend
 echo vi ~/.taskrc # include /usr/local/share/doc/task/rc/dark-blue-256.theme
 #vi ~/.taskrc # include /usr/local/share/doc/task/rc/dark-blue-256.theme
 echo 'include /usr/local/share/doc/task/rc/dark-blue-256.theme' >> x
 echo $ task color legend
 task color legend
 echo $ task list
 task list
 echo vi ~/.taskrc # include /usr/local/share/doc/task/rc/dark-red-256.theme
 #vi ~/.taskrc # include /usr/local/share/doc/task/rc/dark-red-256.theme
 sed 's/blue/red/' x >x2 && mv x2 x
 echo $ task color legend
 task color legend
 echo $ task list
 task list
 echo vi ~/.taskrc # include /usr/local/share/doc/task/rc/dark-256.theme
 #vi ~/.taskrc # include /usr/local/share/doc/task/rc/dark-256.theme
 sed 's/red-//' x >x2 && mv x2 x
 echo $ task list
 task list
 echo $ task "rc.color.project.party=on rgb001" rc.color.keyword.invit=bold list
 task "rc.color.project.party=on rgb001" rc.color.keyword.invit=bold list
 echo $ man task-color
 #man task-color
 # 13 Active tasks
 echo Active tasks --------------------------------------------------------------
 echo $ task 2 start
 task 2 start
 echo $ task list
 task list
 echo $ task active
 task active
 echo $ task 2 stop
 task 2 stop
 echo $ task config journal.time on
 task config journal.time on
 echo $ task config rc.dateformat.xxx xxx
 task config rc.dateformat.xxx xxx
 echo $ task config dateformat.annotation 'Y/m/d H:N'
 task config dateformat.annotation 'Y/m/d H:N'
 echo $ task 2 start
 task 2 start
 echo $ task list venue
 task list venue
 echo $ task 2 stop
 task 2 stop
 echo $ task list venue
 task list venue
 # 14 Due dates
 echo Due dates --------------------------------------------------------------
 echo $ task 1 due:7/31/2010
 task 1 due:7/31/2010
 echo $ task 1 due:2wks
 task 1 due:2wks
 echo $ task 1 due:-2wks
 task 1 due:-2wks
 echo $ task 1 due:eom
 task 1 due:eom
 echo $ task 2 due:8th
 task 2 due:8th
 echo $ task 2 due:sunday
 task 2 due:sunday
 echo $ task 5 due:eow
 task 5 due:eow
 echo $ task list
 task list
 echo $ task overdue
 task overdue
 echo $ task rc.dateformat.report:Y-M-DTH:N:SZ list
 task rc.dateformat.report:Y-M-DTH:N:SZ list
 # 15 Calendar
 echo Calendar --------------------------------------------------------------
 echo $ task calendar
 task calendar
 echo $ vi ~/.taskrc # include /usr/local/share/doc/task/rc/holidays-US.rc
 #vi ~/.taskrc # include /usr/local/share/doc/task/rc/holidays-US.rc
 echo 'include /usr/local/share/doc/task/rc/holidays-US.rc' >> x
 echo $ task calendar
 task calendar
 echo $ task cal 2010
 task cal 2010
 echo $ task rc.calendar.details:full cal
 task rc.calendar.details:full cal
 echo $ task rc.calendar.holidays:full cal
 task rc.calendar.holidays:full cal
 # 16 Recurrence
 echo Recurrence --------------------------------------------------------------
 echo $ task 7 info
 task 7 info
 echo $ task 7 due:eom recur:monthly
 task 7 due:eom recur:monthly
 echo $ task 7
 task 7
 echo $ task 7 until:eoy
 task 7 until:eoy
 echo $ task recurring
 task recurring
 echo $ task add Pay taxes due:4/15/2007 recur:yearly
 task add Pay taxes due:4/15/2007 recur:yearly
 echo $ task long
 task long
 echo $ task 11 delete
 printf "y\ny\n" | task 11 delete      # y, y
 echo $ task list
 task list
 # 17 Special tags
 echo Special tags --------------------------------------------------------------
 echo $ task 6 +nocolor
 task 6 +nocolor
 echo $ task list
 task list
 echo $ task tags
 task tags
 echo $ task 6 -nocolor
 task 6 -nocolor
 # 18 Waiting
 echo Waiting --------------------------------------------------------------
 echo $ task add Look for new apartment due:eoy
 task add Look for new apartment due:eoy
 echo $ task list
 task list
 echo $ task 10 wait:12/1/2010
 task 10 wait:12/1/2010
 echo $ task list
 task list
 echo $ task waiting
 task waiting
 echo $ task add Do something in a few seconds
 task add Do something in a few seconds
 echo $ task 11 wait:5s
 task 11 wait:5s
 echo $ task list
 task list
 sleep 5
 echo $ task list
 task list
 echo $ task 11 rc.confirmation:no delete
 task 11 rc.confirmation:no delete
 # 19 Dependencies
 echo Dependencies --------------------------------------------------------------
 echo $ task list pro:party
 task list pro:party
 echo $ task 3 depends:6
 task 3 depends:6
 echo $ task 6 dep:5
 task 6 dep:5
 echo $ task 2 dep:1
 task 2 dep:1
 echo $ task 5 dep:1,2
 task 5 dep:1,2
 echo $ task 4 dep:1
 task 4 dep:1
 echo $ task long pro:party
 task long pro:party
 echo $ task 5 dep:-1
 task 5 dep:-1
 echo $ task blocked
 task blocked
 echo $ task unblocked
 task  unblocked
 echo $ task 1 info
 task  1 info
 echo $ task 2 info
 task  2 info
 echo $ task 2 done
 echo 'y' | task  2 done
 echo $ task 1 info
 task  1 info
 # 20 Reports
 echo Reports --------------------------------------------------------------
 echo $ task minimal
 task  minimal
 echo $ task ls
 task  ls
 echo $ task list
 task  list
 echo $ task long
 task  long
 echo $ task all
 task  all
 echo $ task completed
 task  completed
 echo $ task recurring
 task  recurring
 echo $ task waiting
 task  waiting
 echo $ task blocked
 task  blocked
 echo $ task oldest
 task  oldest
 echo $ task newest
 task  newest
 echo $ task timesheet
 task  timesheet
 echo $ task next
 task  next
 # 21 Custom report
 echo Custom report --------------------------------------------------------------
 echo 'report.foo.description=My own report'     >> x
 echo 'report.foo.columns=id,entry,description'  >> x
 echo 'report.foo.labels=ID,Entered,Description' >> x
 echo 'report.foo.sort=entry+,description+'      >> x
 echo 'report.foo.filter=status:pending'         >> x
 echo 'task help | grep foo'
 task  help | grep foo
 echo $ task show report.foo
 task  show report.foo
 echo $ task foo
 task  foo
 # 22 Charts
 echo Charts --------------------------------------------------------------
 echo $ task history
 task history
 echo $ task history.annual
 task history.annual
 echo $ task ghistory
 task ghistory
 echo $ task ghistory.annual
 task ghistory.annual
 echo $ task summary
 task summary
 # 23 Advanced filters
 echo Advanced filters --------------------------------------------------------------
 echo $ task list
 task  list
 echo $ task list invit
 task  list invit
 echo $ task list description.contains:invit
 task  list description.contains:invit
 echo $ task list desc.word:the
 task  list desc.word:the
 echo $ task list desc.noword:invitations
 task  list desc.noword:invitations
 echo $ task list pro:party
 task  list pro:party
 echo $ task list pro.is:party
 task  list pro.is:party
 echo $ task list pro.not:party
 task  list pro.not:party
 echo $ task list pro:party priority.over:L
 task  list pro:party priority.over:L
 echo $ task list pro:party limit:2
 task  list pro:party limit:2
 echo $ task list limit:page
 task  list limit:page
 echo $ task all status:pending
 task  all status:pending
 echo $ task all status:waiting
 task  all status:waiting
 # 24 Import/export
 echo Import/export --------------------------------------------------------------
 echo $ task export.csv
 task  export.csv
 echo $ task export.csv venue
 task  export.csv venue
 echo $ task export.vcalendar venue
 task  export.vcalendar venue
 echo $ task export.yaml venue
 task  export.yaml venue
 cat <<EOF >file.text
 Remember to read the task man page
 EOF
 cat file.text
 echo $ task import file.text
 printf "y\n" | task  import file.text
 cat <<EOF >file.yaml
 %YAML 1.1
 ---
  task:
    description: Visit http://taskwarrior.org
    due: 1281844800
    entry: 1281289630
    priority: H
    project: work
    status: pending
    uuid: 23afada0-a446-8d5a-c213-30d99d52c4b0
 ...
 EOF
 cat file.yaml
 echo $ task import file.yaml
 printf "y\n" | task  import file.yaml
 echo $ task new limit:2
 task  new limit:2
 # 25 Help
 echo Help --------------------------------------------------------------
 echo $ task help
 task  help
 echo $ man task
 #man task
 echo $ man taskrc
 #man taskrc
 echo $ man task-color
 #man task-color
 echo $ man task-tutorial
 #man task-tutorial
 echo $ man task-faq
 #man task-faq
 echo $ man task-sync
 #man task-sync
 # 26 Wrap up
 echo Wrap up --------------------------------------------------------------
 echo $ task version
 task  version
 exit
--- a/doc/misc/tutorial/shell/run.200
+++ b/doc/misc/tutorial/shell/run.200
@@ -0,0 +1,520 @@
 #! /bin/bash
 rm -f /Users/paul/.task/pending.data /Users/paul/.task/completed.data /Users/paul/.task/undo.data
 echo 'data.location=~/.task' > /Users/paul/.taskrc
 echo 'color=off' >> /Users/paul/.taskrc
 echo 'color.summary.background=on gray3' >> /Users/paul/.taskrc
 echo '#include /usr/local/share/doc/task/rc/dark-blue-256.theme' >> /Users/paul/.taskrc
 echo '#include /usr/local/share/doc/task/rc/dark-red-256.theme' >> /Users/paul/.taskrc
 echo '#include /usr/local/share/doc/task/rc/dark-256.theme' >> /Users/paul/.taskrc
 # 1 Intro
 # 2 Basic usage
 echo Basic usage --------------------------------------------------------------
 echo $ task add Select a free weekend in November
 task add Select a free weekend in November
 echo $ task add Select and book a venue
 task add Select and book a venue
 echo $ task add Come up with a guest list
 task add Come up with a guest list
 echo $ task add Mail invitations
 task add Mail invitations
 echo $ task add Select a caterer
 task add Select a caterer
 echo $ task list
 task list
 echo $ task log Order a special cake
 task log Order a special cake
 echo $ task 4 duplicate /Mail/Design/
 task 4 duplicate /Mail/Design/
 echo $ task 4 duplicate /Mail/Print/
 task 4 duplicate /Mail/Print/
 echo $ task list
 task list
 echo $ task 3 done
 task 3 done
 echo $ task list
 task list
 # 3 Projects
 echo Projects --------------------------------------------------------------
 echo $ task add Pay teh rent on teh 31st
 task add Pay teh rent on teh 31st
 echo $ task 7 /teh/the/g
 task 7 /teh/the/g
 echo $ task list
 task list
 echo $ task 7 project:home
 task 7 project:home
 echo $ task 1-6 project:party
 echo 'All' | task 1-6 project:party
 echo $ task projects
 task projects
 echo $ task list project:home
 task list project:home
 echo $ task li pro:par
 task li pro:par
 # 4 Priorities
 echo Priorities --------------------------------------------------------------
 echo $ task 1-3,5 priority:H
 echo 'All' | task 1-3,5 priority:H
 echo $ task list
 task list
 echo $ task 3 pri:
 task 3 pri:
 # 5 Tags
 echo Tags --------------------------------------------------------------
 echo $ task list
 task list
 echo $ task 3,5,6 +mall
 echo 'All' | task 3,5,6 +mall
 echo $ task long
 task long
 echo $ task list +mall
 task list +mall
 echo $ task 3 -mall
 task 3 -mall
 # 6 Modifications
 echo Modifications --------------------------------------------------------------
 echo $ task 7 Pay rent at the end of the month
 echo 'Yes' | task 7 Pay rent at the end of the month
 echo $ task add music
 task add music
 echo $ task 8 prepend Select some
 task 8 prepend Select some
 echo $ task 8 append for after dinner
 task 8 append for after dinner
 echo $ task list
 task list
 echo $ task edit
 #task edit
 echo $ task add Hire a band?
 #task add Hire a band?
 echo $ task add Hire a band\?
 #task add Hire a band\?
 echo $ task add "Hire a band?"
 #task add "Hire a band?"
 echo $ task add -- Hire a band\? +dj
 task add -- Hire a band\? +dj
 echo $ task undo
 echo 'y' | task undo
 echo $ task 1 delete
 echo 'y' | task 1 delete
 echo $ task undo
 echo 'y' | task undo
 # 7 Info
 echo Info --------------------------------------------------------------
 echo $ task 1 info
 task 1 info
 echo $ task stats
 task stats
 # 8 Annotations
 echo Annotations --------------------------------------------------------------
 echo $ task 1 annotate the 13 looks good
 task 1 annotate the 13 looks good
 sleep 1
 echo $ task 1 annotate or the 14th
 task 1 annotate or the 14th
 echo $ task list
 task list
 echo $ task list rc.annotations:full
 task list rc.annotations:full
 echo $ task list rc.annotations:sparse
 task list rc.annotations:sparse
 echo $ task list rc.annotations:none
 task list rc.annotations:none
 echo $ task 1 denotate 14th
 task 1 denotate 14th
 echo $ task list
 task list
 # 9 Configuration
 echo Configuration --------------------------------------------------------------
 echo $ task show
 task show
 echo $ task config answer forty-two
 echo 'y' | task config answer forty-two
 echo $ task show answer
 task show answer
 echo $ task config answer
 echo 'y' | task config answer
 echo $ task rc.report.list.sort=description+ list
 task rc.report.list.sort=description+ list
 # 10 Defaults
 echo Defaults --------------------------------------------------------------
 echo $ task config default.command list
 echo 'y' | task config default.command list
 echo $ task 
 task 
 echo $ task config default.priority H
 echo 'y' | task config default.priority H
 echo $ task config default.project Work
 echo 'y' | task config default.project Work
 echo $ task add New task
 task add New task
 echo $ task list
 task list
 echo $ task undo
 echo 'y' | task undo
 echo $ task config default.priority
 echo 'y' | task config default.priority
 echo $ task config default.project
 echo 'y' | task config default.project
 # 11 Aliases
 echo Aliases --------------------------------------------------------------
 echo $ task config alias.zzz list
 echo 'y' | task config alias.zzz list
 echo $ task zzz
 task zzz
 echo $ task z
 task z
 # 12 Color
 echo Color --------------------------------------------------------------
 echo $ task config color on
 echo 'y' | task config color on
 echo $ task list
 task list
 echo $ task 1 bg:on_red
 task 1 bg:on_red
 echo $ task list
 task list
 echo $ task 1 bg:
 task 1 bg:
 echo $ task color
 task color
 echo $ task color white on red
 task color white on red
 echo $ task color legend
 task color legend
 echo vi ~/.taskrc # include /usr/local/share/doc/task/rc/dark-blue-256.theme
 #vi ~/.taskrc # include /usr/local/share/doc/task/rc/dark-blue-256.theme
 echo 'include /usr/local/share/doc/task/rc/dark-blue-256.theme' >> x
 echo $ task color legend
 task color legend
 echo $ task list
 task list
 echo vi ~/.taskrc # include /usr/local/share/doc/task/rc/dark-red-256.theme
 #vi ~/.taskrc # include /usr/local/share/doc/task/rc/dark-red-256.theme
 sed 's/blue/red/' x >x2 && mv x2 x
 echo $ task color legend
 task color legend
 echo $ task list
 task list
 echo vi ~/.taskrc # include /usr/local/share/doc/task/rc/dark-256.theme
 #vi ~/.taskrc # include /usr/local/share/doc/task/rc/dark-256.theme
 sed 's/red-//' x >x2 && mv x2 x
 echo $ task list
 task list
 echo $ task "rc.color.project.party=on rgb001" rc.color.keyword.invit=bold list
 task "rc.color.project.party=on rgb001" rc.color.keyword.invit=bold list
 echo $ man task-color
 #man task-color
 # 13 Active tasks
 echo Active tasks --------------------------------------------------------------
 echo $ task 2 start
 task 2 start
 echo $ task list
 task list
 echo $ task active
 task active
 echo $ task 2 stop
 task 2 stop
 echo $ task config journal.time on
 task config journal.time on
 echo $ task config rc.dateformat.xxx xxx
 task config rc.dateformat.xxx xxx
 echo $ task config dateformat.annotation 'Y/m/d H:N'
 task config dateformat.annotation 'Y/m/d H:N'
 echo $ task 2 start
 task 2 start
 echo $ task list venue
 task list venue
 echo $ task 2 stop
 task 2 stop
 echo $ task list venue
 task list venue
 # 14 Due dates
 echo Due dates --------------------------------------------------------------
 echo $ task 1 due:7/31/2010
 task 1 due:7/31/2010
 echo $ task 1 due:2wks
 task 1 due:2wks
 echo $ task 1 due:-2wks
 task 1 due:-2wks
 echo $ task 1 due:eom
 task 1 due:eom
 echo $ task 2 due:8th
 task 2 due:8th
 echo $ task 2 due:sunday
 task 2 due:sunday
 echo $ task 5 due:eow
 task 5 due:eow
 echo $ task list
 task list
 echo $ task overdue
 task overdue
 echo $ task rc.dateformat.report:Y-M-DTH:N:SZ list
 task rc.dateformat.report:Y-M-DTH:N:SZ list
 # 15 Calendar
 echo Calendar --------------------------------------------------------------
 echo $ task calendar
 task calendar
 echo $ vi ~/.taskrc # include /usr/local/share/doc/task/rc/holidays-US.rc
 #vi ~/.taskrc # include /usr/local/share/doc/task/rc/holidays-US.rc
 echo 'include /usr/local/share/doc/task/rc/holidays-US.rc' >> x
 echo $ task calendar
 task calendar
 echo $ task cal 2010
 task cal 2010
 echo $ task rc.calendar.details:full cal
 task rc.calendar.details:full cal
 echo $ task rc.calendar.holidays:full cal
 task rc.calendar.holidays:full cal
 # 16 Recurrence
 echo Recurrence --------------------------------------------------------------
 echo $ task 7 info
 task 7 info
 echo $ task 7 due:eom recur:monthly
 task 7 due:eom recur:monthly
 echo $ task 7
 task 7
 echo $ task 7 until:eoy
 task 7 until:eoy
 echo $ task recurring
 task recurring
 echo $ task add Pay taxes due:4/15/2007 recur:yearly
 task add Pay taxes due:4/15/2007 recur:yearly
 echo $ task long
 task long
 echo $ task 11 delete
 printf "y\ny\n" | task 11 delete      # y, y
 echo $ task list
 task list
 # 17 Special tags
 echo Special tags --------------------------------------------------------------
 echo $ task 6 +nocolor
 task 6 +nocolor
 echo $ task list
 task list
 echo $ task tags
 task tags
 echo $ task 6 -nocolor
 task 6 -nocolor
 # 18 Waiting
 echo Waiting --------------------------------------------------------------
 echo $ task add Look for new apartment due:eoy
 task add Look for new apartment due:eoy
 echo $ task list
 task list
 echo $ task 10 wait:12/1/2010
 task 10 wait:12/1/2010
 echo $ task list
 task list
 echo $ task waiting
 task waiting
 echo $ task add Do something in a few seconds
 task add Do something in a few seconds
 echo $ task 11 wait:5s
 task 11 wait:5s
 echo $ task list
 task list
 sleep 5
 echo $ task list
 task list
 echo $ task 11 rc.confirmation:no delete
 task 11 rc.confirmation:no delete
 # 19 Dependencies
 echo Dependencies --------------------------------------------------------------
 echo $ task list pro:party
 task list pro:party
 echo $ task 3 depends:6
 task 3 depends:6
 echo $ task 6 dep:5
 task 6 dep:5
 echo $ task 2 dep:1
 task 2 dep:1
 echo $ task 5 dep:1,2
 task 5 dep:1,2
 echo $ task 4 dep:1
 task 4 dep:1
 echo $ task long pro:party
 task long pro:party
 echo $ task 5 dep:-1
 task 5 dep:-1
 echo $ task blocked
 task blocked
 echo $ task unblocked
 task  unblocked
 echo $ task 1 info
 task  1 info
 echo $ task 2 info
 task  2 info
 echo $ task 2 done
 echo 'y' | task  2 done
 echo $ task 1 info
 task  1 info
 # 20 Reports
 echo Reports --------------------------------------------------------------
 echo $ task minimal
 task  minimal
 echo $ task ls
 task  ls
 echo $ task list
 task  list
 echo $ task long
 task  long
 echo $ task all
 task  all
 echo $ task completed
 task  completed
 echo $ task recurring
 task  recurring
 echo $ task waiting
 task  waiting
 echo $ task blocked
 task  blocked
 echo $ task oldest
 task  oldest
 echo $ task newest
 task  newest
 echo $ task timesheet
 task  timesheet
 echo $ task next
 task  next
 # 21 Custom report
 echo Custom report --------------------------------------------------------------
 echo 'report.foo.description=My own report'     >> x
 echo 'report.foo.columns=id,entry,description'  >> x
 echo 'report.foo.labels=ID,Entered,Description' >> x
 echo 'report.foo.sort=entry+,description+'      >> x
 echo 'report.foo.filter=status:pending'         >> x
 echo 'task help | grep foo'
 task  help | grep foo
 echo $ task show report.foo
 task  show report.foo
 echo $ task foo
 task  foo
 # 22 Charts
 echo Charts --------------------------------------------------------------
 echo $ task history
 task history
 echo $ task history.annual
 task history.annual
 echo $ task ghistory
 task ghistory
 echo $ task ghistory.annual
 task ghistory.annual
 echo $ task summary
 task summary
 # 23 Advanced filters
 echo Advanced filters --------------------------------------------------------------
 echo $ task list
 task  list
 echo $ task list invit
 task  list invit
 echo $ task list description.contains:invit
 task  list description.contains:invit
 echo $ task list desc.word:the
 task  list desc.word:the
 echo $ task list desc.noword:invitations
 task  list desc.noword:invitations
 echo $ task list pro:party
 task  list pro:party
 echo $ task list pro.is:party
 task  list pro.is:party
 echo $ task list pro.not:party
 task  list pro.not:party
 echo $ task list pro:party priority.over:L
 task  list pro:party priority.over:L
 echo $ task list pro:party limit:2
 task  list pro:party limit:2
 echo $ task list limit:page
 task  list limit:page
 echo $ task all status:pending
 task  all status:pending
 echo $ task all status:waiting
 task  all status:waiting
 # 24 Import/export
 echo Import/export --------------------------------------------------------------
 echo $ task export.csv
 task  export.csv
 echo $ task export.csv venue
 task  export.csv venue
 echo $ task export.vcalendar venue
 task  export.vcalendar venue
 echo $ task export.yaml venue
 task  export.yaml venue
 cat <<EOF >file.text
 Remember to read the task man page
 EOF
 cat file.text
 echo $ task import file.text
 printf "y\n" | task  import file.text
 cat <<EOF >file.yaml
 %YAML 1.1
 ---
  task:
    description: Visit http://taskwarrior.org
    due: 1281844800
    entry: 1281289630
    priority: H
    project: work
    status: pending
    uuid: 23afada0-a446-8d5a-c213-30d99d52c4b0
 ...
 EOF
 cat file.yaml
 echo $ task import file.yaml
 printf "y\n" | task  import file.yaml
 echo $ task new limit:2
 task  new limit:2
 # 25 Help
 echo Help --------------------------------------------------------------
 echo $ task help
 task  help
 echo $ man task
 #man task
 echo $ man taskrc
 #man taskrc
 echo $ man task-color
 #man task-color
 echo $ man task-tutorial
 #man task-tutorial
 echo $ man task-faq
 #man task-faq
 echo $ man task-sync
 #man task-sync
 # 26 Wrap up
 echo Wrap up --------------------------------------------------------------
 echo $ task version
 task  version
 exit
--- a/doc/misc/tutorial/shell/script.txt
+++ b/doc/misc/tutorial/shell/script.txt
@@ -0,0 +1,20 @@
 [Make window 116x32 for movie recording, light text, dark background]
 This is the script from which a 2.0-specific movie will be made.  On the left
 are the typed commands, and on the right is the voice track.
 It is intended that the left and right be combined and the result will be a new
 task-tutorial.5 man page.
 ---------------------------------------- Shell -----------------------------------------------------
 tasksh                                   You can use the tasksh shell to create a more immersive
 task> projects                           environment.  Any task command you run outside the shell
 task> tags                               can also be run inside the shell, without the need to prefix
 task> list                               every command with "task".
 task> quit
 ---------------------------------------- End -------------------------------------------------------
--- a/doc/misc/tutorial/tags/run.200
+++ b/doc/misc/tutorial/tags/run.200
@@ -0,0 +1,520 @@
 #! /bin/bash
 rm -f /Users/paul/.task/pending.data /Users/paul/.task/completed.data /Users/paul/.task/undo.data
 echo 'data.location=~/.task' > /Users/paul/.taskrc
 echo 'color=off' >> /Users/paul/.taskrc
 echo 'color.summary.background=on gray3' >> /Users/paul/.taskrc
 echo '#include /usr/local/share/doc/task/rc/dark-blue-256.theme' >> /Users/paul/.taskrc
 echo '#include /usr/local/share/doc/task/rc/dark-red-256.theme' >> /Users/paul/.taskrc
 echo '#include /usr/local/share/doc/task/rc/dark-256.theme' >> /Users/paul/.taskrc
 # 1 Intro
 # 2 Basic usage
 echo Basic usage --------------------------------------------------------------
 echo $ task add Select a free weekend in November
 task add Select a free weekend in November
 echo $ task add Select and book a venue
 task add Select and book a venue
 echo $ task add Come up with a guest list
 task add Come up with a guest list
 echo $ task add Mail invitations
 task add Mail invitations
 echo $ task add Select a caterer
 task add Select a caterer
 echo $ task list
 task list
 echo $ task log Order a special cake
 task log Order a special cake
 echo $ task 4 duplicate /Mail/Design/
 task 4 duplicate /Mail/Design/
 echo $ task 4 duplicate /Mail/Print/
 task 4 duplicate /Mail/Print/
 echo $ task list
 task list
 echo $ task 3 done
 task 3 done
 echo $ task list
 task list
 # 3 Projects
 echo Projects --------------------------------------------------------------
 echo $ task add Pay teh rent on teh 31st
 task add Pay teh rent on teh 31st
 echo $ task 7 /teh/the/g
 task 7 /teh/the/g
 echo $ task list
 task list
 echo $ task 7 project:home
 task 7 project:home
 echo $ task 1-6 project:party
 echo 'All' | task 1-6 project:party
 echo $ task projects
 task projects
 echo $ task list project:home
 task list project:home
 echo $ task li pro:par
 task li pro:par
 # 4 Priorities
 echo Priorities --------------------------------------------------------------
 echo $ task 1-3,5 priority:H
 echo 'All' | task 1-3,5 priority:H
 echo $ task list
 task list
 echo $ task 3 pri:
 task 3 pri:
 # 5 Tags
 echo Tags --------------------------------------------------------------
 echo $ task list
 task list
 echo $ task 3,5,6 +mall
 echo 'All' | task 3,5,6 +mall
 echo $ task long
 task long
 echo $ task list +mall
 task list +mall
 echo $ task 3 -mall
 task 3 -mall
 # 6 Modifications
 echo Modifications --------------------------------------------------------------
 echo $ task 7 Pay rent at the end of the month
 echo 'Yes' | task 7 Pay rent at the end of the month
 echo $ task add music
 task add music
 echo $ task 8 prepend Select some
 task 8 prepend Select some
 echo $ task 8 append for after dinner
 task 8 append for after dinner
 echo $ task list
 task list
 echo $ task edit
 #task edit
 echo $ task add Hire a band?
 #task add Hire a band?
 echo $ task add Hire a band\?
 #task add Hire a band\?
 echo $ task add "Hire a band?"
 #task add "Hire a band?"
 echo $ task add -- Hire a band\? +dj
 task add -- Hire a band\? +dj
 echo $ task undo
 echo 'y' | task undo
 echo $ task 1 delete
 echo 'y' | task 1 delete
 echo $ task undo
 echo 'y' | task undo
 # 7 Info
 echo Info --------------------------------------------------------------
 echo $ task 1 info
 task 1 info
 echo $ task stats
 task stats
 # 8 Annotations
 echo Annotations --------------------------------------------------------------
 echo $ task 1 annotate the 13 looks good
 task 1 annotate the 13 looks good
 sleep 1
 echo $ task 1 annotate or the 14th
 task 1 annotate or the 14th
 echo $ task list
 task list
 echo $ task list rc.annotations:full
 task list rc.annotations:full
 echo $ task list rc.annotations:sparse
 task list rc.annotations:sparse
 echo $ task list rc.annotations:none
 task list rc.annotations:none
 echo $ task 1 denotate 14th
 task 1 denotate 14th
 echo $ task list
 task list
 # 9 Configuration
 echo Configuration --------------------------------------------------------------
 echo $ task show
 task show
 echo $ task config answer forty-two
 echo 'y' | task config answer forty-two
 echo $ task show answer
 task show answer
 echo $ task config answer
 echo 'y' | task config answer
 echo $ task rc.report.list.sort=description+ list
 task rc.report.list.sort=description+ list
 # 10 Defaults
 echo Defaults --------------------------------------------------------------
 echo $ task config default.command list
 echo 'y' | task config default.command list
 echo $ task 
 task 
 echo $ task config default.priority H
 echo 'y' | task config default.priority H
 echo $ task config default.project Work
 echo 'y' | task config default.project Work
 echo $ task add New task
 task add New task
 echo $ task list
 task list
 echo $ task undo
 echo 'y' | task undo
 echo $ task config default.priority
 echo 'y' | task config default.priority
 echo $ task config default.project
 echo 'y' | task config default.project
 # 11 Aliases
 echo Aliases --------------------------------------------------------------
 echo $ task config alias.zzz list
 echo 'y' | task config alias.zzz list
 echo $ task zzz
 task zzz
 echo $ task z
 task z
 # 12 Color
 echo Color --------------------------------------------------------------
 echo $ task config color on
 echo 'y' | task config color on
 echo $ task list
 task list
 echo $ task 1 bg:on_red
 task 1 bg:on_red
 echo $ task list
 task list
 echo $ task 1 bg:
 task 1 bg:
 echo $ task color
 task color
 echo $ task color white on red
 task color white on red
 echo $ task color legend
 task color legend
 echo vi ~/.taskrc # include /usr/local/share/doc/task/rc/dark-blue-256.theme
 #vi ~/.taskrc # include /usr/local/share/doc/task/rc/dark-blue-256.theme
 echo 'include /usr/local/share/doc/task/rc/dark-blue-256.theme' >> x
 echo $ task color legend
 task color legend
 echo $ task list
 task list
 echo vi ~/.taskrc # include /usr/local/share/doc/task/rc/dark-red-256.theme
 #vi ~/.taskrc # include /usr/local/share/doc/task/rc/dark-red-256.theme
 sed 's/blue/red/' x >x2 && mv x2 x
 echo $ task color legend
 task color legend
 echo $ task list
 task list
 echo vi ~/.taskrc # include /usr/local/share/doc/task/rc/dark-256.theme
 #vi ~/.taskrc # include /usr/local/share/doc/task/rc/dark-256.theme
 sed 's/red-//' x >x2 && mv x2 x
 echo $ task list
 task list
 echo $ task "rc.color.project.party=on rgb001" rc.color.keyword.invit=bold list
 task "rc.color.project.party=on rgb001" rc.color.keyword.invit=bold list
 echo $ man task-color
 #man task-color
 # 13 Active tasks
 echo Active tasks --------------------------------------------------------------
 echo $ task 2 start
 task 2 start
 echo $ task list
 task list
 echo $ task active
 task active
 echo $ task 2 stop
 task 2 stop
 echo $ task config journal.time on
 task config journal.time on
 echo $ task config rc.dateformat.xxx xxx
 task config rc.dateformat.xxx xxx
 echo $ task config dateformat.annotation 'Y/m/d H:N'
 task config dateformat.annotation 'Y/m/d H:N'
 echo $ task 2 start
 task 2 start
 echo $ task list venue
 task list venue
 echo $ task 2 stop
 task 2 stop
 echo $ task list venue
 task list venue
 # 14 Due dates
 echo Due dates --------------------------------------------------------------
 echo $ task 1 due:7/31/2010
 task 1 due:7/31/2010
 echo $ task 1 due:2wks
 task 1 due:2wks
 echo $ task 1 due:-2wks
 task 1 due:-2wks
 echo $ task 1 due:eom
 task 1 due:eom
 echo $ task 2 due:8th
 task 2 due:8th
 echo $ task 2 due:sunday
 task 2 due:sunday
 echo $ task 5 due:eow
 task 5 due:eow
 echo $ task list
 task list
 echo $ task overdue
 task overdue
 echo $ task rc.dateformat.report:Y-M-DTH:N:SZ list
 task rc.dateformat.report:Y-M-DTH:N:SZ list
 # 15 Calendar
 echo Calendar --------------------------------------------------------------
 echo $ task calendar
 task calendar
 echo $ vi ~/.taskrc # include /usr/local/share/doc/task/rc/holidays-US.rc
 #vi ~/.taskrc # include /usr/local/share/doc/task/rc/holidays-US.rc
 echo 'include /usr/local/share/doc/task/rc/holidays-US.rc' >> x
 echo $ task calendar
 task calendar
 echo $ task cal 2010
 task cal 2010
 echo $ task rc.calendar.details:full cal
 task rc.calendar.details:full cal
 echo $ task rc.calendar.holidays:full cal
 task rc.calendar.holidays:full cal
 # 16 Recurrence
 echo Recurrence --------------------------------------------------------------
 echo $ task 7 info
 task 7 info
 echo $ task 7 due:eom recur:monthly
 task 7 due:eom recur:monthly
 echo $ task 7
 task 7
 echo $ task 7 until:eoy
 task 7 until:eoy
 echo $ task recurring
 task recurring
 echo $ task add Pay taxes due:4/15/2007 recur:yearly
 task add Pay taxes due:4/15/2007 recur:yearly
 echo $ task long
 task long
 echo $ task 11 delete
 printf "y\ny\n" | task 11 delete      # y, y
 echo $ task list
 task list
 # 17 Special tags
 echo Special tags --------------------------------------------------------------
 echo $ task 6 +nocolor
 task 6 +nocolor
 echo $ task list
 task list
 echo $ task tags
 task tags
 echo $ task 6 -nocolor
 task 6 -nocolor
 # 18 Waiting
 echo Waiting --------------------------------------------------------------
 echo $ task add Look for new apartment due:eoy
 task add Look for new apartment due:eoy
 echo $ task list
 task list
 echo $ task 10 wait:12/1/2010
 task 10 wait:12/1/2010
 echo $ task list
 task list
 echo $ task waiting
 task waiting
 echo $ task add Do something in a few seconds
 task add Do something in a few seconds
 echo $ task 11 wait:5s
 task 11 wait:5s
 echo $ task list
 task list
 sleep 5
 echo $ task list
 task list
 echo $ task 11 rc.confirmation:no delete
 task 11 rc.confirmation:no delete
 # 19 Dependencies
 echo Dependencies --------------------------------------------------------------
 echo $ task list pro:party
 task list pro:party
 echo $ task 3 depends:6
 task 3 depends:6
 echo $ task 6 dep:5
 task 6 dep:5
 echo $ task 2 dep:1
 task 2 dep:1
 echo $ task 5 dep:1,2
 task 5 dep:1,2
 echo $ task 4 dep:1
 task 4 dep:1
 echo $ task long pro:party
 task long pro:party
 echo $ task 5 dep:-1
 task 5 dep:-1
 echo $ task blocked
 task blocked
 echo $ task unblocked
 task  unblocked
 echo $ task 1 info
 task  1 info
 echo $ task 2 info
 task  2 info
 echo $ task 2 done
 echo 'y' | task  2 done
 echo $ task 1 info
 task  1 info
 # 20 Reports
 echo Reports --------------------------------------------------------------
 echo $ task minimal
 task  minimal
 echo $ task ls
 task  ls
 echo $ task list
 task  list
 echo $ task long
 task  long
 echo $ task all
 task  all
 echo $ task completed
 task  completed
 echo $ task recurring
 task  recurring
 echo $ task waiting
 task  waiting
 echo $ task blocked
 task  blocked
 echo $ task oldest
 task  oldest
 echo $ task newest
 task  newest
 echo $ task timesheet
 task  timesheet
 echo $ task next
 task  next
 # 21 Custom report
 echo Custom report --------------------------------------------------------------
 echo 'report.foo.description=My own report'     >> x
 echo 'report.foo.columns=id,entry,description'  >> x
 echo 'report.foo.labels=ID,Entered,Description' >> x
 echo 'report.foo.sort=entry+,description+'      >> x
 echo 'report.foo.filter=status:pending'         >> x
 echo 'task help | grep foo'
 task  help | grep foo
 echo $ task show report.foo
 task  show report.foo
 echo $ task foo
 task  foo
 # 22 Charts
 echo Charts --------------------------------------------------------------
 echo $ task history
 task history
 echo $ task history.annual
 task history.annual
 echo $ task ghistory
 task ghistory
 echo $ task ghistory.annual
 task ghistory.annual
 echo $ task summary
 task summary
 # 23 Advanced filters
 echo Advanced filters --------------------------------------------------------------
 echo $ task list
 task  list
 echo $ task list invit
 task  list invit
 echo $ task list description.contains:invit
 task  list description.contains:invit
 echo $ task list desc.word:the
 task  list desc.word:the
 echo $ task list desc.noword:invitations
 task  list desc.noword:invitations
 echo $ task list pro:party
 task  list pro:party
 echo $ task list pro.is:party
 task  list pro.is:party
 echo $ task list pro.not:party
 task  list pro.not:party
 echo $ task list pro:party priority.over:L
 task  list pro:party priority.over:L
 echo $ task list pro:party limit:2
 task  list pro:party limit:2
 echo $ task list limit:page
 task  list limit:page
 echo $ task all status:pending
 task  all status:pending
 echo $ task all status:waiting
 task  all status:waiting
 # 24 Import/export
 echo Import/export --------------------------------------------------------------
 echo $ task export.csv
 task  export.csv
 echo $ task export.csv venue
 task  export.csv venue
 echo $ task export.vcalendar venue
 task  export.vcalendar venue
 echo $ task export.yaml venue
 task  export.yaml venue
 cat <<EOF >file.text
 Remember to read the task man page
 EOF
 cat file.text
 echo $ task import file.text
 printf "y\n" | task  import file.text
 cat <<EOF >file.yaml
 %YAML 1.1
 ---
  task:
    description: Visit http://taskwarrior.org
    due: 1281844800
    entry: 1281289630
    priority: H
    project: work
    status: pending
    uuid: 23afada0-a446-8d5a-c213-30d99d52c4b0
 ...
 EOF
 cat file.yaml
 echo $ task import file.yaml
 printf "y\n" | task  import file.yaml
 echo $ task new limit:2
 task  new limit:2
 # 25 Help
 echo Help --------------------------------------------------------------
 echo $ task help
 task  help
 echo $ man task
 #man task
 echo $ man taskrc
 #man taskrc
 echo $ man task-color
 #man task-color
 echo $ man task-tutorial
 #man task-tutorial
 echo $ man task-faq
 #man task-faq
 echo $ man task-sync
 #man task-sync
 # 26 Wrap up
 echo Wrap up --------------------------------------------------------------
 echo $ task version
 task  version
 exit
--- a/doc/misc/tutorial/tags/script.200.txt
+++ b/doc/misc/tutorial/tags/script.200.txt
@@ -0,0 +1,46 @@
 [Make window 116x32 for movie recording, light text, dark background]
 This is the script from which a 2.0-specific movie will be made.  On the left
 are the typed commands, and on the right is the voice track.
 It is intended that the left and right be combined and the result will be a new
 task-tutorial.5 man page.
 ---------------------------------------- Tags ------------------------------------------------------
 task list                                A task may only have one project, but it may have any number
                                         of tags, which are just single words associated with the task.
 task 3,5,6 +mall                         I can go to the print shop at the mall, and do all the
                                         invitation tasks, so let's tag them all.
 task long                                The long report shows tags, too,
 task list +mall                          and I can use tags as a filter to any report too.
 task 3 -mall                             I made a mistake - I can't mail out the invitations at the
                                         mall, so let's remove that tag.
 ---------------------------------------- Special Tags ----------------------------------------------
 task 6 +nocolor                          You've seen tags, but there are also 'special tags' that
 task list                                have effects on individual tasks.  The 'nocolor' special
                                         tag causes the color rules to be bypassed.
 task tags                                Special tags are highlighted by the 'tags' command.
 task 6 -nocolor                          There are others - the 'nonag' special tag prevents the
                                         generation of nag messages when you work on low priority
                                         tasks when there are more important ones.
                                         The 'nocal' special tag will prevent a task from appearing
                                         on the calendar.
 ---------------------------------------- End -------------------------------------------------------
 Show 'nocal'
 Show 'nonag'
 Show 'next'
 Show how adding a special tag generates feedback.
--- a/doc/misc/tutorial/waiting/run.200
+++ b/doc/misc/tutorial/waiting/run.200
@@ -0,0 +1,520 @@
 #! /bin/bash
 rm -f /Users/paul/.task/pending.data /Users/paul/.task/completed.data /Users/paul/.task/undo.data
 echo 'data.location=~/.task' > /Users/paul/.taskrc
 echo 'color=off' >> /Users/paul/.taskrc
 echo 'color.summary.background=on gray3' >> /Users/paul/.taskrc
 echo '#include /usr/local/share/doc/task/rc/dark-blue-256.theme' >> /Users/paul/.taskrc
 echo '#include /usr/local/share/doc/task/rc/dark-red-256.theme' >> /Users/paul/.taskrc
 echo '#include /usr/local/share/doc/task/rc/dark-256.theme' >> /Users/paul/.taskrc
 # 1 Intro
 # 2 Basic usage
 echo Basic usage --------------------------------------------------------------
 echo $ task add Select a free weekend in November
 task add Select a free weekend in November
 echo $ task add Select and book a venue
 task add Select and book a venue
 echo $ task add Come up with a guest list
 task add Come up with a guest list
 echo $ task add Mail invitations
 task add Mail invitations
 echo $ task add Select a caterer
 task add Select a caterer
 echo $ task list
 task list
 echo $ task log Order a special cake
 task log Order a special cake
 echo $ task 4 duplicate /Mail/Design/
 task 4 duplicate /Mail/Design/
 echo $ task 4 duplicate /Mail/Print/
 task 4 duplicate /Mail/Print/
 echo $ task list
 task list
 echo $ task 3 done
 task 3 done
 echo $ task list
 task list
 # 3 Projects
 echo Projects --------------------------------------------------------------
 echo $ task add Pay teh rent on teh 31st
 task add Pay teh rent on teh 31st
 echo $ task 7 /teh/the/g
 task 7 /teh/the/g
 echo $ task list
 task list
 echo $ task 7 project:home
 task 7 project:home
 echo $ task 1-6 project:party
 echo 'All' | task 1-6 project:party
 echo $ task projects
 task projects
 echo $ task list project:home
 task list project:home
 echo $ task li pro:par
 task li pro:par
 # 4 Priorities
 echo Priorities --------------------------------------------------------------
 echo $ task 1-3,5 priority:H
 echo 'All' | task 1-3,5 priority:H
 echo $ task list
 task list
 echo $ task 3 pri:
 task 3 pri:
 # 5 Tags
 echo Tags --------------------------------------------------------------
 echo $ task list
 task list
 echo $ task 3,5,6 +mall
 echo 'All' | task 3,5,6 +mall
 echo $ task long
 task long
 echo $ task list +mall
 task list +mall
 echo $ task 3 -mall
 task 3 -mall
 # 6 Modifications
 echo Modifications --------------------------------------------------------------
 echo $ task 7 Pay rent at the end of the month
 echo 'Yes' | task 7 Pay rent at the end of the month
 echo $ task add music
 task add music
 echo $ task 8 prepend Select some
 task 8 prepend Select some
 echo $ task 8 append for after dinner
 task 8 append for after dinner
 echo $ task list
 task list
 echo $ task edit
 #task edit
 echo $ task add Hire a band?
 #task add Hire a band?
 echo $ task add Hire a band\?
 #task add Hire a band\?
 echo $ task add "Hire a band?"
 #task add "Hire a band?"
 echo $ task add -- Hire a band\? +dj
 task add -- Hire a band\? +dj
 echo $ task undo
 echo 'y' | task undo
 echo $ task 1 delete
 echo 'y' | task 1 delete
 echo $ task undo
 echo 'y' | task undo
 # 7 Info
 echo Info --------------------------------------------------------------
 echo $ task 1 info
 task 1 info
 echo $ task stats
 task stats
 # 8 Annotations
 echo Annotations --------------------------------------------------------------
 echo $ task 1 annotate the 13 looks good
 task 1 annotate the 13 looks good
 sleep 1
 echo $ task 1 annotate or the 14th
 task 1 annotate or the 14th
 echo $ task list
 task list
 echo $ task list rc.annotations:full
 task list rc.annotations:full
 echo $ task list rc.annotations:sparse
 task list rc.annotations:sparse
 echo $ task list rc.annotations:none
 task list rc.annotations:none
 echo $ task 1 denotate 14th
 task 1 denotate 14th
 echo $ task list
 task list
 # 9 Configuration
 echo Configuration --------------------------------------------------------------
 echo $ task show
 task show
 echo $ task config answer forty-two
 echo 'y' | task config answer forty-two
 echo $ task show answer
 task show answer
 echo $ task config answer
 echo 'y' | task config answer
 echo $ task rc.report.list.sort=description+ list
 task rc.report.list.sort=description+ list
 # 10 Defaults
 echo Defaults --------------------------------------------------------------
 echo $ task config default.command list
 echo 'y' | task config default.command list
 echo $ task 
 task 
 echo $ task config default.priority H
 echo 'y' | task config default.priority H
 echo $ task config default.project Work
 echo 'y' | task config default.project Work
 echo $ task add New task
 task add New task
 echo $ task list
 task list
 echo $ task undo
 echo 'y' | task undo
 echo $ task config default.priority
 echo 'y' | task config default.priority
 echo $ task config default.project
 echo 'y' | task config default.project
 # 11 Aliases
 echo Aliases --------------------------------------------------------------
 echo $ task config alias.zzz list
 echo 'y' | task config alias.zzz list
 echo $ task zzz
 task zzz
 echo $ task z
 task z
 # 12 Color
 echo Color --------------------------------------------------------------
 echo $ task config color on
 echo 'y' | task config color on
 echo $ task list
 task list
 echo $ task 1 bg:on_red
 task 1 bg:on_red
 echo $ task list
 task list
 echo $ task 1 bg:
 task 1 bg:
 echo $ task color
 task color
 echo $ task color white on red
 task color white on red
 echo $ task color legend
 task color legend
 echo vi ~/.taskrc # include /usr/local/share/doc/task/rc/dark-blue-256.theme
 #vi ~/.taskrc # include /usr/local/share/doc/task/rc/dark-blue-256.theme
 echo 'include /usr/local/share/doc/task/rc/dark-blue-256.theme' >> x
 echo $ task color legend
 task color legend
 echo $ task list
 task list
 echo vi ~/.taskrc # include /usr/local/share/doc/task/rc/dark-red-256.theme
 #vi ~/.taskrc # include /usr/local/share/doc/task/rc/dark-red-256.theme
 sed 's/blue/red/' x >x2 && mv x2 x
 echo $ task color legend
 task color legend
 echo $ task list
 task list
 echo vi ~/.taskrc # include /usr/local/share/doc/task/rc/dark-256.theme
 #vi ~/.taskrc # include /usr/local/share/doc/task/rc/dark-256.theme
 sed 's/red-//' x >x2 && mv x2 x
 echo $ task list
 task list
 echo $ task "rc.color.project.party=on rgb001" rc.color.keyword.invit=bold list
 task "rc.color.project.party=on rgb001" rc.color.keyword.invit=bold list
 echo $ man task-color
 #man task-color
 # 13 Active tasks
 echo Active tasks --------------------------------------------------------------
 echo $ task 2 start
 task 2 start
 echo $ task list
 task list
 echo $ task active
 task active
 echo $ task 2 stop
 task 2 stop
 echo $ task config journal.time on
 task config journal.time on
 echo $ task config rc.dateformat.xxx xxx
 task config rc.dateformat.xxx xxx
 echo $ task config dateformat.annotation 'Y/m/d H:N'
 task config dateformat.annotation 'Y/m/d H:N'
 echo $ task 2 start
 task 2 start
 echo $ task list venue
 task list venue
 echo $ task 2 stop
 task 2 stop
 echo $ task list venue
 task list venue
 # 14 Due dates
 echo Due dates --------------------------------------------------------------
 echo $ task 1 due:7/31/2010
 task 1 due:7/31/2010
 echo $ task 1 due:2wks
 task 1 due:2wks
 echo $ task 1 due:-2wks
 task 1 due:-2wks
 echo $ task 1 due:eom
 task 1 due:eom
 echo $ task 2 due:8th
 task 2 due:8th
 echo $ task 2 due:sunday
 task 2 due:sunday
 echo $ task 5 due:eow
 task 5 due:eow
 echo $ task list
 task list
 echo $ task overdue
 task overdue
 echo $ task rc.dateformat.report:Y-M-DTH:N:SZ list
 task rc.dateformat.report:Y-M-DTH:N:SZ list
 # 15 Calendar
 echo Calendar --------------------------------------------------------------
 echo $ task calendar
 task calendar
 echo $ vi ~/.taskrc # include /usr/local/share/doc/task/rc/holidays-US.rc
 #vi ~/.taskrc # include /usr/local/share/doc/task/rc/holidays-US.rc
 echo 'include /usr/local/share/doc/task/rc/holidays-US.rc' >> x
 echo $ task calendar
 task calendar
 echo $ task cal 2010
 task cal 2010
 echo $ task rc.calendar.details:full cal
 task rc.calendar.details:full cal
 echo $ task rc.calendar.holidays:full cal
 task rc.calendar.holidays:full cal
 # 16 Recurrence
 echo Recurrence --------------------------------------------------------------
 echo $ task 7 info
 task 7 info
 echo $ task 7 due:eom recur:monthly
 task 7 due:eom recur:monthly
 echo $ task 7
 task 7
 echo $ task 7 until:eoy
 task 7 until:eoy
 echo $ task recurring
 task recurring
 echo $ task add Pay taxes due:4/15/2007 recur:yearly
 task add Pay taxes due:4/15/2007 recur:yearly
 echo $ task long
 task long
 echo $ task 11 delete
 printf "y\ny\n" | task 11 delete      # y, y
 echo $ task list
 task list
 # 17 Special tags
 echo Special tags --------------------------------------------------------------
 echo $ task 6 +nocolor
 task 6 +nocolor
 echo $ task list
 task list
 echo $ task tags
 task tags
 echo $ task 6 -nocolor
 task 6 -nocolor
 # 18 Waiting
 echo Waiting --------------------------------------------------------------
 echo $ task add Look for new apartment due:eoy
 task add Look for new apartment due:eoy
 echo $ task list
 task list
 echo $ task 10 wait:12/1/2010
 task 10 wait:12/1/2010
 echo $ task list
 task list
 echo $ task waiting
 task waiting
 echo $ task add Do something in a few seconds
 task add Do something in a few seconds
 echo $ task 11 wait:5s
 task 11 wait:5s
 echo $ task list
 task list
 sleep 5
 echo $ task list
 task list
 echo $ task 11 rc.confirmation:no delete
 task 11 rc.confirmation:no delete
 # 19 Dependencies
 echo Dependencies --------------------------------------------------------------
 echo $ task list pro:party
 task list pro:party
 echo $ task 3 depends:6
 task 3 depends:6
 echo $ task 6 dep:5
 task 6 dep:5
 echo $ task 2 dep:1
 task 2 dep:1
 echo $ task 5 dep:1,2
 task 5 dep:1,2
 echo $ task 4 dep:1
 task 4 dep:1
 echo $ task long pro:party
 task long pro:party
 echo $ task 5 dep:-1
 task 5 dep:-1
 echo $ task blocked
 task blocked
 echo $ task unblocked
 task  unblocked
 echo $ task 1 info
 task  1 info
 echo $ task 2 info
 task  2 info
 echo $ task 2 done
 echo 'y' | task  2 done
 echo $ task 1 info
 task  1 info
 # 20 Reports
 echo Reports --------------------------------------------------------------
 echo $ task minimal
 task  minimal
 echo $ task ls
 task  ls
 echo $ task list
 task  list
 echo $ task long
 task  long
 echo $ task all
 task  all
 echo $ task completed
 task  completed
 echo $ task recurring
 task  recurring
 echo $ task waiting
 task  waiting
 echo $ task blocked
 task  blocked
 echo $ task oldest
 task  oldest
 echo $ task newest
 task  newest
 echo $ task timesheet
 task  timesheet
 echo $ task next
 task  next
 # 21 Custom report
 echo Custom report --------------------------------------------------------------
 echo 'report.foo.description=My own report'     >> x
 echo 'report.foo.columns=id,entry,description'  >> x
 echo 'report.foo.labels=ID,Entered,Description' >> x
 echo 'report.foo.sort=entry+,description+'      >> x
 echo 'report.foo.filter=status:pending'         >> x
 echo 'task help | grep foo'
 task  help | grep foo
 echo $ task show report.foo
 task  show report.foo
 echo $ task foo
 task  foo
 # 22 Charts
 echo Charts --------------------------------------------------------------
 echo $ task history
 task history
 echo $ task history.annual
 task history.annual
 echo $ task ghistory
 task ghistory
 echo $ task ghistory.annual
 task ghistory.annual
 echo $ task summary
 task summary
 # 23 Advanced filters
 echo Advanced filters --------------------------------------------------------------
 echo $ task list
 task  list
 echo $ task list invit
 task  list invit
 echo $ task list description.contains:invit
 task  list description.contains:invit
 echo $ task list desc.word:the
 task  list desc.word:the
 echo $ task list desc.noword:invitations
 task  list desc.noword:invitations
 echo $ task list pro:party
 task  list pro:party
 echo $ task list pro.is:party
 task  list pro.is:party
 echo $ task list pro.not:party
 task  list pro.not:party
 echo $ task list pro:party priority.over:L
 task  list pro:party priority.over:L
 echo $ task list pro:party limit:2
 task  list pro:party limit:2
 echo $ task list limit:page
 task  list limit:page
 echo $ task all status:pending
 task  all status:pending
 echo $ task all status:waiting
 task  all status:waiting
 # 24 Import/export
 echo Import/export --------------------------------------------------------------
 echo $ task export.csv
 task  export.csv
 echo $ task export.csv venue
 task  export.csv venue
 echo $ task export.vcalendar venue
 task  export.vcalendar venue
 echo $ task export.yaml venue
 task  export.yaml venue
 cat <<EOF >file.text
 Remember to read the task man page
 EOF
 cat file.text
 echo $ task import file.text
 printf "y\n" | task  import file.text
 cat <<EOF >file.yaml
 %YAML 1.1
 ---
  task:
    description: Visit http://taskwarrior.org
    due: 1281844800
    entry: 1281289630
    priority: H
    project: work
    status: pending
    uuid: 23afada0-a446-8d5a-c213-30d99d52c4b0
 ...
 EOF
 cat file.yaml
 echo $ task import file.yaml
 printf "y\n" | task  import file.yaml
 echo $ task new limit:2
 task  new limit:2
 # 25 Help
 echo Help --------------------------------------------------------------
 echo $ task help
 task  help
 echo $ man task
 #man task
 echo $ man taskrc
 #man taskrc
 echo $ man task-color
 #man task-color
 echo $ man task-tutorial
 #man task-tutorial
 echo $ man task-faq
 #man task-faq
 echo $ man task-sync
 #man task-sync
 # 26 Wrap up
 echo Wrap up --------------------------------------------------------------
 echo $ task version
 task  version
 exit
--- a/doc/misc/tutorial/waiting/script.200.txt
+++ b/doc/misc/tutorial/waiting/script.200.txt
@@ -0,0 +1,31 @@
 [Make window 116x32 for movie recording, light text, dark background]
 This is the script from which a 2.0-specific movie will be made.  On the left
 are the typed commands, and on the right is the voice track.
 It is intended that the left and right be combined and the result will be a new
 task-tutorial.5 man page.
 ---------------------------------------- Waiting ---------------------------------------------------
 task add Look for new apartment due:eoy  When you have a task with a due date that is far out into
 task list                                the future, you may want to hide that task for a while.
 task 10 wait:12/1/2010                   You can provide a wait date for a task, and it will remain
 task list                                hidden until that date.  It will no longer be cluttering
 task waiting                             your task list, but it is still there, and visible using
                                         the 'waiting' report.  When the wait date comes, the task
                                         will just pop back into the list.
 task add Do something in a few seconds   To illustrate this, let's set up a task with a very short
 task 11 wait:5s                          wait time of five seconds.
 task list                                It's gone.
 (sleep 5)                                We wait for 5 seconds...
 task list                                And it's back.
 task 11 rc.confirmation:no delete        And now it's deleted.
 ---------------------------------------- End -------------------------------------------------------
--- a/doc/rc/dark-16.theme
+++ b/doc/rc/dark-16.theme
@@ -3,7 +3,7 @@
 #
 # taskwarrior - a command line task list manager.
 #
-# Copyright 2006-2012, Paul Beckingham, Federico Hernandez.
+# Copyright 2006-2014, Paul Beckingham, Federico Hernandez.
 #
 # Permission is hereby granted, free of charge, to any person obtaining a copy
 # of this software and associated documentation files (the "Software"), to deal
@@ -30,6 +30,7 @@
 color=on
 color.header=yellow
 color.footnote=yellow
 color.error=yellow
 color.debug=yellow
 color.summary.bar=black on green
@@ -69,6 +70,7 @@ color.pri.M=white
 color.pri.L=
 color.tagged=green
 color.blocked=black on white
 color.blocking=black on bright white
 color.project.none=
 color.tag.none=
 color.alternate=
--- a/doc/rc/dark-256.theme
+++ b/doc/rc/dark-256.theme
@@ -3,7 +3,7 @@
 #
 # taskwarrior - a command line task list manager.
 #
-# Copyright 2006-2012, Paul Beckingham, Federico Hernandez.
+# Copyright 2006-2014, Paul Beckingham, Federico Hernandez.
 #
 # Permission is hereby granted, free of charge, to any person obtaining a copy
 # of this software and associated documentation files (the "Software"), to deal
@@ -30,6 +30,7 @@
 color=on
 color.header=color3
 color.footnote=color3
 color.error=color3
 color.debug=color3
 color.summary.bar=black on rgb141
@@ -69,6 +70,7 @@ color.pri.M=color250
 color.pri.L=color245
 color.tagged=rgb031
 color.blocked=white on color8
 color.blocking=white on color15
 color.project.none=
 color.tag.none=
 color.alternate=on color233
--- a/doc/rc/dark-blue-256.theme
+++ b/doc/rc/dark-blue-256.theme
@@ -3,7 +3,7 @@
 #
 # taskwarrior - a command line task list manager.
 #
-# Copyright 2006-2012, Paul Beckingham, Federico Hernandez.
+# Copyright 2006-2014, Paul Beckingham, Federico Hernandez.
 #
 # Permission is hereby granted, free of charge, to any person obtaining a copy
 # of this software and associated documentation files (the "Software"), to deal
@@ -30,6 +30,7 @@
 color=on
 color.header=rgb013
 color.footnote=rgb013
 color.error=rgb013
 color.debug=rgb013
 color.summary.bar=white on rgb003
@@ -69,6 +70,7 @@ color.pri.M=rgb025
 color.pri.L=rgb015
 color.tagged=color246
 color.blocked=white on rgb001
 color.blocking=white on rgb002
 color.project.none=
 color.tag.none=
 color.alternate=on color233
--- a/doc/rc/dark-gray-256.theme
+++ b/doc/rc/dark-gray-256.theme
@@ -3,7 +3,7 @@
 #
 # taskwarrior - a command line task list manager.
 #
-# Copyright 2006-2012, Paul Beckingham, Federico Hernandez.
+# Copyright 2006-2014, Paul Beckingham, Federico Hernandez.
 #
 # Permission is hereby granted, free of charge, to any person obtaining a copy
 # of this software and associated documentation files (the "Software"), to deal
@@ -30,6 +30,7 @@
 color=on
 color.header=color8
 color.footnote=color8
 color.error=color8
 color.debug=color8
 color.summary.bar=black on gray12
@@ -69,6 +70,7 @@ color.pri.M=color7
 color.pri.L=color8
 color.tagged=gray12
 color.blocked=color15 on color8
 color.blocking=color15 on color7
 color.project.none=
 color.tag.none=
 color.alternate=on gray2
--- a/doc/rc/dark-green-256.theme
+++ b/doc/rc/dark-green-256.theme
@@ -3,7 +3,7 @@
 #
 # taskwarrior - a command line task list manager.
 #
-# Copyright 2006-2012, Paul Beckingham, Federico Hernandez.
+# Copyright 2006-2014, Paul Beckingham, Federico Hernandez.
 #
 # Permission is hereby granted, free of charge, to any person obtaining a copy
 # of this software and associated documentation files (the "Software"), to deal
@@ -30,6 +30,7 @@
 color=on
 color.header=rgb031
 color.footnote=rgb031
 color.error=rgb031
 color.debug=rgb031
 color.summary.bar=white on rgb030
@@ -69,6 +70,7 @@ color.pri.M=rgb030
 color.pri.L=rgb010
 color.tagged=color246
 color.blocked=white on rgb010
 color.blocking=white on rgb020
 color.project.none=
 color.tag.none=
 color.alternate=on color233
--- a/doc/rc/dark-red-256.theme
+++ b/doc/rc/dark-red-256.theme
@@ -3,7 +3,7 @@
 #
 # taskwarrior - a command line task list manager.
 #
-# Copyright 2006-2012, Paul Beckingham, Federico Hernandez.
+# Copyright 2006-2014, Paul Beckingham, Federico Hernandez.
 #
 # Permission is hereby granted, free of charge, to any person obtaining a copy
 # of this software and associated documentation files (the "Software"), to deal
@@ -30,6 +30,7 @@
 color=on
 color.header=rgb100
 color.footnote=rgb100
 color.error=rgb100
 color.debug=rgb100
 color.summary.bar=white on rgb300
@@ -69,6 +70,7 @@ color.pri.M=rgb400
 color.pri.L=rgb300
 color.tagged=color246
 color.blocked=white on rgb100
 color.blocking=white on rgb200
 color.project.none=
 color.tag.none=
 color.alternate=on color233
--- a/doc/rc/dark-violets-256.theme
+++ b/doc/rc/dark-violets-256.theme
@@ -3,7 +3,7 @@
 #
 # taskwarrior - a command line task list manager.
 #
-# Copyright 2006-2012, Paul Beckingham, Federico Hernandez.
+# Copyright 2006-2014, Paul Beckingham, Federico Hernandez.
 #
 # Permission is hereby granted, free of charge, to any person obtaining a copy
 # of this software and associated documentation files (the "Software"), to deal
@@ -30,6 +30,7 @@
 color=on
 color.header=rgb013
 color.footnote=rgb013
 color.error=rgb013
 color.debug=rgb013
 color.summary.bar=white on rgb103
@@ -69,6 +70,7 @@ color.pri.M=rgb304
 color.pri.L=rgb325
 color.tagged=rgb334
 color.blocked=white on rgb101
 color.blocking=white on rgb202
 color.project.none=
 color.tag.none=
 color.alternate=on gray2
--- a/doc/rc/dark-yellow-green.theme
+++ b/doc/rc/dark-yellow-green.theme
@@ -3,7 +3,7 @@
 #
 # taskwarrior - a command line task list manager.
 #
-# Copyright 2006-2012, Paul Beckingham, Federico Hernandez.
+# Copyright 2006-2014, Paul Beckingham, Federico Hernandez.
 #
 # Permission is hereby granted, free of charge, to any person obtaining a copy
 # of this software and associated documentation files (the "Software"), to deal
@@ -30,6 +30,7 @@
 color=on
 color.header=rgb031
 color.footnote=rgb031
 color.error=rgb031
 color.debug=rgb031
 color.summary.bar=white on rgb030
@@ -69,6 +70,7 @@ color.pri.M=rgb030
 color.pri.L=rgb010
 color.tagged=rgb342
 color.blocked=white on rgb110
 color.blocking=white on rgb220
 color.project.none=
 color.tag.none=
 color.alternate=on gray0
--- a/doc/rc/holidays.be-BY.rc
+++ b/doc/rc/holidays.be-BY.rc
@@ -1,9 +1,9 @@
 ###############################################################################
 # International Holiday Data provided by Holidata.net
 # http://holidata.net/be-BY/2012.json
 # http://holidata.net/be-BY/2013.json
 # http://holidata.net/be-BY/2014.json
 #
-# Copyright 2006-2012, Paul Beckingham, Federico Hernandez.
+# Copyright 2006-2014, Paul Beckingham, Federico Hernandez.
 #
 # Permission is hereby granted, free of charge, to any person obtaining a copy
 # of this software and associated documentation files (the "Software"), to deal
@@ -28,42 +28,42 @@
 ###############################################################################
 holiday.be-BY1.name=Новы Год
-holiday.be-BY1.date=20120101
+holiday.be-BY1.date=20130101
 holiday.be-BY2.name=Раство Хрыстова(праваслаўнае)
-holiday.be-BY2.date=20120107
+holiday.be-BY2.date=20130107
 holiday.be-BY3.name=Міжнародны жаночы дзень
-holiday.be-BY3.date=20120803
+holiday.be-BY3.date=20130803
 holiday.be-BY4.name=Пасха(праваслаўная)
-holiday.be-BY4.date=20120415
+holiday.be-BY4.date=20130505
 holiday.be-BY5.name=Радуніца
-holiday.be-BY5.date=20120424
+holiday.be-BY5.date=20130514
 holiday.be-BY6.name=Свята працы
-holiday.be-BY6.date=20120501
+holiday.be-BY6.date=20130501
 holiday.be-BY7.name=Дзень Перамогі
-holiday.be-BY7.date=20120509
+holiday.be-BY7.date=20130509
 holiday.be-BY8.name=Дзень незалежнаці
-holiday.be-BY8.date=20120703
+holiday.be-BY8.date=20130703
 holiday.be-BY9.name=Дзень Кастрычніцкай рэвалюцыі
-holiday.be-BY9.date=20121107
+holiday.be-BY9.date=20131107
 holiday.be-BY10.name=Раство Хрыстова(у заходніх хрысціян)
-holiday.be-BY10.date=20121225
+holiday.be-BY10.date=20131225
 holiday.be-BY11.name=Новы Год
-holiday.be-BY11.date=20130101
+holiday.be-BY11.date=20140101
 holiday.be-BY12.name=Раство Хрыстова(праваслаўнае)
-holiday.be-BY12.date=20130107
+holiday.be-BY12.date=20140107
 holiday.be-BY13.name=Міжнародны жаночы дзень
-holiday.be-BY13.date=20130803
+holiday.be-BY13.date=20140803
 holiday.be-BY14.name=Пасха(праваслаўная)
-holiday.be-BY14.date=20130505
+holiday.be-BY14.date=20140420
 holiday.be-BY15.name=Радуніца
-holiday.be-BY15.date=20130514
+holiday.be-BY15.date=20140529
 holiday.be-BY16.name=Свята працы
-holiday.be-BY16.date=20130501
+holiday.be-BY16.date=20140501
 holiday.be-BY17.name=Дзень Перамогі
-holiday.be-BY17.date=20130509
+holiday.be-BY17.date=20140509
 holiday.be-BY18.name=Дзень незалежнаці
-holiday.be-BY18.date=20130703
+holiday.be-BY18.date=20140703
 holiday.be-BY19.name=Дзень Кастрычніцкай рэвалюцыі
-holiday.be-BY19.date=20131107
+holiday.be-BY19.date=20141107
 holiday.be-BY20.name=Раство Хрыстова(у заходніх хрысціян)
-holiday.be-BY20.date=20131225
+holiday.be-BY20.date=20141225
--- a/doc/rc/holidays.cs-CZ.rc
+++ b/doc/rc/holidays.cs-CZ.rc
@@ -1,9 +1,9 @@
 ###############################################################################
 # International Holiday Data provided by Holidata.net
 # http://holidata.net/cs-CZ/2012.json
 # http://holidata.net/cs-CZ/2013.json
 # http://holidata.net/cs-CZ/2014.json
 #
-# Copyright 2006-2012, Paul Beckingham, Federico Hernandez.
+# Copyright 2006-2014, Paul Beckingham, Federico Hernandez.
 #
 # Permission is hereby granted, free of charge, to any person obtaining a copy
 # of this software and associated documentation files (the "Software"), to deal
@@ -28,54 +28,54 @@
 ###############################################################################
 holiday.cs-CZ1.name=Nový rok
-holiday.cs-CZ1.date=20120101
+holiday.cs-CZ1.date=20130101
 holiday.cs-CZ2.name=Den obnovy samostatnosti českého státu
-holiday.cs-CZ2.date=20120101
+holiday.cs-CZ2.date=20130101
 holiday.cs-CZ3.name=Velikonoční pondělí
-holiday.cs-CZ3.date=20120409
+holiday.cs-CZ3.date=20130401
 holiday.cs-CZ4.name=Svátek práce
-holiday.cs-CZ4.date=20120501
+holiday.cs-CZ4.date=20130501
 holiday.cs-CZ5.name=Den vítězství
-holiday.cs-CZ5.date=20120508
+holiday.cs-CZ5.date=20130508
 holiday.cs-CZ6.name=Den slovanských věrozvěstů
-holiday.cs-CZ6.date=20120705
+holiday.cs-CZ6.date=20130705
 holiday.cs-CZ7.name=Den upálení mistra Jana Husa
-holiday.cs-CZ7.date=20120706
+holiday.cs-CZ7.date=20130706
 holiday.cs-CZ8.name=Den české státnosti
-holiday.cs-CZ8.date=20120928
+holiday.cs-CZ8.date=20130928
 holiday.cs-CZ9.name=Den vzniku samostatného československého státu
-holiday.cs-CZ9.date=20121028
+holiday.cs-CZ9.date=20131028
 holiday.cs-CZ10.name=Den boje za svobodu a demokracii
-holiday.cs-CZ10.date=20121117
+holiday.cs-CZ10.date=20131117
 holiday.cs-CZ11.name=Štědrý den
-holiday.cs-CZ11.date=20121224
+holiday.cs-CZ11.date=20131224
 holiday.cs-CZ12.name=1. svátek vánoční
-holiday.cs-CZ12.date=20121225
+holiday.cs-CZ12.date=20131225
 holiday.cs-CZ13.name=2. svátek vánoční
-holiday.cs-CZ13.date=20121226
+holiday.cs-CZ13.date=20131226
 holiday.cs-CZ14.name=Nový rok
-holiday.cs-CZ14.date=20130101
+holiday.cs-CZ14.date=20140101
 holiday.cs-CZ15.name=Den obnovy samostatnosti českého státu
-holiday.cs-CZ15.date=20130101
+holiday.cs-CZ15.date=20140101
 holiday.cs-CZ16.name=Velikonoční pondělí
-holiday.cs-CZ16.date=20130401
+holiday.cs-CZ16.date=20140421
 holiday.cs-CZ17.name=Svátek práce
-holiday.cs-CZ17.date=20130501
+holiday.cs-CZ17.date=20140501
 holiday.cs-CZ18.name=Den vítězství
-holiday.cs-CZ18.date=20130508
+holiday.cs-CZ18.date=20140508
 holiday.cs-CZ19.name=Den slovanských věrozvěstů
-holiday.cs-CZ19.date=20130705
+holiday.cs-CZ19.date=20140705
 holiday.cs-CZ20.name=Den upálení mistra Jana Husa
-holiday.cs-CZ20.date=20130706
+holiday.cs-CZ20.date=20140706
 holiday.cs-CZ21.name=Den české státnosti
-holiday.cs-CZ21.date=20130928
+holiday.cs-CZ21.date=20140928
 holiday.cs-CZ22.name=Den vzniku samostatného československého státu
-holiday.cs-CZ22.date=20131028
+holiday.cs-CZ22.date=20141028
 holiday.cs-CZ23.name=Den boje za svobodu a demokracii
-holiday.cs-CZ23.date=20131117
+holiday.cs-CZ23.date=20141117
 holiday.cs-CZ24.name=Štědrý den
-holiday.cs-CZ24.date=20131224
+holiday.cs-CZ24.date=20141224
 holiday.cs-CZ25.name=1. svátek vánoční
-holiday.cs-CZ25.date=20131225
+holiday.cs-CZ25.date=20141225
 holiday.cs-CZ26.name=2. svátek vánoční
-holiday.cs-CZ26.date=20131226
+holiday.cs-CZ26.date=20141226
--- a/doc/rc/holidays.da-DK.rc
+++ b/doc/rc/holidays.da-DK.rc
@@ -1,9 +1,9 @@
 ###############################################################################
 # International Holiday Data provided by Holidata.net
 # http://holidata.net/da-DK/2012.json
 # http://holidata.net/da-DK/2013.json
 # http://holidata.net/da-DK/2014.json
 #
-# Copyright 2006-2012, Paul Beckingham, Federico Hernandez.
+# Copyright 2006-2014, Paul Beckingham, Federico Hernandez.
 #
 # Permission is hereby granted, free of charge, to any person obtaining a copy
 # of this software and associated documentation files (the "Software"), to deal
@@ -28,50 +28,26 @@
 ###############################################################################
 holiday.da-DK1.name=Nytårsdag
-holiday.da-DK1.date=20120101
+holiday.da-DK1.date=20130101
 holiday.da-DK2.name=Palmesøndag
-holiday.da-DK2.date=20120401
+holiday.da-DK2.date=20130324
 holiday.da-DK3.name=Skærtorsdag
-holiday.da-DK3.date=20120405
+holiday.da-DK3.date=20130328
 holiday.da-DK4.name=Langfredag
-holiday.da-DK4.date=20120406
+holiday.da-DK4.date=20130329
 holiday.da-DK5.name=Påskedag
-holiday.da-DK5.date=20120408
+holiday.da-DK5.date=20130331
 holiday.da-DK6.name=Anden påskedag
-holiday.da-DK6.date=20120409
+holiday.da-DK6.date=20130401
 holiday.da-DK7.name=Store bededag
-holiday.da-DK7.date=20120504
+holiday.da-DK7.date=20130426
 holiday.da-DK8.name=Kristi himmelfartsdag
-holiday.da-DK8.date=20120517
+holiday.da-DK8.date=20130509
 holiday.da-DK9.name=Pinsedag
-holiday.da-DK9.date=20120527
+holiday.da-DK9.date=20130519
 holiday.da-DK10.name=Anden pinsedag
-holiday.da-DK10.date=20120528
+holiday.da-DK10.date=20130520
 holiday.da-DK11.name=Juledag
-holiday.da-DK11.date=20121225
+holiday.da-DK11.date=20131225
 holiday.da-DK12.name=Anden juledag
-holiday.da-DK12.date=20121226
+holiday.da-DK12.date=20131226
 holiday.da-DK13.name=Nytårsdag
 holiday.da-DK13.date=20130101
 holiday.da-DK14.name=Palmesøndag
 holiday.da-DK14.date=20130324
 holiday.da-DK15.name=Skærtorsdag
 holiday.da-DK15.date=20130328
 holiday.da-DK16.name=Langfredag
 holiday.da-DK16.date=20130329
 holiday.da-DK17.name=Påskedag
 holiday.da-DK17.date=20130331
 holiday.da-DK18.name=Anden påskedag
 holiday.da-DK18.date=20130401
 holiday.da-DK19.name=Store bededag
 holiday.da-DK19.date=20130426
 holiday.da-DK20.name=Kristi himmelfartsdag
 holiday.da-DK20.date=20130509
 holiday.da-DK21.name=Pinsedag
 holiday.da-DK21.date=20130519
 holiday.da-DK22.name=Anden pinsedag
 holiday.da-DK22.date=20130520
 holiday.da-DK23.name=Juledag
 holiday.da-DK23.date=20131225
 holiday.da-DK24.name=Anden juledag
 holiday.da-DK24.date=20131226
--- a/doc/rc/holidays.de-AT.rc
+++ b/doc/rc/holidays.de-AT.rc
@@ -1,9 +1,9 @@
 ###############################################################################
 # International Holiday Data provided by Holidata.net
 # http://holidata.net/de-AT/2012.json
 # http://holidata.net/de-AT/2013.json
 # http://holidata.net/de-AT/2014.json
 #
-# Copyright 2006-2012, Paul Beckingham, Federico Hernandez.
+# Copyright 2006-2014, Paul Beckingham, Federico Hernandez.
 #
 # Permission is hereby granted, free of charge, to any person obtaining a copy
 # of this software and associated documentation files (the "Software"), to deal
@@ -28,94 +28,48 @@
 ###############################################################################
 holiday.de-AT1.name=Neujahr
-holiday.de-AT1.date=20120101
+holiday.de-AT1.date=20130101
 holiday.de-AT2.name=Heilige drei KÃ¶nige
-holiday.de-AT2.date=20120106
+holiday.de-AT2.date=20130106
 holiday.de-AT3.name=Josef (K, St, T, V)
-holiday.de-AT3.date=20120319
+holiday.de-AT3.date=20130319
 holiday.de-AT4.name=Karfreitag
-holiday.de-AT4.date=20120406
+holiday.de-AT4.date=20130329
 holiday.de-AT5.name=Ostersonntag
-holiday.de-AT5.date=20120408
+holiday.de-AT5.date=20130331
 holiday.de-AT6.name=Ostermontag
-holiday.de-AT6.date=20120409
+holiday.de-AT6.date=20130401
 holiday.de-AT7.name=Staatsfeiertag
-holiday.de-AT7.date=20120501
+holiday.de-AT7.date=20130501
 holiday.de-AT8.name=Florian (O)
-holiday.de-AT8.date=20120504
+holiday.de-AT8.date=20130504
 holiday.de-AT9.name=Christi Himmelfahrt
-holiday.de-AT9.date=20120517
+holiday.de-AT9.date=20130509
 holiday.de-AT10.name=Pfingstsonntag
-holiday.de-AT10.date=20120527
+holiday.de-AT10.date=20130519
 holiday.de-AT11.name=Pfingstmontag
-holiday.de-AT11.date=20120528
+holiday.de-AT11.date=20130520
 holiday.de-AT12.name=Fronleichnam
-holiday.de-AT12.date=20120607
+holiday.de-AT12.date=20130530
 holiday.de-AT13.name=Mariä Himmelfahrt
-holiday.de-AT13.date=20120815
+holiday.de-AT13.date=20130815
 holiday.de-AT14.name=Rupert (S)
-holiday.de-AT14.date=20120924
+holiday.de-AT14.date=20130924
 holiday.de-AT15.name=Tag der Volksabstimmung (K)
-holiday.de-AT15.date=20121010
+holiday.de-AT15.date=20131010
 holiday.de-AT16.name=Allerheiligen
-holiday.de-AT16.date=20121101
+holiday.de-AT16.date=20131101
 holiday.de-AT17.name=Martin (B)
-holiday.de-AT17.date=20121111
+holiday.de-AT17.date=20131111
 holiday.de-AT18.name=Leopold (W, N)
-holiday.de-AT18.date=20121115
+holiday.de-AT18.date=20131115
 holiday.de-AT19.name=Mariä Empfängnis
-holiday.de-AT19.date=20121208
+holiday.de-AT19.date=20131208
 holiday.de-AT20.name=Heiliger Abend
-holiday.de-AT20.date=20121224
+holiday.de-AT20.date=20131224
 holiday.de-AT21.name=Christtag
-holiday.de-AT21.date=20121225
+holiday.de-AT21.date=20131225
 holiday.de-AT22.name=Stefanitag
-holiday.de-AT22.date=20121226
+holiday.de-AT22.date=20131226
 holiday.de-AT23.name=Silvester
-holiday.de-AT23.date=20121231
+holiday.de-AT23.date=20131231
 holiday.de-AT24.name=Neujahr
 holiday.de-AT24.date=20130101
 holiday.de-AT25.name=Heilige drei KÃ¶nige
 holiday.de-AT25.date=20130106
 holiday.de-AT26.name=Josef (K, St, T, V)
 holiday.de-AT26.date=20130319
 holiday.de-AT27.name=Karfreitag
 holiday.de-AT27.date=20130329
 holiday.de-AT28.name=Ostersonntag
 holiday.de-AT28.date=20130331
 holiday.de-AT29.name=Ostermontag
 holiday.de-AT29.date=20130401
 holiday.de-AT30.name=Staatsfeiertag
 holiday.de-AT30.date=20130501
 holiday.de-AT31.name=Florian (O)
 holiday.de-AT31.date=20130504
 holiday.de-AT32.name=Christi Himmelfahrt
 holiday.de-AT32.date=20130509
 holiday.de-AT33.name=Pfingstsonntag
 holiday.de-AT33.date=20130519
 holiday.de-AT34.name=Pfingstmontag
 holiday.de-AT34.date=20130520
 holiday.de-AT35.name=Fronleichnam
 holiday.de-AT35.date=20130530
 holiday.de-AT36.name=Mariä Himmelfahrt
 holiday.de-AT36.date=20130815
 holiday.de-AT37.name=Rupert (S)
 holiday.de-AT37.date=20130924
 holiday.de-AT38.name=Tag der Volksabstimmung (K)
 holiday.de-AT38.date=20131010
 holiday.de-AT39.name=Allerheiligen
 holiday.de-AT39.date=20131101
 holiday.de-AT40.name=Martin (B)
 holiday.de-AT40.date=20131111
 holiday.de-AT41.name=Leopold (W, N)
 holiday.de-AT41.date=20131115
 holiday.de-AT42.name=Mariä Empfängnis
 holiday.de-AT42.date=20131208
 holiday.de-AT43.name=Heiliger Abend
 holiday.de-AT43.date=20131224
 holiday.de-AT44.name=Christtag
 holiday.de-AT44.date=20131225
 holiday.de-AT45.name=Stefanitag
 holiday.de-AT45.date=20131226
 holiday.de-AT46.name=Silvester
 holiday.de-AT46.date=20131231
--- a/doc/rc/holidays.de-DE.rc
+++ b/doc/rc/holidays.de-DE.rc
@@ -1,9 +1,9 @@
 ###############################################################################
 # International Holiday Data provided by Holidata.net
 # http://holidata.net/de-DE/2012.json
 # http://holidata.net/de-DE/2013.json
 # http://holidata.net/de-DE/2014.json
 #
-# Copyright 2006-2012, Paul Beckingham, Federico Hernandez.
+# Copyright 2006-2014, Paul Beckingham, Federico Hernandez.
 #
 # Permission is hereby granted, free of charge, to any person obtaining a copy
 # of this software and associated documentation files (the "Software"), to deal
@@ -28,138 +28,78 @@
 ###############################################################################
 holiday.de-DE1.name=Neujahr
-holiday.de-DE1.date=20120101
+holiday.de-DE1.date=20130101
 holiday.de-DE2.name=Heilige drei Könige
-holiday.de-DE2.date=20120106
+holiday.de-DE2.date=20130106
-holiday.de-DE3.name=Heilige drei Könige
+holiday.de-DE3.name=Karfreitag
-holiday.de-DE3.date=20120106
+holiday.de-DE3.date=20130329
-holiday.de-DE4.name=Heilige drei Könige
+holiday.de-DE4.name=Ostern
-holiday.de-DE4.date=20120106
+holiday.de-DE4.date=20130331
-holiday.de-DE5.name=Karfreitag
+holiday.de-DE5.name=Ostermontag
-holiday.de-DE5.date=20120406
+holiday.de-DE5.date=20130401
-holiday.de-DE6.name=Ostern
+holiday.de-DE6.name=Erster Maifeiertag
-holiday.de-DE6.date=20120408
+holiday.de-DE6.date=20130501
-holiday.de-DE7.name=Ostermontag
+holiday.de-DE7.name=Christi Himmelfahrt
-holiday.de-DE7.date=20120409
+holiday.de-DE7.date=20130509
-holiday.de-DE8.name=Erster Maifeiertag
+holiday.de-DE8.name=Pfingstsonntag
-holiday.de-DE8.date=20120501
+holiday.de-DE8.date=20130519
-holiday.de-DE9.name=Christi Himmelfahrt
+holiday.de-DE9.name=Pfingstmontag
-holiday.de-DE9.date=20120517
+holiday.de-DE9.date=20130520
-holiday.de-DE10.name=Pfingstsonntag
+holiday.de-DE10.name=Fronleichnam
-holiday.de-DE10.date=20120527
+holiday.de-DE10.date=20130530
-holiday.de-DE11.name=Pfingstmontag
+holiday.de-DE11.name=Mariä Himmelfahrt
-holiday.de-DE11.date=20120528
+holiday.de-DE11.date=20130815
-holiday.de-DE12.name=Fronleichnam
+holiday.de-DE12.name=Tag der Deutschen Einheit
-holiday.de-DE12.date=20120607
+holiday.de-DE12.date=20131003
-holiday.de-DE13.name=Fronleichnam
+holiday.de-DE13.name=Reformationstag
-holiday.de-DE13.date=20120607
+holiday.de-DE13.date=20131031
-holiday.de-DE14.name=Fronleichnam
+holiday.de-DE14.name=Allerheiligen
-holiday.de-DE14.date=20120607
+holiday.de-DE14.date=20131101
-holiday.de-DE15.name=Fronleichnam
+holiday.de-DE15.name=Buss und Bettag
-holiday.de-DE15.date=20120607
+holiday.de-DE15.date=20131120
-holiday.de-DE16.name=Fronleichnam
+holiday.de-DE16.name=Heilig Abend
-holiday.de-DE16.date=20120607
+holiday.de-DE16.date=20131224
-holiday.de-DE17.name=Fronleichnam
+holiday.de-DE17.name=Weihnachtstag
-holiday.de-DE17.date=20120607
+holiday.de-DE17.date=20131225
-holiday.de-DE18.name=Mariä Himmelfahrt
+holiday.de-DE18.name=Zweiter Weihnachtstag
-holiday.de-DE18.date=20120815
+holiday.de-DE18.date=20131226
-holiday.de-DE19.name=Tag der Deutschen Einheit
+holiday.de-DE19.name=Sylvester
-holiday.de-DE19.date=20121003
+holiday.de-DE19.date=20131231
-holiday.de-DE20.name=Reformationstag
+holiday.de-DE20.name=Neujahr
-holiday.de-DE20.date=20121031
+holiday.de-DE20.date=20140101
-holiday.de-DE21.name=Reformationstag
+holiday.de-DE21.name=Heilige drei Könige
-holiday.de-DE21.date=20121031
+holiday.de-DE21.date=20140106
-holiday.de-DE22.name=Reformationstag
+holiday.de-DE22.name=Karfreitag
-holiday.de-DE22.date=20121031
+holiday.de-DE22.date=20140418
-holiday.de-DE23.name=Reformationstag
+holiday.de-DE23.name=Ostern
-holiday.de-DE23.date=20121031
+holiday.de-DE23.date=20140420
-holiday.de-DE24.name=Reformationstag
+holiday.de-DE24.name=Ostermontag
-holiday.de-DE24.date=20121031
+holiday.de-DE24.date=20140421
-holiday.de-DE25.name=Allerheiligen
+holiday.de-DE25.name=Erster Maifeiertag
-holiday.de-DE25.date=20121101
+holiday.de-DE25.date=20140501
-holiday.de-DE26.name=Allerheiligen
+holiday.de-DE26.name=Christi Himmelfahrt
-holiday.de-DE26.date=20121101
+holiday.de-DE26.date=20140529
-holiday.de-DE27.name=Allerheiligen
+holiday.de-DE27.name=Pfingstsonntag
-holiday.de-DE27.date=20121101
+holiday.de-DE27.date=20140608
-holiday.de-DE28.name=Allerheiligen
+holiday.de-DE28.name=Pfingstmontag
-holiday.de-DE28.date=20121101
+holiday.de-DE28.date=20140609
-holiday.de-DE29.name=Allerheiligen
+holiday.de-DE29.name=Fronleichnam
-holiday.de-DE29.date=20121101
+holiday.de-DE29.date=20140619
-holiday.de-DE30.name=Buss und Bettag
+holiday.de-DE30.name=Mariä Himmelfahrt
-holiday.de-DE30.date=20121121
+holiday.de-DE30.date=20140815
-holiday.de-DE31.name=Heilig Abend
+holiday.de-DE31.name=Tag der Deutschen Einheit
-holiday.de-DE31.date=20121224
+holiday.de-DE31.date=20141003
-holiday.de-DE32.name=Weihnachtstag
+holiday.de-DE32.name=Reformationstag
-holiday.de-DE32.date=20121225
+holiday.de-DE32.date=20141031
-holiday.de-DE33.name=Zweiter Weihnachtstag
+holiday.de-DE33.name=Allerheiligen
-holiday.de-DE33.date=20121226
+holiday.de-DE33.date=20141101
-holiday.de-DE34.name=Sylvester
+holiday.de-DE34.name=Buss und Bettag
-holiday.de-DE34.date=20121231
+holiday.de-DE34.date=20141119
-holiday.de-DE35.name=Neujahr
+holiday.de-DE35.name=Heilig Abend
-holiday.de-DE35.date=20130101
+holiday.de-DE35.date=20141224
-holiday.de-DE36.name=Heilige drei Könige
+holiday.de-DE36.name=Weihnachtstag
-holiday.de-DE36.date=20130106
+holiday.de-DE36.date=20141225
-holiday.de-DE37.name=Heilige drei Könige
+holiday.de-DE37.name=Zweiter Weihnachtstag
-holiday.de-DE37.date=20130106
+holiday.de-DE37.date=20141226
-holiday.de-DE38.name=Heilige drei Könige
+holiday.de-DE38.name=Sylvester
-holiday.de-DE38.date=20130106
+holiday.de-DE38.date=20141231
 holiday.de-DE39.name=Karfreitag
 holiday.de-DE39.date=20130329
 holiday.de-DE40.name=Ostern
 holiday.de-DE40.date=20130331
 holiday.de-DE41.name=Ostermontag
 holiday.de-DE41.date=20130401
 holiday.de-DE42.name=Erster Maifeiertag
 holiday.de-DE42.date=20130501
 holiday.de-DE43.name=Christi Himmelfahrt
 holiday.de-DE43.date=20130509
 holiday.de-DE44.name=Pfingstsonntag
 holiday.de-DE44.date=20130519
 holiday.de-DE45.name=Pfingstmontag
 holiday.de-DE45.date=20130520
 holiday.de-DE46.name=Fronleichnam
 holiday.de-DE46.date=20130530
 holiday.de-DE47.name=Fronleichnam
 holiday.de-DE47.date=20130530
 holiday.de-DE48.name=Fronleichnam
 holiday.de-DE48.date=20130530
 holiday.de-DE49.name=Fronleichnam
 holiday.de-DE49.date=20130530
 holiday.de-DE50.name=Fronleichnam
 holiday.de-DE50.date=20130530
 holiday.de-DE51.name=Fronleichnam
 holiday.de-DE51.date=20130530
 holiday.de-DE52.name=Mariä Himmelfahrt
 holiday.de-DE52.date=20130815
 holiday.de-DE53.name=Tag der Deutschen Einheit
 holiday.de-DE53.date=20131003
 holiday.de-DE54.name=Reformationstag
 holiday.de-DE54.date=20131031
 holiday.de-DE55.name=Reformationstag
 holiday.de-DE55.date=20131031
 holiday.de-DE56.name=Reformationstag
 holiday.de-DE56.date=20131031
 holiday.de-DE57.name=Reformationstag
 holiday.de-DE57.date=20131031
 holiday.de-DE58.name=Reformationstag
 holiday.de-DE58.date=20131031
 holiday.de-DE59.name=Allerheiligen
 holiday.de-DE59.date=20131101
 holiday.de-DE60.name=Allerheiligen
 holiday.de-DE60.date=20131101
 holiday.de-DE61.name=Allerheiligen
 holiday.de-DE61.date=20131101
 holiday.de-DE62.name=Allerheiligen
 holiday.de-DE62.date=20131101
 holiday.de-DE63.name=Allerheiligen
 holiday.de-DE63.date=20131101
 holiday.de-DE64.name=Buss und Bettag
 holiday.de-DE64.date=20131120
 holiday.de-DE65.name=Heilig Abend
 holiday.de-DE65.date=20131224
 holiday.de-DE66.name=Weihnachtstag
 holiday.de-DE66.date=20131225
 holiday.de-DE67.name=Zweiter Weihnachtstag
 holiday.de-DE67.date=20131226
 holiday.de-DE68.name=Sylvester
 holiday.de-DE68.date=20131231
--- a/doc/rc/holidays.en-CA.rc
+++ b/doc/rc/holidays.en-CA.rc
@@ -1,9 +1,9 @@
 ###############################################################################
 # International Holiday Data provided by Holidata.net
 # http://holidata.net/en-CA/2012.json
 # http://holidata.net/en-CA/2013.json
 # http://holidata.net/en-CA/2014.json
 #
-# Copyright 2006-2012, Paul Beckingham, Federico Hernandez.
+# Copyright 2006-2014, Paul Beckingham, Federico Hernandez.
 #
 # Permission is hereby granted, free of charge, to any person obtaining a copy
 # of this software and associated documentation files (the "Software"), to deal
@@ -28,58 +28,28 @@
 ###############################################################################
 holiday.en-CA1.name=New Year's Day
-holiday.en-CA1.date=20120101
+holiday.en-CA1.date=20130101
-holiday.en-CA2.name=New Year's Day (obs.)
+holiday.en-CA2.name=Family Day
-holiday.en-CA2.date=20120102
+holiday.en-CA2.date=20130218
-holiday.en-CA3.name=Family Day
+holiday.en-CA3.name=Good Friday
-holiday.en-CA3.date=20120220
+holiday.en-CA3.date=20130329
-holiday.en-CA4.name=Good Friday
+holiday.en-CA4.name=Easter Monday
-holiday.en-CA4.date=20120406
+holiday.en-CA4.date=20130401
-holiday.en-CA5.name=Easter Monday
+holiday.en-CA5.name=Victoria Day
-holiday.en-CA5.date=20120409
+holiday.en-CA5.date=20130520
-holiday.en-CA6.name=Victoria Day
+holiday.en-CA6.name=Canada Day
-holiday.en-CA6.date=20120521
+holiday.en-CA6.date=20130701
-holiday.en-CA7.name=Canada Day
+holiday.en-CA7.name=First Monday of August
-holiday.en-CA7.date=20120701
+holiday.en-CA7.date=20130805
-holiday.en-CA8.name=Canada Day (obs.)
+holiday.en-CA8.name=Labour Day
-holiday.en-CA8.date=20120702
+holiday.en-CA8.date=20130902
-holiday.en-CA9.name=First Monday of August
+holiday.en-CA9.name=Thanksgiving Day
-holiday.en-CA9.date=20120806
+holiday.en-CA9.date=20131014
-holiday.en-CA10.name=Labour Day
+holiday.en-CA10.name=Remembrance Day
-holiday.en-CA10.date=20120903
+holiday.en-CA10.date=20131111
-holiday.en-CA11.name=Thanksgiving Day
+holiday.en-CA11.name=Christmas Day
-holiday.en-CA11.date=20121008
+holiday.en-CA11.date=20131225
-holiday.en-CA12.name=Remembrance Day
+holiday.en-CA12.name=Boxing Day
-holiday.en-CA12.date=20121111
+holiday.en-CA12.date=20131226
-holiday.en-CA13.name=Christmas Day
+holiday.en-CA13.name=New Year's Eve
-holiday.en-CA13.date=20121225
+holiday.en-CA13.date=20131231
 holiday.en-CA14.name=Boxing Day
 holiday.en-CA14.date=20121226
 holiday.en-CA15.name=New Year's Eve
 holiday.en-CA15.date=20121231
 holiday.en-CA16.name=New Year's Day
 holiday.en-CA16.date=20130101
 holiday.en-CA17.name=Family Day
 holiday.en-CA17.date=20130218
 holiday.en-CA18.name=Good Friday
 holiday.en-CA18.date=20130329
 holiday.en-CA19.name=Easter Monday
 holiday.en-CA19.date=20130401
 holiday.en-CA20.name=Victoria Day
 holiday.en-CA20.date=20130520
 holiday.en-CA21.name=Canada Day
 holiday.en-CA21.date=20130701
 holiday.en-CA22.name=First Monday of August
 holiday.en-CA22.date=20130805
 holiday.en-CA23.name=Labour Day
 holiday.en-CA23.date=20130902
 holiday.en-CA24.name=Thanksgiving Day
 holiday.en-CA24.date=20131014
 holiday.en-CA25.name=Remembrance Day
 holiday.en-CA25.date=20131111
 holiday.en-CA26.name=Christmas Day
 holiday.en-CA26.date=20131225
 holiday.en-CA27.name=Boxing Day
 holiday.en-CA27.date=20131226
 holiday.en-CA28.name=New Year's Eve
 holiday.en-CA28.date=20131231
--- a/doc/rc/holidays.en-GB.rc
+++ b/doc/rc/holidays.en-GB.rc
@@ -1,9 +1,9 @@
 ###############################################################################
 # International Holiday Data provided by Holidata.net
 # http://holidata.net/en-GB/2012.json
 # http://holidata.net/en-GB/2013.json
 # http://holidata.net/en-GB/2014.json
 #
-# Copyright 2006-2012, Paul Beckingham, Federico Hernandez.
+# Copyright 2006-2014, Paul Beckingham, Federico Hernandez.
 #
 # Permission is hereby granted, free of charge, to any person obtaining a copy
 # of this software and associated documentation files (the "Software"), to deal
@@ -28,38 +28,34 @@
 ###############################################################################
 holiday.en-GB1.name=New Year's Day
-holiday.en-GB1.date=20120101
+holiday.en-GB1.date=20130101
-holiday.en-GB2.name=New Year's Day Holiday
+holiday.en-GB2.name=Good Friday
-holiday.en-GB2.date=20120102
+holiday.en-GB2.date=20130329
-holiday.en-GB3.name=Good Friday
+holiday.en-GB3.name=Easter Monday
-holiday.en-GB3.date=20120406
+holiday.en-GB3.date=20130401
-holiday.en-GB4.name=Easter Monday
+holiday.en-GB4.name=Early May Bank Holiday
-holiday.en-GB4.date=20120409
+holiday.en-GB4.date=20130506
-holiday.en-GB5.name=Early May Bank Holiday
+holiday.en-GB5.name=Spring Bank Holiday
-holiday.en-GB5.date=20120507
+holiday.en-GB5.date=20130527
-holiday.en-GB6.name=Spring Bank Holiday
+holiday.en-GB6.name=August Bank Holiday
-holiday.en-GB6.date=20120604
+holiday.en-GB6.date=20130826
-holiday.en-GB7.name=Queen's Diamond Jubilee
+holiday.en-GB7.name=Christmas Day
-holiday.en-GB7.date=20120605
+holiday.en-GB7.date=20131225
-holiday.en-GB8.name=August Bank Holiday
+holiday.en-GB8.name=Boxing Day
-holiday.en-GB8.date=20120827
+holiday.en-GB8.date=20131226
-holiday.en-GB9.name=Christmas Day
+holiday.en-GB9.name=New Year's Day
-holiday.en-GB9.date=20121225
+holiday.en-GB9.date=20140101
-holiday.en-GB10.name=Boxing Day
+holiday.en-GB10.name=Good Friday
-holiday.en-GB10.date=20121226
+holiday.en-GB10.date=20140418
-holiday.en-GB11.name=New Year's Day
+holiday.en-GB11.name=Easter Monday
-holiday.en-GB11.date=20130101
+holiday.en-GB11.date=20140421
-holiday.en-GB12.name=Good Friday
+holiday.en-GB12.name=Early May Bank Holiday
-holiday.en-GB12.date=20130329
+holiday.en-GB12.date=20140505
-holiday.en-GB13.name=Easter Monday
+holiday.en-GB13.name=Spring Bank Holiday
-holiday.en-GB13.date=20130401
+holiday.en-GB13.date=20140526
-holiday.en-GB14.name=Early May Bank Holiday
+holiday.en-GB14.name=August Bank Holiday
-holiday.en-GB14.date=20130506
+holiday.en-GB14.date=20140825
-holiday.en-GB15.name=Spring Bank Holiday
+holiday.en-GB15.name=Christmas Day
-holiday.en-GB15.date=20130527
+holiday.en-GB15.date=20141225
-holiday.en-GB16.name=August Bank Holiday
+holiday.en-GB16.name=Boxing Day
-holiday.en-GB16.date=20130826
+holiday.en-GB16.date=20141226
 holiday.en-GB17.name=Christmas Day
 holiday.en-GB17.date=20131225
 holiday.en-GB18.name=Boxing Day
 holiday.en-GB18.date=20131226
--- a/doc/rc/holidays.en-NZ.rc
+++ b/doc/rc/holidays.en-NZ.rc
@@ -1,9 +1,9 @@
 ###############################################################################
 # International Holiday Data provided by Holidata.net
 # http://holidata.net/en-NZ/2012.json
 # http://holidata.net/en-NZ/2013.json
 # http://holidata.net/en-NZ/2014.json
 #
-# Copyright 2006-2012, Paul Beckingham, Federico Hernandez.
+# Copyright 2006-2014, Paul Beckingham, Federico Hernandez.
 #
 # Permission is hereby granted, free of charge, to any person obtaining a copy
 # of this software and associated documentation files (the "Software"), to deal
@@ -28,42 +28,22 @@
 ###############################################################################
 holiday.en-NZ1.name=New Year's Day
-holiday.en-NZ1.date=20120101
+holiday.en-NZ1.date=20130101
 holiday.en-NZ2.name=Day after New Years Day
-holiday.en-NZ2.date=20120102
+holiday.en-NZ2.date=20130102
 holiday.en-NZ3.name=Waitangi Day
-holiday.en-NZ3.date=20120206
+holiday.en-NZ3.date=20130206
 holiday.en-NZ4.name=Good Friday
-holiday.en-NZ4.date=20120406
+holiday.en-NZ4.date=20130329
 holiday.en-NZ5.name=Easter Monday
-holiday.en-NZ5.date=20120409
+holiday.en-NZ5.date=20130401
 holiday.en-NZ6.name=ANZAC Day
-holiday.en-NZ6.date=20120425
+holiday.en-NZ6.date=20130425
 holiday.en-NZ7.name=Queen's Birthday
-holiday.en-NZ7.date=20120604
+holiday.en-NZ7.date=20130603
 holiday.en-NZ8.name=Labour Day
-holiday.en-NZ8.date=20121022
+holiday.en-NZ8.date=20131028
 holiday.en-NZ9.name=Christmas Day
-holiday.en-NZ9.date=20121225
+holiday.en-NZ9.date=20131225
 holiday.en-NZ10.name=Boxing Day
-holiday.en-NZ10.date=20121226
+holiday.en-NZ10.date=20131226
 holiday.en-NZ11.name=New Year's Day
 holiday.en-NZ11.date=20130101
 holiday.en-NZ12.name=Day after New Years Day
 holiday.en-NZ12.date=20130102
 holiday.en-NZ13.name=Waitangi Day
 holiday.en-NZ13.date=20130206
 holiday.en-NZ14.name=Good Friday
 holiday.en-NZ14.date=20130329
 holiday.en-NZ15.name=Easter Monday
 holiday.en-NZ15.date=20130401
 holiday.en-NZ16.name=ANZAC Day
 holiday.en-NZ16.date=20130425
 holiday.en-NZ17.name=Queen's Birthday
 holiday.en-NZ17.date=20130603
 holiday.en-NZ18.name=Labour Day
 holiday.en-NZ18.date=20131028
 holiday.en-NZ19.name=Christmas Day
 holiday.en-NZ19.date=20131225
 holiday.en-NZ20.name=Boxing Day
 holiday.en-NZ20.date=20131226
--- a/doc/rc/holidays.en-US.rc
+++ b/doc/rc/holidays.en-US.rc
@@ -1,9 +1,9 @@
 ###############################################################################
 # International Holiday Data provided by Holidata.net
 # http://holidata.net/en-US/2012.json
 # http://holidata.net/en-US/2013.json
 # http://holidata.net/en-US/2014.json
 #
-# Copyright 2006-2012, Paul Beckingham, Federico Hernandez.
+# Copyright 2006-2014, Paul Beckingham, Federico Hernandez.
 #
 # Permission is hereby granted, free of charge, to any person obtaining a copy
 # of this software and associated documentation files (the "Software"), to deal
@@ -28,52 +28,46 @@
 ###############################################################################
 holiday.en-US1.name=New Year's Day
-holiday.en-US1.date=20120101
+holiday.en-US1.date=20130101
-holiday.en-US2.name=New Year's Day
+holiday.en-US2.name=Birthday of Martin Luther King, Jr.
-holiday.en-US2.date=20120102
+holiday.en-US2.date=20130121
-holiday.en-US3.name=Birthday of Martin Luther King, Jr.
+holiday.en-US3.name=Washington's Birthday
-holiday.en-US3.date=20120116
+holiday.en-US3.date=20130218
-holiday.en-US4.name=Washington's Birthday
+holiday.en-US4.name=Patriots' Day
-holiday.en-US4.date=20120220
+holiday.en-US4.date=20130415
-holiday.en-US5.name=Patriots' Day
+holiday.en-US5.name=Memorial Day
-holiday.en-US5.date=20120416
+holiday.en-US5.date=20130527
-holiday.en-US6.name=Patriots' Day
+holiday.en-US6.name=Independence Day
-holiday.en-US6.date=20120416
+holiday.en-US6.date=20130704
-holiday.en-US7.name=Memorial Day
+holiday.en-US7.name=Labor Day
-holiday.en-US7.date=20120528
+holiday.en-US7.date=20130902
-holiday.en-US8.name=Independence Day
+holiday.en-US8.name=Columbus Day
-holiday.en-US8.date=20120704
+holiday.en-US8.date=20131014
-holiday.en-US9.name=Labor Day
+holiday.en-US9.name=Veterans Day
-holiday.en-US9.date=20120903
+holiday.en-US9.date=20131111
-holiday.en-US10.name=Columbus Day
+holiday.en-US10.name=Thanksgiving Day
-holiday.en-US10.date=20121008
+holiday.en-US10.date=20131128
-holiday.en-US11.name=Veterans Day
+holiday.en-US11.name=Christmas Day
-holiday.en-US11.date=20121112
+holiday.en-US11.date=20131225
-holiday.en-US12.name=Thanksgiving Day
+holiday.en-US12.name=New Year's Day
-holiday.en-US12.date=20121122
+holiday.en-US12.date=20140101
-holiday.en-US13.name=Christmas Day
+holiday.en-US13.name=Birthday of Martin Luther King, Jr.
-holiday.en-US13.date=20121225
+holiday.en-US13.date=20140120
-holiday.en-US14.name=New Year's Day
+holiday.en-US14.name=Washington's Birthday
-holiday.en-US14.date=20130101
+holiday.en-US14.date=20140217
-holiday.en-US15.name=Birthday of Martin Luther King, Jr.
+holiday.en-US15.name=Patriots' Day
-holiday.en-US15.date=20130121
+holiday.en-US15.date=20140421
-holiday.en-US16.name=Washington's Birthday
+holiday.en-US16.name=Memorial Day
-holiday.en-US16.date=20130218
+holiday.en-US16.date=20140526
-holiday.en-US17.name=Patriots' Day
+holiday.en-US17.name=Independence Day
-holiday.en-US17.date=20130415
+holiday.en-US17.date=20140704
-holiday.en-US18.name=Patriots' Day
+holiday.en-US18.name=Labor Day
-holiday.en-US18.date=20130415
+holiday.en-US18.date=20140901
-holiday.en-US19.name=Memorial Day
+holiday.en-US19.name=Columbus Day
-holiday.en-US19.date=20130527
+holiday.en-US19.date=20141013
-holiday.en-US20.name=Independence Day
+holiday.en-US20.name=Veterans Day
-holiday.en-US20.date=20130704
+holiday.en-US20.date=20141111
-holiday.en-US21.name=Labor Day
+holiday.en-US21.name=Thanksgiving Day
-holiday.en-US21.date=20130902
+holiday.en-US21.date=20141127
-holiday.en-US22.name=Columbus Day
+holiday.en-US22.name=Christmas Day
-holiday.en-US22.date=20131014
+holiday.en-US22.date=20141225
 holiday.en-US23.name=Veterans Day
 holiday.en-US23.date=20131111
 holiday.en-US24.name=Thanksgiving Day
 holiday.en-US24.date=20131128
 holiday.en-US25.name=Christmas Day
 holiday.en-US25.date=20131225
--- a/doc/rc/holidays.es-ES.rc
+++ b/doc/rc/holidays.es-ES.rc
@@ -1,9 +1,9 @@
 ###############################################################################
 # International Holiday Data provided by Holidata.net
 # http://holidata.net/es-ES/2012.json
 # http://holidata.net/es-ES/2013.json
 # http://holidata.net/es-ES/2014.json
 #
-# Copyright 2006-2012, Paul Beckingham, Federico Hernandez.
+# Copyright 2006-2014, Paul Beckingham, Federico Hernandez.
 #
 # Permission is hereby granted, free of charge, to any person obtaining a copy
 # of this software and associated documentation files (the "Software"), to deal
@@ -28,52 +28,54 @@
 ###############################################################################
 holiday.es-ES1.name=Año Nuevo
-holiday.es-ES1.date=20120101
+holiday.es-ES1.date=20130101
 holiday.es-ES2.name=Día de los Reyes
-holiday.es-ES2.date=20120106
+holiday.es-ES2.date=20130106
 holiday.es-ES3.name=Viernes Santo
-holiday.es-ES3.date=20120406
+holiday.es-ES3.date=20130329
-holiday.es-ES4.name=Fiesta del Trabajo
+holiday.es-ES4.name=Pascua
-holiday.es-ES4.date=20120501
+holiday.es-ES4.date=20130331
-holiday.es-ES5.name=Asunción de la Virgen
+holiday.es-ES5.name=Fiesta del Trabajo
-holiday.es-ES5.date=20120815
+holiday.es-ES5.date=20130501
-holiday.es-ES6.name=Fiesta Nacional de España
+holiday.es-ES6.name=Asunción de la Virgen
-holiday.es-ES6.date=20121012
+holiday.es-ES6.date=20130815
-holiday.es-ES7.name=Dia de todos los Santos
+holiday.es-ES7.name=Fiesta Nacional de España
-holiday.es-ES7.date=20121101
+holiday.es-ES7.date=20131012
-holiday.es-ES8.name=Dia de la Constitución
+holiday.es-ES8.name=Dia de todos los Santos
-holiday.es-ES8.date=20121206
+holiday.es-ES8.date=20131101
-holiday.es-ES9.name=Inmaculada Concepción
+holiday.es-ES9.name=Dia de la Constitución
-holiday.es-ES9.date=20121208
+holiday.es-ES9.date=20131206
-holiday.es-ES10.name=Noche Buena
+holiday.es-ES10.name=Inmaculada Concepción
-holiday.es-ES10.date=20121224
+holiday.es-ES10.date=20131208
-holiday.es-ES11.name=Navidad
+holiday.es-ES11.name=Noche Buena
-holiday.es-ES11.date=20121225
+holiday.es-ES11.date=20131224
-holiday.es-ES12.name=Noche Vieja
+holiday.es-ES12.name=Navidad
-holiday.es-ES12.date=20121231
+holiday.es-ES12.date=20131225
-holiday.es-ES13.name=Año Nuevo
+holiday.es-ES13.name=Noche Vieja
-holiday.es-ES13.date=20130101
+holiday.es-ES13.date=20131231
-holiday.es-ES14.name=Día de los Reyes
+holiday.es-ES14.name=Año Nuevo
-holiday.es-ES14.date=20130106
+holiday.es-ES14.date=20140101
-holiday.es-ES15.name=Viernes Santo
+holiday.es-ES15.name=Día de los Reyes
-holiday.es-ES15.date=20130329
+holiday.es-ES15.date=20140106
-holiday.es-ES16.name=Pascua
+holiday.es-ES16.name=Viernes Santo
-holiday.es-ES16.date=20130331
+holiday.es-ES16.date=20140418
-holiday.es-ES17.name=Fiesta del Trabajo
+holiday.es-ES17.name=Pascua
-holiday.es-ES17.date=20130501
+holiday.es-ES17.date=20140420
-holiday.es-ES18.name=Asunción de la Virgen
+holiday.es-ES18.name=Fiesta del Trabajo
-holiday.es-ES18.date=20130815
+holiday.es-ES18.date=20140501
-holiday.es-ES19.name=Fiesta Nacional de España
+holiday.es-ES19.name=Asunción de la Virgen
-holiday.es-ES19.date=20131012
+holiday.es-ES19.date=20140815
-holiday.es-ES20.name=Dia de todos los Santos
+holiday.es-ES20.name=Fiesta Nacional de España
-holiday.es-ES20.date=20131101
+holiday.es-ES20.date=20141012
-holiday.es-ES21.name=Dia de la Constitución
+holiday.es-ES21.name=Dia de todos los Santos
-holiday.es-ES21.date=20131206
+holiday.es-ES21.date=20141101
-holiday.es-ES22.name=Inmaculada Concepción
+holiday.es-ES22.name=Dia de la Constitución
-holiday.es-ES22.date=20131208
+holiday.es-ES22.date=20141206
-holiday.es-ES23.name=Noche Buena
+holiday.es-ES23.name=Inmaculada Concepción
-holiday.es-ES23.date=20131224
+holiday.es-ES23.date=20141208
-holiday.es-ES24.name=Navidad
+holiday.es-ES24.name=Noche Buena
-holiday.es-ES24.date=20131225
+holiday.es-ES24.date=20141224
-holiday.es-ES25.name=Noche Vieja
+holiday.es-ES25.name=Navidad
-holiday.es-ES25.date=20131231
+holiday.es-ES25.date=20141225
 holiday.es-ES26.name=Noche Vieja
 holiday.es-ES26.date=20141231
--- a/doc/rc/holidays.fr-FR.rc
+++ b/doc/rc/holidays.fr-FR.rc
@@ -1,9 +1,9 @@
 ###############################################################################
 # International Holiday Data provided by Holidata.net
 # http://holidata.net/fr-FR/2012.json
 # http://holidata.net/fr-FR/2013.json
 # http://holidata.net/fr-FR/2014.json
 #
-# Copyright 2006-2012, Paul Beckingham, Federico Hernandez.
+# Copyright 2006-2014, Paul Beckingham, Federico Hernandez.
 #
 # Permission is hereby granted, free of charge, to any person obtaining a copy
 # of this software and associated documentation files (the "Software"), to deal
@@ -28,46 +28,24 @@
 ###############################################################################
 holiday.fr-FR1.name=Jour de l'an
-holiday.fr-FR1.date=20120101
+holiday.fr-FR1.date=20130101
 holiday.fr-FR2.name=Lundi de Pâques
-holiday.fr-FR2.date=20120409
+holiday.fr-FR2.date=20130401
 holiday.fr-FR3.name=Fête du premier mai
-holiday.fr-FR3.date=20120501
+holiday.fr-FR3.date=20130501
 holiday.fr-FR4.name=Armistice 1945
-holiday.fr-FR4.date=20120508
+holiday.fr-FR4.date=20130508
 holiday.fr-FR5.name=Ascencion
-holiday.fr-FR5.date=20120517
+holiday.fr-FR5.date=20130509
 holiday.fr-FR6.name=Pentecôte
-holiday.fr-FR6.date=20120528
+holiday.fr-FR6.date=20130519
 holiday.fr-FR7.name=Fête nationale
-holiday.fr-FR7.date=20120714
+holiday.fr-FR7.date=20130714
 holiday.fr-FR8.name=Assomption
-holiday.fr-FR8.date=20120815
+holiday.fr-FR8.date=20130815
 holiday.fr-FR9.name=Toussaint
-holiday.fr-FR9.date=20121101
+holiday.fr-FR9.date=20131101
 holiday.fr-FR10.name=Armistice 1918
-holiday.fr-FR10.date=20121111
+holiday.fr-FR10.date=20131111
 holiday.fr-FR11.name=Noël
-holiday.fr-FR11.date=20121225
+holiday.fr-FR11.date=20131225
 holiday.fr-FR12.name=Jour de l'an
 holiday.fr-FR12.date=20130101
 holiday.fr-FR13.name=Lundi de Pâques
 holiday.fr-FR13.date=20130401
 holiday.fr-FR14.name=Fête du premier mai
 holiday.fr-FR14.date=20130501
 holiday.fr-FR15.name=Armistice 1945
 holiday.fr-FR15.date=20130508
 holiday.fr-FR16.name=Ascencion
 holiday.fr-FR16.date=20130509
 holiday.fr-FR17.name=Pentecôte
 holiday.fr-FR17.date=20130519
 holiday.fr-FR18.name=Fête nationale
 holiday.fr-FR18.date=20130714
 holiday.fr-FR19.name=Assomption
 holiday.fr-FR19.date=20130815
 holiday.fr-FR20.name=Toussaint
 holiday.fr-FR20.date=20131101
 holiday.fr-FR21.name=Armistice 1918
 holiday.fr-FR21.date=20131111
 holiday.fr-FR22.name=Noël
 holiday.fr-FR22.date=20131225
--- a/doc/rc/holidays.it-IT.rc
+++ b/doc/rc/holidays.it-IT.rc
@@ -1,9 +1,9 @@
 ###############################################################################
 # International Holiday Data provided by Holidata.net
 # http://holidata.net/it-IT/2012.json
 # http://holidata.net/it-IT/2013.json
 # http://holidata.net/it-IT/2014.json
 #
-# Copyright 2006-2012, Paul Beckingham, Federico Hernandez.
+# Copyright 2006-2014, Paul Beckingham, Federico Hernandez.
 #
 # Permission is hereby granted, free of charge, to any person obtaining a copy
 # of this software and associated documentation files (the "Software"), to deal
@@ -28,50 +28,26 @@
 ###############################################################################
 holiday.it-IT1.name=Capodanno
-holiday.it-IT1.date=20120101
+holiday.it-IT1.date=20130101
 holiday.it-IT2.name=Epifania
-holiday.it-IT2.date=20120106
+holiday.it-IT2.date=20130106
 holiday.it-IT3.name=Carnevale
-holiday.it-IT3.date=20120308
+holiday.it-IT3.date=20130210
 holiday.it-IT4.name=Pasqua
-holiday.it-IT4.date=20120409
+holiday.it-IT4.date=20130401
 holiday.it-IT5.name=Festa della liberazione
-holiday.it-IT5.date=20120425
+holiday.it-IT5.date=20130425
 holiday.it-IT6.name=Festa del lavoro
-holiday.it-IT6.date=20120501
+holiday.it-IT6.date=20130501
 holiday.it-IT7.name=Festa della repubblica
-holiday.it-IT7.date=20120602
+holiday.it-IT7.date=20130602
 holiday.it-IT8.name=Assunzione (ferragosto)
-holiday.it-IT8.date=20120815
+holiday.it-IT8.date=20130815
 holiday.it-IT9.name=Ognissanti
-holiday.it-IT9.date=20121101
+holiday.it-IT9.date=20131101
 holiday.it-IT10.name=Immacolata concezione
-holiday.it-IT10.date=20121208
+holiday.it-IT10.date=20131208
 holiday.it-IT11.name=Natale
-holiday.it-IT11.date=20121225
+holiday.it-IT11.date=20131225
 holiday.it-IT12.name=S.to Stefano
-holiday.it-IT12.date=20121226
+holiday.it-IT12.date=20131226
 holiday.it-IT13.name=Capodanno
 holiday.it-IT13.date=20130101
 holiday.it-IT14.name=Epifania
 holiday.it-IT14.date=20130106
 holiday.it-IT15.name=Carnevale
 holiday.it-IT15.date=20130210
 holiday.it-IT16.name=Pasqua
 holiday.it-IT16.date=20130401
 holiday.it-IT17.name=Festa della liberazione
 holiday.it-IT17.date=20130425
 holiday.it-IT18.name=Festa del lavoro
 holiday.it-IT18.date=20130501
 holiday.it-IT19.name=Festa della repubblica
 holiday.it-IT19.date=20130602
 holiday.it-IT20.name=Assunzione (ferragosto)
 holiday.it-IT20.date=20130815
 holiday.it-IT21.name=Ognissanti
 holiday.it-IT21.date=20131101
 holiday.it-IT22.name=Immacolata concezione
 holiday.it-IT22.date=20131208
 holiday.it-IT23.name=Natale
 holiday.it-IT23.date=20131225
 holiday.it-IT24.name=S.to Stefano
 holiday.it-IT24.date=20131226
--- a/doc/rc/holidays.jp-JP.rc
+++ b/doc/rc/holidays.jp-JP.rc
@@ -1,9 +1,9 @@
 ###############################################################################
 # International Holiday Data provided by Holidata.net
 # http://holidata.net/jp-JP/2012.json
 # http://holidata.net/jp-JP/2013.json
 # http://holidata.net/jp-JP/2014.json
 #
-# Copyright 2006-2012, Paul Beckingham, Federico Hernandez.
+# Copyright 2006-2014, Paul Beckingham, Federico Hernandez.
 #
 # Permission is hereby granted, free of charge, to any person obtaining a copy
 # of this software and associated documentation files (the "Software"), to deal
@@ -28,72 +28,36 @@
 ###############################################################################
 holiday.jp-JP1.name=元日
-holiday.jp-JP1.date=20120101
+holiday.jp-JP1.date=20130101
-holiday.jp-JP2.name=振替休日
+holiday.jp-JP2.name=成人の日
-holiday.jp-JP2.date=20120102
+holiday.jp-JP2.date=20130114
-holiday.jp-JP3.name=成人の日
+holiday.jp-JP3.name=建国記念の日
-holiday.jp-JP3.date=20120109
+holiday.jp-JP3.date=20130211
-holiday.jp-JP4.name=建国記念の日
+holiday.jp-JP4.name=春分の日
-holiday.jp-JP4.date=20120211
+holiday.jp-JP4.date=20130320
-holiday.jp-JP5.name=春分の日
+holiday.jp-JP5.name=昭和の日
-holiday.jp-JP5.date=20120320
+holiday.jp-JP5.date=20130429
-holiday.jp-JP6.name=昭和の日
+holiday.jp-JP6.name=憲法記念日
-holiday.jp-JP6.date=20120429
+holiday.jp-JP6.date=20130503
-holiday.jp-JP7.name=振替休日
+holiday.jp-JP7.name=みどりの日
-holiday.jp-JP7.date=20120430
+holiday.jp-JP7.date=20130504
-holiday.jp-JP8.name=憲法記念日
+holiday.jp-JP8.name=こどもの日
-holiday.jp-JP8.date=20120503
+holiday.jp-JP8.date=20130505
-holiday.jp-JP9.name=みどりの日
+holiday.jp-JP9.name=振替休日
-holiday.jp-JP9.date=20120504
+holiday.jp-JP9.date=20130506
-holiday.jp-JP10.name=こどもの日
+holiday.jp-JP10.name=海の日
-holiday.jp-JP10.date=20120505
+holiday.jp-JP10.date=20130715
-holiday.jp-JP11.name=海の日
+holiday.jp-JP11.name=敬老の日
-holiday.jp-JP11.date=20120716
+holiday.jp-JP11.date=20130919
-holiday.jp-JP12.name=敬老の日
+holiday.jp-JP12.name=秋分の日
-holiday.jp-JP12.date=20120917
+holiday.jp-JP12.date=20130923
-holiday.jp-JP13.name=秋分の日
+holiday.jp-JP13.name=体育の日
-holiday.jp-JP13.date=20120922
+holiday.jp-JP13.date=20131014
-holiday.jp-JP14.name=体育の日
+holiday.jp-JP14.name=文化の日
-holiday.jp-JP14.date=20121008
+holiday.jp-JP14.date=20131103
-holiday.jp-JP15.name=文化の日
+holiday.jp-JP15.name=振替休日
-holiday.jp-JP15.date=20121103
+holiday.jp-JP15.date=20131104
 holiday.jp-JP16.name=勤労感謝の日
-holiday.jp-JP16.date=20121123
+holiday.jp-JP16.date=20131123
 holiday.jp-JP17.name=天皇誕生日
-holiday.jp-JP17.date=20121223
+holiday.jp-JP17.date=20131223
 holiday.jp-JP18.name=振替休日
 holiday.jp-JP18.date=20121224
 holiday.jp-JP19.name=元日
 holiday.jp-JP19.date=20130101
 holiday.jp-JP20.name=成人の日
 holiday.jp-JP20.date=20130114
 holiday.jp-JP21.name=建国記念の日
 holiday.jp-JP21.date=20130211
 holiday.jp-JP22.name=春分の日
 holiday.jp-JP22.date=20130320
 holiday.jp-JP23.name=昭和の日
 holiday.jp-JP23.date=20130429
 holiday.jp-JP24.name=憲法記念日
 holiday.jp-JP24.date=20130503
 holiday.jp-JP25.name=みどりの日
 holiday.jp-JP25.date=20130504
 holiday.jp-JP26.name=こどもの日
 holiday.jp-JP26.date=20130505
 holiday.jp-JP27.name=振替休日
 holiday.jp-JP27.date=20130506
 holiday.jp-JP28.name=海の日
 holiday.jp-JP28.date=20130715
 holiday.jp-JP29.name=敬老の日
 holiday.jp-JP29.date=20130919
 holiday.jp-JP30.name=秋分の日
 holiday.jp-JP30.date=20130923
 holiday.jp-JP31.name=体育の日
 holiday.jp-JP31.date=20131014
 holiday.jp-JP32.name=文化の日
 holiday.jp-JP32.date=20131103
 holiday.jp-JP33.name=振替休日
 holiday.jp-JP33.date=20131104
 holiday.jp-JP34.name=勤労感謝の日
 holiday.jp-JP34.date=20131123
 holiday.jp-JP35.name=天皇誕生日
 holiday.jp-JP35.date=20131223
--- a/doc/rc/holidays.nb-NO.rc
+++ b/doc/rc/holidays.nb-NO.rc
@@ -1,9 +1,9 @@
 ###############################################################################
 # International Holiday Data provided by Holidata.net
 # http://holidata.net/nb-NO/2012.json
 # http://holidata.net/nb-NO/2013.json
 # http://holidata.net/nb-NO/2014.json
 #
-# Copyright 2006-2012, Paul Beckingham, Federico Hernandez.
+# Copyright 2006-2014, Paul Beckingham, Federico Hernandez.
 #
 # Permission is hereby granted, free of charge, to any person obtaining a copy
 # of this software and associated documentation files (the "Software"), to deal
@@ -28,70 +28,36 @@
 ###############################################################################
 holiday.nb-NO1.name=Nyttårsdag
-holiday.nb-NO1.date=20120101
+holiday.nb-NO1.date=20130101
 holiday.nb-NO2.name=Fastelavn
-holiday.nb-NO2.date=20120219
+holiday.nb-NO2.date=20130210
 holiday.nb-NO3.name=Palmesøndag
-holiday.nb-NO3.date=20120401
+holiday.nb-NO3.date=20130324
 holiday.nb-NO4.name=Skjærtorsdag
-holiday.nb-NO4.date=20120405
+holiday.nb-NO4.date=20130328
 holiday.nb-NO5.name=Langfredag
-holiday.nb-NO5.date=20120406
+holiday.nb-NO5.date=20130329
 holiday.nb-NO6.name=Påskedag
-holiday.nb-NO6.date=20120408
+holiday.nb-NO6.date=20130331
 holiday.nb-NO7.name=Påskedag
-holiday.nb-NO7.date=20120409
+holiday.nb-NO7.date=20130401
 holiday.nb-NO8.name=Offentlig Høytidsdag
-holiday.nb-NO8.date=20120501
+holiday.nb-NO8.date=20130501
 holiday.nb-NO9.name=Frigjøringsdag 1945
-holiday.nb-NO9.date=20120508
+holiday.nb-NO9.date=20130508
 holiday.nb-NO10.name=Grunnlovsdag
-holiday.nb-NO10.date=20120517
+holiday.nb-NO10.date=20130517
 holiday.nb-NO11.name=Kristi Himmelfartsdag
-holiday.nb-NO11.date=20120517
+holiday.nb-NO11.date=20130509
 holiday.nb-NO12.name=Pinsedag
-holiday.nb-NO12.date=20120527
+holiday.nb-NO12.date=20130519
 holiday.nb-NO13.name=Pinsedag
-holiday.nb-NO13.date=20120528
+holiday.nb-NO13.date=20130520
 holiday.nb-NO14.name=Julaften
-holiday.nb-NO14.date=20121224
+holiday.nb-NO14.date=20131224
 holiday.nb-NO15.name=Juledag
-holiday.nb-NO15.date=20121225
+holiday.nb-NO15.date=20131225
 holiday.nb-NO16.name=Juledag
-holiday.nb-NO16.date=20121226
+holiday.nb-NO16.date=20131226
 holiday.nb-NO17.name=Nyttårsaften
-holiday.nb-NO17.date=20121231
+holiday.nb-NO17.date=20131231
 holiday.nb-NO18.name=Nyttårsdag
 holiday.nb-NO18.date=20130101
 holiday.nb-NO19.name=Fastelavn
 holiday.nb-NO19.date=20130210
 holiday.nb-NO20.name=Palmesøndag
 holiday.nb-NO20.date=20130324
 holiday.nb-NO21.name=Skjærtorsdag
 holiday.nb-NO21.date=20130328
 holiday.nb-NO22.name=Langfredag
 holiday.nb-NO22.date=20130329
 holiday.nb-NO23.name=Påskedag
 holiday.nb-NO23.date=20130331
 holiday.nb-NO24.name=Påskedag
 holiday.nb-NO24.date=20130401
 holiday.nb-NO25.name=Offentlig Høytidsdag
 holiday.nb-NO25.date=20130501
 holiday.nb-NO26.name=Frigjøringsdag 1945
 holiday.nb-NO26.date=20130508
 holiday.nb-NO27.name=Grunnlovsdag
 holiday.nb-NO27.date=20130517
 holiday.nb-NO28.name=Kristi Himmelfartsdag
 holiday.nb-NO28.date=20130509
 holiday.nb-NO29.name=Pinsedag
 holiday.nb-NO29.date=20130519
 holiday.nb-NO30.name=Pinsedag
 holiday.nb-NO30.date=20130520
 holiday.nb-NO31.name=Julaften
 holiday.nb-NO31.date=20131224
 holiday.nb-NO32.name=Juledag
 holiday.nb-NO32.date=20131225
 holiday.nb-NO33.name=Juledag
 holiday.nb-NO33.date=20131226
 holiday.nb-NO34.name=Nyttårsaften
 holiday.nb-NO34.date=20131231
--- a/doc/rc/holidays.nl-NL.rc
+++ b/doc/rc/holidays.nl-NL.rc
@@ -1,9 +1,9 @@
 ###############################################################################
 # International Holiday Data provided by Holidata.net
 # http://holidata.net/nl-NL/2012.json
 # http://holidata.net/nl-NL/2013.json
 # http://holidata.net/nl-NL/2014.json
 #
-# Copyright 2006-2012, Paul Beckingham, Federico Hernandez.
+# Copyright 2006-2014, Paul Beckingham, Federico Hernandez.
 #
 # Permission is hereby granted, free of charge, to any person obtaining a copy
 # of this software and associated documentation files (the "Software"), to deal
@@ -28,58 +28,30 @@
 ###############################################################################
 holiday.nl-NL1.name=Nieuwjaar
-holiday.nl-NL1.date=20120101
+holiday.nl-NL1.date=20130101
 holiday.nl-NL2.name=Goede Vrijdag
-holiday.nl-NL2.date=20120406
+holiday.nl-NL2.date=20130329
 holiday.nl-NL3.name=Pasen
-holiday.nl-NL3.date=20120408
+holiday.nl-NL3.date=20130331
 holiday.nl-NL4.name=Tweede Pasdag
-holiday.nl-NL4.date=20120409
+holiday.nl-NL4.date=20130401
 holiday.nl-NL5.name=Koninginnedag
-holiday.nl-NL5.date=20120430
+holiday.nl-NL5.date=20130430
 holiday.nl-NL6.name=Dodenherdenking
-holiday.nl-NL6.date=20120504
+holiday.nl-NL6.date=20130504
 holiday.nl-NL7.name=Bevrijdingsdag
-holiday.nl-NL7.date=20120505
+holiday.nl-NL7.date=20130505
 holiday.nl-NL8.name=Hemelvaartsdag
-holiday.nl-NL8.date=20120517
+holiday.nl-NL8.date=20130509
 holiday.nl-NL9.name=Pinksteren
-holiday.nl-NL9.date=20120527
+holiday.nl-NL9.date=20130519
 holiday.nl-NL10.name=Tweede Pinksterdag
-holiday.nl-NL10.date=20120528
+holiday.nl-NL10.date=20130520
 holiday.nl-NL11.name=Sinterklaas
-holiday.nl-NL11.date=20121205
+holiday.nl-NL11.date=20131205
 holiday.nl-NL12.name=Koninkrijksdag
-holiday.nl-NL12.date=20121215
+holiday.nl-NL12.date=20131215
 holiday.nl-NL13.name=Kerstmis
-holiday.nl-NL13.date=20121225
+holiday.nl-NL13.date=20131225
 holiday.nl-NL14.name=Tweede Kerstdag
-holiday.nl-NL14.date=20121226
+holiday.nl-NL14.date=20131226
 holiday.nl-NL15.name=Nieuwjaar
 holiday.nl-NL15.date=20130101
 holiday.nl-NL16.name=Goede Vrijdag
 holiday.nl-NL16.date=20130329
 holiday.nl-NL17.name=Pasen
 holiday.nl-NL17.date=20130331
 holiday.nl-NL18.name=Tweede Pasdag
 holiday.nl-NL18.date=20130401
 holiday.nl-NL19.name=Koninginnedag
 holiday.nl-NL19.date=20130430
 holiday.nl-NL20.name=Dodenherdenking
 holiday.nl-NL20.date=20130504
 holiday.nl-NL21.name=Bevrijdingsdag
 holiday.nl-NL21.date=20130505
 holiday.nl-NL22.name=Hemelvaartsdag
 holiday.nl-NL22.date=20130509
 holiday.nl-NL23.name=Pinksteren
 holiday.nl-NL23.date=20130519
 holiday.nl-NL24.name=Tweede Pinksterdag
 holiday.nl-NL24.date=20130520
 holiday.nl-NL25.name=Sinterklaas
 holiday.nl-NL25.date=20131205
 holiday.nl-NL26.name=Koninkrijksdag
 holiday.nl-NL26.date=20131215
 holiday.nl-NL27.name=Kerstmis
 holiday.nl-NL27.date=20131225
 holiday.nl-NL28.name=Tweede Kerstdag
 holiday.nl-NL28.date=20131226
--- a/doc/rc/holidays.sv-SE.rc
+++ b/doc/rc/holidays.sv-SE.rc
@@ -1,9 +1,9 @@
 ###############################################################################
 # International Holiday Data provided by Holidata.net
 # http://holidata.net/sv-SE/2012.json
 # http://holidata.net/sv-SE/2013.json
 # http://holidata.net/sv-SE/2014.json
 #
-# Copyright 2006-2012, Paul Beckingham, Federico Hernandez.
+# Copyright 2006-2014, Paul Beckingham, Federico Hernandez.
 #
 # Permission is hereby granted, free of charge, to any person obtaining a copy
 # of this software and associated documentation files (the "Software"), to deal
@@ -28,70 +28,70 @@
 ###############################################################################
 holiday.sv-SE1.name=Nyårsdagen
-holiday.sv-SE1.date=20120101
+holiday.sv-SE1.date=20130101
 holiday.sv-SE2.name=Trettondedag jul
-holiday.sv-SE2.date=20120106
+holiday.sv-SE2.date=20130106
 holiday.sv-SE3.name=Långfredagen
-holiday.sv-SE3.date=20120406
+holiday.sv-SE3.date=20130329
 holiday.sv-SE4.name=Påskdagen
-holiday.sv-SE4.date=20120408
+holiday.sv-SE4.date=20130331
 holiday.sv-SE5.name=Annandag påsk
-holiday.sv-SE5.date=20120409
+holiday.sv-SE5.date=20130401
 holiday.sv-SE6.name=Valborgmässoafton
-holiday.sv-SE6.date=20120430
+holiday.sv-SE6.date=20130430
 holiday.sv-SE7.name=Första maj
-holiday.sv-SE7.date=20120501
+holiday.sv-SE7.date=20130501
 holiday.sv-SE8.name=Kristi Himmelsfärdsdag
-holiday.sv-SE8.date=20120517
+holiday.sv-SE8.date=20130509
 holiday.sv-SE9.name=Pingstdagen
-holiday.sv-SE9.date=20120527
+holiday.sv-SE9.date=20130519
 holiday.sv-SE10.name=Nationaldagen
-holiday.sv-SE10.date=20120606
+holiday.sv-SE10.date=20130606
 holiday.sv-SE11.name=Midsommarafton
-holiday.sv-SE11.date=20120622
+holiday.sv-SE11.date=20130621
 holiday.sv-SE12.name=Midsommardagen
-holiday.sv-SE12.date=20120623
+holiday.sv-SE12.date=20130622
 holiday.sv-SE13.name=Alla Helgons Dag
-holiday.sv-SE13.date=20121103
+holiday.sv-SE13.date=20131102
 holiday.sv-SE14.name=Julafton
-holiday.sv-SE14.date=20121224
+holiday.sv-SE14.date=20131224
 holiday.sv-SE15.name=Juldagen
-holiday.sv-SE15.date=20121225
+holiday.sv-SE15.date=20131225
 holiday.sv-SE16.name=Annandag jul
-holiday.sv-SE16.date=20121226
+holiday.sv-SE16.date=20131226
 holiday.sv-SE17.name=Nyårsafton
-holiday.sv-SE17.date=20121231
+holiday.sv-SE17.date=20131231
 holiday.sv-SE18.name=Nyårsdagen
-holiday.sv-SE18.date=20130101
+holiday.sv-SE18.date=20140101
 holiday.sv-SE19.name=Trettondedag jul
-holiday.sv-SE19.date=20130106
+holiday.sv-SE19.date=20140106
 holiday.sv-SE20.name=Långfredagen
-holiday.sv-SE20.date=20130329
+holiday.sv-SE20.date=20140418
 holiday.sv-SE21.name=Påskdagen
-holiday.sv-SE21.date=20130331
+holiday.sv-SE21.date=20140420
 holiday.sv-SE22.name=Annandag påsk
-holiday.sv-SE22.date=20130401
+holiday.sv-SE22.date=20140421
 holiday.sv-SE23.name=Valborgmässoafton
-holiday.sv-SE23.date=20130430
+holiday.sv-SE23.date=20140430
 holiday.sv-SE24.name=Första maj
-holiday.sv-SE24.date=20130501
+holiday.sv-SE24.date=20140501
 holiday.sv-SE25.name=Kristi Himmelsfärdsdag
-holiday.sv-SE25.date=20130509
+holiday.sv-SE25.date=20140529
 holiday.sv-SE26.name=Pingstdagen
-holiday.sv-SE26.date=20130519
+holiday.sv-SE26.date=20140608
 holiday.sv-SE27.name=Nationaldagen
-holiday.sv-SE27.date=20130606
+holiday.sv-SE27.date=20140606
 holiday.sv-SE28.name=Midsommarafton
-holiday.sv-SE28.date=20130621
+holiday.sv-SE28.date=20140620
 holiday.sv-SE29.name=Midsommardagen
-holiday.sv-SE29.date=20130622
+holiday.sv-SE29.date=20140621
 holiday.sv-SE30.name=Alla Helgons Dag
-holiday.sv-SE30.date=20131102
+holiday.sv-SE30.date=20141031
 holiday.sv-SE31.name=Julafton
-holiday.sv-SE31.date=20131224
+holiday.sv-SE31.date=20141224
 holiday.sv-SE32.name=Juldagen
-holiday.sv-SE32.date=20131225
+holiday.sv-SE32.date=20141225
 holiday.sv-SE33.name=Annandag jul
-holiday.sv-SE33.date=20131226
+holiday.sv-SE33.date=20141226
 holiday.sv-SE34.name=Nyårsafton
-holiday.sv-SE34.date=20131231
+holiday.sv-SE34.date=20141231
--- a/doc/rc/light-16.theme
+++ b/doc/rc/light-16.theme
@@ -3,7 +3,7 @@
 #
 # taskwarrior - a command line task list manager.
 #
-# Copyright 2006-2012, Paul Beckingham, Federico Hernandez.
+# Copyright 2006-2014, Paul Beckingham, Federico Hernandez.
 #
 # Permission is hereby granted, free of charge, to any person obtaining a copy
 # of this software and associated documentation files (the "Software"), to deal
@@ -30,6 +30,7 @@
 color=on
 color.header=blue
 color.footnote=blue
 color.error=blue
 color.debug=blue
 color.summary.bar=black on green
@@ -69,6 +70,7 @@ color.pri.M=black
 color.pri.L=
 color.tagged=green
 color.blocked=white on black
 color.blocking=bold white on black
 color.project.none=
 color.tag.none=
 color.alternate=
--- a/doc/rc/light-256.theme
+++ b/doc/rc/light-256.theme
@@ -3,7 +3,7 @@
 #
 # taskwarrior - a command line task list manager.
 #
-# Copyright 2006-2012, Paul Beckingham, Federico Hernandez.
+# Copyright 2006-2014, Paul Beckingham, Federico Hernandez.
 #
 # Permission is hereby granted, free of charge, to any person obtaining a copy
 # of this software and associated documentation files (the "Software"), to deal
@@ -30,6 +30,7 @@
 color=on
 color.header=color4
 color.footnote=color4
 color.error=color4
 color.debug=color4
 color.summary.bar=black on rgb141
@@ -69,6 +70,7 @@ color.pri.M=color237
 color.pri.L=color242
 color.tagged=rgb020
 color.blocked=gray12 on gray4
 color.blocking=gray12 on gray6
 color.project.none=
 color.tag.none=
 color.alternate=on color254
--- a/doc/rc/solarized-dark-256.theme
+++ b/doc/rc/solarized-dark-256.theme
@@ -3,7 +3,7 @@
 #
 # taskwarrior - a command line task list manager.
 #
-# Copyright 2006-2012, Paul Beckingham, Federico Hernandez.
+# Copyright 2006-2014, Paul Beckingham, Federico Hernandez.
 # 
 # Colors used are based on the Solarized palette created by Ethan Schoonover 
 # <http://ethanschoonover.com/solarized>
@@ -47,6 +47,7 @@ color.active=bold red
 color.alternate=on black #color0
 color.blocked=color0 on color10
 color.blocking=color15 on color10
 color.burndown.done=color0 on color4
 color.burndown.pending=color0 on color1
@@ -60,6 +61,7 @@ color.calendar.today=color0 on color4
 color.calendar.weekend=on color0
 color.calendar.weeknumber=color4
 color.error=color6
 color.debug=color6
 color.due=color9
 color.due.today=color1
--- a/doc/rc/solarized-light-256.theme
+++ b/doc/rc/solarized-light-256.theme
@@ -3,7 +3,7 @@
 #
 # taskwarrior - a command line task list manager.
 #
-# Copyright 2006-2012, Paul Beckingham, Federico Hernandez.
+# Copyright 2006-2014, Paul Beckingham, Federico Hernandez.
 # 
 # Colors used are based on the Solarized palette created by Ethan Schoonover 
 # <http://ethanschoonover.com/solarized>
@@ -47,6 +47,7 @@ color.active=bold red #color9
 color.alternate=on white #color7 (allows bold for alternate rows)
 color.blocked=on color14
 color.blocking=on color14
 color.burndown.done=color0 on color4
 color.burndown.pending=color0 on color1
@@ -60,6 +61,7 @@ color.calendar.today=color7 on color4
 color.calendar.weekend=on color7
 color.calendar.weeknumber=color14
 color.error=color2
 color.debug=color3
 color.due=color9
 color.due.today=color1
--- a/Show More
+++ b/Show More