Version number and release date for 2.5.1

Text: Fixed extractLines where hyphenation is off
ColTags: Added missing calculation for tag max width
2016-02-24 23:17:29 +01:00 · 2016-02-23 22:15:00 -05:00 · 2016-02-23 21:56:23 -05:00 · 2016-02-23 21:43:44 -05:00 · 2016-02-23 21:41:57 -05:00 · 2016-02-23 21:16:01 -05:00
858 changed files with 81136 additions and 64276 deletions
--- a/.gitignore
+++ b/.gitignore
@@ -1,11 +1,11 @@
 cmake.h
 auto.h
 commit.h
 Makefile
-*/*task
+src/task
-*/*libtask.a
+src/taskd
-*/*/libcommands.a
+src/libtask.a
-*/*/libcolumns.a
+src/commands/libcommands.a
 src/columns/libcolumns.a
 *~
 .*.swp
 package-config/osx/binary/task
@@ -16,3 +16,6 @@ install_manifest.txt
 _CPack_Packages
 CPackConfig.cmake
 CPackSourceConfig.cmake
 patches
 *.exe
 tutorials
--- a/144
+++ b/144
@@ -1,16 +1,19 @@
-The development of taskwarrior was made possible by the significant
+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)
  Renato Alves       (Contributing Author)
  Tomas Babej        (Contributing Author)
 The following submitted code, packages or analysis, and deserve special thanks:
@@ -74,7 +77,56 @@ The following submitted code, packages or analysis, and deserve special thanks:
  Oleksii Tsai
  Jörg Plate
  Markus Kuhn
-  Scott Kostyshak
+  Erik Wenzel
  Štěpán Henek
  Haitham Gad
  Fidel Mato
  Justin Forest
  Vincent Petithory
  Rainer Müller
  Jakub Wilk
  Russell Steicke
  YBSAR
  Ben Armstrong
  Tullio Facchinetti
  Thomas Sullivan
  Martin Natano
  kili
  jasper
  Aaron Bieber
  John West
  Jeroen Budts
  Zed Jorarard
  Elias Probst
  Natanael Copa
  Marton Suranyi
  Nicolas Appriou
  Jochen Sprickerhof
  Alexander Sulfrian
  David Binderman
  atomicules
  catern
  Tatjana Heuser
  leowzukw
  Richard Boß
  Markus Beppler
  Jeremy John Reeder
  Roman Inflianskas
  Łukasz Panek
  V.Krishn
  Jens Erat
  Peter Rochen
  Oota Toshiya
  ribbon
  Daniel Shahaf
  Johannes Wienke
  Alan Young
  Gordon Ball
  Rafał Bolanowski
  Sunil Joshi
  Misty De Meo
  Kent R. Spillner
  Konstantin
 Thanks to the following, who submitted detailed bug reports and excellent
 suggestions:
@@ -153,4 +205,86 @@ suggestions:
  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 Harlan
  Hector Arciga
  Jan Kunder
  jck
  Michele Vetturi
  Jeremiah Marks
  Profpatsch
  Bernd Humpa
  darkfeline
  Onion
  Milos Svantner
  Christopher Roberts
  Steffen Uhlig
  Dirk Sarpe
  Will Dietz
  Charles Ulrich
  Jack
  Kevin Ballard
  Sitaram Chamarty
  lolilolicon
  Lee Lieske
  Peter Vitt
  dev-zero
  Petteri
  Black Ops Testing
  Leon Feng
  Nick Person
  Arnoud K
  Ozgur Akgun
  David Costa
  Sujeevan Vijayakumaran
  Scott Carter
  Taisuke Hachimura
  Martin
  Alexandre de Verteuil
  Scott M
  Stefan Frühwirth
  Pierre Campet
  Denis Kasak
  David Brenner
  Audrey Easterday
  Stefan Betz
  Blake Sweeney
  Dylan Mikus
  Andrea Rizzi
  Florian Petry
  Lars Beckers
  Dustin J. Mitchell
  James Cline
  Ryan
  Simon W. Jackson
  Sebastien Badia
  Michale Meier
  Svetoslav Trochev
  Marc Cornellà
  Ander
  Naga Kiran
  David Badura
  James Dietrich
  JDufault
  Simon Michael
  Robin Green
  pawprint
  Reg
  Yaroslav Molochko
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -7,17 +7,52 @@ include (CheckStructHasMember)
 set (HAVE_CMAKE true)
 project (task)
-set (PROJECT_VERSION "2.1.1")
+set (PROJECT_VERSION "2.5.1")
-SET (TASK_MAN1DIR share/man/man1 CACHE STRING "Installation directory for man pages, section 1")
+OPTION (ENABLE_SYNC "Enable 'task sync' support" ON)
-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")
+if (ENABLE_SYNC)
-SET (TASK_BINDIR  bin            CACHE STRING "Installation directory for the binary")
+  set (USE_GNUTLS ON CACHE BOOL "Build gnutls support." FORCE)
 else (ENABLE_SYNC)
  set (USE_GNUTLS OFF CACHE BOOL "Build gnutls support." FORCE)
  message (WARNING "ENABLE_SYNC=OFF. Not building sync support.")
 endif (ENABLE_SYNC)
 message ("CMAKE_SYSTEM_NAME ${CMAKE_SYSTEM_NAME}")
 include (CheckCXXCompilerFlag)
 # NOTE: If we are to actually use C++11 features, we should either require
 #       a compiler that supports the -std=c++11 flag or check for the
 #       features used.
 #       Relying on -std=c++0x or even -std=gnu++0x is highly volatile.
 CHECK_CXX_COMPILER_FLAG("-std=c++11" _HAS_CXX11)
 CHECK_CXX_COMPILER_FLAG("-std=c++0x" _HAS_CXX0X)
 CHECK_CXX_COMPILER_FLAG("-std=gnu++0x" _HAS_GNU0X)
 if (_HAS_CXX11)
  set (_CXX11_FLAGS "-std=c++11")
 elseif (_HAS_CXX0X)
  message (WARNING "Enabling -std=c++0x draft compile flag. Your compiler does not support the standard '-std=c++11' option.  Consider upgrading.")
  set (_CXX11_FLAGS "-std=c++0x")
 elseif (_HAS_GNU0X)
  message (WARNING "Enabling -std=gnu++0x draft compile flag. Your compiler does not support the standard '-std=c++11' option. Consider upgrading.")
  set (_CXX11_FLAGS "-std=gnu++0x")
 else (_HAS_CXX11)
 message (FATAL_ERROR "C++11 support missing. Try upgrading your C++ compiler. If you have a good reason for using an outdated compiler, please let us know at support@taskwarrior.org.")
 endif (_HAS_CXX11)
 if (${CMAKE_CXX_COMPILER_ID} STREQUAL "Clang")
  set (_CXX11_FLAGS "${_CXX11_FLAGS} -stdlib=libc++")
 endif (${CMAKE_CXX_COMPILER_ID} STREQUAL "Clang")
 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")
@@ -26,10 +61,39 @@ 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)
 elseif (${CMAKE_SYSTEM_NAME} STREQUAL "CYGWIN")
  set (CYGWIN true)
  # NOTE: Not setting -std=gnu++0x leads to compile errors even with
  #       GCC 4.8.3, and debugging those leads to insanity. Adding this
  #       workaround instead of fixing Cygwin.
  set (_CXX11_FLAGS "-std=gnu++0x")
 else (${CMAKE_SYSTEM_NAME} MATCHES "Linux")
  set (UNKNOWN true)
 endif (${CMAKE_SYSTEM_NAME} MATCHES "Linux")
 set (CMAKE_CXX_FLAGS "${_CXX11_FLAGS} ${CMAKE_CXX_FLAGS}")
 set (CMAKE_CXX_FLAGS "-Wall -Wsign-compare -Wreturn-type ${CMAKE_CXX_FLAGS}")
 if (NETBSD)
   # Since readline, etc likely to be in /usr/pkg/lib, not standard library
   # Otherwise will remove links during install
   set (CMAKE_INSTALL_RPATH_USE_LINK_PATH TRUE)
 endif (NETBSD)
 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)
@@ -49,57 +113,68 @@ set (PACKAGE_TARNAME "${PACKAGE}")
 set (PACKAGE_VERSION "${VERSION}")
 set (PACKAGE_STRING "${PACKAGE} ${VERSION}")
-message ("-- Looking for Lua51")
+if (USE_GNUTLS)
-find_package (Lua51)
+   message ("-- Looking for GnuTLS")
-if (LUA51_FOUND)
+   find_package (GnuTLS)
-  message ("-- Found Lua51: ${LUA_LIBRARIES}")
+   if (GNUTLS_FOUND)
-  set (HAVE_LIBLUA true)
+     set (HAVE_LIBGNUTLS true)
-  set (TASK_INCLUDE_DIRS ${TASK_INCLUDE_DIRS} ${LUA_INCLUDE_DIR})
+     set (TASK_INCLUDE_DIRS ${TASK_INCLUDE_DIRS} ${GNUTLS_INCLUDE_DIR})
-  set (TASK_LIBRARIES    ${TASK_LIBRARIES}    ${LUA_LIBRARIES})
+     set (TASK_LIBRARIES    ${TASK_LIBRARIES}    ${GNUTLS_LIBRARIES})
-endif (LUA51_FOUND)
+   endif (GNUTLS_FOUND)
 endif (USE_GNUTLS)
-#message ("-- Looking for pthread")
+if (ENABLE_SYNC AND NOT GNUTLS_FOUND)
-#find_path (PTHREAD_INCLUDE_DIR pthread.h)
+  message (FATAL_ERROR "Cannot find GnuTLS. Use -DENABLE_SYNC=OFF to build Taskwarrior without sync support. See INSTALL for more information.")
-#find_library (PTHREAD_LIBRARY NAMES pthread)
+endif (ENABLE_SYNC AND NOT GNUTLS_FOUND)
 #if (PTHREAD_INCLUDE_DIR AND PTHREAD_LIBRARY)
 #  message ("-- Found pthread: ${PTHREAD_LIBRARY}")
 #  set (HAVE_LIBPTHREAD true)
 #  set (TASK_INCLUDE_DIRS ${TASK_INCLUDE_DIRS} ${PTHREAD_INCLUDE_DIR})
 #  set (TASK_LIBRARIES    ${TASK_LIBRARIES}    ${PTHREAD_LIBRARIES})
 #endif (PTHREAD_INCLUDE_DIR AND PTHREAD_LIBRARY)
 check_function_exists (random  HAVE_RANDOM)
 check_function_exists (srandom HAVE_SRANDOM)
 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 OR OPENBSD)
-  # 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 OR OPENBSD)
  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 OR OPENBSD)
-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_ENG_USA 1)
 set (LANGUAGE_ESP_ESP 2)
 set (LANGUAGE_DEU_DEU 3)
 set (LANGUAGE_FRA_FRA 4)
 set (LANGUAGE_ITA_ITA 5)
 set (LANGUAGE_POR_PRT 6)
 set (LANGUAGE_EPO_RUS 7)
 set (LANGUAGE_POL_POL 8)
 set (LANGUAGE_JPN_JPN 9)
 message ("-- Configuring cmake.h")
 configure_file (
@@ -110,13 +185,15 @@ add_subdirectory (src)
 add_subdirectory (src/commands)
 add_subdirectory (src/columns)
 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)
+set (doc_FILES NEWS ChangeLog README.md INSTALL AUTHORS COPYING LICENSE)
 foreach (doc_FILE ${doc_FILES})
  install (FILES ${doc_FILE}  DESTINATION ${TASK_DOCDIR})
 endforeach (doc_FILE)
@@ -126,8 +203,8 @@ 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/calc$" "performance"
-                                "src/task$" "src/libtask.a" "auto.h$"
+                                "src/libtask.a" "src/columns/libcolumns.a" "src/commands/libcommands.a"
-                                "/\\.gitignore" "/\\.git/" "swp$")
+                                "/\\\\.gitignore" "/\\\\.git/" "swp$" "src/lex$")
 include (CPack)
--- a/4
+++ b/4
@@ -1,6 +1,6 @@
-taskwarrior - a command line task list manager.
+Taskwarrior - a command line task list manager.
-Copyright 2006-2012, Paul Beckingham, Federico Hernandez.
+Copyright 2006 - 2016, 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/3523
+++ b/3523
--- a/235
+++ b/235
@@ -1,191 +1,168 @@
 How to Build Taskwarrior
  Satisfy the Requirements:
    - gcc 4.7 or later, clang 3.3 or later or equivalent. This is because C++11
      is now used.
    - libuuid
    - gnutls (optional)
    - python 2.7 or 3 (optional, for running the test suite)
  Obtain and build code:
    $ git clone https://git.tasktools.org/scm/tm/task.git task.git
    $ cd task.git
    $ git checkout 2.5.0                 # Latest dev branch
    $ cmake -DCMAKE_BUILD_TYPE=debug .   # debug or release. Default: neither.
    $ make VERBOSE=1                     # Shows details
  Running Test Suite:
    $ cd tests
    $ make VERBOSE=1                     # Shows details
    $ ./run_all                          # Runs all tests silently > all.log
    $ ./problems                         # Enumerate test failures in all.log
  Note that any development should be performed using a git clone, and the
  current development branch. The source tarballs do not reflect HEAD, and do
  not contain the test suite.
  If you send a patch (support@taskwarrior.org), make sure that patch is made
  against git HEAD on the development branch. We cannot apply patches made
  against the tarball source, or master.
 General Statement
  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.
+  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
+  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
+  - 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.
+    features.
-  - Join us in the #taskwarrior IRC channel on freenode.net.  Some great ideas,
+  - Join us in the #taskwarrior IRC channel on freenode.net. Many great ideas,
-    suggestions, testing and discussions have taken place there.  It is also the
+    suggestions, testing and discussions have taken place there. It is also
-    quickest way to get help, or confirm a bug.
+    the quickest way to get help, or confirm a bug.
-  - Review documentation: there are man pages, wiki articles, tutorials and so
+  - Join https://answers.tasktools.org and help us by asking, answering and
-    on, and these may contain errors, or more importantly, they may not convey
+    voting on questions and answers, directly helping those who ask, and
-    ideas in the best way.  Perhaps you can help improve it.
+    helping future users who search for existing answers.
-  - Take a look at the bug database.  It is the nature of software to contain
+  - Review documentation: there are man pages, online articles, tutorials and
-    bugs, and there is a continuous effort to fix them.  Looking at open bugs
+    so on, and these may contain errors, or they may not convey ideas in the
-    and confirming them, perhaps determining that it is already fixed, or just
+    best way. Perhaps you can help improve it. Contact us - documentation is
-    adding clarifying information are all very useful contributions and much
+    a separate effort from the codebase, and includes all web sites, and all
-    needed.
+    are available using git.
-  - Fix a bug.  For this you'll need C++ and git skills, but this is one of
+  - Take a look at the bug database, and help triage the bug list. This is a
-    the largest ways you can contribute.  We welcome all bug fixes, provided
+    review process that involves confirming bugs, providing additional data,
    information or analysis. Bug triage is very useful and much needed. You
    could check to see that an old bug is still relevant - sometimes they are
    not.
  - Review the source code, and point out inefficiencies, problems, unreadable
    functions, bugs and assumptions.
  - 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.
+    dependencies. We recommend talking to us before starting. Seriously.
-  - Add unit tests.  Unit tests are possibly the most useful contributions of
+  - 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
+    future regressions, therefore maintaining quality of subsequent releases.
-    the causal bug.
+    Plus, broken tests are a great motivator for us to fix the causal defect.
    You'll need Python skills.
-  - Add a feature.  Well, let's be very clear about this: adding a feature is
+  - 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
+    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
+    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
+    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
+    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
+    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
+    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://central.tasktools.org. 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.
+  - Encouragement. Tell us what works for you, and what doesn't. Tell us about
    your methodology for managing tasks. It's all useful information.
-  Following are specific areas that could use some attention.
+  - Request a feature. This not only tells us that you think something is
    missing from the software, but gives us insights into how you use it.
    Plus, you might get your feature implemented.
-Deprecated Code
+  Next are some specific areas that need attention.
  This is code that is going to be phased out soon, and therefore is not worth
  fixing or documenting.  Don't waste your time.
  - 'shell' command.  It will migrate to become an external script.
  - Shadow file support in core.  It will migrate to become an external script.
  - Support for 'fg:' and 'bg:' attributes.
 New Code Needs
-  This is code that needs to be written, usually down at the C++ function/method
+  This is code that needs to be written.
  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.  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>
    It can be shortened to:
      <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
+    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
+    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 'shell'
    command.  We are hoping to move the weak 'shell' command out of the core,
    which means it can be developed separately.  There are several pending
    feature requests for this, including creative prompts, readline and auto-
    clear.
  - 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
+      https://bug.tasktools.org/browse/EX
    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: Aliases, particularly new enhanced aliases
  - Wiki/Features: All sections
 Unit Tests Needed
-  There are always more unit tests needed.  More specifically, better unit tests
+  There are always more unit tests needed. More specifically, better unit tests
-  are always needed.  The convention is that there are four types of unit test:
+  are always needed. The convention is that there are four types of unit test:
  1. High level tests that exercise large features, or combinations of commands.
     For example, dependencies.t runs through a long list of commands that test
     dependencies, but do so by using 'add', 'modify', 'done' and 'delete'.
-  2. Regression tests that ensure certain bugs are fixed and stay fixed.  These
+  2. Regression tests that ensure certain bugs are fixed and stay fixed. These
-     tests are named bug.NNN.t where NNN refers to the Redmine issue number.
+     tests are named bug.NNN.t where NNN refers to the bug number. While it is
-     While it is not worth creating tests for small fixes like typos, it is for
+     not worth creating tests for small fixes like typos, it is for changes to
-     changes to the logic.
+     the logic.
-  3. Small feature tests.  When small features are added, we would like small,
+  3. Small feature tests. When small features are added, we would like small,
-     low-level feature tests named feature.NNN.t, where NNN is the Redmine
+     low-level feature tests named feature.t, with a descriptive name and
-     issue number.
+     focused tests.
-  4. Code tests.  These are tests written in C++ that exercise C++ objects, or
+  4. Code tests. These are tests written in C++ that exercise C++ objects, or
-     function calls.  These are the lowest level tests.  It is important that
+     function calls. These are the lowest level tests. It is important that
     these kind of tests be extensive and thorough, because the software depends
     on this code the most.
-  The tests are mainly written in Perl, and all use TAP.  Here is how to get the
+  The tests are written in Python, Bash and C++, and all use TAP.
  code and run the test suite:
     git clone git://tasktools.org:task.git
     cd task.git
     cmake .
     make
     make test
  Alternately, you go to the test directory and run the following:
     cd task.git/test
     make
     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:
    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:
    git://tasktools.org/vramsteg.git     
  Tests needed:
-  - The basic.t unit tests are a misnomer, and should be either removed or
+  - Take a look at the bug database (https://bug.tasktools.org) and notice that
-    renamed.  We have long talked of 'basic functionality' that includes add,
+    many issues, open and closed, have the "needsTest" label. These are things
-    delete, done, and list commands.  We need unit tests that prove that basic
+    that we would like to see in the test suite, as regression tests.
    functionality is working, and it 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.
  - Test regex support.
-  - Need unit tests for each bug in the issue list, if suitable.
+  - Need unit tests for each bug in the issue list that is marked with the
-  - We have bugs in the unit tests that only manifest on days such as December
+    'needsTest' label.
    31st.  Clearly there is some bad date math going on, most likely in the
    tests themselves, rather than in taskwarrior.
-  * Note that running the unit tests require the Perl JSON module to be
+  Note that all new unit tests should follow the test/template.t standard.
    installed.
 Work in Progress
  Things that are currently in flux, which is another way of saying leave it
  alone while it is being worked on.
  - Command line parser (A3).
  - Expression evaluation (E9).
  - All columns/Col*::validate methods.
  - New columns/Col*::modify methods.
 Current Codebase Condition
  'master' branch:
-    - 2.0.0 release, current, locked.
+    - 2.4.4 Current release, locked.
-  '2.0.1' branch (to be released as 2.1.0):
+  '2.5.0' branch:
-    - All current development.
+    - Current development branch no plans yet.
  '2.2.0' branch:
    - Future development effort.
 ---
-2012-05-12 Added general statement about how to contribute.
+2015-09-07 Updated for 2.5.0
--- a/149
+++ b/149
@@ -3,67 +3,73 @@ Startup
  Context::initialize and Context::run methods.
  Context is a large object that holds all task information, both in terms of
-  the task data, and intermediate run-time data.  Having one global Context
+  the task data, and intermediate run-time data. Having one global Context
-  object means we don't have 50 global variables.  Context is therefore just a
+  object means we don't have 50 global variables. Context is therefore just a
  big global bucket of data.
-  Context::initialize sets up all the data and processes the command line.  The
+  Context::initialize sets up all the data and processes the command line. The
  initialization process is a big chicken-and-egg problem, because the command
  line depends on configuration (aliases) and the command line can force a
-  reload of configuration (rc:foo).  This is solved by look-ahead: the command
+  reload of configuration (rc:foo). This is solved by look-ahead: the command
  line is scanned for 'rc:xxx' and 'rc.data.location:xxx' arguments, then later
  for overrides.
-  The Context::run method handles all the debug output and exceptions.  Its
+  The Context::run method handles all the debug output and exceptions. Its
  main purpose is to set up exception handling and call Context::dispatch.
 Command Line Parsing
-  Command line parsing is difficult because of all the ambiguity.  The solution
+  Command line parsing is difficult because of all the ambiguity. The solution
-  is to make several passes over the command line.  For example, the task
+  is to make multiple passes over the command line. For example, the command
-  command determines whether subsequent arguments are interpreted as part of a
+  determines whether subsequent arguments are interpreted as part of a filter or
-  filter or set of modifications.
+  set of modifications.
  The CLI2 object is fed command line arguments, then through a succession of
  calls builds and annotates a parse tree.  To help with this, the Lexer is
  used to break up strings into tokens.
 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.
+  look up a command object, then a call is made to the Command::execute method.
  Context stores an associative map of command object pointers indexed by a
-  string.  This means the 'done' string is an index to the CmdDone object that
+  string. This means the 'done' string is an index to the CmdDone object that
  implements the functionality.
 Command Objects
-  Every task command is implemented by a command object.  The command object
+  Every task command is implemented by a command object. The command object
  provides metadata, usage and one-line help in addition to the ::execute method
-  that implements the command.
+  that implements the command. The Command base class implements common
  functionality.
 Column Objects
  There is a 1:1 correspondence between attributes stored in the data files and
-  the columns that may be reported.  These are represented by column objects,
+  the columns that may be reported. These are represented by column objects,
  which are responsible for validating input, measuring space needed according
-  to various formats, and for rendering data for reports.
+  to various formats, and for rendering data for reports. There is a
  ColDescription object that inherits from a Column base class.
 TDB2
-  The TDB2 object is a layered, transactioned I/O manager.  Its purpose is to
+  The TDB2 object is a layered, transactioned I/O manager. Its purpose is to
-  isolate code from file I/O, locking, synching, and parsing details.  It is
+  isolate code from file I/O, locking and parsing details. It is also
-  also responsible for minimizing reads, writes and parsing of data files.
+  responsible for minimizing reads, writes and parsing of data files.
-  All input is assumed to be UTF8.  All stored data is UTF8.
+  All input is assumed to be UTF8. All stored data is UTF8.
 GC
  Garbage Collection is the process that moves tasks between the pending.data
-  and completed.data files.  It is also responsible for waking tasks out of the
+  and completed.data files. It is also responsible for waking tasks out of the
  wait state.
  Every command that displays task IDs will cause a GC to be run first, which
-  minimizes the number of changes necessary to the task IDs.  This means that
+  minimizes the number of changes necessary to the task IDs. This means that
  when a report shows task IDs, those IDs will remain valid while subsequent
-  write commands are issued.  The next report run may show different IDs.
+  write commands are issued. The next report run may show different IDs.
  Minimizing the size of pending.data is important for performance, because it
  is the file that is accessed most.
@@ -71,13 +77,12 @@ GC
 Files
  The data files used are all kept in the rc.data.location directory, which
-  defaults to ~/.task.  The files are:
+  defaults to ~/.task. The files are:
    pending.data
    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.
@@ -86,35 +91,35 @@ Files
  The completed.data file accumulates data over time, and grows unbounded.
-  The undo.data file accumulates changes over time, and grows unbounded.  It
+  The undo.data file accumulates changes over time, and grows unbounded. It
-  provides all the necessary metadata to support the 'undo' command and the
+  provides all the necessary metadata to support the 'undo' command.
  '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 Taskserver. It grows unbounded between 'sync' commands.
  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
-  the complete command line.  These arguments (Arg objects) are grouped into
+  the complete command line. These arguments are extracted from the parse tree
-  a set by the A3 (Args) object according to whether the command found is a
+  according to whether the command found is a read or write command.
  read or write command.
-  There is a Command::filter method for applying a filter to a set of tasks,
+  There is a Filter::subset method for applying a filter to a set of tasks,
-  yielding a result set.  It does this by creating an expression from the
+  yielding a result set. It does this by creating an expression from the
-  filter using the E9 object, then evaluating the expression for each task,
+  parse tree using the Eval object, then evaluating the expression for each task,
-  such that the result set contains only tasks for which the expression
+  such that the result set contains only tasks for which the expression evaluates
-  evaluates to Boolean true.
+  to Boolean true.
 Eval & Variant
  The Eval class evaluates expressions, provided in string form, using the
  Variant class to represent data elements. Variant implements all operators
  for all Variant types.
 Sorting
-  Sorting is performed on a set of tasks.  More specifically, the list that is
+  Sorting is performed on a set of tasks. More specifically, the list that is
  sorted is a set of numeric indexes to tasks that are stored in a separate
-  list.  This minimizes the amount of data copying involved to just integers
+  list. This minimizes the amount of data copying involved to just integers
  rather than Task objects, but at the expense of one level of indirection.
  Memory fragmentation is a bigger problem than the performance of vector
  indexing.
@@ -124,16 +129,16 @@ Sorting
 Render
-  There are two rendering objects, ViewTask and ViewText.  These both have the
+  There are two rendering objects, ViewTask and ViewText. These both have the
-  same tabular grid rendering capabilities.  ViewText maintains a 2D vector of
+  same tabular grid rendering capabilities. ViewText maintains a 2D vector of
  strings to contain the data to be rendered, so it is used for things like the
-  help command output.  ViewTask does not copy data, but assumes all data is
+  help command output. ViewTask does not copy data, but assumes all data is
  stored externally in a vector of Tasks, which minimizes data copying.
  ViewTask contains projection data in the form of a set of Column objects that
-  represent the X axis.  The Y axis is represented by a vector of tasks.
+  represent the X axis. The Y axis is represented by a vector of tasks.
-  The rendering process is complex.  It involves dynamically setting column
+  The rendering process is complex. It involves dynamically setting column
  widths based on (1) available terminal width, (2) the columns to be included
  in the output, (3) ability to wrap text for certain columns and (4) the size
  of the data to be rendered, which involves added complexity when UTF8 is used.
@@ -144,24 +149,22 @@ Render
 Test Suite
  A strong and diverse test suite is critical to the successful release of any
-  software.  With the complex command set and its myriad permutations, a test
+  software. With the complex command set and its myriad permutations, a test
  suite is the only way to ensure quality levels, and guarantee that big changes
-  are sound.
+  are robust.
-  It is intended that the test suite continues growing, mostly adding more
+  It is intended that the test suite continues growing, mostly feature tests.
-  regression tests (bug.*.t) and more feature tests (feature.*.t).  The test are
+  The test are mostly written in Python. Some tests are written in C++ and all
-  mostly written in Perl, and utilize the Test::More module to generate TAP
+  tests generate TAP output.
  output.  Some tests are written in C++ and also generate TAP.
-  There are currently over 5,000 unit tests, that take a minute or two to run
+  There are currently about 8,000 unit tests, that take only a few seconds to
-  in total.
+  run on a multi-core machine.
-  There is a tinderbox that runs on a variable frequency.  As a release
+  Taskwarrior uses flod software to automate continuous integration across many
-  approaches, the frequency is boosted so there are always current results to be
+  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://central.tasktools.org/
  When making code changes, it is important that the test suite be run to verify
  that functionality was not broken.
@@ -175,27 +178,33 @@ Debugging
      http://tasktools.org/performance).
    - Data load times.
    - Terminal size, color capabilities.
-    - Command line parsing steps, shown in colorful diagrams.
+    - Command line parse tree.
    - TDB2 layer and I/O information.
  Additionally, there are other settings (see 'man taskrc' for full details) that
  may also be helpful: 'rc.hooks=on|off', 'rc.debug.parser=0|1|2|3',
  'rc.debug.hooks=0|1|2', 'rc.debug.tls=0|1|2|3...'.
 Patches
-  Patches are encouraged and welcomed.  Either attach them to the appropriate
+  Patches are encouraged and welcomed. Either attach them to the appropriate
-  Redmine issue, or send them to support@taskwarrior.org.  A good patch:
+  Jira issue, or send them to support@taskwarrior.org. A good patch:
    - Maintains the MIT license, and does not contain code lifted from other
-      sources.
+      sources. You will have written 100% of the code in the patch, otherwise
      we cannot maintain the license.
    - Precisely addresses one issue only.
    - Doesn't break unit tests.
    - Doesn't introduce dependencies.
-    - Is accompanied by unit tests, where appropriate.
+    - Is accompanied by unit tests, where appropriate, written in Python.
    - Is accompanied by documentation changes, where appropriate.
    - 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 violating any of the above rules, 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. Check with us first, before sinking time and effort
  into a patch.
 ---
--- a/126
+++ b/126
@@ -1,32 +1,39 @@
 Installation Instructions
 -------------------------
-Please follow the instructions below to build task with cmake.
+Please follow the instructions below to build and install Taskwarrior from
 source.
-Pre-requisites
+Dependencies
--------------
+------------
-You will need the CMake build system installed in order to build taskwarrior
+You will need the CMake build system installed in order to build Taskwarrior
-from source.
+from source. More information on cmake can be obtained at http://cmake.org
-More information on cmake can be obtained at http://cmake.org
+You will also need:
  - make
-Optionally, you might want to have Lua installed, if you wish to write plugins
+You will need a C++ compiler that supports full C++11, which includes:
-and modify taskwarrior.
+  - gcc 4.7   (released 2012-03-23)
  - clang 3.3 (released 2013-01-07)
 You will need the following libraries:
  - libuuid (not needed for OSX)
  - gnutls  (can be optional - see '"sync" command' below)
 Basic Installation
 ------------------
-Briefly, these shell commands will unpack, build and install taskwarrior:
+Briefly, these shell commands will unpack, build and install Taskwarrior:
-  $ tar xzf task-X.Y.Z.tar.gz                     [1]
+  $ tar xzf task-X.Y.Z.tar.gz                   [1]
-  $ cd task-X.Y.Z                                 [2]
+  $ cd task-X.Y.Z                               [2]
-  $ cmake .                                       [3]
+  $ cmake -DCMAKE_BUILD_TYPE=release .          [3]
-  $ make                                          [4]
+  $ make                                        [4]
-  $ sudo make install                             [5]
+  $ sudo make install                           [5]
-  $ cd .. ; rm -r task-X.Y.Z                      [6]
+  $ cd .. ; rm -r task-X.Y.Z                    [6]
 These commands are explained below:
@@ -36,9 +43,10 @@ These commands are explained below:
  2. Change directory to the root of the distribution.
  3. Invokes CMake to scan for dependencies and machine-specific details, then
-     generate the makefiles.  This may take a minute.
+     generate the makefiles.  Requests an optimized build, which will run faster
     and be more compact.  This may take a minute.
-  4. Builds taskwarrior.  This may take a minute.
+  4. Builds Taskwarrior.  This may take a minute.
  5. Installs the program, documentation and other data files.
@@ -67,36 +75,71 @@ 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
 "sync" command
 --------------
 By default, GnuTLS support is required, which enables the "sync" command.
 For Debian based distributions, installing "libgnutls-dev" is sufficient.
 In order to build Taskwarrior without "sync" support, call cmake with the
 "-DENABLE_SYNC=OFF" flag:
   $ cmake . -DENABLE_SYNC=OFF
 and proceed as described in "Basic Installation".
 Localizations
 -------------
 To make use of a translation, specify a language number, as found in cmake.h:
  $ cmake -DLANGUAGE=2 .
 Currently the defined languages are:
  eng_USA 1
  esp_ESP 2
  deu_DEU 3
  fra_FRA 4
  ita_ITA 5
  por_PRT 6
  epo_RUS 7
  pol_POL 8
  jpn-JPN 9
 Uninstallation
 --------------
-To uninstall taskwarrior, you need the Makefiles, so if you deleted them in
+There is no uninstall option in CMake makefiles. This is a manual process.
 step 7 above, they must first be regenerated by following steps [1], [2] and
 [3].  Then simply run:
-  $ sudo make uninstall TODO TODO TODO -- cmake doesn't include uninstall
+To uninstall Taskwarrior, remove the files listed in the install_manifest.txt
 file that was generated when you built Taskwarrior.
 Taskwarrior Build Notes
 -----------------------
-Taskwarrior has dependencies that are detected by cmake in almost all cases, but
+Taskwarrior has dependencies that are detected by CMake in almost all cases, but
 there are situations and operating systems that mean you will need to offer a
 little help.
-If taskwarrior will not build on your system, first take a look at the Operating
+If Taskwarrior will not build on your system, first take a look at the Operating
 System notes below.  If this doesn't help, then go to the Troubleshooting
 section, which includes instructions on how to contact us for help.
@@ -112,15 +155,8 @@ 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
+  Taskwarrior needs to be built from source, and use this configure command:
  Duo hardware.  You will need to build Taskwarrior from source, and use this
  configure command:
    cmake -DCMAKE_C_FLAGS=-m32 -DCMAKE_CXX_FLAGS=-m32 -DCMAKE_EXE_LINKER_FLAGS=-m32 .
@@ -131,10 +167,22 @@ Darwin, 32bit
    http://stackoverflow.com/questions/6077414/cmake-how-to-set-the-ldflags-in-cmakelists-txt
 OpenBSD
  In order to build Taskwarrior 2.4.2+, you might need to install a newer GCC
  version from ports or packages.
  Afterwards, run
    cmake -DCMAKE_CXX_COMPILER=eg++ .
  and build normally.
  See: https://bug.tasktools.org/browse/TW-1579
 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
@@ -143,11 +191,11 @@ may be compiler errors and warnings when running 'make'.  Sometimes you will run
 CMake with no reported problems, and the build will fail later.  This is
 almost always because CMake is mistaken about some assumption.
-If a build does not succeed, please send the contents of the 'CMakeCache.txt' 
+If a build does not succeed, please send the contents of the 'CMakeCache.txt'
 and 'CMakeFiles/CMakeOutput.log' files to support@taskwarrior.org, or post a
 message in the support forums at taskwarrior.org along with the information.
-If CMake runs but taskwarrior does not build, please send the contents of the
+If CMake runs but Taskwarrior does not build, please send the contents of the
 above files as well as a transcript from the build, which is not written to a
 file and must be captured from the terminal.
--- a/4
+++ b/4
@@ -1,6 +1,6 @@
-taskwarrior - a command line task list manager.
+Taskwarrior - a command line task list manager.
-Copyright 2006-2012, Paul Beckingham, Federico Hernandez.
+Copyright 2006 - 2016, 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/75
+++ b/75
@@ -1,69 +1,58 @@
-New Features in taskwarrior 2.1.0
+New Features in Taskwarrior 2.5.1
-  - The new 'project.indented' format is available and used in the 'projects'
+  - As a bug-fix, code cleanup and performance release, new features are
-    and 'summary' commands.
+    limited to only small tweaks.
-  - Support for the 'scheduled' date for a task, which represent the earliest
+  - The 'help' command now takes a 'usage' argument, which displays only the
-    opportunity to work on a task.
+    command usage.
  - All tasks may now be given an 'until' date, after which they will expire
    and are deleted.
  - Improved UTF8 handling for wide characters.
  - User defined attributes.
  - Partial UUIDs must now be at least 14 characters, up from 9.  This
    disambiguates a commonly date format.
-  Please refer to the ChangeLog file for full details.  There are too many to
+New Commands in Taskwarrior 2.5.1
  list here.
-New commands in taskwarrior 2.1.0
+  - None.
-  - New 'ready' report that lists tasks ready for work, sorted by urgency.
+New Configuration Options in Taskwarrior 2.5.1
  - New 'udas' command shows UDA details and warnings.
  - New '_udas' helper command lists UDA names for completion purposes.
-New configuration options in taskwarrior 2.1.0
+  - New 'relative' column format for 'date' type columns does what 'remaining'
    and 'countdown' do, but in one format.
-  - urgency.scheduled.coefficient
+Newly Deprecated Features in Taskwarrior 2.5.1
  - urgency.uda.<name>.coefficient
  - color.scheduled
  - color.blocking
-Newly deprecated features in taskwarrior 2.1.0
+  -
-  - None
+Removed Features in 2.5.1
---
+  - There is no longer a 16-color default configuration for some platforms,
    making all platforms 256-color.
  - The configuration setting 'burndown.bias' is no longer used.
  - The algorithm used to estimate completion on the 'burndown' reports has
    been replaced by something less icky. Estimates are now based on the net
    completion rate after the peak number of pending tasks.
  - The unused 'dom' and 'shell.prompt' configuration settings were removed.
 Known Issues
  - https://bug.tasktools.org/
 Taskwarrior has been built and tested on the following configurations:
-  * OS X 10.7 Lion, 10.6 Snow Leopard
+  * OS X
-  * Fedora 17 Beefy Miracle and 16 Verne
+  * Fedora
-  * Ubuntu 12.04 Precise Pangolin and 11.10 Oneiric Ocelot
+  * Ubuntu
-  * Debian 6.0 Squeeze (stable)i and 5.0 Lenny (oldstable) plus Sid (testing)
+  * Debian
-  * Slackware 13.37
+  * Arch
  * Arch Linux
  * Gentoo Linux
  * Sabayon Linux
  * SliTaz Linux
  * CRUX Linux
  * SuSE
  * derivatives/customizations/flavors of the above Linux distributions
  * Solaris 10 and 8
  * OpenBSD
  * FreeBSD
-  * NetBSD
+  * Cygwin
  * Cygwin 1.7
 ---
 While Taskwarrior has undergone testing, bugs are sure to remain.  If you
 encounter a bug, please enter a new issue at:
-  http://taskwarrior.org/projects/taskwarrior/issues/new
+  https://bug.tasktools.org
 Or you can also report the issue in the forums at:
-  http://taskwarrior.org/projects/taskwarrior/boards
+  https://answers.tasktools.org
 Or just send a message to:
--- a/26
+++ b/26
@@ -1,26 +0,0 @@
 Thank you for taking a look at taskwarrior!
 Taskwarrior is a GTD, todo list, task management, command line utility with a
 multitude of features.  It is a portable, well supported, very active project,
 and it is Open Source.  Taskwarrior has binary distributions, online
 documentation, demonstration movies, and you'll find all the details at:
    http://taskwarrior.org
 At the site you'll find a wiki, discussion forums, downloads, news and more.
 Your contributions are especially welcome.  Whether it comes in the form of
 code patches, ideas, discussion, bug reports, encouragement or criticism, your
 input is needed.
 Please send your support questions and code patches to:
    support@taskwarrior.org
 Consider joining taskwarrior.org and participating in the future of taskwarrior.
 ---
 Taskwarrior is released under the MIT license. For details check the LICENSE
 file.
--- a/README.md
+++ b/README.md
@@ -0,0 +1,47 @@
 # Disclaimer during ongoing development
 We want to discourage you from using the development version of Taskwarrior.
 The development branch is a work in progress and may not pass all quality tests,
 therefore it may harm your data. We do not guarantee proper or even adequate
 functionality, performance or timely fixes.
 We welcome bug reports from beta- and release-level software, but generally not
 development versions. If you are undaunted by this, please:
 - Make proper backups.
 - Expect broken and missing functionality.
 - Be aware that using the development branch involves risks.
 ---
 Thank you for taking a look at Taskwarrior!
 Taskwarrior is a GTD, todo list, task management, command line utility with a
 multitude of features. It is a portable, well supported and very active Open
 Source project. Taskwarrior has binary distributions, online documentation,
 demonstration movies, and you'll find all the details at:
    http://taskwarrior.org
 At the site you'll find online documentation, downloads, news and more.
 Your contributions are especially welcome. Whether it comes in the form of
 code patches, ideas, discussion, bug reports, encouragement or criticism, your
 input is needed.
 For support options, take a look at:
    http://taskwarrior.org/support
 Please send your code patches to:
    support@taskwarrior.org
 Consider joining bug.tasktools.org, answers.tasktools.org and participating in
 the future of Taskwarrior.
 ---
 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}"
@@ -11,17 +12,22 @@
 #define PACKAGE_VERSION   "${PACKAGE_VERSION}"
 #define PACKAGE_STRING    "${PACKAGE_STRING}"
 #define CMAKE_BUILD_TYPE  "${CMAKE_BUILD_TYPE}"
 /* 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_ENG_USA ${LANGUAGE_ENG_USA}
-
+#define LANGUAGE_ESP_ESP ${LANGUAGE_ESP_ESP}
-/*
+#define LANGUAGE_FRA_FRA ${LANGUAGE_FRA_FRA}
-Override PACKAGE_LANGUAGE, then
+#define LANGUAGE_DEU_DEU ${LANGUAGE_DEU_DEU}
-#define LANGUAGE_XX_YY 2
+#define LANGUAGE_ITA_ITA ${LANGUAGE_ITA_ITA}
-*/
+#define LANGUAGE_POR_PRT ${LANGUAGE_POR_PRT}
 #define LANGUAGE_EPO_RUS ${LANGUAGE_EPO_RUS}
 #define LANGUAGE_POL_POL ${LANGUAGE_POL_POL}
 #define LANGUAGE_JPN_JPN ${LANGUAGE_JPN_JPN}
 /* git information */
 #cmakedefine HAVE_COMMIT
@@ -39,24 +45,12 @@ Override PACKAGE_LANGUAGE, then
 #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 pthread library */
 #cmakedefine HAVE_LIBPTHREAD
 /* Found the readline library */
 #cmakedefine HAVE_READLINE
 #cmakedefine HAVE_LIBREADLINE
 /* Found random */
 #cmakedefine HAVE_RANDOM
 /* Found srandom */
 #cmakedefine HAVE_SRANDOM
 /* Found tm_gmtoff */
 #cmakedefine HAVE_TM_GMTOFF
@@ -64,10 +58,18 @@ Override PACKAGE_LANGUAGE, then
 /* Found timegm */
 #cmakedefine HAVE_TIMEGM
-/* Found the uuid library */
+/* Found st.st_birthtime struct member */
-#cmakedefine HAVE_UUID
+#cmakedefine HAVE_ST_BIRTHTIME
 /* Found get_current_dir_name */
 #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/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,16 +1,16 @@
 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-sync.5 taskrc.5 task.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})
+install (DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/rc/    DESTINATION ${TASK_RCDIR})
 install (FILES ${CMAKE_CURRENT_SOURCE_DIR}/ref/task-ref.pdf DESTINATION ${TASK_DOCDIR})
--- a/doc/man/.gitignore
+++ b/doc/man/.gitignore
@@ -1,6 +1,4 @@
 task-color.5
 task-faq.5
 task-sync.5
 task-tutorial.5
 task.1
 taskrc.5
--- a/doc/man/task-color.5.in
+++ b/doc/man/task-color.5.in
@@ -1,7 +1,7 @@
-.TH task-color 5 2012-07-24 "${PACKAGE_STRING}" "User Manuals"
+.TH task-color 5 2016-02-24 "${PACKAGE_STRING}" "User Manuals"
 .SH NAME
-task-color \- A color tutorial for the taskwarrior command line todo manager.
+task-color \- A color tutorial for the Taskwarrior command line todo manager.
 .SH SETUP
 The first thing you need is a terminal program that supports color.  All
@@ -18,8 +18,8 @@ which shell you use).  If this is a new setting, you will need to either run
 that profile script, or close and reopen the terminal window (which does the
 same thing).
-Now tell taskwarrior that you want to use color.  This is the default for
+Now tell Taskwarrior that you want to use color.  This is the default for
-taskwarrior, so the following step may be unnecessary.
+Taskwarrior, so the following step may be unnecessary.
    $ task config color on
@@ -28,11 +28,11 @@ like:
    color=on
-Now taskwarrior is ready.
+Now Taskwarrior is ready.
 .SH AUTOMATIC MONOCHROME
-It should be mentioned that taskwarrior is aware of whether its output is going
+It should be mentioned that Taskwarrior is aware of whether its output is going
-to a terminal, or to a file or through a pipe.  When taskwarrior output goes to
+to a terminal, or to a file or through a pipe.  When Taskwarrior output goes to
 a terminal, color is desirable, but consider the following command:
    $ task list > file.txt
@@ -104,7 +104,7 @@ after 'on' are background.
 There is an additional 'underline' attribute that may be used:
-    underline bright red on black
+    underline bold red on black
 And an 'inverse' attribute:
@@ -113,7 +113,7 @@ And an 'inverse' attribute:
 Taskwarrior has a command that helps you visualize these color combinations.
 Try this:
-    $ task color underline bright red on black
+    $ task color underline bold red on black
 You can use this command to see how the various color combinations work.  You
 will also see some sample colors displayed, like the ones above, in addition to
@@ -240,10 +240,13 @@ It is possible to create a very colorful mix of rules.  With 256-color support,
 those colors can be made subtle, and complementary, but without care, this can
 be a visual mess.  Beware!
 In such cases, consider using the 'rule.color.merge=no' option to disable the
 color blending.
 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
+    deleted,completed,active,keyword.,tag.,project.,overdue,scheduled,due.today,due,blocked,blocking,recurring,tagged,uda.
 These are just the color rules with the 'color.' prefix removed.  The
 rule 'color.due.today' is the highest precedence, and 'color.deleted' is the lowest.
@@ -265,10 +268,10 @@ 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:
+You can use any of the standard Taskwarrior themes:
 .RS
 dark-16.theme
@@ -294,8 +297,17 @@ light-256.theme
 solarized-dark-256.theme
 .br
 solarized-light-256.theme
 .br
 dark-default-16.theme
 .br
 dark-gray-blue-256.theme
 .br
 no-color.theme
 .RE
 Bear in mind that if you are using a terminal with a dark background, you will
 see better results using a dark theme.
 You can also see how the theme will color the various tasks with the command:
    $ task color legend
@@ -304,7 +316,7 @@ 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 \- 2016 P. Beckingham, F. Hernandez.
 Taskwarrior is distributed under the MIT license. See
 http://www.opensource.org/licenses/mit-license.php for more information.
@@ -312,11 +324,9 @@ http://www.opensource.org/licenses/mit-license.php for more information.
 .SH SEE ALSO
 .BR task(1),
 .BR taskrc(5),
 .BR task-faq(5),
 .BR task-tutorial(5),
 .BR task-sync(5)
-For more information regarding taskwarrior, the following may be referenced:
+For more information regarding Taskwarrior, the following may be referenced:
 .TP
 The official site at
@@ -324,7 +334,7 @@ The official site at
 .TP
 The official code repository at
-<git://tasktools.org/task.git/>
+<https://git.tasktools.org/scm/tm/task.git>
 .TP
 You can contact the project by writing an email to
@@ -332,5 +342,5 @@ You can contact the project by writing an email to
 .SH REPORTING BUGS
 .TP
-Bugs in taskwarrior may be reported to the issue-tracker at
+Bugs in Taskwarrior may be reported to the issue-tracker at
 <http://taskwarrior.org>
--- a/doc/man/task-faq.5.in
+++ b/doc/man/task-faq.5.in
@@ -1,398 +0,0 @@
 .TH task-faq 5 2012-07-24 "${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 would like to see a question answered
 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?
 Taskwarrior knows when the output is not going directly to a terminal, and
 strips out all the color control characters.  This is based on the assumption
 that the color control codes are not wanted in the file.  Prevent this with the
 following entry in your .taskrc file:
    _forcecolor=on
 or by temporarily overriding the value on the command line:
    task ... rc._forcecolor=on
 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:
    task ... | less -FrX
 There have been problems reported with the Linux 'more' pager, which inserts
 newline characters.
 .TP
 .B Q: How do I backup my taskwarrior data files?  Where are they?
 Taskwarrior writes all data to files in this location:
    ~/.task/
 You may have overridden this location with the 'data.location' configuration
 setting, in which case backup that instead.  All files in this location should
 be backed up.  Making sure all the files in this location are backed up, and not
 just a named subset will ensure that you properly backup future versions of
 taskwarrior, which will likely introduce more files in this location.
 Don't forget there is also the ~/.taskrc file that contains your taskwarrior
 configuration data.
 .TP
 .B Q: How can I separate my work tasks from my home tasks? Specifically, can I keep them completely separate?
 You can do this by creating an alternate .taskrc file, then using shell
 aliases. Here are example Bash commands to achieve this:
    % cp ~/.taskrc ~/.taskrc_home
    % (now edit .taskrc_home to change the value of data.location)
    % alias wtask="task"
    % alias htask="task rc:~/.taskrc_home"
 This gives you two commands, 'wtask' and 'htask' that operate using two
 different sets of task data files.  Bash shell functions are a good alternative.
 .TP
 .B Q: Can I revert to a previous version of taskwarrior? How?
 Yes, you can revert to a previous version of task, simply by downloading an
 older version and installing it. If you find a bug in task, then this may be the
 only way to work around the bug, until a patch release is made.
 Note that it is possible that the taskwarrior file format will change. For
 example, the format changed between versions 1.5.0 and 1.6.0. Taskwarrior will
 automatically upgrade the file but if you need to revert to a previous version
 of taskwarrior, there is the file format to consider. This is yet another good
 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
 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
 same configuration and data.
 Note that the older version will not be aware of any new configuration settings
 and so will complain about them in the 'show' command.  This can be ignored.
 Likewise the newer version may complain about obsolete entries in the
 configuration.
 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.
 .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
 Duo hardware.  You will need to build Taskwarrior from source, and use this
 configure command:
      ./configure "CFLAGS=-m32" "CXXFLAGS=-m32" "LDFLAGS=-m32"
 See:  http://taskwarrior.org/issues/817
      http://stackoverflow.com/questions/3261909/build-32bit-on-64-bit-linux-using-a-configure-script
 .TP
 .B Q: How do I build taskwarrior under Cygwin?
 Take a look at the README.build file, where the latest information on build
 issues is kept.  Taskwarrior is built the same way everywhere. But under Cygwin,
 you'll need to make sure you have the following packages available first:
    gcc
    make
 The gcc and make packages allow you to compile the code, and are therefore
 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 regular background colors (on_black, on_red,
 on_green ...), but underline and bold are not supported.
 If you run the command:
    % task colors
 Taskwarrior will display all the colors it can use, and you will see which ones
 you can use.
 Note that if you install the 'mintty' shell in Cygwin, then you can use 256
 colors.
 See the 'man task-color' page for more details on which colors can be used.
 .TP
 .B Q: Where does taskwarrior store the data?
 By default, taskwarrior creates a .taskrc file in your home directory and
 populates it with defaults.  Taskwarrior also creates a .task directory in your
 home directory and puts data files there.
 .TP
 .B Q: Can I edit that data?
 Of course you can.  It is a simple text file, and looks somewhat like the JSON
 format, and if you are careful not to break the format, there is no reason not
 to edit it.  But taskwarrior provides a rich command set to do that manipulation
 for you, so it is probably best to leave those files alone.
 .TP
 .B Q: How do I restore my .taskrc file to defaults?
 If you delete (or rename) your .taskrc file, taskwarrior will offer to create a
 default one for you.  Another way to do this is with the command:
    task rc:new-file version
 Taskwarrior will create 'new-file' if it doesn't already exist.  There will not
 be much in it though - taskwarrior relies heavily on default values, which can
 be seen with this command:
    task show
 This lists all the currently known settings.  If you have just created a
 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
 synching tool.  Simply configure taskwarrior to store it's data in a dropbox
 folder, by modifying the:
    data.location=...
 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"
 An alternative to Dropbox is to use the push/pull/merge features built into Taskwarrior. See 'man task-sync' for details.
 .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
 synchronize them later on. For this purpose there is a 'merge' command which is
 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
 above.  But if it gets large, you can certainly truncate it to save space, just
 be careful to delete lines from the top of the file, up to and including a
 separator '---'.  The simplest way is to simply delete the undo.data file.  Note
 that it does not slow down taskwarrior in performance-sensitive areas, because
 it is typically not read until you want 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, as it limits
 functionality.
 .TP
 .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
    task color
 and a full color palette is displayed.  If you see only 8 or 16 colors, perhaps
 with those colors repeated, then your terminal does not support 256 colors.
 See the task-color(5) man page for more details.
 .TP
 .B Q: How do I make use of all these colors?
 Use one of our provided color themes, or create your own - after all, they are
 just collections of color settings.
 See the task-color(5) man page for an in-depth explanation of the color rules.
 .TP
 .B Q: How can I make taskwarrior put the command in the terminal window title?
 Just set the following value in your .taskrc file:
    xterm.title=on
 .TP
 .B Q: Taskwarrior searches in a case-sensitive fashion - can I change that?
 You can.  Just set the following value in your .taskrc file:
    search.case.sensitive=no
 This will affect searching for keywords:
    task Document list
 taskwarrior will perform a caseless search in the description and any
 annotations for the keyword 'Document'.  It also affects description and
 annotation substitutions:
    task 1 modify /teh/the/
 The pattern on the left will now be a caseless search term.
 .TP
 .B Q: Why do the ID numbers change?
 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.
 When you run a report (such as "list"), the numbers are assigned before display.
 For example, you can do this:
    task list
    task 12 done
    task add Pay the rent
    task 31 delete
 Those id numbers are then good until the next report is run.  This is because
 taskwarrior performs a garbage-collect operation on the pending tasks file when
 a report is run, which moves the deleted and completed tasks from the
 pending.data file to the completed.data file.  This keeps the pending tasks file
 small, and therefore keeps taskwarrior fast.  The completed data file is the one
 that grows unbounded with use, but that one isn't accessed as much, so it
 doesn't matter as much.  So in all, the ID number resequencing is about
 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 an implicit logical AND
 operator, so if you were to try this:
    task priority:H priority:M list
 There would be no results, because the priority could not simultaneously be 'H'
 AND 'M'.  Instead, you have a choice.  You can do this:
    task '(priority:H or priority:M)' list
 Note that the quotes are one way of escaping the ( ) characters that are
 otherwise interpreted by the shell before taskwarrior sees them.  You can also
 do this:
    task priority.not:L priority.any: list
 This filter states that the priority must not be 'L', AND there must be a
 priority assigned.  This filter then properly lists tasks that are 'H' or 'M',
 because the two logical restrictions are not mutually exclusive as in the
 original filter.
 Some of you may be familiar with DeMorgan's laws of formal logic that relate
 the AND and OR operators in terms of each other via negation, which can be used
 to construct task filters.
 .TP
 .B Q: How do I delete an annotation?
 Taskwarrior now has a 'denotate' command to remove annotations.  Here is an
 example:
    task add Original task
    task 1 annotate foo
    task 1 annotate bar
    task 1 annotate foo bar
 Now to delete the first annotation, use:
    task 1 denotate foo
 This takes the fragment 'foo' and compares it to each of the annotations. In
 this example, it will remove the first annotation, not the third, because it is
 an exact match.  If there are no exact matches, it will remove the first
 non-exact match:
    task 1 denotate ar
 This will remove the second annotation - the first non-exact match.
 .TP
 .B Q: How do I show tasks completed on a certain day?
 The day in question has to be boxed by a range, like this:
    task end.after:3/29/2012 end.before:3/30/2012 completed
 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: Why Lua as an extension language?
 Lua has many positive attributes:
 - Lua is written using tight, fast, standard C
 - 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.
 .TP
 .B Q: How can I help?
 There are lots of ways.  Here are some:
 - Provide feedback on what works, what does not
 - Tell us how task does or does not fit your workflow
 - Tell people about task
 - Report bugs when you see them
 - Contribute to our Wiki
 - Suggest features
 - Write unit tests
 - Write add-on scripts, and share them
 - Fix bugs
 .SH "CREDITS & COPYRIGHTS"
 Copyright (C) 2006 \- 2012 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 taskrc(5),
 .BR task-tutorial(5),
 .BR task-color(5),
 .BR task-sync(5)
 For more information regarding task, the following may be referenced:
 .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 writing an email to
 <support@taskwarrior.org>
 .SH REPORTING BUGS
 .TP
 Bugs in taskwarrior may be reported to the issue-tracker at
 <http://taskwarrior.org>
--- a/doc/man/task-sync.5.in
+++ b/doc/man/task-sync.5.in
@@ -1,361 +1,149 @@
-.TH task-sync 5 2012-07-24 "${PACKAGE_STRING}" "User Manuals"
+.TH task-sync 5 2016-02-24 "${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
-The push command will copy the local task database to the specified URI.  The
+a '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 (provided the GnuTLS library
 is installed), 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/docs/server_setup.html)
 Once you have an account, you'll receive a certificate, key, and credentials.
 You'll need to put the certificate and key somewhere like this:
    $ cp <name>.cert.pem ~/.task
    $ cp <name>.key.pem ~/.task
 Then you configure Taskwarrior, using the provided details:
    $ task config taskd.certificate ~/.task/<name>.cert.pem
    $ task config taskd.key         ~/.task/<name>.key.pem
    $ task config taskd.credentials <organization>/<name>/<UUID>
    $ 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       'allow all'
 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 \- 2016 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.
@@ -363,10 +151,7 @@ http://www.opensource.org/licenses/mit-license.php for more information.
 .SH SEE ALSO
 .BR task(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:
@@ -376,7 +161,7 @@ The official site at
 .TP
 The official code repository at
-<git://tasktools.org/task.git/>
+<https://git.tasktools.org/scm/tm/task.git>
 .TP
 You can contact the project by writing an email to
--- a/doc/man/task-tutorial.5.in
+++ b/doc/man/task-tutorial.5.in
--- a/doc/man/task.1.in
+++ b/doc/man/task.1.in
@@ -1,4 +1,4 @@
-.TH task 1 2012-07-24 "${PACKAGE_STRING}" "User Manuals"
+.TH task 1 2016-02-24 "${PACKAGE_STRING}" "User Manuals"
 .SH NAME
 task \- A command line todo manager.
@@ -14,7 +14,7 @@ that you want to do, allowing you to add/remove, and otherwise manipulate them.
 Taskwarrior has a rich set of subcommands that allow you to do various things
 with it.
-At the core, taskwarrior is a list processing program. You add text and
+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
@@ -67,12 +67,12 @@ 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 (comma or space-separated list of ID
+multiple tasks use one of these forms (space-separated list of ID numbers,
-numbers, UUID numbers or ID ranges):
+UUID numbers or ID ranges):
-  task 1,2,3                                    delete
+  task 1 2 3                                    delete
  task 1-3                                      info
-  task 1,2-5,19                                 modify pri:H
+  task 1 2-5 19                                 modify pri:H
  task 4-7 ebeeab00-ccf8-464b-8b58-f7f2d606edfb info
 .SH MODIFICATIONS
@@ -83,7 +83,8 @@ as:
  task <filter> <command> project:Home
  task <filter> <command> +weekend +garden due:tomorrow
  task <filter> <command> Description/annotation text
-  task <filter> <command> /from/to/
+  task <filter> <command> /from/to/     <- replace first match
  task <filter> <command> /from/to/g    <- replace all matches
 .SH SUBCOMMANDS
@@ -97,7 +98,7 @@ generated, as with verbose=nothing).
 .SH READ SUBCOMMANDS
 Reports are read subcommands. There are several reports currently predefined in
-taskwarrior. The output and sort behavior of these reports can be configured in
+Taskwarrior. The output and sort behavior of these reports can be configured in
 the configuration file. See also the man page taskrc(5).  There are also other
 read subcommands that are not reports.
@@ -121,16 +122,20 @@ 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
-Shows a graphical burndown chart, by day.  Note that 'burndown' is an alias to
+Shows a graphical burndown chart, by day.
 the 'burndown.daily' report.
 .TP
 .B task <filter> burndown.weekly
-Shows a graphical burndown chart, by week.
+Shows a graphical burndown chart, by week.  Note that 'burndown' is an alias to
 the 'burndown.weekly' report.
 .TP
 .B task <filter> burndown.monthly
@@ -140,8 +145,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 '2015', 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 2015') 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 +156,14 @@ 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 commands
 Shows all the supported commands, with some details of each.
 .TP
 .B task <filter> completed
@@ -168,7 +178,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
@@ -195,10 +216,10 @@ an alias to 'history.monthly'.
 .TP
 .B task <filter> ids
 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,
+a space-separated list.  This is useful as input to a task command, to achieve
-to achieve this:
+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:
@@ -214,7 +235,7 @@ 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
 filters, then makes each of those tasks pending again.
@@ -281,7 +302,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
@@ -327,31 +349,25 @@ In general, this is not the recommended method of modifying tasks, but is
 provided for exceptional circumstances.  Use carefully.
 .TP
-.B task import <file> [<file> ...]
+.B task import [<file> ...]
-Imports tasks in the JSON format.  The standard task release comes with a few
+Imports tasks in the JSON format.  Can be used to add new tasks, or update
-example scripts, such as import-yaml.pl.
+existing ones.  Tasks are identified by their UUID.
 If no file or "-" is specified, import tasks from STDIN.
 Setting rc.recurrence.confirmation to an appropriate level is recommended
 if import is to be used in automated workflows.  See taskrc(5).
 For importing other file formats, the standard task release comes with a
 few 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 the task-sync(5) man page.
 .TP
 .B task <filter> modify <mods>
 Modifies the existing task with provided information.
@@ -360,17 +376,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 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.
@@ -386,9 +391,25 @@ time from the specified task.
 Miscellaneous subcommands either accept no command line arguments, or accept
 non-standard arguments.
 .TP
 .B task calc <expression>
 Evaluates an algebraic expression. Can be used to test how Taskwarrior
 parses and evaluates the expression given on the command line.
 Examples:
    task calc 1 + 1
    2
    task calc now + 8d
    2015-03-26T18:06:57
    task calc eom
    2015-03-31T23:59:59
 .TP
 .B task config [name [value | '']]
-Add, modify and remove settings directly in the taskwarrior configuration.
+Add, modify and remove settings directly in the Taskwarrior configuration.
 This command either modifies the 'name' setting with a new value of 'value',
 or adds a new entry that is equivalent to 'name=value':
@@ -403,6 +424,46 @@ Finally, this command removes any 'name=...' entry from the .taskrc file:
    task config name
 .TP
 .B task context <name>
 Sets the currently active context. See the CONTEXT section.
 Example:
    task context work
 .TP
 .B task context delete <name>
 Deletes the context with the name <name>. If the context being deleted is currently
 set as active, it will be unset.
 Example:
    task context delete work
 .TP
 .B task context define <name> <filter>
 Defines a new context with name <name> and definition <filter>. This command
 does not affect the currently set context, just adds a new context definition.
 Examples:
    task context define work project:Work
    task context define home project:Home or +home
    task context define superurgent due:today and +urgent
 .TP
 .B task context list
 Outputs a list of available contexts along with their definitions.
 .TP
 .B task context none
 Clears the currently active context, if any was set.
 .TP
 .B task context show
 Shows the currently active context, along with its definition.
 .TP
 .B task diagnostics
 Shows diagnostic information, of the kind needed when reporting a problem.
@@ -431,10 +492,6 @@ 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.  If a
@@ -451,7 +508,10 @@ 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. It is an error to attempt to add or remove a
 virtual tag.
 .TP
 .B task timesheet [weeks]
@@ -463,10 +523,14 @@ Reverts the most recent action.  Obeys the confirmation setting.
 .TP
 .B task version
-Shows the taskwarrior version number.
+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.
@@ -479,14 +543,32 @@ Generates a list of all commands, for autocompletion purposes.
 .B task _config
 Lists all supported configuration variables, for completion purposes.
 .TP
 .B task _context
 Lists all available context variables, for completion purposes.
 .TP
 .B task <filter> _ids
 Shows only the IDs of matching tasks, in the form of a list.
 Deprecated in favor of _unique.
 .TP
 .B task _show
 Shows the combined defaults and overrides of the configuration settings, for use
 by third-party applications.
 .TP
 .B task <filter> _unique <attribute>
 Reports a unique set of attribute values. For example, to see all the active
 projects:
  task +PENDING _unique projects
 .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.
 Deprecated in favor of _unique.
 .TP
 .B task _udas
@@ -495,10 +577,12 @@ 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.
 Deprecated in favor of _unique.
 .TP
 .B task <filter> _tags
 Shows only a list of all tags used, for autocompletion purposes.
 Deprecated in favor of _unique.
 .TP
 .B task <filter> _urgency
@@ -506,7 +590,7 @@ Displays the urgency measure of a task.
 .TP
 .B task _version
-Shows only the taskwarrior version number.
+Shows only the Taskwarrior version number.
 .TP
 .B task _zshcommands
@@ -520,6 +604,37 @@ Shows the IDs and descriptions of matching tasks.
 .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.
 Note that if the DOM reference is not valid, or the reference evaluates to a
 missing value, the command exits with 1.
 Additionally, some components of the attributes of particular types may be
 extracted by DOM references.
  $ task _get 2.due.year
  2015
 For a full list of supported attribute-specific DOM references, consult
 the online documentation at:
 <http://taskwarrior.org/docs/dom.html>
 .SH ATTRIBUTES AND METADATA
 .TP
@@ -547,6 +662,46 @@ 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:
    ACTIVE       Matches if the task is started
    ANNOTATED    Matches if the task has annotations
    BLOCKED      Matches if the task is blocked
    BLOCKING     Matches if the task is blocking
    CHILD        Matches if the task has a parent
    COMPLETED    Matches if the task has completed status
    DELETED      Matches if the task has deleted status
    DUE          Matches if the task is due
    DUETODAY     Matches if the task is due today
    LATEST       Matches if the task is the newest added task
    MONTH        Matches if the task is due this month
    ORPHAN       Matches if the task has any orphaned UDA values
    OVERDUE      Matches if the task is overdue
    PARENT       Matches if the task is a parent
    PENDING      Matches if the task has pending status
    PRIORITY     Matches if the task has a priority
    PROJECT      Matches if the task has a project
    READY        Matches if the task is actionable
    SCHEDULED    Matches if the task is scheduled
    TAGGED       Matches if the task has tags
    TODAY        Matches if the task is due today
    TOMORROW     Matches if the task is due sometime tomorrow
    UDA          Matches if the task has any UDA values
    UNBLOCKED    Matches if the task is not blocked
    UNTIL        Matches if the task expires
    WAITING      Matches if the task is waiting
    WEEK         Matches if the task is due this week
    YEAR         Matches if the task is due this year
    YESTERDAY    Matches if the task was due sometime yesterday
 .\" If you update the above list, update src/commands/CmdInfo.cpp and src/commands/CmdTags.cpp as well.
 You can use +BLOCKED to filter blocked tasks, or -BLOCKED for unblocked tasks.
 Similarly, -BLOCKED is equivalent to +UNBLOCKED. It is an error to attempt to
 add or remove a virtual tag.
 .TP
 .B project:<project-name>
 Specifies the project to which a task is related to.
@@ -571,14 +726,6 @@ Specifies the date after which a task can be accomplished.
 .B until:<expiration date of task>
 Specifies the expiration date of a task, after which it will be deleted.
 .TP
 .B fg:<color-spec>
 Specifies foreground color. Deprecated.
 .TP
 .B bg:<color-spec>
 Specifies background color. Deprecated.
 .TP
 .B limit:<number-of-rows>
 Specifies the desired number of tasks a report should show, if a positive
@@ -588,7 +735,9 @@ to 25 lines.
 .TP
 .B wait:<wait-date>
-Date until task becomes pending.
+When a task is given a wait date, it is hidden from most reports by changing
 its status to 'waiting'. When that date is passed, the status is changed back
 to 'pending', and the task becomes visible.
 .TP
 .B depends:<id1,id2 ...>
@@ -606,7 +755,7 @@ For report purposes, specifies the date that a task was created.
 Attribute modifiers improve filters.  Supported modifiers are:
 .RS
-.B before     (synonyms under, below)
+.B  before     (synonyms under, below)
 .br
 .B  after      (synonyms over, above)
 .br
@@ -724,14 +873,33 @@ modifier.
 You can use the following operators in filter expressions:
-  and  or  xor            Logical operators
+  and  or  xor  !               Logical operators
-  <  <=  =  !=  >=  >     Relational operators
+  <  <=  =  ==  !=  !==  >=  >  Relational operators
-  (  )                    Precedence
+  (  )                          Precedence
 For example:
  task due.before:eom priority.not:L list
-  task '( due < eom or priority != L )'  list
+  task '( due < eom or priority != L )' list
  task '! ( project:Home or project:Garden )' list
 The
 .I =
 operator tests for approximate equality.  Dates compare
 equal if they are on the same day (hour and minutes are ignored).
 Strings compare equal if the left operand starts with the right operand.
 The
 .I ==
 operator tests for exact equality.  The
 .I !=
 and
 .I !==
 operators are the negation of
 .I =
 and
 .I ==
 respectively.  The negation operator is
 .IR ! .
 Note that the parentheses are required when using a logical operator other than
 the 'and' operator.  The reason is that some reports contain filters that must
@@ -765,7 +933,7 @@ The original example therefore must be entered as:
  task '( project:Home or project:Garden )' list
 This includes quotes to escape the parentheses, so that the shell doesn't
-interpret them and hide them from taskwarrior.
+interpret them and hide them from Taskwarrior.
 There is redundancy between operators, attribute modifiers and other syntactic
 sugar.  For example, the following are all equivalent:
@@ -792,10 +960,12 @@ task ... due:7/14/2008
 .TP
 ISO-8601
-task ... due:20120314T223000Z
+task ... due:2013-03-14T22:30:00Z
 .TP
 Relative wording
 task ... due:now
 .br
 task ... due:today
 .br
 task ... due:yesterday
@@ -813,7 +983,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
@@ -828,7 +998,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
@@ -854,6 +1024,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
@@ -899,8 +1085,68 @@ biannual, biyearly, 2yr
 Every two years.
 .RE
 .SH CONTEXT
 Context is a user-defined filter, which is automatically applied to all commands
 that filter the task list. In particular, any report command will have its
 result affected by the current active context.
    $ task list
    ID Age Project  Description        Urg
    1  2d  Sport    Run 5 miles        1.42
    2  1d  Home     Clean the dishes   1.14
    $ task context home
    Context 'home' set. Use 'task context none' to remove.
    $ task list
    ID Age Project  Description        Urg
    2  1d  Home     Clean the dishes   1.14
    Context 'home' set. Use 'task context none' to remove.
 As seen in the example above, context is applied by specifying its name to the
 "context" command. To change the currently applied context, just pass the
 new context's name to the 'context' command.
 To unset any context, use the 'none' subcommand.
    $ task context none
    Context unset.
    $ task list
    ID Age Project  Description        Urg
    1  2d  Sport    Run 5 miles        1.42
    2  1d  Home     Clean the dishes   1.14
 Context can be defined using the 'define' subcommand, specifying both the name
 of the new context, and it's assigned filter.
    $ task context define home project:Home
    Are you sure you want to add 'context.home' with a value of 'project:Home'? (yes/no) yes
    Context 'home' successfully defined.
 To remove the definition, use the 'delete' subcommand.
    $ task context delete home
    Are you sure you want to remove 'context.home'? (yes/no) yes
    Context 'home' successfully undefined.
 To check what is the currently active context, use the 'show' subcommand.
    $ task context show
    Context 'home' with filter 'project:Home' is currently applied.
 Contexts can store arbitrarily complex filters.
    $ task context define family project:Family or +paul or +nancy
    Are you sure you want to add 'context.home' with a value of 'project:Family or +paul or +nancy'? (yes/no) yes
    Context 'family' successfully defined.
 Contexts are permanent, and the currently set context name is stored in the
 "context" configuration variable. The context definition is stored in the
 "context.<name>" configuration variable.
 .SH COMMAND ABBREVIATION
-All taskwarrior commands may be abbreviated as long as a unique prefix is used,
+All Taskwarrior commands may be abbreviated as long as a unique prefix is used,
 for example:
 .RS
@@ -939,7 +1185,7 @@ $ task add "quoted ' quote"
 $ task add escaped \\' quote
 .RE
-The argument \-\- (a double dash) tells taskwarrior to treat all other args
+The argument \-\- (a double dash) tells Taskwarrior to treat all other args
 as description:
 .RS
@@ -966,6 +1212,9 @@ intact, so you can use:
 $ task add project:\\'Three Word Project\\' description
 .RE
 Taskwarrior supports Unicode using only the UTF8 encoding, with no Byte Order
 Marks in the data files.
 .SH CONFIGURATION FILE AND OVERRIDE OPTIONS
 Taskwarrior stores its configuration in a file in the user's home directory:
 ~/.taskrc. The default configuration file can be overridden with:
@@ -974,7 +1223,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.
@@ -990,20 +1240,14 @@ the 'data.location' configuration setting of the task data directory.
 .SH MORE EXAMPLES
-For examples please see the task tutorial man page at
+For examples please see the online documentation starting at
 .RS
-man task-tutorial
+<http://taskwarrior.org/docs>
 .RE
-or the online documentation starting at
+Note that the online documentation can be more detailed and more current than
-
+this man page.
 .RS
 <http://taskwarrior.org/projects/taskwarrior/wiki>
 .RE
 Note that the online documentation is more detailed and more current than this
 man page.
 .SH FILES
@@ -1028,22 +1272,20 @@ The file that contains the completed ("done") tasks.
 .TP
 ~/.task/undo.data
-The file that contains information needed by the "undo" and "merge" commands.
+The file that contains information needed by the "undo" command.
 .SH "CREDITS & COPYRIGHTS"
-Copyright (C) 2006 \- 2012 P. Beckingham, F. Hernandez.
+Copyright (C) 2006 \- 2016 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 taskrc(5),
 .BR task-tutorial(5),
 .BR task-faq(5),
 .BR task-color(5),
 .BR task-sync(5)
-For more information regarding taskwarrior, see the following:
+For more information regarding Taskwarrior, see the following:
 .TP
 The official site at
@@ -1051,7 +1293,7 @@ The official site at
 .TP
 The official code repository at
-<git://tasktools.org/task.git/>
+<https://git.tasktools.org/scm/tm/task.git>
 .TP
 You can contact the project by emailing
@@ -1059,6 +1301,6 @@ You can contact the project by emailing
 .SH REPORTING BUGS
 .TP
-Bugs in taskwarrior may be reported to the issue-tracker at
+Bugs in Taskwarrior may be reported to the issue-tracker at
-<http://taskwarrior.org>
+<https://bug.tasktools.org/>
--- a/doc/man/taskrc.5.in
+++ b/doc/man/taskrc.5.in
--- a/doc/misc/themes/README
+++ b/doc/misc/themes/README
@@ -1,15 +1,24 @@
 Themes
-To generate samples of themes, first execute the 'run' script to generate the
+To generate samples of themes, first execute the 'setup' script to generate the
 sample data.  Note that this data may need to be tweaked to include qualities
 that need to be illustrated in theme sample.
-Then edit the 'rc' file to include the desired theme file.
+Using a dark-background terminal (black recommended), run the following:
-Then run 'per' once per theme, and capture the display.
+  run.dark
-Note that this will require that the terminal window be switched between a black
+Using a light-background terminal, run the following:
-and white background to properly show the light and dark themes.
+
  run.light
 Using a solarized dark terminal, run the following:
  run.solar.dark
 Using a solarized light terminal, run the following:
  run.solar.light
 Note that for the solarized themes, the terminal color palette needs to be set
 to specific colors.
--- a/doc/misc/themes/per
+++ b/doc/misc/themes/per
@@ -1,8 +0,0 @@
 echo '$ task list'
 task rc:rc list | grep -v alternate
 echo '$ task summary'
 task rc:rc summary | grep -v alternate
 echo '$ task ghistory'
 task rc:rc ghistory | grep -v alternate
 echo '$ task calendar'
 task rc:rc calendar | grep -v alternate
--- a/doc/misc/themes/run
+++ b/doc/misc/themes/run
@@ -1,47 +0,0 @@
 rm pending.data completed.data undo.data rc
 cat <<EOF >>rc
 data.location=.
 confirmation=off
 _forcecolor=on
 #include ~/task-2.0.0.git/doc/rc/light-16.theme
 #include ~/task-2.0.0.git/doc/rc/dark-16.theme
 #include ~/task-2.0.0.git/doc/rc/light-256.theme
 #include ~/task-2.0.0.git/doc/rc/dark-256.theme
 #include ~/task-2.0.0.git/doc/rc/dark-gray-256.theme
 #include ~/task-2.0.0.git/doc/rc/dark-red-256.theme
 #include ~/task-2.0.0.git/doc/rc/dark-green-256.theme
 #include ~/task-2.0.0.git/doc/rc/dark-blue-256.theme
 include ~/task-2.0.0.git/doc/rc/dark-violets-256.theme
 #include ~/task-2.0.0.git/doc/rc/dark-yellow-green.theme
 #include ~/task-2.0.0.git/doc/rc/solarized-dark-256.theme
 #include ~/task-2.0.0.git/doc/rc/solarized-light-256.theme
 EOF
 task rc:rc add Ordinary task
 task rc:rc add Started task
 task rc:rc 2 start
 task rc:rc add High priority task pri:H
 task rc:rc add Medium priority task pri:M
 task rc:rc add Low priority task pri:L
 task rc:rc add Household task project:Home
 task rc:rc add Outdoor task project:Garden
 task rc:rc add Overdue task due:yesterday
 task rc:rc add Due task due:tomorrow
 task rc:rc add Not yet due tasks due:2/14/2012
 task rc:rc add Recurring task due:eom recur:monthly
 task rc:rc add Tagged task +tag1
 task rc:rc add Blocking task
 task rc:rc add Dependent task
 task rc:rc log Completed_1 project:Garden
 task rc:rc log Completed_2 project:Garden
 task rc:rc log Completed_3 project:Home
 task rc:rc add Deleted_1
 task rc:rc 14 mod depends:13
 task rc:rc 15 delete
--- a/doc/misc/themes/run.dark
+++ b/doc/misc/themes/run.dark
@@ -0,0 +1,36 @@
 #!/bin/bash
 for theme in $PWD/../../rc/dark-16.theme \
             $PWD/../../rc/dark-256.theme \
             $PWD/../../rc/dark-blue-256.theme \
             $PWD/../../rc/dark-gray-256.theme \
             $PWD/../../rc/dark-gray-blue-256.theme \
             $PWD/../../rc/dark-green-256.theme \
             $PWD/../../rc/dark-red-256.theme \
             $PWD/../../rc/dark-violets-256.theme \
             $PWD/../../rc/dark-yellow-green.theme
 do
  cat <<EOF >x
 data.location=.
 confirmation=off
 detection=off
 _forcecolor=on
 default.height=24
 verbose=off
 include $theme
 EOF
  echo "--- $theme -----------------------------------------------------"
  echo '$ task color legend'
  task rc:x color legend
  echo '$ task list'
  task rc:x list
  echo '$ task summary'
  task rc:x summary
  echo '$ task ghistory'
  task rc:x ghistory
  echo '$ task calendar'
  task rc:x calendar
  echo '$ task burndown.daily'
  task rc:x burndown.daily
 done
--- a/doc/misc/themes/run.default
+++ b/doc/misc/themes/run.default
@@ -0,0 +1,24 @@
 #!/bin/bash
 cat <<EOF >x
 data.location=.
 confirmation=off
 detection=off
 _forcecolor=on
 default.height=24
 verbose=off
 EOF
 echo "--- DEFAULT -----------------------------------------------------"
 echo '$ task color legend'
 task rc:x color legend
 echo '$ task list'
 task rc:x list
 echo '$ task summary'
 task rc:x summary
 echo '$ task ghistory'
 task rc:x ghistory
 echo '$ task calendar'
 task rc:x calendar
 echo '$ task burndown.daily'
 task rc:x burndown.daily
--- a/doc/misc/themes/run.light
+++ b/doc/misc/themes/run.light
@@ -0,0 +1,29 @@
 #!/bin/bash
 for theme in $PWD/../../rc/light-16.theme \
             $PWD/../../rc/light-256.theme
 do
  cat <<EOF >x
 data.location=.
 confirmation=off
 detection=off
 _forcecolor=on
 default.height=24
 verbose=off
 include $theme
 EOF
  echo "--- $theme -----------------------------------------------------"
  echo '$ task color legend'
  task rc:x color legend
  echo '$ task list'
  task rc:x list
  echo '$ task summary'
  task rc:x summary
  echo '$ task ghistory'
  task rc:x ghistory
  echo '$ task calendar'
  task rc:x calendar
  echo '$ task burndown.daily'
  task rc:x burndown.daily
 done
--- a/doc/misc/themes/run.solar.dark
+++ b/doc/misc/themes/run.solar.dark
@@ -0,0 +1,28 @@
 #!/bin/bash
 for theme in $PWD/../../rc/solarized-dark-256.theme
 do
  cat <<EOF >x
 data.location=.
 confirmation=off
 detection=off
 _forcecolor=on
 default.height=24
 verbose=off
 include $theme
 EOF
  echo "--- $theme -----------------------------------------------------"
  echo '$ task color legend'
  task rc:x color legend
  echo '$ task list'
  task rc:x list
  echo '$ task summary'
  task rc:x summary
  echo '$ task ghistory'
  task rc:x ghistory
  echo '$ task calendar'
  task rc:x calendar
  echo '$ task burndown.daily'
  task rc:x burndown.daily
 done
--- a/doc/misc/themes/run.solar.light
+++ b/doc/misc/themes/run.solar.light
@@ -0,0 +1,28 @@
 #!/bin/bash
 for theme in $PWD/../../rc/solarized-light-256.theme
 do
  cat <<EOF >x
 data.location=.
 confirmation=off
 detection=off
 _forcecolor=on
 default.height=24
 verbose=off
 include $theme
 EOF
  echo "--- $theme -----------------------------------------------------"
  echo '$ task color legend'
  task rc:x color legend
  echo '$ task list'
  task rc:x list
  echo '$ task summary'
  task rc:x summary
  echo '$ task ghistory'
  task rc:x ghistory
  echo '$ task calendar'
  task rc:x calendar
  echo '$ task burndown.daily'
  task rc:x burndown.daily
 done
--- a/doc/misc/themes/setup
+++ b/doc/misc/themes/setup
@@ -0,0 +1,33 @@
 rm pending.data completed.data undo.data x
 cat <<EOF >>x
 data.location=.
 confirmation=off
 _forcecolor=on
 EOF
 task rc:x add Ordinary task
 task rc:x add Started task
 task rc:x 2 start
 task rc:x add High priority task pri:H
 task rc:x add Medium priority task pri:M
 task rc:x add Low priority task pri:L
 task rc:x add Household task project:Home
 task rc:x add Outdoor task project:Garden
 task rc:x add Overdue task due:yesterday
 task rc:x add Due task due:tomorrow
 task rc:x add Not yet due tasks due:eom
 task rc:x add Recurring task due:eom recur:monthly
 task rc:x add Tagged task +tag1
 task rc:x add Blocking task
 task rc:x add Dependent task
 task rc:x log Completed_1 project:Garden
 task rc:x log Completed_2 project:Garden
 task rc:x log Completed_3 project:Home
 task rc:x add Deleted_1
 task rc:x 14 mod depends:13
 task rc:x 15 delete
--- a/doc/misc/tutorial/active/run.200
+++ b/doc/misc/tutorial/active/run.200
@@ -1,533 +0,0 @@
 #! /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 Shell
 echo Shell --------------------------------------------------------------
 echo $ task shell
 #task shell
 echo '> projects'
 #> projects
 echo '> tags'
 #> tags
 echo '> list'
 #> list
 echo '> quit'
 #> quit
 # 18 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
 # 19 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
 # 20 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
 # 21 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
 # 22 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
 # 23 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
 # 24 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
 # 25 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
 # 26 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
 # 27 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
@@ -1,43 +0,0 @@
 [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
@@ -1,533 +0,0 @@
 #! /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 Shell
 echo Shell --------------------------------------------------------------
 echo $ task shell
 #task shell
 echo '> projects'
 #> projects
 echo '> tags'
 #> tags
 echo '> list'
 #> list
 echo '> quit'
 #> quit
 # 18 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
 # 19 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
 # 20 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
 # 21 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
 # 22 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
 # 23 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
 # 24 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
 # 25 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
 # 26 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
 # 27 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
@@ -1,24 +0,0 @@
 [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
@@ -1,533 +0,0 @@
 #! /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 Shell
 echo Shell --------------------------------------------------------------
 echo $ task shell
 #task shell
 echo '> projects'
 #> projects
 echo '> tags'
 #> tags
 echo '> list'
 #> list
 echo '> quit'
 #> quit
 # 18 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
 # 19 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
 # 20 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
 # 21 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
 # 22 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
 # 23 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
 # 24 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
 # 25 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
 # 26 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
 # 27 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
@@ -1,27 +0,0 @@
 [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
@@ -1,533 +0,0 @@
 #! /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 Shell
 echo Shell --------------------------------------------------------------
 echo $ task shell
 #task shell
 echo '> projects'
 #> projects
 echo '> tags'
 #> tags
 echo '> list'
 #> list
 echo '> quit'
 #> quit
 # 18 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
 # 19 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
 # 20 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
 # 21 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
 # 22 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
 # 23 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
 # 24 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
 # 25 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
 # 26 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
 # 27 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
@@ -1,29 +0,0 @@
 [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
@@ -1,533 +0,0 @@
 #! /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 Shell
 echo Shell --------------------------------------------------------------
 echo $ task shell
 #task shell
 echo '> projects'
 #> projects
 echo '> tags'
 #> tags
 echo '> list'
 #> list
 echo '> quit'
 #> quit
 # 18 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
 # 19 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
 # 20 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
 # 21 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
 # 22 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
 # 23 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
 # 24 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
 # 25 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
 # 26 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
 # 27 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
@@ -1,27 +0,0 @@
 [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
@@ -1,533 +0,0 @@
 #! /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 Shell
 echo Shell --------------------------------------------------------------
 echo $ task shell
 #task shell
 echo '> projects'
 #> projects
 echo '> tags'
 #> tags
 echo '> list'
 #> list
 echo '> quit'
 #> quit
 # 18 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
 # 19 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
 # 20 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
 # 21 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
 # 22 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
 # 23 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
 # 24 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
 # 25 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
 # 26 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
 # 27 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
@@ -1,70 +0,0 @@
 [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/configuration/run.200
+++ b/doc/misc/tutorial/configuration/run.200
@@ -1,533 +0,0 @@
 #! /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 Shell
 echo Shell --------------------------------------------------------------
 echo $ task shell
 #task shell
 echo '> projects'
 #> projects
 echo '> tags'
 #> tags
 echo '> list'
 #> list
 echo '> quit'
 #> quit
 # 18 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
 # 19 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
 # 20 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
 # 21 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
 # 22 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
 # 23 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
 # 24 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
 # 25 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
 # 26 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
 # 27 Wrap up
 echo Wrap up --------------------------------------------------------------
 echo $ task version
 task  version
 exit
--- a/doc/misc/tutorial/configuration/script.200.txt
+++ b/doc/misc/tutorial/configuration/script.200.txt
@@ -1,40 +0,0 @@
 [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.
 ---------------------------------------- Configuration ---------------------------------------------
 task show                                There is a 'show' command, that is used to display the
                                         active configuration.  There are hundreds of settings that
                                         can be changed, and every one has a sensible default.
 man taskrc                               If you want a complete list of all the settings and their
                                         meanings, read the man page.
 task config answer 42                    The 'config' command is used to modify the settings, and in
                                         this case the configuration variable 'answer' is given the
                                         value of 42.
 task show answer                         The 'show' command indicates that the value was changed,
 task config answer                       and also that the variable is unrecognized.  The show
                                         command performs a detailed check on your configuration, and
                                         alerts you to several kinds of problem.  The config command
                                         can also remove a value.
 task rc.report.list.sort=description+ list
                                         A very powerful feature is the ability to override the
                                         configuration variables temporarily.  Here I am requesting
                                         an ascending sort on the description field only.
 ---------------------------------------- End -------------------------------------------------------
 Mention minimal asspect of ~/.taskrc
 Mention rc override of file
 Mention rc overrides of values
--- a/doc/misc/tutorial/custom/run.200
+++ b/doc/misc/tutorial/custom/run.200
@@ -1,533 +0,0 @@
 #! /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 Shell
 echo Shell --------------------------------------------------------------
 echo $ task shell
 #task shell
 echo '> projects'
 #> projects
 echo '> tags'
 #> tags
 echo '> list'
 #> list
 echo '> quit'
 #> quit
 # 18 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
 # 19 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
 # 20 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
 # 21 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
 # 22 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
 # 23 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
 # 24 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
 # 25 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
 # 26 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
 # 27 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
@@ -1,37 +0,0 @@
 [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
@@ -1,533 +0,0 @@
 #! /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 Shell
 echo Shell --------------------------------------------------------------
 echo $ task shell
 #task shell
 echo '> projects'
 #> projects
 echo '> tags'
 #> tags
 echo '> list'
 #> list
 echo '> quit'
 #> quit
 # 18 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
 # 19 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
 # 20 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
 # 21 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
 # 22 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
 # 23 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
 # 24 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
 # 25 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
 # 26 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
 # 27 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
@@ -1,28 +0,0 @@
 [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
@@ -1,533 +0,0 @@
 #! /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 Shell
 echo Shell --------------------------------------------------------------
 echo $ task shell
 #task shell
 echo '> projects'
 #> projects
 echo '> tags'
 #> tags
 echo '> list'
 #> list
 echo '> quit'
 #> quit
 # 18 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
 # 19 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
 # 20 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
 # 21 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
 # 22 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
 # 23 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
 # 24 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
 # 25 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
 # 26 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
 # 27 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
@@ -1,47 +0,0 @@
 [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
@@ -1,533 +0,0 @@
 #! /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 Shell
 echo Shell --------------------------------------------------------------
 echo $ task shell
 #task shell
 echo '> projects'
 #> projects
 echo '> tags'
 #> tags
 echo '> list'
 #> list
 echo '> quit'
 #> quit
 # 18 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
 # 19 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
 # 20 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
 # 21 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
 # 22 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
 # 23 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
 # 24 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
 # 25 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
 # 26 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
 # 27 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
@@ -1,31 +0,0 @@
 [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
@@ -1,30 +0,0 @@
 Calendar trick
  ln -s `which task` ./cal
  ./cal
 Synch
  push
  pull
  merge
 Logo
 Version
 Verbosity
 Formats
 Setup
  First time use
  Where the files are
  Using the man pages
  http://tasktools.org/latest
 Next Report
  Usage
  Configuration
  Urgency
  +next special tag
--- a/doc/misc/tutorial/filters/run.200
+++ b/doc/misc/tutorial/filters/run.200
@@ -1,533 +0,0 @@
 #! /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 Shell
 echo Shell --------------------------------------------------------------
 echo $ task shell
 #task shell
 echo '> projects'
 #> projects
 echo '> tags'
 #> tags
 echo '> list'
 #> list
 echo '> quit'
 #> quit
 # 18 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
 # 19 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
 # 20 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
 # 21 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
 # 22 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
 # 23 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
 # 24 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
 # 25 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
 # 26 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
 # 27 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
@@ -1,55 +0,0 @@
 [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/help/run.200
+++ b/doc/misc/tutorial/help/run.200
@@ -1,533 +0,0 @@
 #! /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 Shell
 echo Shell --------------------------------------------------------------
 echo $ task shell
 #task shell
 echo '> projects'
 #> projects
 echo '> tags'
 #> tags
 echo '> list'
 #> list
 echo '> quit'
 #> quit
 # 18 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
 # 19 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
 # 20 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
 # 21 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
 # 22 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
 # 23 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
 # 24 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
 # 25 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
 # 26 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
 # 27 Wrap up
 echo Wrap up --------------------------------------------------------------
 echo $ task version
 task  version
 exit
--- a/doc/misc/tutorial/help/script.200.txt
+++ b/doc/misc/tutorial/help/script.200.txt
@@ -1,32 +0,0 @@
 [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.
 ---------------------------------------- Help ------------------------------------------------------
 task help                                You'll find a quick reference page built in, with the 'help'
 man task                                 command, or perhaps you'll want to take a look at the several
 man taskrc                               man pages installed.  This demo has superficially shown
 man task-color                           many features which have more capability and depth which you
                                         can find in the man pages, and online.
 man task-tutorial                        This screencast is actually just a recording of me going
                                         through the tutorial.
 man task-faq                             Some frequently asked questions are answered here.
 man task-sync                            You've patiently watched this whole movie, so here's your
                                         reward - taskwarrior 1.9.3 has network synchronization
                                         features, for sharing tasks across computers.  But this is
                                         just a teaser - synch will be shown in the next movie.
 ---------------------------------------- End -------------------------------------------------------
 Replace spoken track completely.
--- a/doc/misc/tutorial/import_export/run.200
+++ b/doc/misc/tutorial/import_export/run.200
@@ -1,533 +0,0 @@
 #! /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 Shell
 echo Shell --------------------------------------------------------------
 echo $ task shell
 #task shell
 echo '> projects'
 #> projects
 echo '> tags'
 #> tags
 echo '> list'
 #> list
 echo '> quit'
 #> quit
 # 18 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
 # 19 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
 # 20 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
 # 21 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
 # 22 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
 # 23 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
 # 24 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
 # 25 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
 # 26 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
 # 27 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
@@ -1,35 +0,0 @@
 [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
@@ -1,533 +0,0 @@
 #! /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 Shell
 echo Shell --------------------------------------------------------------
 echo $ task shell
 #task shell
 echo '> projects'
 #> projects
 echo '> tags'
 #> tags
 echo '> list'
 #> list
 echo '> quit'
 #> quit
 # 18 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
 # 19 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
 # 20 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
 # 21 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
 # 22 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
 # 23 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
 # 24 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
 # 25 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
 # 26 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
 # 27 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
@@ -1,24 +0,0 @@
 [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/intro/run.200
+++ b/doc/misc/tutorial/intro/run.200
@@ -1,533 +0,0 @@
 #! /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 Shell
 echo Shell --------------------------------------------------------------
 echo $ task shell
 #task shell
 echo '> projects'
 #> projects
 echo '> tags'
 #> tags
 echo '> list'
 #> list
 echo '> quit'
 #> quit
 # 18 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
 # 19 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
 # 20 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
 # 21 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
 # 22 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
 # 23 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
 # 24 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
 # 25 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
 # 26 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
 # 27 Wrap up
 echo Wrap up --------------------------------------------------------------
 echo $ task version
 task  version
 exit
--- a/doc/misc/tutorial/intro/script.200.txt
+++ b/doc/misc/tutorial/intro/script.200.txt
@@ -1,25 +0,0 @@
 [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.
 ---------------------------------------- Intro -----------------------------------------------------
 http://taskwarrior.org                   Hello, and welcome to this taskwarrior version 1.9.3 demo.
                                         I'm going to show you over 100 features, so don't blink, or
                                         you'll miss some.  Even experienced users are going to learn
                                         *something*.
                                         I will start off with basic usage, and proceed to more
                                         sophisticated commands as we go along.
 ---------------------------------------- End -------------------------------------------------------
 Include first time use
 Include 30-second tutorial
--- a/doc/misc/tutorial/modifications/run.200
+++ b/doc/misc/tutorial/modifications/run.200
@@ -1,533 +0,0 @@
 #! /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 Shell
 echo Shell --------------------------------------------------------------
 echo $ task shell
 #task shell
 echo '> projects'
 #> projects
 echo '> tags'
 #> tags
 echo '> list'
 #> list
 echo '> quit'
 #> quit
 # 18 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
 # 19 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
 # 20 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
 # 21 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
 # 22 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
 # 23 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
 # 24 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
 # 25 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
 # 26 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
 # 27 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
@@ -1,48 +0,0 @@
 [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
@@ -1,533 +0,0 @@
 #! /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 Shell
 echo Shell --------------------------------------------------------------
 echo $ task shell
 #task shell
 echo '> projects'
 #> projects
 echo '> tags'
 #> tags
 echo '> list'
 #> list
 echo '> quit'
 #> quit
 # 18 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
 # 19 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
 # 20 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
 # 21 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
 # 22 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
 # 23 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
 # 24 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
 # 25 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
 # 26 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
 # 27 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
@@ -1,21 +0,0 @@
 [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
@@ -1,533 +0,0 @@
 #! /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 Shell
 echo Shell --------------------------------------------------------------
 echo $ task shell
 #task shell
 echo '> projects'
 #> projects
 echo '> tags'
 #> tags
 echo '> list'
 #> list
 echo '> quit'
 #> quit
 # 18 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
 # 19 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
 # 20 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
 # 21 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
 # 22 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
 # 23 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
 # 24 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
 # 25 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
 # 26 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
 # 27 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
@@ -1,36 +0,0 @@
 [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
@@ -1,533 +0,0 @@
 #! /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 Shell
 echo Shell --------------------------------------------------------------
 echo $ task shell
 #task shell
 echo '> projects'
 #> projects
 echo '> tags'
 #> tags
 echo '> list'
 #> list
 echo '> quit'
 #> quit
 # 18 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
 # 19 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
 # 20 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
 # 21 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
 # 22 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
 # 23 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
 # 24 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
 # 25 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
 # 26 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
 # 27 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
@@ -1,40 +0,0 @@
 [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
@@ -1,533 +0,0 @@
 #! /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 Shell
 echo Shell --------------------------------------------------------------
 echo $ task shell
 #task shell
 echo '> projects'
 #> projects
 echo '> tags'
 #> tags
 echo '> list'
 #> list
 echo '> quit'
 #> quit
 # 18 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
 # 19 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
 # 20 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
 # 21 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
 # 22 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
 # 23 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
 # 24 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
 # 25 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
 # 26 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
 # 27 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
@@ -1,33 +0,0 @@
 [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
@@ -1,533 +0,0 @@
 #! /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 Shell
 echo Shell --------------------------------------------------------------
 echo $ task shell
 #task shell
 echo '> projects'
 #> projects
 echo '> tags'
 #> tags
 echo '> list'
 #> list
 echo '> quit'
 #> quit
 # 18 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
 # 19 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
 # 20 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
 # 21 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
 # 22 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
 # 23 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
 # 24 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
 # 25 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
 # 26 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
 # 27 Wrap up
 echo Wrap up --------------------------------------------------------------
 echo $ task version
 task  version
 exit
--- a/doc/misc/tutorial/run.200
+++ b/doc/misc/tutorial/run.200
@@ -1,533 +0,0 @@
 #! /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 Shell
 echo Shell --------------------------------------------------------------
 echo $ task shell
 #task shell
 echo '> projects'
 #> projects
 echo '> tags'
 #> tags
 echo '> list'
 #> list
 echo '> quit'
 #> quit
 # 18 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
 # 19 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
 # 20 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
 # 21 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
 # 22 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
 # 23 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
 # 24 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
 # 25 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
 # 26 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
 # 27 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
@@ -1,533 +0,0 @@
 #! /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 Shell
 echo Shell --------------------------------------------------------------
 echo $ task shell
 #task shell
 echo '> projects'
 #> projects
 echo '> tags'
 #> tags
 echo '> list'
 #> list
 echo '> quit'
 #> quit
 # 18 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
 # 19 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
 # 20 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
 # 21 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
 # 22 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
 # 23 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
 # 24 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
 # 25 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
 # 26 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
 # 27 Wrap up
 echo Wrap up --------------------------------------------------------------
 echo $ task version
 task  version
 exit
--- a/doc/misc/tutorial/shell/script.200.txt
+++ b/doc/misc/tutorial/shell/script.200.txt
@@ -1,22 +0,0 @@
 [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 -----------------------------------------------------
 task shell                               You can use the shell command 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 -------------------------------------------------------
 Show use of rlwrap.
--- a/doc/misc/tutorial/tags/run.200
+++ b/doc/misc/tutorial/tags/run.200
@@ -1,533 +0,0 @@
 #! /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 Shell
 echo Shell --------------------------------------------------------------
 echo $ task shell
 #task shell
 echo '> projects'
 #> projects
 echo '> tags'
 #> tags
 echo '> list'
 #> list
 echo '> quit'
 #> quit
 # 18 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
 # 19 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
 # 20 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
 # 21 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
 # 22 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
 # 23 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
 # 24 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
 # 25 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
 # 26 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
 # 27 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
@@ -1,46 +0,0 @@
 [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
@@ -1,533 +0,0 @@
 #! /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 Shell
 echo Shell --------------------------------------------------------------
 echo $ task shell
 #task shell
 echo '> projects'
 #> projects
 echo '> tags'
 #> tags
 echo '> list'
 #> list
 echo '> quit'
 #> quit
 # 18 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
 # 19 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
 # 20 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
 # 21 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
 # 22 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
 # 23 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
 # 24 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
 # 25 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
 # 26 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
 # 27 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
@@ -1,31 +0,0 @@
 [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
@@ -1,9 +1,6 @@
-################################################################################
+###############################################################################
 # Sample taskwarrior 1.9 (or later) dark 16-color theme
 #
-# taskwarrior - a command line task list manager.
+# Copyright 2006 - 2016, Paul Beckingham, Federico Hernandez.
 #
 # Copyright 2006-2012, 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
@@ -27,51 +24,78 @@
 #
 ###############################################################################
-color=on
+rule.precedence.color=deleted,completed,active,keyword.,tag.,project.,overdue,scheduled,due.today,due,blocked,blocking,recurring,tagged,uda.
 # General decoration
 color.label=
 color.label.sort=
 color.alternate=
 color.header=yellow
 color.footnote=yellow
-color.error=yellow
+color.warning=bold red
-color.debug=yellow
+color.error=white on red
 color.debug=blue
-color.summary.bar=black on green
+# Task state
-color.summary.background=white on black
+color.completed=
 color.deleted=
 color.active=black on bright green
 color.recurring=magenta
 color.scheduled=white on green
 color.until=
 color.blocked=black on white
 color.blocking=black on bright white
-color.history.add=black on red
+# Project
-color.history.done=black on green
+color.project.none=
 color.history.delete=black on yellow
 # Priority
 color.uda.priority.H=bold white
 color.uda.priority.M=white
 color.uda.priority.L=
 # Tags
 color.tag.next=bold yellow
 color.tag.none=
 color.tagged=green
 # Due
 color.due=red
 color.due.today=red
 color.overdue=bold red
 # UDA
 #color.uda.X=
 # Report: burndown
 color.burndown.done=on green
 color.burndown.pending=on red
 color.burndown.started=on yellow
 color.burndown.done=on green
 # Report: history
 color.history.add=black on red
 color.history.delete=black on yellow
 color.history.done=black on green
 # Report: summary
 color.summary.background=white on black
 color.summary.bar=black on green
 # Command: calendar
 color.calendar.due=white on red
 color.calendar.due.today=bold white on red
 color.calendar.holiday=black on bright yellow
 color.calendar.overdue=black on bright red
 color.calendar.today=bold white on bright blue
 color.calendar.weekend=white on bright black
 color.calendar.weeknumber=bold blue
 # Command: sync
 color.sync.added=green
 color.sync.changed=yellow
 color.sync.rejected=red
-color.undo.before=red
+# Command: undo
 color.undo.after=green
-
+color.undo.before=red
 color.calendar.today=bold white on bright blue
 color.calendar.due=white on red
 color.calendar.due.today=bold white on red
 color.calendar.overdue=black on bright red
 color.calendar.weekend=white on bright black
 color.calendar.holiday=black on bright yellow
 color.calendar.weeknumber=bold blue
 color.recurring=magenta
 color.overdue=bold red
 color.due.today=red
 color.due=red
 color.active=black on bright green
 color.pri.none=
 color.pri.H=bold white
 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
@@ -1,9 +1,6 @@
 ###############################################################################
 # Sample taskwarrior 1.9 (or later) dark 256-color theme
 #
-# taskwarrior - a command line task list manager.
+# Copyright 2006 - 2016, Paul Beckingham, Federico Hernandez.
 #
 # Copyright 2006-2012, 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
@@ -27,51 +24,75 @@
 #
 ###############################################################################
-color=on
+rule.precedence.color=deleted,completed,active,keyword.,tag.,project.,overdue,scheduled,due.today,due,blocked,blocking,recurring,tagged,uda.
 # General decoration
 color.label=
 color.label.sort=
 color.alternate=on gray2
 color.header=color3
 color.footnote=color3
-color.error=color3
+color.warning=bold red
-color.debug=color3
+color.error=white on red
 color.debug=color4
-color.summary.bar=black on rgb141
+# Task state
-color.summary.background=white on color0
+color.completed=
 color.deleted=
 color.active=rgb555 on rgb410
 color.recurring=rgb013
 color.scheduled=on rgb001
 color.until=
 color.blocked=white on color8
 color.blocking=black on color15
-color.history.add=color0 on rgb500
+# Project
-color.history.done=color0 on rgb050
+color.project.none=
 color.history.delete=color0 on rgb550
 # Priority
 color.uda.priority.H=color255
 color.uda.priority.L=color245
 color.uda.priority.M=color250
 # Tags
 color.tag.next=rgb440
 color.tag.none=
 color.tagged=rgb031
 # Due
 color.due.today=rgb400
 color.due=color1
 color.overdue=color9
 # Report: burndown
 color.burndown.done=on rgb010
 color.burndown.pending=on color9
 color.burndown.started=on color11
 color.burndown.done=on rgb010
 # Report: history
 color.history.add=color0 on rgb500
 color.history.delete=color0 on rgb550
 color.history.done=color0 on rgb050
 # Report: summary
 color.summary.background=white on color0
 color.summary.bar=black on rgb141
 # Command: calendar
 color.calendar.due.today=color15 on color1
 color.calendar.due=color0 on color1
 color.calendar.holiday=color0 on color11
 color.calendar.overdue=color0 on color9
 color.calendar.today=color15 on rgb013
 color.calendar.weekend=on color235
 color.calendar.weeknumber=rgb013
 # Command: sync
 color.sync.added=rgb010
 color.sync.changed=color11
 color.sync.rejected=color9
-color.undo.before=color1
+# Command: undo
 color.undo.after=color2
-
+color.undo.before=color1
 color.calendar.today=color15 on rgb013
 color.calendar.due=color0 on color1
 color.calendar.due.today=color15 on color1
 color.calendar.overdue=color0 on color9
 color.calendar.weekend=on color235
 color.calendar.holiday=color0 on color11
 color.calendar.weeknumber=rgb013
 color.recurring=rgb013
 color.overdue=color9
 color.due.today=rgb400
 color.due=color1
 color.active=rgb555 on rgb410
 color.pri.none=
 color.pri.H=color255
 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
@@ -1,9 +1,6 @@
 ###############################################################################
 # Sample taskwarrior 1.9 (or later) dark 256-color theme, featuring blue.
 #
-# taskwarrior - a command line task list manager.
+# Copyright 2006 - 2016, Paul Beckingham, Federico Hernandez.
 #
 # Copyright 2006-2012, 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
@@ -27,51 +24,75 @@
 #
 ###############################################################################
-color=on
+rule.precedence.color=deleted,completed,active,keyword.,tag.,project.,overdue,scheduled,due.today,due,blocked,blocking,recurring,tagged,uda.
 # General decoration
 color.label=
 color.label.sort=
 color.alternate=on gray2
 color.header=rgb013
 color.footnote=rgb013
-color.error=rgb013
+color.warning=bold red
 color.error=white on red
 color.debug=rgb013
-color.summary.bar=white on rgb003
+# Task state
-color.summary.background=white on color0
+color.completed=
 color.deleted=
 color.active=rgb045 on rgb015
 color.recurring=rgb115
 color.scheduled=on rgb012
 color.until=
 color.blocked=white on rgb001
 color.blocking=white on rgb002
-color.history.add=color0 on rgb015
+# Project
-color.history.done=color0 on rgb025
+color.project.none=
 color.history.delete=color0 on rgb035
 # Priority
 color.uda.priority.H=rgb035
 color.uda.priority.L=rgb015
 color.uda.priority.M=rgb025
 # Tags
 color.tag.next=rgb550
 color.tag.none=
 color.tagged=color246
 # Due
 color.due.today=color252
 color.due=color249
 color.overdue=color255
 # Report: burndown
 color.burndown.done=on gray4
 color.burndown.pending=on rgb004
 color.burndown.started=on rgb015
 color.burndown.done=on gray4
 # Report: history
 color.history.add=color0 on rgb015
 color.history.delete=color0 on rgb035
 color.history.done=color0 on rgb025
 # Report: summary
 color.summary.background=on rgb001
 color.summary.bar=on rgb114
 # Command: calendar
 color.calendar.due.today=color0 on color252
 color.calendar.due=color0 on color249
 color.calendar.holiday=color255 on rgb013
 color.calendar.overdue=color0 on color255
 color.calendar.today=color0 on rgb115
 color.calendar.weekend=on color235
 color.calendar.weeknumber=rgb015
 # Command: sync
 color.sync.added=gray4
 color.sync.changed=rgb015
 color.sync.rejected=rgb004
-color.undo.before=rgb013
+# Command: undo
 color.undo.after=rgb035
-
+color.undo.before=rgb013
 color.calendar.today=color0 on rgb115
 color.calendar.due=color0 on color249
 color.calendar.due.today=color0 on color252
 color.calendar.overdue=color0 on color255
 color.calendar.weekend=on color235
 color.calendar.holiday=color255 on rgb013
 color.calendar.weeknumber=rgb015
 color.recurring=rgb115
 color.overdue=color255
 color.due.today=color252
 color.due=color249
 color.active=rgb045 on rgb015
 color.pri.none=
 color.pri.H=rgb035
 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
@@ -1,9 +1,6 @@
 ###############################################################################
 # Sample taskwarrior 1.9 (or later) dark gray 256-color theme
 #
-# taskwarrior - a command line task list manager.
+# Copyright 2006 - 2016, Paul Beckingham, Federico Hernandez.
 #
 # Copyright 2006-2012, 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
@@ -27,51 +24,75 @@
 #
 ###############################################################################
-color=on
+rule.precedence.color=deleted,completed,active,keyword.,tag.,project.,overdue,scheduled,due.today,due,blocked,blocking,recurring,tagged,uda.
 color.header=color8
 color.footnote=color8
 color.error=color8
 color.debug=color8
-color.summary.bar=black on gray12
+# General decoration
-color.summary.background=white on gray3
+color.label=
-
+color.label.sort=
 color.history.add=color0 on gray6
 color.history.done=color0 on gray15
 color.history.delete=color0 on gray10
 color.burndown.pending=on gray6
 color.burndown.started=on gray15
 color.burndown.done=on gray10
 color.sync.added=gray10
 color.sync.changed=gray15
 color.sync.rejected=gray6
 color.undo.before=gray6
 color.undo.after=gray15
 color.calendar.today=color8 on color15
 color.calendar.due=color7 on color8
 color.calendar.due.today=color15 on color8
 color.calendar.overdue=underline color0 on color7
 color.calendar.weekend=on color235
 color.calendar.holiday=color7 on color15
 color.calendar.weeknumber=gray4
 color.recurring=gray8
 color.overdue=color0 on color15
 color.due.today=underline color0 on color7
 color.due=color7
 color.active=color7 on color8
 color.pri.none=
 color.pri.H=color15
 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
 color.header=color0 on gray11
 color.footnote=on gray5
 color.warning=bold red
 color.error=white on red
 color.debug=blue
 # Task state
 color.completed=
 color.deleted=
 color.active=black on gray18
 color.recurring=
 color.scheduled=on gray8
 color.until=
 color.blocked=gray13
 color.blocking=bold white
 # Project
 color.project.none=
 # Priority
 color.uda.priority.H=gray21
 color.uda.priority.M=gray18
 color.uda.priority.L=gray12
 # Tags
 color.tag.next=bold white
 color.tag.none=
 color.tagged=
 # Due
 color.due=on gray3
 color.due.today=on gray4
 color.overdue=on gray6
 # Report: burndown
 color.burndown.pending=gray15 on gray5
 color.burndown.started=black on gray10
 color.burndown.done=gray5 on gray23
 # Report: history
 color.history.add=gray15 on gray5
 color.history.delete=black on gray10
 color.history.done=gray5 on gray23
 # Report: summary
 color.summary.bar=on gray12
 color.summary.background=on gray5
 # Command: calendar
 color.calendar.due=on gray8
 color.calendar.due.today=black on gray15
 color.calendar.holiday=black on gray20
 color.calendar.overdue=gray2 on gray10
 color.calendar.today=bold white
 color.calendar.weekend=on gray2
 color.calendar.weeknumber=gray6
 # Command: sync
 color.sync.added=gray15 on gray5
 color.sync.changed=black on gray10
 color.sync.rejected=gray5 on gray23
 # Command: undo
 color.undo.before=white on black
 color.undo.after=black on white
--- a/doc/rc/dark-gray-blue-256.theme
+++ b/doc/rc/dark-gray-blue-256.theme
@@ -0,0 +1,98 @@
 ###############################################################################
 #
 # Copyright 2006 - 2016, 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
 # in the Software without restriction, including without limitation the rights
 # to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
 # copies of the Software, and to permit persons to whom the Software is
 # furnished to do so, subject to the following conditions:
 #
 # The above copyright notice and this permission notice shall be included
 # in all copies or substantial portions of the Software.
 #
 # THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
 # OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
 # FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
 # THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
 # LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
 # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 # SOFTWARE.
 #
 # http://www.opensource.org/licenses/mit-license.php
 #
 ###############################################################################
 rule.precedence.color=deleted,completed,active,keyword.,tag.,project.,overdue,scheduled,due.today,due,blocked,blocking,recurring,tagged,uda.
 # General decoration
 color.label=
 color.label.sort=
 color.alternate=on gray2
 color.header=gray10
 color.footnote=gray10
 color.warning=white on blue
 color.error=white on red
 color.debug=blue
 # Task state
 color.completed=
 color.deleted=
 color.active=color15 on rgb035
 color.recurring=
 color.scheduled=
 color.until=
 color.blocked=bold gray10 on gray4
 color.blocking=gray18 on gray6
 # Project
 color.project.none=
 # Priority
 color.uda.priority.H=
 color.uda.priority.L=
 color.uda.priority.M=
 # Tags
 color.tag.next=
 color.tag.none=
 color.tagged=
 # Due
 color.due=color0 on rgb013
 color.due.today=color0 on rgb024
 color.overdue=color0 on rgb035
 # Report: burndown
 color.burndown.pending=white on gray9
 color.burndown.started=black on gray16
 color.burndown.done=white on rgb013
 # Report: history
 color.history.add=white on gray6
 color.history.delete=black on gray18
 color.history.done=black on rgb024
 # Report: summary
 color.summary.bar=on rgb012
 color.summary.background=on gray2
 # Command: calendar
 color.calendar.due=color0 on gray10
 color.calendar.due.today=color0 on gray15
 color.calendar.holiday=color15 on rgb005
 color.calendar.overdue=color0 on gray20
 color.calendar.today=underline black on color15
 color.calendar.weekend=on gray4
 color.calendar.weeknumber=gray10
 # Command: sync
 color.sync.added=gray10
 color.sync.changed=gray15
 color.sync.rejected=gray23
 # Command: undo
 color.undo.before=rgb013
 color.undo.after=rgb035
--- a/doc/rc/dark-green-256.theme
+++ b/doc/rc/dark-green-256.theme
@@ -1,9 +1,6 @@
 ###############################################################################
 # Sample taskwarrior 1.9 (or later) dark 256-color theme, featuring green.
 #
-# taskwarrior - a command line task list manager.
+# Copyright 2006 - 2016, Paul Beckingham, Federico Hernandez.
 #
 # Copyright 2006-2012, 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
@@ -27,51 +24,74 @@
 #
 ###############################################################################
-color=on
+rule.precedence.color=deleted,completed,active,keyword.,tag.,project.,overdue,scheduled,due.today,due,blocked,blocking,recurring,tagged,uda.
 # General decoration
 color.label=
 color.label.sort=
 color.alternate=on gray2
 color.header=rgb031
 color.footnote=rgb031
-color.error=rgb031
+color.warning=rgb020
-color.debug=rgb031
+color.error=white on red
 color.debug=blue
-color.summary.bar=white on rgb030
+# Task state
-color.summary.background=white on color0
+color.completed=
 color.deleted=
 color.active=rgb050 on rgb010
 color.recurring=rgb151
 color.scheduled=black on rgb031
 color.until=
 color.blocked=white on rgb010
 color.blocking=white on rgb020
-color.history.add=color0 on rgb010
+# Project
-color.history.done=color0 on rgb030
+color.project.none=
 color.history.delete=color0 on rgb050
 # Priority
 color.uda.priority.H=rgb050
 color.uda.priority.L=rgb010
 color.uda.priority.M=rgb030
 # Tags
 color.tag.next=rgb440
 color.tag.none=
 color.tagged=color246
 # Due
 color.due.today=color252
 color.due=color249
 color.overdue=color255
 # Report: burndown
 color.burndown.done=on gray4
 color.burndown.pending=on rgb010
 color.burndown.started=on rgb030
 color.burndown.done=on gray4
 # Report: history
 color.history.add=color0 on rgb010
 color.history.delete=color0 on rgb050
 color.history.done=color0 on rgb030
 # Report: summary
 color.summary.background=white on gray3
 color.summary.bar=white on rgb030
 # Command: calendar
 color.calendar.due.today=color0 on color225
 color.calendar.due=color0 on color249
 color.calendar.holiday=rgb151 on rgb020
 color.calendar.overdue=color0 on color255
 color.calendar.today=color0 on rgb151
 color.calendar.weekend=on color235
 color.calendar.weeknumber=rgb010
 # Command: sync
 color.sync.added=gray4
 color.sync.changed=rgb030
 color.sync.rejected=rgb010
-color.undo.before=rgb031
+# Command: undo
 color.undo.after=rgb053
-
+color.undo.before=rgb021
 color.calendar.today=color0 on rgb151
 color.calendar.due=color0 on color249
 color.calendar.due.today=color0 on color225
 color.calendar.overdue=color0 on color255
 color.calendar.weekend=on color235
 color.calendar.holiday=rgb151 on rgb020
 color.calendar.weeknumber=rgb010
 color.recurring=rgb151
 color.overdue=color255
 color.due.today=color252
 color.due=color249
 color.active=rgb050 on rgb010
 color.pri.none=
 color.pri.H=rgb050
 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
@@ -1,9 +1,6 @@
 ###############################################################################
 # Sample taskwarrior 1.9 (or later) dark 256-color theme, featuring red.
 #
-# taskwarrior - a command line task list manager.
+# Copyright 2006 - 2016, Paul Beckingham, Federico Hernandez.
 #
 # Copyright 2006-2012, 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
@@ -27,51 +24,75 @@
 #
 ###############################################################################
-color=on
+rule.precedence.color=deleted,completed,active,keyword.,tag.,project.,overdue,scheduled,due.today,due,blocked,blocking,recurring,tagged,uda.
 # General decoration
 color.label=
 color.label.sort=
 color.alternate=on gray2
 color.header=rgb100
 color.footnote=rgb100
-color.error=rgb100
+color.warning=red
-color.debug=rgb100
+color.error=white on red
 color.debug=blue
-color.summary.bar=white on rgb300
+# Task state
-color.summary.background=white on color0
+color.completed=
 color.deleted=
 color.active=rgb500 on rgb100
 color.recurring=rgb511
 color.scheduled=white on rgb311
 color.until=
 color.blocked=white on rgb100
 color.blocking=white on rgb200
-color.history.add=color0 on rgb100
+# Project
-color.history.done=color0 on rgb300
+color.project.none=
 color.history.delete=color0 on rgb500
 # Priority
 color.uda.priority.H=rgb500
 color.uda.priority.L=rgb300
 color.uda.priority.M=rgb400
 # Tags
 color.tag.next=rgb511
 color.tag.none=
 color.tagged=color246
 # Due
 color.due.today=color252
 color.due=color249
 color.overdue=color255
 # Report: burndown
 color.burndown.done=on gray4
 color.burndown.pending=on rgb200
 color.burndown.started=on rgb411
 color.burndown.done=on gray4
 # Report: history
 color.history.add=color0 on rgb100
 color.history.delete=color0 on rgb500
 color.history.done=color0 on rgb300
 # Report: summary
 color.summary.background=white on color0
 color.summary.bar=white on rgb300
 # Command: calendar
 color.calendar.due.today=color0 on color252
 color.calendar.due=color0 on color249
 color.calendar.holiday=rgb522 on rgb300
 color.calendar.overdue=color0 on color255
 color.calendar.today=color0 on rgb511
 color.calendar.weekend=on color235
 color.calendar.weeknumber=rgb100
 # Command: sync
 color.sync.added=gray4
 color.sync.changed=rgb411
 color.sync.rejected=rgb200
-color.undo.before=rgb301
+# Command: undo
-color.undo.after=rgb503
+color.undo.after=rgb511
-
+color.undo.before=rgb200
 color.calendar.today=color0 on rgb511
 color.calendar.due=color0 on color249
 color.calendar.due.today=color0 on color252
 color.calendar.overdue=color0 on color255
 color.calendar.weekend=on color235
 color.calendar.holiday=rgb522 on rgb300
 color.calendar.weeknumber=rgb100
 color.recurring=rgb511
 color.overdue=color255
 color.due.today=color252
 color.due=color249
 color.active=rgb500 on rgb100
 color.pri.none=
 color.pri.H=rgb500
 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
@@ -1,9 +1,6 @@
-################################################################################
+###############################################################################
 # Sample taskwarrior 1.9 (or later) dark violet 256-color theme
 #
-# taskwarrior - a command line task list manager.
+# Copyright 2006 - 2016, Paul Beckingham, Federico Hernandez.
 #
 # Copyright 2006-2012, 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
@@ -27,51 +24,75 @@
 #
 ###############################################################################
-color=on
+rule.precedence.color=deleted,completed,active,keyword.,tag.,project.,overdue,scheduled,due.today,due,blocked,blocking,recurring,tagged,uda.
 # General decoration
 color.label=
 color.label.sort=
 color.alternate=on gray2
 color.header=rgb013
 color.footnote=rgb013
-color.error=rgb013
+color.warning=white on rgb103
-color.debug=rgb013
+color.error=white on red
 color.debug=blue
-color.summary.bar=white on rgb103
+# Task state
-color.summary.background=white on color0
+color.completed=
 color.deleted=
 color.active=rgb445 on rgb213
 color.recurring=rgb115
 color.scheduled=white on rgb113
 color.until=
 color.blocked=white on rgb101
 color.blocking=white on rgb202
-color.history.add=color0 on rgb105
+# Project
-color.history.done=color0 on rgb205
+color.project.none=
 color.history.delete=color0 on rgb305
 # Priority
 color.uda.priority.H=rgb404
 color.uda.priority.M=rgb304
 color.uda.priority.L=rgb325
 # Tags
 color.tag.next=
 color.tag.none=
 color.tagged=rgb334
 # Due
 color.due=rgb015
 color.due.today=rgb125
 color.overdue=color5
 # Report: burndown
 color.burndown.pending=on rgb103
 color.burndown.started=on rgb214
 color.burndown.done=on gray4
 # Report: history
 color.history.add=color0 on rgb105
 color.history.done=color0 on rgb205
 color.history.delete=color0 on rgb305
 # Report: summary
 color.summary.bar=white on rgb104
 color.summary.background=white on rgb001
 # Command: calendar
 color.calendar.due=color0 on rgb325
 color.calendar.due.today=color0 on rgb404
 color.calendar.holiday=color15 on rgb102
 color.calendar.overdue=color0 on color5
 color.calendar.today=color15 on rgb103
 color.calendar.weekend=gray12 on gray3
 color.calendar.weeknumber=rgb104
 # Command: sync
 color.sync.added=gray4
 color.sync.changed=rgb214
 color.sync.rejected=rgb103
 # Command: undo
 color.undo.before=rgb103
 color.undo.after=rgb305
 color.calendar.today=color15 on rgb103
 color.calendar.due=color0 on rgb325
 color.calendar.due.today=color0 on rgb404
 color.calendar.overdue=color0 on color9
 color.calendar.weekend=gray12 on gray3
 color.calendar.holiday=color15 on rgb022
 color.calendar.weeknumber=rgb104
 color.recurring=rgb115
 color.overdue=color9
 color.due.today=rgb533
 color.due=rgb055
 color.active=rgb445 on rgb213
 color.pri.none=
 color.pri.H=rgb404
 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
@@ -1,9 +1,6 @@
-################################################################################
+###############################################################################
 # Sample taskwarrior 1.9 (or later) dark-yellow-green 256-color theme
 #
-# taskwarrior - a command line task list manager.
+# Copyright 2006 - 2016, Paul Beckingham, Federico Hernandez.
 #
 # Copyright 2006-2012, 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
@@ -27,51 +24,75 @@
 #
 ###############################################################################
-color=on
+rule.precedence.color=deleted,completed,active,keyword.,tag.,project.,overdue,scheduled,due.today,due,blocked,blocking,recurring,tagged,uda.
 # General decoration
 color.label=
 color.label.sort=
 color.alternate=on gray2
 color.header=rgb031
 color.footnote=rgb031
-color.error=rgb031
+color.warning=black on yellow
-color.debug=rgb031
+color.error=white on red
 color.debug=blue
-color.summary.bar=white on rgb030
+# Task state
-color.summary.background=white on color0
+color.completed=
 color.deleted=
 color.active=rgb451 on rgb320
 color.recurring=rgb343
 color.scheduled=black on rgb441
 color.until=
 color.blocked=white on rgb110
 color.blocking=white on rgb220
-color.history.add=color0 on rgb010
+# Project
-color.history.done=color0 on rgb030
+color.project.none=
 color.history.delete=color0 on rgb050
 # Priority
 color.uda.priority.H=rgb450
 color.uda.priority.M=rgb030
 color.uda.priority.L=rgb010
 # Tags
 color.tag.next=
 color.tag.none=
 color.tagged=rgb342
 # Due
 color.due=rgb440
 color.due.today=rgb430
 color.overdue=rgb420
 # Report: burndown
 color.burndown.pending=on rgb110
 color.burndown.started=on rgb430
 color.burndown.done=on gray4
 # Report: history
 color.history.add=color0 on rgb110
 color.history.done=color0 on rgb430
 color.history.delete=white on gray4
 # Report: summary
 color.summary.bar=white on rgb330
 color.summary.background=white on rgb110
 # Command: calendar
 color.calendar.due=color0 on rgb440
 color.calendar.due.today=color0 on rgb430
 color.calendar.holiday=rgb151 on rgb020
 color.calendar.overdue=color0 on rgb420
 color.calendar.today=color15 on rgb110
 color.calendar.weekend=on color235
 color.calendar.weeknumber=rgb110
 # Command: sync
 color.sync.added=gray4
 color.sync.changed=rgb430
 color.sync.rejected=rgb110
-color.undo.before=rgb031
+# Command: undo
-color.undo.after=rgb053
+color.undo.before=rgb021
-
+color.undo.after=rgb042
 color.calendar.today=color15 on rgb110
 color.calendar.due=color0 on rgb430
 color.calendar.due.today=color0 on rgb410
 color.calendar.overdue=color0 on rgb400
 color.calendar.weekend=on color235
 color.calendar.holiday=rgb151 on rgb020
 color.calendar.weeknumber=rgb110
 color.recurring=rgb343
 color.overdue=rgb400
 color.due.today=rgb410
 color.due=rgb420
 color.active=rgb451 on rgb310
 color.pri.none=
 color.pri.H=rgb450
 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/2015.json
-# http://holidata.net/be-BY/2013.json
+# http://holidata.net/be-BY/2016.json
 #
-# Copyright 2006-2012, Paul Beckingham, Federico Hernandez.
+# Copyright 2006 - 2016, 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=20150101
 holiday.be-BY2.name=Раство Хрыстова(праваслаўнае)
-holiday.be-BY2.date=20120107
+holiday.be-BY2.date=20150107
 holiday.be-BY3.name=Міжнародны жаночы дзень
-holiday.be-BY3.date=20120803
+holiday.be-BY3.date=20150803
 holiday.be-BY4.name=Пасха(праваслаўная)
-holiday.be-BY4.date=20120415
+holiday.be-BY4.date=20150420
 holiday.be-BY5.name=Радуніца
-holiday.be-BY5.date=20120424
+holiday.be-BY5.date=20150421
 holiday.be-BY6.name=Свята працы
-holiday.be-BY6.date=20120501
+holiday.be-BY6.date=20150501
 holiday.be-BY7.name=Дзень Перамогі
-holiday.be-BY7.date=20120509
+holiday.be-BY7.date=20150509
 holiday.be-BY8.name=Дзень незалежнаці
-holiday.be-BY8.date=20120703
+holiday.be-BY8.date=20150703
 holiday.be-BY9.name=Дзень Кастрычніцкай рэвалюцыі
-holiday.be-BY9.date=20121107
+holiday.be-BY9.date=20151107
 holiday.be-BY10.name=Раство Хрыстова(у заходніх хрысціян)
-holiday.be-BY10.date=20121225
+holiday.be-BY10.date=20151225
 holiday.be-BY11.name=Новы Год
-holiday.be-BY11.date=20130101
+holiday.be-BY11.date=20160101
 holiday.be-BY12.name=Раство Хрыстова(праваслаўнае)
-holiday.be-BY12.date=20130107
+holiday.be-BY12.date=20160107
 holiday.be-BY13.name=Міжнародны жаночы дзень
-holiday.be-BY13.date=20130803
+holiday.be-BY13.date=20160803
 holiday.be-BY14.name=Пасха(праваслаўная)
-holiday.be-BY14.date=20130505
+holiday.be-BY14.date=20160327
 holiday.be-BY15.name=Радуніца
-holiday.be-BY15.date=20130514
+holiday.be-BY15.date=20160510
 holiday.be-BY16.name=Свята працы
-holiday.be-BY16.date=20130501
+holiday.be-BY16.date=20160501
 holiday.be-BY17.name=Дзень Перамогі
-holiday.be-BY17.date=20130509
+holiday.be-BY17.date=20160509
 holiday.be-BY18.name=Дзень незалежнаці
-holiday.be-BY18.date=20130703
+holiday.be-BY18.date=20160703
 holiday.be-BY19.name=Дзень Кастрычніцкай рэвалюцыі
-holiday.be-BY19.date=20131107
+holiday.be-BY19.date=20161107
 holiday.be-BY20.name=Раство Хрыстова(у заходніх хрысціян)
-holiday.be-BY20.date=20131225
+holiday.be-BY20.date=20161225
--- 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/2015.json
-# http://holidata.net/cs-CZ/2013.json
+# http://holidata.net/cs-CZ/2016.json
 #
-# Copyright 2006-2012, Paul Beckingham, Federico Hernandez.
+# Copyright 2006 - 2016, 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=20150101
 holiday.cs-CZ2.name=Den obnovy samostatnosti českého státu
-holiday.cs-CZ2.date=20120101
+holiday.cs-CZ2.date=20150101
 holiday.cs-CZ3.name=Velikonoční pondělí
-holiday.cs-CZ3.date=20120409
+holiday.cs-CZ3.date=20150406
 holiday.cs-CZ4.name=Svátek práce
-holiday.cs-CZ4.date=20120501
+holiday.cs-CZ4.date=20150501
 holiday.cs-CZ5.name=Den vítězství
-holiday.cs-CZ5.date=20120508
+holiday.cs-CZ5.date=20150508
 holiday.cs-CZ6.name=Den slovanských věrozvěstů
-holiday.cs-CZ6.date=20120705
+holiday.cs-CZ6.date=20150705
 holiday.cs-CZ7.name=Den upálení mistra Jana Husa
-holiday.cs-CZ7.date=20120706
+holiday.cs-CZ7.date=20150706
 holiday.cs-CZ8.name=Den české státnosti
-holiday.cs-CZ8.date=20120928
+holiday.cs-CZ8.date=20150928
 holiday.cs-CZ9.name=Den vzniku samostatného československého státu
-holiday.cs-CZ9.date=20121028
+holiday.cs-CZ9.date=20151028
 holiday.cs-CZ10.name=Den boje za svobodu a demokracii
-holiday.cs-CZ10.date=20121117
+holiday.cs-CZ10.date=20151117
 holiday.cs-CZ11.name=Štědrý den
-holiday.cs-CZ11.date=20121224
+holiday.cs-CZ11.date=20151224
 holiday.cs-CZ12.name=1. svátek vánoční
-holiday.cs-CZ12.date=20121225
+holiday.cs-CZ12.date=20151225
 holiday.cs-CZ13.name=2. svátek vánoční
-holiday.cs-CZ13.date=20121226
+holiday.cs-CZ13.date=20151226
 holiday.cs-CZ14.name=Nový rok
-holiday.cs-CZ14.date=20130101
+holiday.cs-CZ14.date=20160101
 holiday.cs-CZ15.name=Den obnovy samostatnosti českého státu
-holiday.cs-CZ15.date=20130101
+holiday.cs-CZ15.date=20160101
 holiday.cs-CZ16.name=Velikonoční pondělí
-holiday.cs-CZ16.date=20130401
+holiday.cs-CZ16.date=20160328
 holiday.cs-CZ17.name=Svátek práce
-holiday.cs-CZ17.date=20130501
+holiday.cs-CZ17.date=20160501
 holiday.cs-CZ18.name=Den vítězství
-holiday.cs-CZ18.date=20130508
+holiday.cs-CZ18.date=20160508
 holiday.cs-CZ19.name=Den slovanských věrozvěstů
-holiday.cs-CZ19.date=20130705
+holiday.cs-CZ19.date=20160705
 holiday.cs-CZ20.name=Den upálení mistra Jana Husa
-holiday.cs-CZ20.date=20130706
+holiday.cs-CZ20.date=20160706
 holiday.cs-CZ21.name=Den české státnosti
-holiday.cs-CZ21.date=20130928
+holiday.cs-CZ21.date=20160928
 holiday.cs-CZ22.name=Den vzniku samostatného československého státu
-holiday.cs-CZ22.date=20131028
+holiday.cs-CZ22.date=20161028
 holiday.cs-CZ23.name=Den boje za svobodu a demokracii
-holiday.cs-CZ23.date=20131117
+holiday.cs-CZ23.date=20161117
 holiday.cs-CZ24.name=Štědrý den
-holiday.cs-CZ24.date=20131224
+holiday.cs-CZ24.date=20161224
 holiday.cs-CZ25.name=1. svátek vánoční
-holiday.cs-CZ25.date=20131225
+holiday.cs-CZ25.date=20161225
 holiday.cs-CZ26.name=2. svátek vánoční
-holiday.cs-CZ26.date=20131226
+holiday.cs-CZ26.date=20161226
--- 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/2015.json
-# http://holidata.net/da-DK/2013.json
+# http://holidata.net/da-DK/2016.json
 #
-# Copyright 2006-2012, Paul Beckingham, Federico Hernandez.
+# Copyright 2006 - 2016, 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,46 @@
 ###############################################################################
 holiday.da-DK1.name=Nytårsdag
-holiday.da-DK1.date=20120101
+holiday.da-DK1.date=20150101
-holiday.da-DK2.name=Palmesøndag
+holiday.da-DK2.name=Skærtorsdag
-holiday.da-DK2.date=20120401
+holiday.da-DK2.date=20150402
-holiday.da-DK3.name=Skærtorsdag
+holiday.da-DK3.name=Langfredag
-holiday.da-DK3.date=20120405
+holiday.da-DK3.date=20150403
-holiday.da-DK4.name=Langfredag
+holiday.da-DK4.name=Påskedag
-holiday.da-DK4.date=20120406
+holiday.da-DK4.date=20150405
-holiday.da-DK5.name=Påskedag
+holiday.da-DK5.name=Anden påskedag
-holiday.da-DK5.date=20120408
+holiday.da-DK5.date=20150406
-holiday.da-DK6.name=Anden påskedag
+holiday.da-DK6.name=Kristi himmelfartsdag
-holiday.da-DK6.date=20120409
+holiday.da-DK6.date=20150514
-holiday.da-DK7.name=Store bededag
+holiday.da-DK7.name=Pinsedag
-holiday.da-DK7.date=20120504
+holiday.da-DK7.date=20150524
-holiday.da-DK8.name=Kristi himmelfartsdag
+holiday.da-DK8.name=Anden pinsedag
-holiday.da-DK8.date=20120517
+holiday.da-DK8.date=20150525
-holiday.da-DK9.name=Pinsedag
+holiday.da-DK9.name=Grundlovsdag
-holiday.da-DK9.date=20120527
+holiday.da-DK9.date=20150605
-holiday.da-DK10.name=Anden pinsedag
+holiday.da-DK10.name=Juledag
-holiday.da-DK10.date=20120528
+holiday.da-DK10.date=20151225
-holiday.da-DK11.name=Juledag
+holiday.da-DK11.name=Anden juledag
-holiday.da-DK11.date=20121225
+holiday.da-DK11.date=20151226
-holiday.da-DK12.name=Anden juledag
+holiday.da-DK12.name=Nytårsdag
-holiday.da-DK12.date=20121226
+holiday.da-DK12.date=20160101
-holiday.da-DK13.name=Nytårsdag
+holiday.da-DK13.name=Skærtorsdag
-holiday.da-DK13.date=20130101
+holiday.da-DK13.date=20160324
-holiday.da-DK14.name=Palmesøndag
+holiday.da-DK14.name=Langfredag
-holiday.da-DK14.date=20130324
+holiday.da-DK14.date=20160325
-holiday.da-DK15.name=Skærtorsdag
+holiday.da-DK15.name=Påskedag
-holiday.da-DK15.date=20130328
+holiday.da-DK15.date=20160327
-holiday.da-DK16.name=Langfredag
+holiday.da-DK16.name=Anden påskedag
-holiday.da-DK16.date=20130329
+holiday.da-DK16.date=20160328
-holiday.da-DK17.name=Påskedag
+holiday.da-DK17.name=Kristi himmelfartsdag
-holiday.da-DK17.date=20130331
+holiday.da-DK17.date=20160505
-holiday.da-DK18.name=Anden påskedag
+holiday.da-DK18.name=Pinsedag
-holiday.da-DK18.date=20130401
+holiday.da-DK18.date=20160515
-holiday.da-DK19.name=Store bededag
+holiday.da-DK19.name=Anden pinsedag
-holiday.da-DK19.date=20130426
+holiday.da-DK19.date=20160516
-holiday.da-DK20.name=Kristi himmelfartsdag
+holiday.da-DK20.name=Grundlovsdag
-holiday.da-DK20.date=20130509
+holiday.da-DK20.date=20160605
-holiday.da-DK21.name=Pinsedag
+holiday.da-DK21.name=Juledag
-holiday.da-DK21.date=20130519
+holiday.da-DK21.date=20161225
-holiday.da-DK22.name=Anden pinsedag
+holiday.da-DK22.name=Anden juledag
-holiday.da-DK22.date=20130520
+holiday.da-DK22.date=20161226
 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/2015.json
-# http://holidata.net/de-AT/2013.json
+# http://holidata.net/de-AT/2016.json
 #
-# Copyright 2006-2012, Paul Beckingham, Federico Hernandez.
+# Copyright 2006 - 2016, 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,98 @@
 ###############################################################################
 holiday.de-AT1.name=Neujahr
-holiday.de-AT1.date=20120101
+holiday.de-AT1.date=20150101
 holiday.de-AT2.name=Heilige drei KÃ¶nige
-holiday.de-AT2.date=20120106
+holiday.de-AT2.date=20150106
 holiday.de-AT3.name=Josef (K, St, T, V)
-holiday.de-AT3.date=20120319
+holiday.de-AT3.date=20150319
 holiday.de-AT4.name=Karfreitag
-holiday.de-AT4.date=20120406
+holiday.de-AT4.date=20150403
 holiday.de-AT5.name=Ostersonntag
-holiday.de-AT5.date=20120408
+holiday.de-AT5.date=20150405
 holiday.de-AT6.name=Ostermontag
-holiday.de-AT6.date=20120409
+holiday.de-AT6.date=20150406
 holiday.de-AT7.name=Staatsfeiertag
-holiday.de-AT7.date=20120501
+holiday.de-AT7.date=20150501
 holiday.de-AT8.name=Florian (O)
-holiday.de-AT8.date=20120504
+holiday.de-AT8.date=20150504
 holiday.de-AT9.name=Christi Himmelfahrt
-holiday.de-AT9.date=20120517
+holiday.de-AT9.date=20150514
 holiday.de-AT10.name=Pfingstsonntag
-holiday.de-AT10.date=20120527
+holiday.de-AT10.date=20150524
 holiday.de-AT11.name=Pfingstmontag
-holiday.de-AT11.date=20120528
+holiday.de-AT11.date=20150525
 holiday.de-AT12.name=Fronleichnam
-holiday.de-AT12.date=20120607
+holiday.de-AT12.date=20150604
 holiday.de-AT13.name=Mariä Himmelfahrt
-holiday.de-AT13.date=20120815
+holiday.de-AT13.date=20150815
 holiday.de-AT14.name=Rupert (S)
-holiday.de-AT14.date=20120924
+holiday.de-AT14.date=20150924
 holiday.de-AT15.name=Tag der Volksabstimmung (K)
-holiday.de-AT15.date=20121010
+holiday.de-AT15.date=20151010
-holiday.de-AT16.name=Allerheiligen
+holiday.de-AT16.name=Nationalfeiertag
-holiday.de-AT16.date=20121101
+holiday.de-AT16.date=20151026
-holiday.de-AT17.name=Martin (B)
+holiday.de-AT17.name=Allerheiligen
-holiday.de-AT17.date=20121111
+holiday.de-AT17.date=20151101
-holiday.de-AT18.name=Leopold (W, N)
+holiday.de-AT18.name=Martin (B)
-holiday.de-AT18.date=20121115
+holiday.de-AT18.date=20151111
-holiday.de-AT19.name=Mariä Empfängnis
+holiday.de-AT19.name=Leopold (W, N)
-holiday.de-AT19.date=20121208
+holiday.de-AT19.date=20151115
-holiday.de-AT20.name=Heiliger Abend
+holiday.de-AT20.name=Mariä Empfängnis
-holiday.de-AT20.date=20121224
+holiday.de-AT20.date=20151208
-holiday.de-AT21.name=Christtag
+holiday.de-AT21.name=Heiliger Abend
-holiday.de-AT21.date=20121225
+holiday.de-AT21.date=20151224
-holiday.de-AT22.name=Stefanitag
+holiday.de-AT22.name=Christtag
-holiday.de-AT22.date=20121226
+holiday.de-AT22.date=20151225
-holiday.de-AT23.name=Silvester
+holiday.de-AT23.name=Stefanitag
-holiday.de-AT23.date=20121231
+holiday.de-AT23.date=20151226
-holiday.de-AT24.name=Neujahr
+holiday.de-AT24.name=Silvester
-holiday.de-AT24.date=20130101
+holiday.de-AT24.date=20151231
-holiday.de-AT25.name=Heilige drei KÃ¶nige
+holiday.de-AT25.name=Neujahr
-holiday.de-AT25.date=20130106
+holiday.de-AT25.date=20160101
-holiday.de-AT26.name=Josef (K, St, T, V)
+holiday.de-AT26.name=Heilige drei KÃ¶nige
-holiday.de-AT26.date=20130319
+holiday.de-AT26.date=20160106
-holiday.de-AT27.name=Karfreitag
+holiday.de-AT27.name=Josef (K, St, T, V)
-holiday.de-AT27.date=20130329
+holiday.de-AT27.date=20160319
-holiday.de-AT28.name=Ostersonntag
+holiday.de-AT28.name=Karfreitag
-holiday.de-AT28.date=20130331
+holiday.de-AT28.date=20160325
-holiday.de-AT29.name=Ostermontag
+holiday.de-AT29.name=Ostersonntag
-holiday.de-AT29.date=20130401
+holiday.de-AT29.date=20160327
-holiday.de-AT30.name=Staatsfeiertag
+holiday.de-AT30.name=Ostermontag
-holiday.de-AT30.date=20130501
+holiday.de-AT30.date=20160328
-holiday.de-AT31.name=Florian (O)
+holiday.de-AT31.name=Staatsfeiertag
-holiday.de-AT31.date=20130504
+holiday.de-AT31.date=20160501
-holiday.de-AT32.name=Christi Himmelfahrt
+holiday.de-AT32.name=Florian (O)
-holiday.de-AT32.date=20130509
+holiday.de-AT32.date=20160504
-holiday.de-AT33.name=Pfingstsonntag
+holiday.de-AT33.name=Christi Himmelfahrt
-holiday.de-AT33.date=20130519
+holiday.de-AT33.date=20160505
-holiday.de-AT34.name=Pfingstmontag
+holiday.de-AT34.name=Pfingstsonntag
-holiday.de-AT34.date=20130520
+holiday.de-AT34.date=20160515
-holiday.de-AT35.name=Fronleichnam
+holiday.de-AT35.name=Pfingstmontag
-holiday.de-AT35.date=20130530
+holiday.de-AT35.date=20160516
-holiday.de-AT36.name=Mariä Himmelfahrt
+holiday.de-AT36.name=Fronleichnam
-holiday.de-AT36.date=20130815
+holiday.de-AT36.date=20160526
-holiday.de-AT37.name=Rupert (S)
+holiday.de-AT37.name=Mariä Himmelfahrt
-holiday.de-AT37.date=20130924
+holiday.de-AT37.date=20160815
-holiday.de-AT38.name=Tag der Volksabstimmung (K)
+holiday.de-AT38.name=Rupert (S)
-holiday.de-AT38.date=20131010
+holiday.de-AT38.date=20160924
-holiday.de-AT39.name=Allerheiligen
+holiday.de-AT39.name=Tag der Volksabstimmung (K)
-holiday.de-AT39.date=20131101
+holiday.de-AT39.date=20161010
-holiday.de-AT40.name=Martin (B)
+holiday.de-AT40.name=Nationalfeiertag
-holiday.de-AT40.date=20131111
+holiday.de-AT40.date=20161026
-holiday.de-AT41.name=Leopold (W, N)
+holiday.de-AT41.name=Allerheiligen
-holiday.de-AT41.date=20131115
+holiday.de-AT41.date=20161101
-holiday.de-AT42.name=Mariä Empfängnis
+holiday.de-AT42.name=Martin (B)
-holiday.de-AT42.date=20131208
+holiday.de-AT42.date=20161111
-holiday.de-AT43.name=Heiliger Abend
+holiday.de-AT43.name=Leopold (W, N)
-holiday.de-AT43.date=20131224
+holiday.de-AT43.date=20161115
-holiday.de-AT44.name=Christtag
+holiday.de-AT44.name=Mariä Empfängnis
-holiday.de-AT44.date=20131225
+holiday.de-AT44.date=20161208
-holiday.de-AT45.name=Stefanitag
+holiday.de-AT45.name=Heiliger Abend
-holiday.de-AT45.date=20131226
+holiday.de-AT45.date=20161224
-holiday.de-AT46.name=Silvester
+holiday.de-AT46.name=Christtag
-holiday.de-AT46.date=20131231
+holiday.de-AT46.date=20161225
 holiday.de-AT47.name=Stefanitag
 holiday.de-AT47.date=20161226
 holiday.de-AT48.name=Silvester
 holiday.de-AT48.date=20161231
--- a/doc/rc/holidays.de-BE.rc
+++ b/doc/rc/holidays.de-BE.rc
@@ -0,0 +1,77 @@
 ###############################################################################
 # International Holiday Data provided by Holidata.net
 # http://holidata.net/de-BE/2015.json
 # http://holidata.net/de-BE/2016.json
 #
 # Copyright 2006 - 2016, 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
 # in the Software without restriction, including without limitation the rights
 # to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
 # copies of the Software, and to permit persons to whom the Software is
 # furnished to do so, subject to the following conditions:
 #
 # The above copyright notice and this permission notice shall be included
 # in all copies or substantial portions of the Software.
 #
 # THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
 # OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
 # FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
 # THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
 # LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
 # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 # SOFTWARE.
 #
 # http://www.opensource.org/licenses/mit-license.php
 #
 ###############################################################################
 holiday.de-BE1.name=Neujahr
 holiday.de-BE1.date=20150101
 holiday.de-BE2.name=Ostern
 holiday.de-BE2.date=20150405
 holiday.de-BE3.name=Ostermontag
 holiday.de-BE3.date=20150406
 holiday.de-BE4.name=Tag der Arbeit
 holiday.de-BE4.date=20150501
 holiday.de-BE5.name=Christi Himmelfahrt
 holiday.de-BE5.date=20150514
 holiday.de-BE6.name=Pfingsten
 holiday.de-BE6.date=20150524
 holiday.de-BE7.name=Pfingstmontag
 holiday.de-BE7.date=20150525
 holiday.de-BE8.name=Nationalfeiertag
 holiday.de-BE8.date=20150721
 holiday.de-BE9.name=Mariä Himmelfahrt
 holiday.de-BE9.date=20150815
 holiday.de-BE10.name=Allerheiligen
 holiday.de-BE10.date=20151101
 holiday.de-BE11.name=Waffenstillstand
 holiday.de-BE11.date=20151111
 holiday.de-BE12.name=Weihnacht
 holiday.de-BE12.date=20151225
 holiday.de-BE13.name=Neujahr
 holiday.de-BE13.date=20160101
 holiday.de-BE14.name=Ostern
 holiday.de-BE14.date=20160527
 holiday.de-BE15.name=Ostermontag
 holiday.de-BE15.date=20160528
 holiday.de-BE16.name=Tag der Arbeit
 holiday.de-BE16.date=20160501
 holiday.de-BE17.name=Christi Himmelfahrt
 holiday.de-BE17.date=20160505
 holiday.de-BE18.name=Pfingsten
 holiday.de-BE18.date=20160515
 holiday.de-BE19.name=Pfingstmontag
 holiday.de-BE19.date=20160516
 holiday.de-BE20.name=Nationalfeiertag
 holiday.de-BE20.date=20160721
 holiday.de-BE21.name=Mariä Himmelfahrt
 holiday.de-BE21.date=20160815
 holiday.de-BE22.name=Allerheiligen
 holiday.de-BE22.date=20161101
 holiday.de-BE23.name=Waffenstillstand
 holiday.de-BE23.date=20161111
 holiday.de-BE24.name=Weihnacht
 holiday.de-BE24.date=20161225
--- a/doc/rc/holidays.de-CH.rc
+++ b/doc/rc/holidays.de-CH.rc
@@ -0,0 +1,101 @@
 ###############################################################################
 # International Holiday Data provided by Holidata.net
 # http://holidata.net/de-CH/2015.json
 # http://holidata.net/de-CH/2016.json
 #
 # Copyright 2006 - 2016, 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
 # in the Software without restriction, including without limitation the rights
 # to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
 # copies of the Software, and to permit persons to whom the Software is
 # furnished to do so, subject to the following conditions:
 #
 # The above copyright notice and this permission notice shall be included
 # in all copies or substantial portions of the Software.
 #
 # THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
 # OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
 # FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
 # THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
 # LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
 # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 # SOFTWARE.
 #
 # http://www.opensource.org/licenses/mit-license.php
 #
 ###############################################################################
 holiday.de-CH1.name=Neujahrstag
 holiday.de-CH1.date=20150101
 holiday.de-CH2.name=Berchtoldstag
 holiday.de-CH2.date=20150102
 holiday.de-CH3.name=Heilige Drei Könige
 holiday.de-CH3.date=20150106
 holiday.de-CH4.name=Josefstag
 holiday.de-CH4.date=20150319
 holiday.de-CH5.name=Karfreitag
 holiday.de-CH5.date=20150403
 holiday.de-CH6.name=Ostersonntag
 holiday.de-CH6.date=20150405
 holiday.de-CH7.name=Ostermontag
 holiday.de-CH7.date=20150406
 holiday.de-CH8.name=Tag der Arbeit
 holiday.de-CH8.date=20150501
 holiday.de-CH9.name=Auffahrt
 holiday.de-CH9.date=20150514
 holiday.de-CH10.name=Pfingstsonntag
 holiday.de-CH10.date=20150524
 holiday.de-CH11.name=Pfingstmontag
 holiday.de-CH11.date=20150525
 holiday.de-CH12.name=Fronleichnam
 holiday.de-CH12.date=20150604
 holiday.de-CH13.name=Bundesfeier
 holiday.de-CH13.date=20150801
 holiday.de-CH14.name=Mariä Himmelfahrt
 holiday.de-CH14.date=20150815
 holiday.de-CH15.name=Allerheiligen
 holiday.de-CH15.date=20151101
 holiday.de-CH16.name=Mariä Empfängnis
 holiday.de-CH16.date=20151208
 holiday.de-CH17.name=Weihnachtstag
 holiday.de-CH17.date=20151225
 holiday.de-CH18.name=Stephanstag
 holiday.de-CH18.date=20151226
 holiday.de-CH19.name=Neujahrstag
 holiday.de-CH19.date=20160101
 holiday.de-CH20.name=Berchtoldstag
 holiday.de-CH20.date=20160102
 holiday.de-CH21.name=Heilige Drei Könige
 holiday.de-CH21.date=20160106
 holiday.de-CH22.name=Josefstag
 holiday.de-CH22.date=20160319
 holiday.de-CH23.name=Karfreitag
 holiday.de-CH23.date=20160325
 holiday.de-CH24.name=Ostersonntag
 holiday.de-CH24.date=20160327
 holiday.de-CH25.name=Ostermontag
 holiday.de-CH25.date=20160328
 holiday.de-CH26.name=Tag der Arbeit
 holiday.de-CH26.date=20160501
 holiday.de-CH27.name=Auffahrt
 holiday.de-CH27.date=20160505
 holiday.de-CH28.name=Pfingstsonntag
 holiday.de-CH28.date=20160515
 holiday.de-CH29.name=Pfingstmontag
 holiday.de-CH29.date=20160516
 holiday.de-CH30.name=Fronleichnam
 holiday.de-CH30.date=20160526
 holiday.de-CH31.name=Bundesfeier
 holiday.de-CH31.date=20160801
 holiday.de-CH32.name=Mariä Himmelfahrt
 holiday.de-CH32.date=20160815
 holiday.de-CH33.name=Allerheiligen
 holiday.de-CH33.date=20161101
 holiday.de-CH34.name=Mariä Empfängnis
 holiday.de-CH34.date=20161208
 holiday.de-CH35.name=Weihnachtstag
 holiday.de-CH35.date=20161225
 holiday.de-CH36.name=Stephanstag
 holiday.de-CH36.date=20161226
--- 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/2015.json
-# http://holidata.net/de-DE/2013.json
+# http://holidata.net/de-DE/2016.json
 #
-# Copyright 2006-2012, Paul Beckingham, Federico Hernandez.
+# Copyright 2006 - 2016, 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=20150101
 holiday.de-DE2.name=Heilige drei Könige
-holiday.de-DE2.date=20120106
+holiday.de-DE2.date=20150106
-holiday.de-DE3.name=Heilige drei Könige
+holiday.de-DE3.name=Karfreitag
-holiday.de-DE3.date=20120106
+holiday.de-DE3.date=20150403
-holiday.de-DE4.name=Heilige drei Könige
+holiday.de-DE4.name=Ostern
-holiday.de-DE4.date=20120106
+holiday.de-DE4.date=20150405
-holiday.de-DE5.name=Karfreitag
+holiday.de-DE5.name=Ostermontag
-holiday.de-DE5.date=20120406
+holiday.de-DE5.date=20150406
-holiday.de-DE6.name=Ostern
+holiday.de-DE6.name=Erster Maifeiertag
-holiday.de-DE6.date=20120408
+holiday.de-DE6.date=20150501
-holiday.de-DE7.name=Ostermontag
+holiday.de-DE7.name=Christi Himmelfahrt
-holiday.de-DE7.date=20120409
+holiday.de-DE7.date=20150514
-holiday.de-DE8.name=Erster Maifeiertag
+holiday.de-DE8.name=Pfingstsonntag
-holiday.de-DE8.date=20120501
+holiday.de-DE8.date=20150524
-holiday.de-DE9.name=Christi Himmelfahrt
+holiday.de-DE9.name=Pfingstmontag
-holiday.de-DE9.date=20120517
+holiday.de-DE9.date=20150525
-holiday.de-DE10.name=Pfingstsonntag
+holiday.de-DE10.name=Fronleichnam
-holiday.de-DE10.date=20120527
+holiday.de-DE10.date=20150604
-holiday.de-DE11.name=Pfingstmontag
+holiday.de-DE11.name=Mariä Himmelfahrt
-holiday.de-DE11.date=20120528
+holiday.de-DE11.date=20150815
-holiday.de-DE12.name=Fronleichnam
+holiday.de-DE12.name=Tag der Deutschen Einheit
-holiday.de-DE12.date=20120607
+holiday.de-DE12.date=20151003
-holiday.de-DE13.name=Fronleichnam
+holiday.de-DE13.name=Reformationstag
-holiday.de-DE13.date=20120607
+holiday.de-DE13.date=20151031
-holiday.de-DE14.name=Fronleichnam
+holiday.de-DE14.name=Allerheiligen
-holiday.de-DE14.date=20120607
+holiday.de-DE14.date=20151101
-holiday.de-DE15.name=Fronleichnam
+holiday.de-DE15.name=Buß- und Bettag
-holiday.de-DE15.date=20120607
+holiday.de-DE15.date=20151118
-holiday.de-DE16.name=Fronleichnam
+holiday.de-DE16.name=Heilig Abend
-holiday.de-DE16.date=20120607
+holiday.de-DE16.date=20151224
-holiday.de-DE17.name=Fronleichnam
+holiday.de-DE17.name=Weihnachtstag
-holiday.de-DE17.date=20120607
+holiday.de-DE17.date=20151225
-holiday.de-DE18.name=Mariä Himmelfahrt
+holiday.de-DE18.name=Zweiter Weihnachtstag
-holiday.de-DE18.date=20120815
+holiday.de-DE18.date=20151226
-holiday.de-DE19.name=Tag der Deutschen Einheit
+holiday.de-DE19.name=Silvester
-holiday.de-DE19.date=20121003
+holiday.de-DE19.date=20151231
-holiday.de-DE20.name=Reformationstag
+holiday.de-DE20.name=Neujahr
-holiday.de-DE20.date=20121031
+holiday.de-DE20.date=20160101
-holiday.de-DE21.name=Reformationstag
+holiday.de-DE21.name=Heilige drei Könige
-holiday.de-DE21.date=20121031
+holiday.de-DE21.date=20160106
-holiday.de-DE22.name=Reformationstag
+holiday.de-DE22.name=Karfreitag
-holiday.de-DE22.date=20121031
+holiday.de-DE22.date=20160325
-holiday.de-DE23.name=Reformationstag
+holiday.de-DE23.name=Ostern
-holiday.de-DE23.date=20121031
+holiday.de-DE23.date=20160327
-holiday.de-DE24.name=Reformationstag
+holiday.de-DE24.name=Ostermontag
-holiday.de-DE24.date=20121031
+holiday.de-DE24.date=20160328
-holiday.de-DE25.name=Allerheiligen
+holiday.de-DE25.name=Erster Maifeiertag
-holiday.de-DE25.date=20121101
+holiday.de-DE25.date=20160501
-holiday.de-DE26.name=Allerheiligen
+holiday.de-DE26.name=Christi Himmelfahrt
-holiday.de-DE26.date=20121101
+holiday.de-DE26.date=20160505
-holiday.de-DE27.name=Allerheiligen
+holiday.de-DE27.name=Pfingstsonntag
-holiday.de-DE27.date=20121101
+holiday.de-DE27.date=20160515
-holiday.de-DE28.name=Allerheiligen
+holiday.de-DE28.name=Pfingstmontag
-holiday.de-DE28.date=20121101
+holiday.de-DE28.date=20160516
-holiday.de-DE29.name=Allerheiligen
+holiday.de-DE29.name=Fronleichnam
-holiday.de-DE29.date=20121101
+holiday.de-DE29.date=20160526
-holiday.de-DE30.name=Buss und Bettag
+holiday.de-DE30.name=Mariä Himmelfahrt
-holiday.de-DE30.date=20121121
+holiday.de-DE30.date=20160815
-holiday.de-DE31.name=Heilig Abend
+holiday.de-DE31.name=Tag der Deutschen Einheit
-holiday.de-DE31.date=20121224
+holiday.de-DE31.date=20161003
-holiday.de-DE32.name=Weihnachtstag
+holiday.de-DE32.name=Reformationstag
-holiday.de-DE32.date=20121225
+holiday.de-DE32.date=20161031
-holiday.de-DE33.name=Zweiter Weihnachtstag
+holiday.de-DE33.name=Allerheiligen
-holiday.de-DE33.date=20121226
+holiday.de-DE33.date=20161101
-holiday.de-DE34.name=Sylvester
+holiday.de-DE34.name=Buß- und Bettag
-holiday.de-DE34.date=20121231
+holiday.de-DE34.date=20161116
-holiday.de-DE35.name=Neujahr
+holiday.de-DE35.name=Heilig Abend
-holiday.de-DE35.date=20130101
+holiday.de-DE35.date=20161224
-holiday.de-DE36.name=Heilige drei Könige
+holiday.de-DE36.name=Weihnachtstag
-holiday.de-DE36.date=20130106
+holiday.de-DE36.date=20161225
-holiday.de-DE37.name=Heilige drei Könige
+holiday.de-DE37.name=Zweiter Weihnachtstag
-holiday.de-DE37.date=20130106
+holiday.de-DE37.date=20161226
-holiday.de-DE38.name=Heilige drei Könige
+holiday.de-DE38.name=Silvester
-holiday.de-DE38.date=20130106
+holiday.de-DE38.date=20161231
 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.el-GR.rc
+++ b/doc/rc/holidays.el-GR.rc
@@ -0,0 +1,85 @@
 ###############################################################################
 # International Holiday Data provided by Holidata.net
 # http://holidata.net/el-GR/2015.json
 # http://holidata.net/el-GR/2016.json
 #
 # Copyright 2006 - 2016, 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
 # in the Software without restriction, including without limitation the rights
 # to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
 # copies of the Software, and to permit persons to whom the Software is
 # furnished to do so, subject to the following conditions:
 #
 # The above copyright notice and this permission notice shall be included
 # in all copies or substantial portions of the Software.
 #
 # THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
 # OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
 # FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
 # THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
 # LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
 # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 # SOFTWARE.
 #
 # http://www.opensource.org/licenses/mit-license.php
 #
 ###############################################################################
 holiday.el-GR1.name=Πρωτοχρονιά
 holiday.el-GR1.date=20150101
 holiday.el-GR2.name=Θεοφάνεια
 holiday.el-GR2.date=20150106
 holiday.el-GR3.name=Καθαρά Δευτέρα
 holiday.el-GR3.date=20150223
 holiday.el-GR4.name=Ευαγγελισμός της Θεοτόκου και Εθνική Ημέρα Ανεξαρτησίας της Ελλάδας
 holiday.el-GR4.date=20150325
 holiday.el-GR5.name=Πρωτομαγιά
 holiday.el-GR5.date=20150418
 holiday.el-GR6.name=Μεγάλη Παρασκευή
 holiday.el-GR6.date=20150410
 holiday.el-GR7.name=Μεγάλο Σάββατο
 holiday.el-GR7.date=20150411
 holiday.el-GR8.name=Πάσχα
 holiday.el-GR8.date=20150412
 holiday.el-GR9.name=Δευτέρα του Πάσχα
 holiday.el-GR9.date=20150413
 holiday.el-GR10.name=Δευτέρα του Αγίου Πνεύματος
 holiday.el-GR10.date=20150601
 holiday.el-GR11.name=Κοίμηση της Θεοτόκου
 holiday.el-GR11.date=20150815
 holiday.el-GR12.name=Ημέρα του ΌΧΙ
 holiday.el-GR12.date=20151028
 holiday.el-GR13.name=Χριστούγεννα
 holiday.el-GR13.date=20151225
 holiday.el-GR14.name=Επόμενη ημέρα Χριστουγέννων
 holiday.el-GR14.date=20151226
 holiday.el-GR15.name=Πρωτοχρονιά
 holiday.el-GR15.date=20160101
 holiday.el-GR16.name=Θεοφάνεια
 holiday.el-GR16.date=20160106
 holiday.el-GR17.name=Καθαρά Δευτέρα
 holiday.el-GR17.date=20160314
 holiday.el-GR18.name=Ευαγγελισμός της Θεοτόκου και Εθνική Ημέρα Ανεξαρτησίας της Ελλάδας
 holiday.el-GR18.date=20160325
 holiday.el-GR19.name=Πρωτομαγιά
 holiday.el-GR19.date=20160418
 holiday.el-GR20.name=Μεγάλη Παρασκευή
 holiday.el-GR20.date=20160429
 holiday.el-GR21.name=Μεγάλο Σάββατο
 holiday.el-GR21.date=20160430
 holiday.el-GR22.name=Πάσχα
 holiday.el-GR22.date=20160501
 holiday.el-GR23.name=Δευτέρα του Πάσχα
 holiday.el-GR23.date=20160502
 holiday.el-GR24.name=Δευτέρα του Αγίου Πνεύματος
 holiday.el-GR24.date=20160620
 holiday.el-GR25.name=Κοίμηση της Θεοτόκου
 holiday.el-GR25.date=20160815
 holiday.el-GR26.name=Ημέρα του ΌΧΙ
 holiday.el-GR26.date=20161028
 holiday.el-GR27.name=Χριστούγεννα
 holiday.el-GR27.date=20161225
 holiday.el-GR28.name=Επόμενη ημέρα Χριστουγέννων
 holiday.el-GR28.date=20161226
--- a/doc/rc/holidays.en-AU.rc
+++ b/doc/rc/holidays.en-AU.rc
@@ -0,0 +1,119 @@
 ###############################################################################
 # International Holiday Data provided by Holidata.net
 # http://holidata.net/en-AU/2015.json
 # http://holidata.net/en-AU/2016.json
 #
 # Copyright 2006 - 2016, 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
 # in the Software without restriction, including without limitation the rights
 # to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
 # copies of the Software, and to permit persons to whom the Software is
 # furnished to do so, subject to the following conditions:
 #
 # The above copyright notice and this permission notice shall be included
 # in all copies or substantial portions of the Software.
 #
 # THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
 # OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
 # FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
 # THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
 # LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
 # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 # SOFTWARE.
 #
 # http://www.opensource.org/licenses/mit-license.php
 #
 ###############################################################################
 holiday.en-AU1.name=New Year's Day
 holiday.en-AU1.date=20150101
 holiday.en-AU2.name=Australia Day
 holiday.en-AU2.date=20150126
 holiday.en-AU3.name=Royal Hobart Regatta
 holiday.en-AU3.date=20150209
 holiday.en-AU4.name=Labour Day
 holiday.en-AU4.date=20150302
 holiday.en-AU5.name=Labour Day
 holiday.en-AU5.date=20150309
 holiday.en-AU6.name=Canberra Day
 holiday.en-AU6.date=20150309
 holiday.en-AU7.name=Eight Hours Day
 holiday.en-AU7.date=20150309
 holiday.en-AU8.name=Good Friday
 holiday.en-AU8.date=20150403
 holiday.en-AU9.name=Easter Saturday
 holiday.en-AU9.date=20150404
 holiday.en-AU10.name=Easter Sunday
 holiday.en-AU10.date=20150405
 holiday.en-AU11.name=Easter Monday
 holiday.en-AU11.date=20150406
 holiday.en-AU12.name=Anzac Day
 holiday.en-AU12.date=20150425
 holiday.en-AU13.name=May Day
 holiday.en-AU13.date=20150504
 holiday.en-AU14.name=Foundation Day
 holiday.en-AU14.date=20150601
 holiday.en-AU15.name=Queen's Birthday
 holiday.en-AU15.date=20150608
 holiday.en-AU16.name=Picnic Day
 holiday.en-AU16.date=20150803
 holiday.en-AU17.name=Bank Holiday
 holiday.en-AU17.date=20150803
 holiday.en-AU18.name=Queen's Birthday
 holiday.en-AU18.date=20150928
 holiday.en-AU19.name=Labour Day
 holiday.en-AU19.date=20151005
 holiday.en-AU20.name=Recreation Day
 holiday.en-AU20.date=20151102
 holiday.en-AU21.name=Christmas Day
 holiday.en-AU21.date=20151225
 holiday.en-AU22.name=Boxing Day
 holiday.en-AU22.date=20151226
 holiday.en-AU23.name=Proclamation Day
 holiday.en-AU23.date=20151226
 holiday.en-AU24.name=New Year's Day
 holiday.en-AU24.date=20160101
 holiday.en-AU25.name=Australia Day
 holiday.en-AU25.date=20160126
 holiday.en-AU26.name=Royal Hobart Regatta
 holiday.en-AU26.date=20160208
 holiday.en-AU27.name=Labour Day
 holiday.en-AU27.date=20160307
 holiday.en-AU28.name=Labour Day
 holiday.en-AU28.date=20160314
 holiday.en-AU29.name=Canberra Day
 holiday.en-AU29.date=20160314
 holiday.en-AU30.name=Eight Hours Day
 holiday.en-AU30.date=20160314
 holiday.en-AU31.name=Good Friday
 holiday.en-AU31.date=20160325
 holiday.en-AU32.name=Easter Saturday
 holiday.en-AU32.date=20160326
 holiday.en-AU33.name=Easter Monday
 holiday.en-AU33.date=20160327
 holiday.en-AU34.name=Anzac Day
 holiday.en-AU34.date=20160425
 holiday.en-AU35.name=May Day
 holiday.en-AU35.date=20160502
 holiday.en-AU36.name=Foundation Day
 holiday.en-AU36.date=20160603
 holiday.en-AU37.name=Queen's Birthday
 holiday.en-AU37.date=20160613
 holiday.en-AU38.name=Picnic Day
 holiday.en-AU38.date=20160801
 holiday.en-AU39.name=Bank Holiday
 holiday.en-AU39.date=20160801
 holiday.en-AU40.name=Queen's Birthday
 holiday.en-AU40.date=20160926
 holiday.en-AU41.name=Labour Day
 holiday.en-AU41.date=20161003
 holiday.en-AU42.name=Recreation Day
 holiday.en-AU42.date=20161107
 holiday.en-AU43.name=Christmas Day
 holiday.en-AU43.date=20161225
 holiday.en-AU44.name=Boxing Day
 holiday.en-AU44.date=20161226
 holiday.en-AU45.name=Proclamation Day
 holiday.en-AU45.date=20161226
--- a/Show More
+++ b/Show More