Version number and release date for 2.3.0

Minor documentation updates
taskshell
2014-01-15 23:41:22 +01:00 · 2014-01-15 23:28:07 +01:00 · 2014-01-15 16:20:33 -05:00 · 2014-01-12 16:34:28 -05:00 · 2014-01-12 16:31:07 -05:00 · 2014-01-12 16:30:22 -05:00
631 changed files with 24871 additions and 9826 deletions
--- a/.gitignore
+++ b/.gitignore
@@ -2,10 +2,12 @@ cmake.h
 auto.h
 commit.h
 Makefile
-*/*task
-*/*libtask.a
-*/*/libcommands.a
-*/*/libcolumns.a
+src/task
+src/libtask.a
+src/commands/libcommands.a
+src/columns/libcolumns.a
+src/shell/libtasksh.a
+src/shell/tasksh
 *~
 .*.swp
 package-config/osx/binary/task
@@ -16,3 +18,5 @@ install_manifest.txt
 _CPack_Packages
 CPackConfig.cmake
 CPackSourceConfig.cmake
+patches
+*.exe
--- a/45
+++ b/45
@@ -2,15 +2,16 @@ The development of taskwarrior was made possible by the significant
 contributions of the following people:

  Paul Beckingham    (Principal Author)
-  Federico Hernandez (Package Maintainer & Contributing Author)
+  Federico Hernandez (Principal Author)
  David J Patrick    (Designer)
  John Florian       (Contributing Author)
  Cory Donnelly      (Contributing Author)
  Johannes Schlatow  (Contributing Author)
-  Dirk Deimeke       (Technical Advisor & Marketing)
+  Dirk Deimeke       (Technical Advisor & Evangelist)
  Wim Schuermann     (Contributing Author)
  Owen Clarke        (Contributing Author)
  Louis-Claude Canon (Contributing Author)
+  Scott Kostyshak    (Contributing Author)

 The following submitted code, packages or analysis, and deserve special thanks:

@@ -74,7 +75,25 @@ 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
+  Tullio Facchinetti
+  Thomas Sullivan
+  Martin Natano
+  kili
+  jasper
+  Aaron Bieber
+  John West
+  Jeroen Budts
+  Zed Jorarard

 Thanks to the following, who submitted detailed bug reports and excellent
 suggestions:
@@ -153,4 +172,22 @@ 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 H
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -7,17 +7,14 @@ include (CheckStructHasMember)
 set (HAVE_CMAKE true)

 project (task)
-set (PROJECT_VERSION "2.1.1")
-
-SET (TASK_MAN1DIR share/man/man1 CACHE STRING "Installation directory for man pages, section 1")
-SET (TASK_MAN5DIR share/man/man5 CACHE STRING "Installation directory for man pages, section 5")
-SET (TASK_DOCDIR  share/doc/task CACHE STRING "Installation directory for doc files")
-SET (TASK_BINDIR  bin            CACHE STRING "Installation directory for the binary")
+set (PROJECT_VERSION "2.3.0")

 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 +23,23 @@ elseif (${CMAKE_SYSTEM_NAME} MATCHES "NetBSD")
  set (NETBSD true)
 elseif (${CMAKE_SYSTEM_NAME} MATCHES "SunOS")
  set (SOLARIS true)
+elseif (${CMAKE_SYSTEM_NAME} STREQUAL "GNU")
+  set (GNUHURD true)
 else (${CMAKE_SYSTEM_NAME} MATCHES "Linux")
  set (UNKNOWN true)
 endif (${CMAKE_SYSTEM_NAME} MATCHES "Linux")

+if (FREEBSD)
+SET (TASK_MAN1DIR man/man1 CACHE STRING "Installation directory for man pages, section 1")
+SET (TASK_MAN5DIR man/man5 CACHE STRING "Installation directory for man pages, section 5")
+else (FREEBSD)
+SET (TASK_MAN1DIR share/man/man1 CACHE STRING "Installation directory for man pages, section 1")
+SET (TASK_MAN5DIR share/man/man5 CACHE STRING "Installation directory for man pages, section 5")
+endif (FREEBSD)
+SET (TASK_DOCDIR  share/doc/task CACHE STRING "Installation directory for doc files")
+SET (TASK_RCDIR "${TASK_DOCDIR}/rc" CACHE STRING "Installation directory for configuration files")
+SET (TASK_BINDIR  bin            CACHE STRING "Installation directory for the binary")
+
 message ("-- Looking for SHA1 references")
 if (EXISTS ${CMAKE_SOURCE_DIR}/.git/index)
  set (HAVE_COMMIT true)
@@ -49,14 +59,13 @@ set (PACKAGE_TARNAME "${PACKAGE}")
 set (PACKAGE_VERSION "${VERSION}")
 set (PACKAGE_STRING "${PACKAGE} ${VERSION}")

-message ("-- Looking for Lua51")
-find_package (Lua51)
-if (LUA51_FOUND)
-  message ("-- Found Lua51: ${LUA_LIBRARIES}")
-  set (HAVE_LIBLUA true)
-  set (TASK_INCLUDE_DIRS ${TASK_INCLUDE_DIRS} ${LUA_INCLUDE_DIR})
-  set (TASK_LIBRARIES    ${TASK_LIBRARIES}    ${LUA_LIBRARIES})
-endif (LUA51_FOUND)
+message ("-- Looking for GnuTLS")
+find_package (GnuTLS)
+if (GNUTLS_FOUND)
+  set (HAVE_LIBGNUTLS true)
+  set (TASK_INCLUDE_DIRS ${TASK_INCLUDE_DIRS} ${GNUTLS_INCLUDE_DIR})
+  set (TASK_LIBRARIES    ${TASK_LIBRARIES}    ${GNUTLS_LIBRARIES})
+endif (GNUTLS_FOUND)

 #message ("-- Looking for pthread")
 #find_path (PTHREAD_INCLUDE_DIR pthread.h)
@@ -68,38 +77,62 @@ endif (LUA51_FOUND)
 #  set (TASK_LIBRARIES    ${TASK_LIBRARIES}    ${PTHREAD_LIBRARIES})
 #endif (PTHREAD_INCLUDE_DIR AND PTHREAD_LIBRARY)

-check_function_exists (random  HAVE_RANDOM)
-check_function_exists (srandom HAVE_SRANDOM)
+# include the readline library finder module
+set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} "${CMAKE_SOURCE_DIR}/cmake/Modules")
+
+# find readline
+message ("-- Looking for GNU Readline")
+find_package (Readline)
+if (READLINE_FOUND)
+  set (HAVE_READLINE true)
+  set (TASK_INCLUDE_DIRS ${TASK_INCLUDE_DIRS} ${READLINE_INCLUDE_DIR})
+  set (TASK_LIBRARIES    ${TASK_LIBRARIES}    ${READLINE_LIBRARIES})
+endif (READLINE_FOUND)
+
 check_function_exists (timegm  HAVE_TIMEGM)
+check_function_exists (get_current_dir_name HAVE_GET_CURRENT_DIR_NAME)
+check_function_exists (wordexp HAVE_WORDEXP)

 check_struct_has_member ("struct tm" tm_gmtoff time.h HAVE_TM_GMTOFF)
+check_struct_has_member ("struct stat" st_birthtime "sys/types.h;sys/stat.h" HAVE_ST_BIRTHTIME)

 message ("-- Looking for libuuid")
-if (DARWIN)
-  # Apple includes the uuid functions in their libc, rather than libuuid
-  set (HAVE_UUID true)
+if (DARWIN OR FREEBSD)
+  # Apple and FreeBSD include the uuid functions in their libc, rather than libuuid
  check_function_exists (uuid_unparse_lower HAVE_UUID_UNPARSE_LOWER)
-else (DARWIN)
+else (DARWIN OR FREEBSD)
  find_path    (UUID_INCLUDE_DIR   uuid/uuid.h)
  find_library (UUID_LIBRARY NAMES uuid)
  if (UUID_INCLUDE_DIR AND UUID_LIBRARY)
-    set (HAVE_UUID true)
    set (TASK_INCLUDE_DIRS ${TASK_INCLUDE_DIRS} ${UUID_INCLUDE_DIR})
    set (TASK_LIBRARIES    ${TASK_LIBRARIES}    ${UUID_LIBRARY})
    # Look for uuid_unparse_lower
    set (CMAKE_REQUIRED_INCLUDES  ${CMAKE_REQUIRED_INCLUDES}  ${UUID_INCLUDE_DIR})
    set (CMAKE_REQUIRED_LIBRARIES ${CMAKE_REQUIRED_LIBRARIES} ${UUID_LIBRARY})
    check_function_exists (uuid_unparse_lower HAVE_UUID_UNPARSE_LOWER)
+  else (UUID_INCLUDE_DIR AND UUID_LIBRARY)
+    message (FATAL_ERROR "-- libuuid not found.")
  endif (UUID_INCLUDE_DIR AND UUID_LIBRARY)
-endif (DARWIN)
+endif (DARWIN OR FREEBSD)

-if (HAVE_UUID AND HAVE_UUID_UNPARSE_LOWER)
+if (HAVE_UUID_UNPARSE_LOWER)
  message ("-- Found libuuid")
-elseif (HAVE_UUID AND NOT HAVE_UUID_UNPARSE_LOWER)
+else (HAVE_UUID_UNPARSE_LOWER)
  message ("-- Found libuuid, using internal uuid_unparse_lower")
-else (HAVE_UUID AND HAVE_UUID_UNPARSE_LOWER)
-  message ("-- libuuid not found, using internal uuid")
-endif (HAVE_UUID AND HAVE_UUID_UNPARSE_LOWER)
+endif (HAVE_UUID_UNPARSE_LOWER)
+
+# Set the package language.
+if (LANGUAGE)
+  set (PACKAGE_LANGUAGE ${LANGUAGE})
+else (LANGUAGE)
+  set (PACKAGE_LANGUAGE 1)
+endif (LANGUAGE)
+
+set (LANGUAGE_EN_US 1)
+set (LANGUAGE_ES_ES 2)
+set (LANGUAGE_DE_DE 3)
+set (LANGUAGE_FR_FR 4)
+set (LANGUAGE_IT_IT 5)

 message ("-- Configuring cmake.h")
 configure_file (
@@ -109,12 +142,16 @@ configure_file (
 add_subdirectory (src)
 add_subdirectory (src/commands)
 add_subdirectory (src/columns)
+add_subdirectory (src/shell)
 add_subdirectory (doc)
 add_subdirectory (i18n)
 add_subdirectory (scripts)
-if (EXISTS test)
+if (EXISTS ${CMAKE_SOURCE_DIR}/test)
  add_subdirectory (test EXCLUDE_FROM_ALL)
-endif (EXISTS test)
+endif (EXISTS ${CMAKE_SOURCE_DIR}/test)
+if (EXISTS performance)
+  add_subdirectory (performance EXCLUDE_FROM_ALL)
+endif (EXISTS performance)

 set (doc_FILES NEWS ChangeLog README INSTALL AUTHORS COPYING)
 foreach (doc_FILE ${doc_FILES})
@@ -126,8 +163,9 @@ endforeach (doc_FILE)
 set (CPACK_SOURCE_GENERATOR "TGZ")
 set (CPACK_SOURCE_PACKAGE_FILE_NAME ${PACKAGE_NAME}-${PACKAGE_VERSION})
 set (CPACK_SOURCE_IGNORE_FILES  "CMakeCache" "CMakeFiles" "CPackConfig" "CPackSourceConfig"
-                                "_CPack_Packages" "cmake_install" "install_manifest"
-                                "Makefile$" "test" "package-config" "misc/*"
-                                "src/task$" "src/libtask.a" "auto.h$"
+                                "_CPack_Packages" "cmake_install" "install_manifest" "Makefile$"
+                                "test" "package-config" "misc/*" "src/task$" "src/libtask.a"
+                                "src/columns/libcolumns.a" "src/commands/libcommands.a"
+                                "src/shell/tasksh$" "src/shell/libtasksh.a" "auto.h$"
                                "/\\.gitignore" "/\\.git/" "swp$")
 include (CPack)
--- a/2
+++ b/2
@@ -1,6 +1,6 @@
 taskwarrior - a command line task list manager.

-Copyright 2006-2012, Paul Beckingham, Federico Hernandez.
+Copyright 2006-2014, Paul Beckingham, Federico Hernandez.

 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal
--- a/267
+++ b/267
@@ -1,14 +1,269 @@
 ------ current release ---------------------------

-2.1.1 (2012-07-24)
+2.3.0 (2014-01-15)
+
+Features
+ + #328 Replaced the 'shell' command with a standalone 'tasksh' binary, which
+   includes GNU readline support (thanks to Haitham Gad).
+ + #934 support for 'reserved.lines' to accommodate multi-line
+   shell prompts when used in conjunction with 'limit:page' (thanks to Robert
+   Gill).
+ + #1226 A new French translation has begun, and will continue to be a work in
+   progress for a while (thanks to YBSA R).
+ + #1227 A new 'verify_l10n' utility ensures the localizations are in sync
+   (thanks to Wim Schuermann).
+ + #1250 Support out-of-tree test runs (thanks to Jakub Wilk).
+ + #1256 Supports default values for UDA fields (thanks to Thomas Sullivan).
+ + #1297 The task₋sync(5) man pages is rewritten with examples.
+ + #1339 The configuration file now supports JSON encoding of Unicode
+   characters, by specifying \uNNNN.
+ + #1385 Need a way to configure the trust of self-signed certificates.
+ + #1423 sync vs. push, pull, merge collision avoidance.
+ + #1473 Make TASK_RCDIR customizable (thanks to Jakub Wilk).
+ + Stores un-synched transactions in <data.location>/backlog.data.
+ + Adds a new 'synchronize' command to sync data with a Taskserver.
+ + Adds a new 'initialize' synchronize command argument that uploads all pending
+   tasks for first-time initialization.
+ + Adds a new 'sync' verbosity token, which will remind when a backlog builds
+   up and needs a sync.
+ + Supports IPv4 and IPv6 server addresses.
+ + Began fr-FR localization.
+ + Complete it-IT localization.
+ + Merged three l10n utility scripts into one tools, scripts/utils/l10n, which
+   will help the translation effort.
+ + The 'due' urgency component now uses seconds, not days, in the calculation.
+ + The 'debug.tls' configuration variable takes an integer which corresponds to
+   the GnuTLS log level.  For debugging.
+ + File format 2 (used in version 0.9.3 - 1.5.0) is no longer supported.
+ + Migrated column processing code into Task.cpp for future use within each
+   individual column object.  Legacy code left in Task.cpp for column objects
+   that are not yet modified.
+ + ColPriority.cpp - Migration of column modification code out of Task.cpp and
+   into the individual column object.
+ + Now requires libuuid (thanks to Martin Natano).
+ + New '_get' is a DOM accessor helper command.
+ + New virtual tags (WEEK, MONTH, YEAR, PARENT).
+ + Added the 'remaining' format for all date columns.
+ + Protects against interrupt during critical DB commit and sync operations.
+ + The 'push', 'pull' and 'merge' commands now generate a 'deprecated' message.
+ + Rewritten task-sync(5) man page, listing sync options and setup guidelines..
+ + Now properly uses the libc version of uuid_create and uuid_to_string for
+   FreeBSD (thanks to Pietro Cerutti).
+ + Performance improvements:
+   + Optimizes indexing into pending.data for direct task access.
+   + Improved I/O performance with better defaults for buffer sizes.

 Bugs
- + Fixed bug that caused miplaced commas in JSON export (thanks to greenskeleton).
- + Fixed bug #1036, which prevents 'until' attributes to be modified for
-   non-recurring tasks (thanks to Stéphane Pezennec).
+ + #1195 Random seed not random enough - removed all random number code (thanks
+   to Jakub Wilk).
+ + #1196 Now builds on Hurd (thanks to Jakub Wilk).
+ + #1197 Now 'tasksh' recognizes Ctrl-D to exit.
+ + #1200 Directory d_type==DT_UNKNOWN is now handled correctly (thanks to Jakub
+   Wilk).
+ + #1211 The 'dateformat' settings now default to the ISO-8601 standard of
+   'Y-M-D' (thanks to Robin Björklin).
+ + #1222 The 'summary' report now obeys the 'color.label' setting (thanks to
+   Steve Rader).
+ + #1235 The 'shell' command can now start in non-interactive mode without a
+   .taskrc file (thanks to Haitham Gad).
+ + #1247 Tests now create a local dir, rather than use the insecure /tmp dir
+   (thanks to Jakub Wilk).
+ + #1248 Merge tests no longer connect to takwarrior.org (thank to Jakub Wilk).
+ + #1249 Build system now recognizes GNU/Hurd and GNU/kFreeBSD (thanks to Jakub
+   Wilk).
+ + #1263 The 'waiting' report properly lists only pending tasks with a wait date
+   (thanks to Fidel Mato).
+ + #1268 Edit doesn't accept changes, if task has completed dependency (thanks
+   to Dmitriy Matrosov, Michele Santullo).
+ + #1270 The 'undo' command is now properly removing backlog entries.
+ + #1273 Query with negative relative date differs greatly from absolute date
+   in past (thanks to John West).
+ + #1279 Assorted corrections to the task-ref.pdf document (thanks to Benjamin
+   Weber).
+ + #1286 Cannot use "sow", "som", etc in "entry.after", "end.after" filters
+   (thanks to Jake Bell).
+ + #1300 Encode/decode pairing is now properly balanced.
+ + #1305 Commit hash now available in tarball builds (thanks to Ben Boeckel).
+ + #1352 Terminal crashes when using taskwarrior's zsh completion (thanks to
+   Ivan Freitas, XTaran).
+ + #1356 Command reference now mentions /from/to/g.
+ + #1381 Invalid JSON exported by Task 2.3.0-beta1 (thanks to Kosta H).
+ + #1387 ZSH Auto-Completion dates are not current (thanks to Benjamin Weber).
+ + #1388 Updated task(1) man pages with import/export script examples (thanks to
+   Benjamin Weber).
+ + #1410 Incomplete Date Synonym List in man task (thanks to Benjamin Weber).
+ + #1414 Client does not verify SSL certificates (thanks to Scott Kroll).
+ + #1415 Client should not require a SSL certificate if the server has a trusted
+   certificate (thanks to Scott Kroll).
+ + #1476 Unicode indicators increase column width (thanks to Paul Kishimoto).
+ + #1477 Pre-compiled static library (*.a) in source tarball (thanks to Jakub
+   Wilk);
+ + #1478 pri_sort.t failure (thanks to Jakub Wilk).
+ + #1479 bug_annual.t failure (thanks to Jakub Wilk).
+ + Fixed bug so that 'limit:page' now considers footnote messages.
+ + Fixed bug where specifying an ID of 0 yielded all completed/deleted tasks
+   (thanks to greenskeleton).
+ + Fixed rc.nag documentation (thanks to Jeroen Budts).
+ + Fixed bug where task edit incorrectly claimed duration UDA was modified.

 ------ old releases ------------------------------

+2.2.0 (2013-04-07) 05f7948f7e70d7be3642bdc336faace52eaa9dfb
+
+Features
+ + Added Feature #685, which provides a 'blocking' report, and new color rule
+   (thanks to Michelle Crane).
+ + Added Feature #953, which includes the total number of blocked and blocking
+   tasks to the 'statistics' command output (thanks to T. Charles Yun).
+ + Added Feature #1039, which adds new date shortcuts, 'socm' and 'eocm',
+   meaning start and end of current month (thanks to Thomas Sullivan,
+   Louis-Claude Canon).
+ + Added Feature #1061, which allows the 'columns' command to use a search
+   string for the column name (thanks to Uli Martens).
+ + Added Feature #1069, which gives a clearer error when a UDA
+   is added without the uda.<uda-name>.type variable.
+ + Added Feature #1099, which supports the 'color.uda.<uda-name>' color rule
+   (thanks to Florian Hollerweger).
+ + Added Feature #1124, which provides a '_show' command that displays all
+   configuration defaults and settings, for use by third-party software (thanks
+   to Jake Bell).
+ + Added feature #1147, applying patch to display duration of each activity
+   session (thanks to Justin Forest).
+ + The 'projects' command now outputs abstract parents and reduces
+   repetition by not printing parent names in front of children names.
+ + Added framework for testing bash autocompletion.
+ + New helper command '_aliases' for autocompletion purposes.
+ + Stop consider new tasks after quitting a bulk change.
+ + Removed deprecated 'fg:' and 'bg:' attributes.
+ + The 'diagnostics' command now reports libuuid details.
+ + New characters for parsing and formating dates ('n', 's' and 'v').
+ + Virtual tags (BLOCKED, UNBLOCKED, BLOCKING, DUE, DUETODAY, OVERDUE, TODAY,
+   ACTIVE, SCHEDULED, CHILD, UNTIL, WAITING and ANNOTATED).
+ + New 'modified' attribute, which contains the most recent modification date,
+   if a modification has occurred.
+ + Fixed the mechanism used for selecting translations (thanks to Fidel Mato).
+ + Added new export script: export-tsv.pl.
+ + Added the configuration variable 'print.empty.columns'.
+ + The 'push' and 'pull' commands now properly distinguish between a missing
+   transport utility and other errors (thanks to Russell Steicke).
+ + Removed support for Lua extensions.
+ + Added tips.fr-FR (thanks to YBSAR).
+ + Added tips.es-ES (thanks to Fidel Mato).
+
+Bugs
+ + Fixed bug #642, so that the default 'data.location=~/.task' preserves the
+   '~', leading to more portable .taskrc files (thanks to alparo).
+ + Fixed bug #947, #1031, which kept expanding aliases after the '--' operator
+   (thanks to Jim B).
+ + Fixed bug #1038, which prints blank lines with bulk changes and when the
+   verbose attributes does not specify it. Lines do a better separation between
+   each changes also.
+ + Fixed bug #1042, where the 'diagnostics' command failed to detect missing
+   external utilities on Solaris and NetBSD.
+ + Fixed bug #1043, where aliases were not recognized by bash autocompletion.
+ + Fixed bug #1044, where 'task projects' considers newly deleted tasks and
+   provides an incorrect summary.
+ + Fixed bug #1047, which caused extra commas in exported JSON when UDA orphans
+   were present (thanks to Thomas Sullivan).
+ + Fixed bug #1048, which segfaulted rather than complain about syntax (thanks
+   to Bryce Harrington, Štěpán Henek).
+ + Fixed bug #1053, where ' characters were not escaped by export-csv.pl (thanks
+   to John Florian).
+ + Fixed bug #1056, where CmdSummary did not print abstract parents.
+ + Fixed bug #1059, where CmdEdit was running garbage collection.
+ + Fixed bug #1060, where an error was not thrown correctly.
+ + Fixed bug #1063, so that numeric UDA fields are now sortable (thanks to Max
+   Muller).
+ + Fixed bug #1065, where CmdShow issued messages in incorrect situations.
+ + Partially fixed #1083, which showed 'task 0 ...' when modifying a non-
+   pending task (thanks to Aikido Guy).
+ + Fixed bug #1087, which gave incorrect task/line counts under certain
+   conditions.
+ + Fixed bug #1091, allowing filters to use 'urgency.over:4.5'.
+ + Fixed bug #1110, which did not treat 'status:Completed' the same
+   as 'status:completed' (thanks to Aikido Guy).
+ + Fixed bug #1118, which dropped changes after edits were rejected (thanks to
+   Ben Boeckel).
+ + Fixed bug #1123, which caused the undo of a 'log' command to corrupt the data
+   file (thanks to Tim None).
+ + Fixed bug #1128, which caused 'age' columns to be right-justified instead of
+   left-justified (thanks to Steve Rader).
+ + Fixed bug #1136, #1177, which incorrectly line-wrapped tasks with annotations
+   (thanks to Steve Rader, T. Charles Yun).
+ + Fixed bug #1135, #1137, which caused file locks to be non-blocking (thanks
+   to Steve Rader).
+ + Fixed bug #1150, which referenced deprecated features in the tutorial man
+   page (thanks to Benjamin Weber).
+ + Fixed bug #1154, which now allows priorities to be specified in any case.
+ + Fixed bug #1178, which included binary libraries in the released source
+   package (thanks to Jakub Wilk).
+ + Fixed bug #1181, where single-character columns were often rendered using
+   widths larger than 1 (thanks to Max Muller).
+ + Fixed bug #1183, correcting error message typos (thanks to Jakub Wilk).
+ + Fixed bug #1184, correcting man page formatting (thanks to Jakub Wilk).
+ + Fixed bug #1185, correcting man page install location for out-of-tree
+   builds (thanks to Jakub Wilk).
+ + Fixed bug #1189, which caused wide Asian UTF8 characters to be measured as
+   narrow characters (thanks to Roy Zuo).
+ + Fixed bug #1191, which kept file locks active for longer than necessary,
+   and caused the 'execute' command to be considered a 'write' command.
+ + Fixed bug #1192, which failed to expand braces internally, as POSIX /bin/sh
+   does not do {} expansion, thereby causing push/pull errors (thanks to Russell
+   Steicke).
+ + Fixed bug #1194, so that $HOME has precedence over the passwd db when looking
+   for the user's home directory (thanks to Jakub Wilk).
+ + Fixed bug #1199, where 'stat' was used instead of 'lstat' (thanks to Jakub
+   Wilk).
+ + Fixed bug #1200, where directory removal didn't handle d_type==DT_UNKNOWN
+   (thanks to Jakub Wilk).
+ + Fixed bug #1209, spelling mistake in reference page (thanks to Friedrich
+   Heusler).
+ + Fixed bug #1210 so that widths are taken from localized strings instead of
+   hardcoded.
+ + Fixed bug #1218 so that description columns minimum width is calculated
+   correctly.
+ + Improved hyphenation by splitting on commas (even if no whitespace after).
+   Leads to better output of, for example, 'task show', where comma-separated
+   lists are common.
+ + No more bash completion of, for example, 'projABC:', or of 'proj:' if
+   abbreviation.minimum is greater than 4.
+ + Fixed bug where shadow files are not properly created when there is a missing
+   .taskrc file (thanks to Pietro Cerutti).
+ + Fixed bug with 'socm' date calculation that failed on some days, by
+   simplifying the implementation.
+ + Fix a bug where 'print.empty.columns=no' resulted in never printing the
+   project column.
+ + Integrated latest UTF8 character width calculations from Markus Kuhn.
+ + Fixed bug where localized UTF8 strings were not properly substr'd (thanks to
+   Fidel Mato).
+ + Fixed a bug where the bash completion script was causing gc() to be run.
+ + Fixed manpages that were not installed when running an out-of-source build
+   (thanks to Vincent Petithory).
+ + Added missing localized confirmation strings (thanks to Rainer Müller).
+ + Fixed bug that added an extra newline after setting the terminal title
+   (thanks to Rainer Müller).
+ + Fixed a bug where the terminal title was tried to be set without a tty
+   (thanks to Rainer Müller).
+ + Fixed hook tests to work on released code (thanks to Jakub Wilk).
+ + Fixed bug where arguments passed to 'task execute' needed double escaping.
+ + Fixed a bug so that the report filter order is preserved, to enable an
+   optimization that was being skipped.
+
+2.1.2 (2012-09-18) 1e3176ed70d2b50faf03838d0df279b2a4ae93b2
+
+Bugs
+ + Bug fix release regarding #1104, which causes duplicate UUIDs during
+   the merge command.
+ + Fixed bug where shadow files are not properly created when there is a missing
+   .taskrc file (thanks to Pietro Cerutti).
+
+2.1.1 (2012-07-24) 46c5f8b826838ce96d9df7fcd3039de3c43483dd
+
+Bugs
+ + Fixed bug that caused misplaced commas in JSON export (thanks to greenskeleton).
+ + Fixed bug #1036, which prevents 'until' attributes to be modified for
+   non-recurring tasks (thanks to Stéphane Pezennec).
+
 2.1.0 (2012-07-23) a413331c9450b48065f94639e7ab0455eaa74293

 Features
@@ -31,9 +286,9 @@ Features
 + Performance improvements:
   + Added parse-free convenience functions
   + Filter optimization: with no 'OR' or 'XOR' operators, no UUIDS but with IDs
-     the completed.data file is not referenced
+     the completed.data file is not referenced.
   + Reduced excessive number of sort columns on certain reports
-   + Speed boost for 'next' report
+   + Speed boost for 'next' report.
 + Similar helper subcommands for 'uuids' as for there is for 'ids' (_uuids and
   _zshuuids).
 + Possible to specify the date format when editing with 'dateformat.edit'.
--- a/60
+++ b/60
@@ -14,16 +14,14 @@ General Statement
    quickest way to get help, or confirm a bug.

  - Review documentation: there are man pages, wiki articles, tutorials and so
-    on, and these may contain errors, or more importantly, they may not convey
-    ideas in the best way.  Perhaps you can help improve it.
+    on, and these may contain errors, or they may not convey ideas in the best
+    way.  Perhaps you can help improve it.

-  - Take a look at the bug database.  It is the nature of software to contain
-    bugs, and there is a continuous effort to fix them.  Looking at open bugs
-    and confirming them, perhaps determining that it is already fixed, or just
-    adding clarifying information are all very useful contributions and much
-    needed.
+  - Take a look at the bug database, and help triage the bug list.  This is a
+    review process that involves confirming bugs, providing additional data,
+    information or analysis.  Bug triage is very useful and much needed.

-  - Fix a bug.  For this you'll need C++ and git skills, but this is one of
+  - 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.
@@ -44,9 +42,16 @@ General Statement
    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.

-  - Spread the word. Help others become more effective at managing tasks.
+  - Donate some server time to the testing effort, by participating in the
+    continuous integration of all changes, with our Flod software.  See this
+    page for an example:  http://tasktools.org/tinderbox
+    Ask us about running a Flod satellite, we're always looking for exotic
+    platforms to test on.

-  - Encouragement. Tell us what works for you, and what doesn't. It's all good.
+  - Spread the word.  Help others become more effective at managing tasks.
+
+  - Encouragement.  Tell us what works for you, and what doesn't.  It's all
+    good.

  Following are specific areas that could use some attention.

@@ -54,9 +59,7 @@ Deprecated Code
  This is code that is going to be phased out soon, and therefore is not worth
  fixing or documenting.  Don't waste your time.

-  - '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
@@ -80,11 +83,6 @@ New Code Needs
    data file, as found by 'task diag'.  This should check to see if there is
    a suitable UUID generator installed.  This should also be careful to
    properly handle recurring tasks.
-  - Need an external implementation equivalent to, or better than the '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.
@@ -127,6 +125,7 @@ Unit Tests Needed
  code and run the test suite:
     git clone git://tasktools.org:task.git
     cd task.git
+     git checkout 2.3.0
     cmake .
     make
     make test
@@ -138,7 +137,7 @@ Unit Tests Needed
     make test

  Either way, a TAP file 'all.log' is written that contains all test results.
-  once this file is created, you can see the failing tests using this script:
+  Once this file is created, you can see the failing tests using this script:

    cd task.git/test
    ./problems
@@ -146,14 +145,15 @@ Unit Tests Needed
  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     
+    git://tasktools.org/vramsteg.git

  Tests needed:

  - The basic.t unit tests are a misnomer, and should be either removed or
    renamed.  We have long talked of 'basic functionality' that includes add,
    delete, done, and list commands.  We need unit tests that prove that basic
-    functionality is working, and it should be called basic.t.
+    functionality is working, and the file containing them should be called
+    basic.t.
  - None of the current unit tests remove the 'extensions' directory, and they
    all should.
  - Test propagation of modifications to recurring tasks.
@@ -161,11 +161,13 @@ Unit Tests Needed
  - Need unit tests for each bug in the issue list, if suitable.
  - We have bugs in the unit tests that only manifest on days such as December
    31st.  Clearly there is some bad date math going on, most likely in the
-    tests themselves, rather than in taskwarrior.
+    tests themselves, rather than in Taskwarrior.

-  * Note that running the unit tests require the Perl JSON module to be
+  * Note that running the unit tests requires the Perl JSON module to be
    installed.

+  Note that all new unit tests should follow the test/template.t standard.
+
 Work in Progress
  Things that are currently in flux, which is another way of saying leave it
  alone while it is being worked on.
@@ -178,14 +180,18 @@ Work in Progress
 Current Codebase Condition

  'master' branch:
-    - 2.0.0 release, current, locked.
-
-  '2.0.1' branch (to be released as 2.1.0):
-    - All current development.
+    - 2.2.0 Current release, locked.

  '2.2.0' branch:
-    - Future development effort.
+    - Current release.  Locked.
+
+  '2.3.0' branch:
+    - Current development branch with sync features, and new tasksh.
+
+  '2.4.0' branch:
+    - Command line parser rewrite.

 ---

 2012-05-12 Added general statement about how to contribute.
+2013-09-09 Updated branch info.
--- a/25
+++ b/25
@@ -26,7 +26,7 @@ Command Line Parsing


 Dispatch
-  Dispatch is simple:  once the command line is parsed, the command is used to
+  Dispatch is simple: once the command line is parsed, the command is used to
  look up a command object, then call its execute method.

  Context stores an associative map of command object pointers indexed by a
@@ -77,7 +77,6 @@ Files
    completed.data
    undo.data
    backlog.data
-    synch.key

  The pending.data file aspires to contain only pending, waiting and recurring
  tasks, but this is only correct after a GC, and before any tasks are modified.
@@ -91,12 +90,9 @@ Files
  'merge' command.

  The backlog.data file contains an accumulated set of changes that have not
-  been transmitted to the task server.  It grows unbounded between 'synch'
+  been transmitted to the Taskserver.  It grows unbounded between 'synch'
  commands.

-  The synch.key file contains a synch receipt that is used to optimize synch
-  operations.
-

 Filter
  A filter is simply a set of command line arguments, but is only a subset of
@@ -156,12 +152,11 @@ Test Suite
  There are currently over 5,000 unit tests, that take a minute or two to run
  in total.

-  There is a tinderbox that runs on a variable frequency.  As a release
-  approaches, the frequency is boosted so there are always current results to be
-  found.  Between releases the tinderbox runs daily.  It is intended that this
-  be modified for continuous integration, so it runs once per commit.
+  Taskwarrior uses flod software to automate continuous integration across
+  many platforms. Code changes are automatically detected, propagated, built and
+  tested on a variety of participating platforms. Grid testing results are here:

-    http://tasktools.org/tinderbox/task.html
+    http://tasktools.org/tinderbox/taskwarrior-2.3.0.html

  When making code changes, it is important that the test suite be run to verify
  that functionality was not broken.
@@ -193,9 +188,9 @@ Patches
    - Conforms to the prevailing coding standards - in other words, it should
      fit right in with the existing code.

-  A patch may be rejected for any of the above reasons, and more.  Bad patches
-  may be accepted and modified depending on work load and mood.  It is possible
-  that a patch may be rejected because it conflicts in some way with plans or
-  upcoming changes.
+  A patch may be rejected for not following the above guidelines, and more.
+  Bad patches may be accepted and modified depending on work load and mood.  It
+  is possible that a patch may be rejected because it conflicts in some way with
+  plans or upcoming changes.

 ---
--- a/38
+++ b/38
@@ -12,8 +12,8 @@ from source.

 More information on cmake can be obtained at http://cmake.org

-Optionally, you might want to have Lua installed, if you wish to write plugins
-and modify taskwarrior.
+It is HIGHLY RECOMMENDED that you build with a library that provides uuid_*
+functions, such as libuuid.


 Basic Installation
@@ -67,16 +67,31 @@ lists them and their defaults plus the CMAKE_INSTALL_PREFIX:
  CMAKE_INSTALL_PREFIX  /usr/local
  TASK_BINDIR           bin
  TASK_DOCDIR           share/doc/task
+  TASK_RCDIR            share/doc/task/rc
  TASK_MAN1DIR          share/man/man1
  TASK_MAN5DIR          share/man/man5

 The corresponding TASK_* variables will be combined with CMAKE_INSTALL_PREFIX to
-get absolute installation directoris:
+get absolute installation directories:

-  CMAKE_INSTALL_PREFIZ/TASK_BINDIR   /usr/local/bin
-  CMAKE_INSTALL_PREFIZ/TASK_DOCDIR   /usr/local/share/doc/task
-  CMAKE_INSTALL_PREFIZ/TASK_MAN1DIR  /usr/local/share/man/man1
-  CMAKE_INSTALL_PREFIZ/TASK_MAN5DIR  /usr/local/share/man/man5
+  CMAKE_INSTALL_PREFIX/TASK_BINDIR   /usr/local/bin
+  CMAKE_INSTALL_PREFIX/TASK_DOCDIR   /usr/local/share/doc/task
+  CMAKE_INSTALL_PREFIX/TASK_RCDIR    /usr/local/share/doc/task/rc
+  CMAKE_INSTALL_PREFIX/TASK_MAN1DIR  /usr/local/share/man/man1
+  CMAKE_INSTALL_PREFIX/TASK_MAN5DIR  /usr/local/share/man/man5
+
+
+Localizations
+-------------
+
+To make use of a translation, specify a language number, as found in cmake.h:
+
+  $ cmake -DLANGUAGE=2 .
+
+Currently the defined languages are:
+
+  en-US    1
+  es-ES    2


 Uninstallation
@@ -112,11 +127,6 @@ Cygwin
  again, or reinstall Cygwin under your normal Windows login.


-Darwin
-  If you're having trouble with Lua, check to see if the include files were
-  installed. If you're using fink, this will require the lua51-dev package in
-  addition to lua51.
-
 Darwin, 32bit
  The taskwarrior packages will not work on a 32-bit OSX installation on Core
  Duo hardware.  You will need to build Taskwarrior from source, and use this
@@ -134,7 +144,7 @@ Darwin, 32bit
 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,7 +153,7 @@ 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.

--- a/2
+++ b/2
@@ -1,6 +1,6 @@
 taskwarrior - a command line task list manager.

-Copyright 2006-2012, Paul Beckingham, Federico Hernandez.
+Copyright 2006-2014, Paul Beckingham, Federico Hernandez.

 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal
--- a/71
+++ b/71
@@ -1,45 +1,60 @@

-New Features in taskwarrior 2.1.0
+New Features in taskwarrior 2.3.0

-  - The new 'project.indented' format is available and used in the 'projects'
-    and 'summary' commands.
-  - Support for the 'scheduled' date for a task, which represent the earliest
-    opportunity to work on a task.
-  - 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.
+  - New Taskserver sync capabilities.
+  - New shell (tasksh) with Readline support replaces old 'task shell' command.
+  - The 'dateformat' settings now default to the ISO-8601 standard of 'Y-M-D'.
+  - Italian translation.
+  - French translation has begun.
+  - UDA fields now allow default values.
+  - Now requires libuuid.
+  - New virtual tags: WEEK, MONTH, YEAR, PARENT.
+  - New 'remaining' format for date columns.
+  - New '_get' DOM accessor helper command.
+  - New task-sync(5) man page.

-  Please refer to the ChangeLog file for full details.  There are too many to
-  list here.
+New commands in taskwarrior 2.3.0

-New commands in taskwarrior 2.1.0
+  - New 'sync' command to synchronize data with a Taskserver.
+  - New 'tasksh' command which replaces the old 'task shell' with an improved
+    standalone shell, featuring Readline support.

-  - New 'ready' report that lists tasks ready for work, sorted by urgency.
-  - New 'udas' command shows UDA details and warnings.
-  - New '_udas' helper command lists UDA names for completion purposes.
+New configuration options in taskwarrior 2.3.0

-New configuration options in taskwarrior 2.1.0
+  - 'taskd.server' specifies host:port of the Taskserver.
+  - 'taskd.credentials' specifies user credentials for the Taskserver.
+  - 'taskd.certificate' specifies the Taskserver certificate for authentication.
+  - 'taskd.key' specifies the Taskserver key for encryption.
+  - 'taskd.ca' specifies the Taskserver CA.
+  - 'taskd.trust' overrides certificate checking.
+  - 'taskd.ciphers' overrides default cipher selection.
+  - 'debug.tls' shows TLS log information, for debugging.
+  - The configuration file supports JSON encoding of unicode characters \uNNNN.

-  - urgency.scheduled.coefficient
-  - urgency.uda.<name>.coefficient
-  - color.scheduled
-  - color.blocking
+Newly deprecated features in taskwarrior 2.3.0
+  
+  - File format 2 (used in version 0.9.3 - 1.5.0) is no longer supported.
+  - The 'push', 'pull' and 'merge' commands will be removed in version 2.4.0
+    The new 'sync' command, in conjunction with the Taskserver is the new sync
+    mechanism.
+  - The 'diagnostics' command no longer generates 1000 UUIDs as a uniqueness
+    test, because libuuid is now mandatory.

-Newly deprecated features in taskwarrior 2.1.0
+Known Issues

-  - None
+  - There is a zsh bug (fixed, but not necessarily updated in your OS) that can
+    cause the terminal to crash when completion is invoked.  See the issue for
+    full details:
+    http://taskwarrior.org/issues/1352

 ---

 Taskwarrior has been built and tested on the following configurations:

-  * OS X 10.7 Lion, 10.6 Snow Leopard
-  * Fedora 17 Beefy Miracle and 16 Verne
-  * Ubuntu 12.04 Precise Pangolin and 11.10 Oneiric Ocelot
-  * Debian 6.0 Squeeze (stable)i and 5.0 Lenny (oldstable) plus Sid (testing)
+  * OS X 10.9 Mavericks, 10.8 Mountain Lion
+  * Fedora 19 Schrodinger's Cat and 18 Spherical Cow
+  * Ubuntu 10.04 Lucid Lynx, 13.04 Raring Ringtail and 13.10 Saucy Salamander
+  * Debian 7.0 Wheezy (stable) and 6.0 Squeeze (oldstable) plus Sid (testing)
  * Slackware 13.37
  * Arch Linux
  * Gentoo Linux
--- a/15
+++ b/15
@@ -1,3 +1,18 @@
+                         *** Disclaimer ***
+                       *** during ongoing ***
+                        *** development ***
+
+The development branch is a work in progress and may not pass all quality tests,
+therefore it may harm your data.  While we welcome bug reports from the
+development branch, we do not guarantee proper or timely fixes.
+
+      Broken functionality may arise from ongoing development work.
+
+                        Make proper backups.
+
+       Be aware that using the development branch involves risks.
+
+---

 Thank you for taking a look at taskwarrior!

--- a/cmake.h.in
+++ b/cmake.h.in
@@ -1,6 +1,7 @@
 /* cmake.h.in. Creates cmake.h during a cmake run */

-#define L10N                                           // Localization complete.
+/* Product identification */
+#define PRODUCT_TASKWARRIOR 1

 /* Package information */
 #define PACKAGE           "${PACKAGE}"
@@ -12,16 +13,15 @@
 #define PACKAGE_STRING    "${PACKAGE_STRING}"

 /* Installation details */
-#define TASK_RCDIR "${CMAKE_INSTALL_PREFIX}/${TASK_DOCDIR}/rc"
+#define TASK_RCDIR "${CMAKE_INSTALL_PREFIX}/${TASK_RCDIR}"

 /* Localization */
-#define PACKAGE_LANGUAGE  1
-#define LANGUAGE_EN_US 1
-
-/*
-Override PACKAGE_LANGUAGE, then
-#define LANGUAGE_XX_YY 2
-*/
+#define PACKAGE_LANGUAGE  ${PACKAGE_LANGUAGE}
+#define LANGUAGE_EN_US ${LANGUAGE_EN_US}
+#define LANGUAGE_ES_ES ${LANGUAGE_ES_ES}
+#define LANGUAGE_FR_FR ${LANGUAGE_FR_FR}
+#define LANGUAGE_DE_DE ${LANGUAGE_DE_DE}
+#define LANGUAGE_IT_IT ${LANGUAGE_IT_IT}

 /* git information */
 #cmakedefine HAVE_COMMIT
@@ -39,35 +39,37 @@ Override PACKAGE_LANGUAGE, then
 #cmakedefine NETBSD
 #cmakedefine HAIKU
 #cmakedefine SOLARIS
-#cmakedefine WIN32
+#cmakedefine KFREEBSD
+#cmakedefine GNUHURD
 #cmakedefine UNKNOWN

-/* Found the lua library */
-#cmakedefine HAVE_LIBLUA
+/* Found the GnuTLS library */
+#cmakedefine HAVE_LIBGNUTLS
+
+/* Found the Readline library */
+#cmakedefine HAVE_READLINE

 /* 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

 /* Found timegm */
 #cmakedefine HAVE_TIMEGM

-/* Found the uuid library */
-#cmakedefine HAVE_UUID
+/* Found st.st_birthtime struct member */
+#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/cmake/Modules/FindReadline.cmake
+++ b/cmake/Modules/FindReadline.cmake
@@ -0,0 +1,81 @@
+# - Find the readline library
+# This module defines
+#  READLINE_INCLUDE_DIR, path to readline/readline.h, etc.
+#  READLINE_LIBRARIES, the libraries required to use READLINE.
+#  READLINE_FOUND, If false, do not try to use READLINE.
+# also defined, but not for general use are
+# READLINE_readline_LIBRARY, where to find the READLINE library.
+# READLINE_ncurses_LIBRARY, where to find the ncurses library [might not be defined]
+
+# Apple readline does not support readline hooks
+# So we look for another one by default
+IF (APPLE OR FREEBSD)
+  FIND_PATH (READLINE_INCLUDE_DIR NAMES readline/readline.h PATHS
+    /usr/include/
+    /sw/include
+    /opt/local/include
+    /opt/include
+    /usr/local/include
+    NO_DEFAULT_PATH
+    )
+ENDIF (APPLE OR FREEBSD)
+FIND_PATH (READLINE_INCLUDE_DIR NAMES readline/readline.h)
+
+
+# Apple readline does not support readline hooks
+# So we look for another one by default
+IF (APPLE OR FREEBSD)
+  FIND_LIBRARY (READLINE_readline_LIBRARY NAMES readline PATHS
+    /usr/lib
+    /sw/lib
+    /opt/local/lib
+    /opt/lib
+    /usr/local/lib
+    NO_DEFAULT_PATH
+    )
+ENDIF (APPLE OR FREEBSD)
+FIND_LIBRARY (READLINE_readline_LIBRARY NAMES readline)
+
+# Sometimes readline really needs ncurses
+IF (APPLE OR FREEBSD)
+  FIND_LIBRARY (READLINE_ncurses_LIBRARY NAMES ncurses PATHS
+    /usr/lib
+    /sw/lib
+    /opt/local/lib
+    /opt/lib
+    /usr/local/lib
+    /usr/lib
+    NO_DEFAULT_PATH
+    )
+ENDIF (APPLE OR FREEBSD)
+FIND_LIBRARY (READLINE_ncurses_LIBRARY NAMES ncurses)
+
+MARK_AS_ADVANCED (
+  READLINE_INCLUDE_DIR
+  READLINE_readline_LIBRARY
+  READLINE_ncurses_LIBRARY
+  )
+
+SET (READLINE_FOUND "NO" )
+IF (READLINE_INCLUDE_DIR)
+  IF (READLINE_readline_LIBRARY)
+    SET (READLINE_FOUND "YES" )
+    SET (READLINE_LIBRARIES
+      ${READLINE_readline_LIBRARY} 
+      )
+
+    # some readline libraries depend on ncurses
+    IF (READLINE_ncurses_LIBRARY)
+      SET (READLINE_LIBRARIES ${READLINE_LIBRARIES} ${READLINE_ncurses_LIBRARY})
+    ENDIF (READLINE_ncurses_LIBRARY)
+
+  ENDIF (READLINE_readline_LIBRARY)
+ENDIF (READLINE_INCLUDE_DIR)
+
+IF (READLINE_FOUND)
+  MESSAGE (STATUS "Found readline library")
+ELSE (READLINE_FOUND)
+  IF (READLINE_FIND_REQUIRED)
+    MESSAGE (FATAL_ERROR "Could not find readline -- please give some paths to CMake")
+  ENDIF (READLINE_FIND_REQUIRED)
+ENDIF (READLINE_FOUND)
--- a/commit.h.in
+++ b/commit.h.in
@@ -1,5 +1,4 @@
 /* commit.h.in. Creates commit.h during a cmake run */
-#define L10N                                           // Localization complete.

 /* git information */
 #define COMMIT "${COMMIT}"
--- a/doc/CMakeLists.txt
+++ b/doc/CMakeLists.txt
@@ -1,15 +1,15 @@
 cmake_minimum_required (VERSION 2.8)
 message ("-- Configuring man pages")
-set (man_FILES task-color.5 task-faq.5 task-sync.5 task-tutorial.5 task.1 taskrc.5)
+set (man_FILES task-color.5 task-faq.5 task-sync.5 task-tutorial.5 taskrc.5 task.1 tasksh.1)
 foreach (man_FILE ${man_FILES})
  configure_file (
    man/${man_FILE}.in
    man/${man_FILE})
 endforeach (man_FILE)

-install (DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/man/   DESTINATION ${TASK_MAN1DIR}
+install (DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/man/   DESTINATION ${TASK_MAN1DIR}
                                                      FILES_MATCHING PATTERN "*.1")
-install (DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/man/   DESTINATION ${TASK_MAN5DIR}
+install (DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/man/   DESTINATION ${TASK_MAN5DIR}
                                                      FILES_MATCHING PATTERN "*.5")
 install (DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/rc     DESTINATION ${TASK_DOCDIR})

--- a/doc/man/.gitignore
+++ b/doc/man/.gitignore
@@ -4,3 +4,4 @@ task-sync.5
 task-tutorial.5
 task.1
 taskrc.5
+tasksh.1
--- a/doc/man/task-color.5.in
+++ b/doc/man/task-color.5.in
@@ -1,4 +1,4 @@
-.TH task-color 5 2012-07-24 "${PACKAGE_STRING}" "User Manuals"
+.TH task-color 5 2014-01-15 "${PACKAGE_STRING}" "User Manuals"

 .SH NAME
 task-color \- A color tutorial for the taskwarrior command line todo manager.
@@ -243,7 +243,7 @@ be a visual mess.  Beware!
 The precedence for the color rules is determined by the configuration
 variable 'rule.precedence.color', which by default contains:

-    due.today,active,blocked,overdue,due,keyword.,project.,tag.,recurring,pri.,tagged,completed,deleted
+    due.today,active,blocking,blocked,overdue,due,scheduled,keyword.,project.,tag.,uda.,recurring,pri.,tagged,completed,deleted

 These are just the color rules with the 'color.' prefix removed.  The
 rule 'color.due.today' is the highest precedence, and 'color.deleted' is the lowest.
@@ -265,7 +265,7 @@ your .taskrc file (note that your installation may use a slightly different path
 from the example):

 .RS
-include /usr/local/share/doc/task/rc/dark-256.theme
+include ${CMAKE_INSTALL_PREFIX}/${TASK_RCDIR}/dark-256.theme
 .RE

 You can use any of the standard taskwarrior themes:
@@ -304,13 +304,14 @@ Better yet, create your own, and share it.  We will gladly host the theme file
 on <http://taskwarrior.org>.

 .SH "CREDITS & COPYRIGHTS"
-Copyright (C) 2006 \- 2012 P. Beckingham, F. Hernandez.
+Copyright (C) 2006 \- 2014 P. Beckingham, F. Hernandez.

 Taskwarrior is distributed under the MIT license. See
 http://www.opensource.org/licenses/mit-license.php for more information.

 .SH SEE ALSO
 .BR task(1),
+.BR tasksh(1),
 .BR taskrc(5),
 .BR task-faq(5),
 .BR task-tutorial(5),
--- a/doc/man/task-faq.5.in
+++ b/doc/man/task-faq.5.in
@@ -1,4 +1,4 @@
-.TH task-faq 5 2012-07-24 "${PACKAGE_STRING}" "User Manuals"
+.TH task-faq 5 2014-01-15 "${PACKAGE_STRING}" "User Manuals"

 .SH NAME
 task-faq \- A FAQ for the task(1) command line todo manager.
@@ -72,9 +72,9 @@ reason to back up your task data files!
 .TP
 .B Q: Can I have two separate versions of taskwarrior installed?  How?
 Yes, and here is one simple way to do that.  Install the older version of
-taskwarrior, and then rename the 'task' binary to something like 't194' to
+taskwarrior, and then rename the 'task' binary to something like 't230' to
 reflect the version number.  Then install the newer version, which will be
-named 'task'.  Now you have 't194' and 'task' both installed, both using the
+named 'task'.  Now you have 't230' and 'task' both installed, both using the
 same configuration and data.

 Note that the older version will not be aware of any new configuration settings
@@ -86,6 +86,9 @@ Note also that the man pages will overwrite, which is why it is suggested that
 the older version be installed first, so that you benefit from improved
 documentation.

+Is this a good idea?  Not really.  You should be using the latest software
+whenever possible, enjoying the benefits of enhancements and bug fixes.
+
 .TP
 .B Q: How do I build a Darwin 32bit version of task
 The taskwarrior packages will not work on a 32-bit OSX installation on Core
@@ -159,11 +162,6 @@ new file, then this command lists only the defaults.
 Note that this is a good way to learn about new configuration settings,
 particularly if your .taskrc file was created by an older version.

-.TP
-.B Q: Do I need to back up my taskwarrior data?
-Yes you do, like all your other files.  You should back up all the files in your
-~/.task directory, and your ~/.taskrc file too.
-
 .TP
 .B Q: Can I share my tasks between different machines?
 Yes, you can.  Most people have success with a DropBox - a free and secure file
@@ -174,40 +172,25 @@ folder, by modifying the:

 configuration variable.  Check out DropBox at http://www.dropbox.com.

-You might also want to share the same .taskrc file. You can do this by putting an alias in the .bashrc file along the lines of
-
-alias task="task rc:/home/username/Dropbox/mysharedtaskrc"
-
-An alternative to Dropbox is to use the push/pull/merge features built into Taskwarrior. See 'man task-sync' for details.
+You might also want to share the same .taskrc file. You can do this by putting
+an alias in the .bashrc file along the lines of

+    alias task="task rc:/home/username/Dropbox/mysharedtaskrc"

 .TP
 .B Q: I don't want to use dropbox. Is there another way to synchronize my tasks?
-Of course. Especially if you want to modify tasks offline on both machines and
-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.
+Yes.  Get a Taskserver account, and sync tasks between all your machines and
+devices.  See task-sync(5).

 .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.
+You need it if you want the undo capability.  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.
@@ -262,7 +245,8 @@ Taskwarrior does this to always show you the smallest numbers it can.  The idea
 is that if your tasks are numbered 1 - 33, for example, those are easy to type
 in.  If instead task kept a rolling sequence number, after a while your tasks
 might be numbered 481 - 513, which makes it more likely to enter one
-incorrectly, because there are more digits.
+incorrectly, because there are more digits, and humans have difficulty with
+longer numbers.

 When you run a report (such as "list"), the numbers are assigned before display.
 For example, you can do this:
@@ -335,22 +319,11 @@ This will remove the second annotation - the first non-exact match.
 .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
+    task end.after:3/29/2013 end.before:3/30/2013 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:
@@ -366,13 +339,14 @@ There are lots of ways.  Here are some:
 - Fix bugs

 .SH "CREDITS & COPYRIGHTS"
-Copyright (C) 2006 \- 2012 P. Beckingham, F. Hernandez.
+Copyright (C) 2006 \- 2014 P. Beckingham, F. Hernandez.

 Taskwarrior is distributed under the MIT license. See
 http://www.opensource.org/licenses/mit-license.php for more information.

 .SH SEE ALSO
 .BR task(1),
+.BR tasksh(1),
 .BR taskrc(5),
 .BR task-tutorial(5),
 .BR task-color(5),
--- a/doc/man/task-sync.5.in
+++ b/doc/man/task-sync.5.in
@@ -1,372 +1,159 @@
-.TH task-sync 5 2012-07-24 "${PACKAGE_STRING}" "User Manuals"
+.TH task-sync 5 2014-01-15 "${PACKAGE_STRING}" "User Manuals"

 .SH NAME
-task-sync \- A tutorial for the task(1) data synchronization capabilities.
+task-sync \- A discussion and tutorial for the various task(1) data
+synchronization capabilities.

-.SH DESCRIPTION
-Taskwarrior has built-in support for synchronization, which can be used to keep
-two task databases up to date, regardless of which one is used.  This capability
-can also be used to keep a backup copy of your task database on another machine.
+.SH INTRODUCTION
+Taskwarrior has several sync options, external and internal.  If you wish to
+sync your data, choose one method only; mixing methods is only going to lead to
+problems.  Each of the methods discussed have their own strengths.

-Taskwarrior can use various protocols for transferring the data.
-
-.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:
+.SH ALTERNATIVES
+There are three alternatives for syncing data, which are:

+1) Version control systems, such as git, hg, svn
 .br
-.RS
-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:
-
+2) File hosting systems, such as DropBox
 .br
-.RS
-$ task merge ~/work/
-.RE
+3) Using the Taskserver and the 'sync' command

-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
-data back to the remote location specified by the URI.  This is useful if you
-are keeping two task databases synchronized, but it can be turned off.  See
-CONFIGURATION.
+.SH OPTION 1: VERSION CONTROL SYSTEMS
+There are several good, distributed VCS systems (git, hg, ...) and centralized
+VCS systems (svn ...), and they function in a similar fashion for our purposes.

-Note that a merge operation is not atomically reversible.  You could however
-run the 'task undo' command repeatedly to undo the effects.
-
-.SH PUSH
-The push command will copy the local task database to the specified URI.  The
-syntax is:
+Setup is straightforward.  You place your .task directory under revision
+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
+scripts so that every task command is preceded by a 'pull' and followed by a
+'push'.

+Strengths:
 .br
-.RS
-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:
-
+  - Good data transport mechanisms
 .br
-.RS
-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:
+  - Secure transport options

+Weaknesses:
 .br
-.RS
-/home/bob/.task/
-.RE
-
-All the other URIs allow access to remote machines.  The first uses SSH and scp
-(either form can be used):
-
+  - You need proficiency with VCS tools
 .br
-.RS
-ssh://[user@]host[:port]/absolute/path/to/.task/
+  - You will need to manually resolve conflicts frequently
 .br
-[user@]host:/absolute/path/to/.task/
-.RE
+  - You need to provide the mechanism for making sure copies are up to date

-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
-ssh://[user@]host[:port]/.task/
+  - Always secure
 .br
-[user@]host:.task/
-.RE
-
-or even shorter
-
+  - Good client support
 .br
-.RS
-[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:
-
+  - Easy setup
 .br
-.RS
-ssh://configured-host/~[username]/.task/
+  - Transparent use
+
+Weaknesses:
 .br
-configured-host:~[username]/.task/
-.RE
+  - Tasks are not properly merged


-Rsync is another supported protocol that minimizes network traffic, by a clever
-algorithm that doesn't copy files that have not changed:
+.SH OPTION 3: TASKSERVER
+The Taskserver was designed for this purpose to be secure, fast and conflict
+free, allowing data interchange between assorted Taskwarrior clients, and
+tolerant of network connectivity problems.

+There is a 'sync' command built in to Taskwarrior, and with a server account
+and client configuration, syncing is done on demand.
+
+Setup is a matter of creating an account on a Taskserver (see your Taskserver
+provider or operate your own - see
+http://taskwarrior.org/projects/taskwarrior/wiki/Server_setup)
+
+Once you have an account, you'll receive a certificate, key and a password.
+You'll need to put the certificate and key somewhere like this:
+
+    $ cp <name>.cert.pem ~/.task
+    $ cp <name>.key.pem ~/.task
+
+Then you configure Taskwarrior, using the account details:
+
+    $ task config taskd.certificate ~/.task/<name>.cert.pem
+    $ task config taskd.key         ~/.task/<name>.key.pem
+    $ task config taskd.credentials <organization>/<name>/<password>
+    $ task config taskd.server      <server domain>:<port>
+
+If you are using a private server, you are likely also using a self-signed
+certificate, which means you will need one of the following additional entries:
+
+    $ task config taskd.ca          ~/.task/ca.cert.pem
+
+The CA (Certificate Authority) will be used to verify the server certificate.
+Alternatively, you can override the cert verification process using:
+
+    $ task config taskd.trust       yes
+
+This is an insecure option that should be used with caution, because it directs
+Taskwarrior to trust any certificate.
+
+After setup, you run a one-time sync initialization, like this:
+
+    $ task sync initialize
+
+This will make sure your client and the server are properly in sync to begin
+with.  From this point on, you never run the 'initialize' command again, just
+go about your business, and when you want to sync, run this:
+
+    $ task sync
+
+You'll see a summary of how many tasks were uploaded and downloaded.  You can
+safely run the command as often as you like.  When there are no changes to sync,
+nothing happens.  If you do not have connectivity, your task changes accumulate
+so that when you next run 'sync' with proper connectivity, the changes are
+properly handled, in the right order.
+
+Strengths:
 .br
-.RS
-rsync://[user@]host.xz[:port]/path/to/.task/
-.RE
-
-Curl supports several protocols that can transfer data using HTTP, HTTPS and
-FTP:
-
+  - Always secure
 .br
-.RS
-http://host[:port]/path/to/.task/
+  - Minimal bandwidth
 .br
-https://host[:port]/path/to/.task/
+  - Tolerates connectivity outage
+
+Weaknesses:
 .br
-ftp://[user@]host[:port]/path/to/.task/
-.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.
+  - You need to manage your own server, or gain access to a hosted server.

 .SH "CREDITS & COPYRIGHTS"
-Copyright (C) 2006 \- 2012 P. Beckingham, F. Hernandez.
-
-The sync capabilities were written by J. Schlatow.
-Parts copyright (C) 2010 - 2012 J. Schlatow.
+Copyright (C) 2006 \- 2014 P. Beckingham, F. Hernandez.

 Taskwarrior is distributed under the MIT license. See
 http://www.opensource.org/licenses/mit-license.php for more information.

 .SH SEE ALSO
 .BR task(1),
+.BR tasksh(1),
 .BR taskrc(5),
 .BR task-faq(5),
 .BR task-color(5),
 .BR task-tutorial(5),
-.BR ssh_config(5)

 For more information regarding task, the following may be referenced:

--- a/doc/man/task-tutorial.5.in
+++ b/doc/man/task-tutorial.5.in
@@ -1,4 +1,4 @@
-.TH task-tutorial 5 2012-07-24 "${PACKAGE_STRING}" "User Manuals"
+.TH task-tutorial 5 2014-01-15 "${PACKAGE_STRING}" "User Manuals"

 .SH NAME
 task-tutorial \- A tutorial for the task(1) command line todo manager.
@@ -1096,49 +1096,6 @@ ID Project Pri Due Active Age     Description
 What you see is the result of a set of color rules being applied to the tasks.
 There is a hierarchy of color rules that colorize a task based on the metadata.

-Here is an example of an explicit override to the color rules where a specific
-task is given a red background.
-
-.RS
-$ task 1 modify bg:on_red
-.br
-modified 1 task.
-.br
-$ task list
-.br
-
-.br
-ID Project Pri Due Active Age     Description
-.br
-- ------- --- --- ------ ------- ----------------------------------
-.br
- 1 party   H                 1 hr Select a free weekend in November
-.br
-                                  10/16/2010 the 13th looks good
-.br
- 2 party   H                 1 hr Select and book a venue
-.br
- 5 party   H              59 mins Design invitations
-.br
- 8                        33 mins Select some Music for after dinner
-.br
- 7 home                   50 mins Pay rent at the end of the month
-.br
- 3 party                     1 hr Mail invitations
-.br
- 4 party                     1 hr Select a caterer
-.br
- 6 party                  59 mins Print invitations
-.br
-
-.br
-8 tasks
-.br
-$ task 1 modify bg:
-.br
-Modified 1 task.
-.RE
-
 Taskwarrior supports 256 colors on certain terminal emulators, and this shows
 the range of colors available.  Note that your terminal may show fewer colors.

@@ -1329,19 +1286,19 @@ theme into the configuration file, you can see some striking effects.  For a
 blue theme, add this line to your .taskrc file:

 .RS
-include /usr/local/share/doc/task/rc/dark-blue-256.theme
+include ${CMAKE_INSTALL_PREFIX}/${TASK_RCDIR}/dark-blue-256.theme
 .RE

 For a red theme:

 .RS
-include /usr/local/share/doc/task/rc/dark-red-256.theme
+include ${CMAKE_INSTALL_PREFIX}/${TASK_RCDIR}/dark-red-256.theme
 .RE

 For a general dark theme:

 .RS
-include /usr/local/share/doc/task/rc/dark-256.theme
+include ${CMAKE_INSTALL_PREFIX}/${TASK_RCDIR}/dark-256.theme
 .RE

 Here are two color rules that specify a dark blue background for all tasks that
@@ -1540,7 +1497,7 @@ used most.  You can create your own, or use one of the samples to show holidays
 on the calendar.  Try adding this line to your ~/.taskrc file:

 .RS
-include /usr/local/share/doc/task/rc/holidays.en-US.rc
+include ${CMAKE_INSTALL_PREFIX}/${TASK_RCDIR}/holidays.en-US.rc
 .RE

 Then:
@@ -1897,95 +1854,6 @@ Deleting recurring task 14 'Pay taxes'.
 Deleting recurring task 15 'Pay taxes'.
 .RE

-.SH SHELL
-You can use the shell command to create a more immersive environment.  Any task
-command you run outside the shell can also be run inside the shell, without the
-need to prefix every command with "task".
-
-.RS
-$ task shell
-.br
-task 1.9.4 shell
-.br
-
-.br
-Enter any task command (such as 'list'), or hit 'Enter'.
-.br
-There is no need to include the 'task' command itself.
-.br
-Enter 'quit' to end the session.
-.br
-
-.br
-task>
-.br
-task> projects
-.br
-
-.br
-Project Tasks Pri:None Pri:L Pri:M Pri:H
-.br
------- ----- -------- ----- ----- -----
-.br
-            7        7     0     0     0
-.br
-home        2        2     0     0     0
-.br
-party       6        3     0     0     3
-.br
-
-.br
-3 projects (15 tasks)
-.br
-task> tags
-.br
-
-.br
-Tag  Count
-.br
-mall     2
-.br
-
-.br
-1 tag (15 tasks)
-.br
-task> list
-.br
-
-.br
-ID Project Pri Due        Active Age   Description
-.br
-- ------- --- ---------- ------ ----- ------------------------------------
-.br
- 2 party   H   10/17/2010        2 hrs Select and book a venue
-.br
-                                       2010/10/16 11:20 Started task
-.br
-                                       2010/10/16 11:21 Stopped task
-.br
- 5 party   H   10/22/2010        2 hrs Design invitations
-.br
- 1 party   H   10/31/2010        2 hrs Select a free weekend in November
-.br
-                                       2010/10/16 00:00 the 13th looks good
-.br
- 9 home        10/31/2010         1 hr Pay rent at the end of the month
-.br
- 8                                1 hr Select some Music for after dinner
-.br
- 3 party                         2 hrs Mail invitations
-.br
- 4 party                         2 hrs Select a caterer
-.br
- 6 party                         2 hrs Print invitations
-.br
-
-.br
-8 tasks
-.br
-task> quit
-.RE
-
 .SH SPECIAL TAGS
 You've seen tags, but there are also 'special tags' that have effects on
 individual tasks.  The 'nocolor' special tag causes the color rules to be
@@ -3213,7 +3081,7 @@ $ task help
 .RE

 .SH "CREDITS & COPYRIGHTS"
-Copyright (C) 2006 \- 2012 P. Beckingham, F. Hernandez.
+Copyright (C) 2006 \- 2014 P. Beckingham, F. Hernandez.

 This man page was originally written by Federico Hernandez, and has been modified and supplemented by Paul Beckingham.

@@ -3222,6 +3090,7 @@ http://www.opensource.org/licenses/mit-license.php for more information.

 .SH SEE ALSO
 .BR task(1),
+.BR tasksh(1),
 .BR taskrc(5),
 .BR task-faq(5),
 .BR task-color(5),
--- a/doc/man/task.1.in
+++ b/doc/man/task.1.in
@@ -1,4 +1,4 @@
-.TH task 1 2012-07-24 "${PACKAGE_STRING}" "User Manuals"
+.TH task 1 2014-01-15 "${PACKAGE_STRING}" "User Manuals"

 .SH NAME
 task \- A command line todo manager.
@@ -121,7 +121,11 @@ Shows all tasks matching the filter, including parents of recurring tasks.

 .TP
 .B task <filter> blocked
-Shows all tasks matching the filter, that have dependencies on other tasks.
+Shows all tasks matching the filter, that are currently blocked by other tasks.
+
+.TP
+.B task <filter> blocking
+Shows all tasks matching the filter, that block other tasks.

 .TP
 .B task <filter> burndown.daily
@@ -140,8 +144,8 @@ Shows a graphical burndown chart, by month.
 .B task calendar [due|<month> <year>|<year>] [y]
 Shows a monthly calendar with due tasks marked.  Shows one horizontal line of
 months.  If the 'y' argument is provided, will show at least one complete year.
-If a year is provided, such as '2012', then that full year is shown.  If both
-a month and a year are specified ('6 2012') then the months displayed begin at
+If a year is provided, such as '2014', then that full year is shown.  If both
+a month and a year are specified ('6 2014') then the months displayed begin at
 the specified month and year.  If the 'due' argument is provided, will show
 the starting month of the earliest due task.

@@ -151,9 +155,10 @@ Displays all possible colors, a named sample, or a legend containing all
 currently defined colors.

 .TP
-.B task columns
+.B task columns [substring]
 Displays all supported columns and formatting styles.  Useful when creating
-custom reports.
+custom reports.  If a substring is provided, only matching column names are
+shown.

 .TP
 .B task <filter> completed
@@ -168,7 +173,18 @@ Displays only a count of tasks matching the filter.
 Exports all tasks in the JSON format.  Redirect the output to a file, if you
 wish to save it, or pipe it to another command or script to convert it to
 another format. The standard task release comes with a few example scripts,
-such as export-yaml.pl.
+such as:
+
+  export-csv.pl
+  export-sql.py
+  export-xml.py
+  export-yaml.pl
+  export-html.pl
+  export-tsv.pl
+  export-xml.rb
+  export-ical.pl
+  export-xml.pl
+  export-yad.pl

 .TP
 .B task <filter> ghistory.annual
@@ -198,7 +214,7 @@ Applies the filter then extracts only the task IDs and presents them as
 a range, for example: 1-4,12.  This is useful as input to a task command,
 to achieve this:

-	task $(task project:Home ids) modify priority:H
+  task $(task project:Home ids) modify priority:H

 This example first gets the IDs for the project:Home filter, then sets
 the priority to H for each of those tasks.  This can also be achieved directly:
@@ -214,7 +230,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 +297,8 @@ Shows all recurring tasks matching the filter.

 .TP
 .B task <filter> unblocked
-Shows all tasks that do not have dependencies, matching the filter.
+Shows all tasks that are not currently blocked by other tasks, matching the
+filter.

 .TP
 .B task <filter> waiting
@@ -329,29 +346,15 @@ provided for exceptional circumstances.  Use carefully.
 .TP
 .B task import <file> [<file> ...]
 Imports tasks in the JSON format.  The standard task release comes with a few
-example scripts, such as import-yaml.pl.
+example scripts, such as:
+
+  import-todo.sh.pl
+  import-yaml.pl

 .TP
 .B task log <mods>
 Adds a new task that is already completed, to the task list.

-.TP
-.B task merge <URL>
-Merges two task databases by comparing the modifications that are stored in the
-undo.data files. The location of the second undo.data file must be passed on as
-argument. URL may have the following syntaxes:
-
-	ssh://[user@]host.xz[:port]/path/to/.task/
-
-	rsync://[user@]host.xz[:port]/path/to/.task/
-
-	[user@]host.xz:path/to/.task/
-
-	/path/to/local/.task/
-
-You can set aliases for frequently used URLs in the .taskrc. Further
-documentation can be found in the task-sync(5) man page.
-
 .TP
 .B task <filter> modify <mods>
 Modifies the existing task with provided information.
@@ -360,17 +363,6 @@ Modifies the existing task with provided information.
 .B task <filter> prepend <mods>
 Prepends description text to an existing task.

-.TP
-.B task pull <URL>
-Overwrites the task database with those files found at the URL.
-(See 'merge' command for valid URL syntax.)
-
-.TP
-.B task push <URL>
-Pushes the task database to a remote 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.
@@ -431,10 +423,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 +439,9 @@ Shows a report of aggregated task status by project.

 .TP
 .B task <filter> tags
-Show a list of all tags used.  Any special tags used are highlighted.
+Show a list of all tags used.  Any special tags used are highlighted.  Note that
+virtual tags are not listed - they don't really exist, and are just a convenient
+notation for other task metadata.

 .TP
 .B task timesheet [weeks]
@@ -467,6 +457,10 @@ Shows the taskwarrior version number.

 .SH HELPER SUBCOMMANDS

+.TP
+.B task _aliases
+Generates a list of all aliases, for autocompletion purposes.
+
 .TP
 .B task _columns
 Displays only a list of supported columns.
@@ -483,6 +477,11 @@ Lists all supported configuration variables, for completion purposes.
 .B task <filter> _ids
 Shows only the IDs of matching tasks, in the form of a list.

+.TP
+.B task _show
+Shows the combined defaults and overrides of the configuration settings, for use
+by third-party applications.
+
 .TP
 .B task <filter> _uuids
 Shows only the UUIDs of matching tasks among all tasks (even deleted and
@@ -520,6 +519,24 @@ 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.
+
 .SH ATTRIBUTES AND METADATA

 .TP
@@ -547,6 +564,31 @@ exempt from all color rules.  The supported special tags are:
    +nocal       This task will not appear on the calendar
    +next        Elevates task so it appears on 'next' report

+There are also virtual tags, which represent task metadata in tag form.  These
+tags do not exist, but can be used to filter tasks.  The supported virtual tags
+are:
+
+    BLOCKED      Matches if the task is blocked
+    UNBLOCKED    Matches if the task is not blocked
+    BLOCKING     Matches if the task is blocking
+    DUE          Matches if the task is due
+    DUETODAY     Matches if the task is due today
+    TODAY        Matches if the task is due today
+    WEEK         Matches if the task is due this week
+    MONTH        Matches if the task is due this month
+    YEAR         Matches if the task is due this year
+    OVERDUE      Matches if the task is overdue
+    ACTIVE       Matches if the task is started
+    SCHEDULED    Matches if the task is scheduled
+    PARENT       Matches if the task is a parent
+    CHILD        Matches if the task has a parent
+    UNTIL        Matches if the task expires
+    WAITING      Matches if the task is waiting
+    ANNOTATED    Matches if the task has annotations
+
+You can use +BLOCKED to filter blocked tasks, or -BLOCKED for unblocked tasks.
+Similarly, -BLOCKED is equivalent to +UNBLOCKED.
+
 .TP
 .B project:<project-name>
 Specifies the project to which a task is related to.
@@ -571,14 +613,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
@@ -792,10 +826,12 @@ task ... due:7/14/2008

 .TP
 ISO-8601
-task ... due:20120314T223000Z
+task ... due:20130314T223000Z

 .TP
 Relative wording
+task ... due:now
+.br
 task ... due:today
 .br
 task ... due:yesterday
@@ -813,7 +849,7 @@ task ... due:1day
 task ... due:9hrs

 .TP
-Start of (work) week (Monday), calendar week (Sunday or Monday), month, quarter and year
+Start of next (work) week (Monday), calendar week (Sunday or Monday), month, quarter and year
 .br
 task ... due:sow
 .br
@@ -828,7 +864,7 @@ task ... due:soq
 task ... due:soy

 .TP
-End of (work) week (Friday), calendar week (Saturday or Sunday), month, quarter and year
+End of current (work) week (Friday), calendar week (Saturday or Sunday), month, quarter and year
 .br
 task ... due:eow
 .br
@@ -854,6 +890,22 @@ This sets the wait date to 1/18/2038.
 .TP
 Next occurring weekday
 task ... due:fri
+
+.TP
+Predictable holidays
+task ... due:goodfriday
+.br
+task ... due:easter
+.br
+task ... due:eastermonday
+.br
+task ... due:ascension
+.br
+task ... due:pentecost
+.br
+task ... due:midsommar
+.br
+task ... due:midsommarafton
 .RE

 .SS FREQUENCIES
@@ -974,7 +1026,8 @@ Taskwarrior stores its configuration in a file in the user's home directory:
 .B task rc:<path-to-alternate-file> ...
 Specifies an alternate configuration file.

-.TP TASKRC=/tmp/.taskrc task ..
+.TP
+.B TASKRC=/tmp/.taskrc task ..
 The environment variable overrides the default and the command line
 specification of the .taskrc file.

@@ -1028,15 +1081,16 @@ 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 \- 2014 P. Beckingham, F. Hernandez.

 Taskwarrior is distributed under the MIT license. See
 http://www.opensource.org/licenses/mit-license.php for more information.

 .SH SEE ALSO
+.BR tasksh(1),
 .BR taskrc(5),
 .BR task-tutorial(5),
 .BR task-faq(5),
--- a/doc/man/taskrc.5.in
+++ b/doc/man/taskrc.5.in
@@ -1,4 +1,4 @@
-.TH taskrc 5 2012-07-24 "${PACKAGE_STRING}" "User Manuals"
+.TH taskrc 5 2014-01-15 "${PACKAGE_STRING}" "User Manuals"

 .SH NAME
 taskrc \- Configuration file for the task(1) command
@@ -80,6 +80,8 @@ The hash mark, or pound sign ("#") is used as a comment character. It can be
 used to annotate the configuration file. All text after the character to the end
 of the line is ignored.

+The configuration file supports UTF8 as well as JSON encoding, such as \\uNNNN.
+
 Note that taskwarrior is flexible about the values used to represent Boolean
 items.  You can use "on", "yes", "y", "1" and "true".
 Anything else means "off".
@@ -89,7 +91,7 @@ You can edit your .taskrc file by hand if you wish, or you can use the 'config'
 command.  To permanently set a value in your .taskrc file, use this command:

 .RS
-$ task config nag "You have higher priority tasks!"
+$ task config nag "You have more urgent tasks."
 .RE

 To delete an entry, use this command:
@@ -129,9 +131,9 @@ ones containing just the relevant configuration data like colors, etc.
 There are two excellent uses of includes in your .taskrc, shown here:

 .RS
-include /usr/local/share/doc/task/rc/holidays.en-US.rc
+include ${CMAKE_INSTALL_PREFIX}/${TASK_RCDIR}/holidays.en-US.rc
 .br
-include /usr/local/share/doc/task/rc/dark-16.theme
+include ${CMAKE_INSTALL_PREFIX}/${TASK_RCDIR}/dark-16.theme
 .RE

 This includes two standard files that are distributed with taskwarrior, which
@@ -139,7 +141,7 @@ define a set of US holidays, and set up a 16-color theme to use, to color the
 reports and calendar.

 .SH ENVIRONMENT VARIABLES
-These environmant variables override defaults and command line arguments.
+These environment variables override defaults and command line arguments.

 .TP
 .B TASKDATA=~/.task
@@ -230,9 +232,9 @@ that you would see a smaller, more compact representation of the task, with no
 help text.  Deprecated - use verbosity token 'edit'.

 .TP
-.B locale=en-US.UTF8
-Locale to be used by Taskwarrior for synchronization with the task server.  The
-default value is currently blank.
+.B reserved.lines=1
+This is the number of lines reserved at the bottom of the screen for the shell
+prompt.  This is only referenced when 'limit:page' is used.

 .SS MISCELLANEOUS

@@ -258,6 +260,7 @@ control specific occasions when output is generated.  This list may contain:
    edit       Used the verbose template for the 'edit' command
    special    Feedback when applying special tags
    project    Feedback about project status changes
+    sync       Feedback about the need for sync

 Note that the "on" setting is equivalent to all the tokens being specified,
 and the "nothing" setting is equivalent to none of the tokens being specified.
@@ -265,7 +268,7 @@ and the "nothing" setting is equivalent to none of the tokens being specified.
 Here are the shortcut equivalents:

    verbose=on
-    verbose=blank,header,footnote,label,new-id,affected,edit,special,project
+    verbose=blank,header,footnote,label,new-id,affected,edit,special,project,sync

    verbose=off
    verbose=blank,label,new-id,edit
@@ -316,11 +319,11 @@ variable is "no".
 This is useful for preventing large-scale unintended changes.

 .TP
-.B nag=You have higher priority tasks.
+.B nag=You have more urgent tasks.
 This may be a string of text, or blank. It is used as a prompt when a task is
 started or completed that is not considered high priority.  Default value is:
-You have higher priority tasks.  It is a gentle reminder that you are
-contradicting your own priority settings.
+You have more urgent tasks.  It is a gentle reminder that you are contradicting
+your own priority settings.

 .TP
 .B complete.all.projects=yes
@@ -346,6 +349,11 @@ May be yes or no, and determines whether the 'tags' command lists all the tag
 names you have used, or just the ones used in active tasks.  The default value is
 "no".

+.TP
+.B print.empty.columns=no
+May be yes or no, and determines whether columns with no data for any task are
+printed.  Defaults to no.
+
 .TP
 .B search.case.sensitive=yes
 May be yes or no, and determines whether keyword lookup and substitutions on the
@@ -398,11 +406,6 @@ $ task rc._forcecolor=yes list > file
 .RE
 .RE

-.TP
-.B shell.prompt=task>
-The task shell command uses this value as a prompt.  You can change it to any
-string you like.
-
 .TP
 .B active.indicator=*
 The character or string to show in the start.active column.  Defaults to *.
@@ -457,6 +460,10 @@ debug output can be useful.  It can also help explain how the command line is
 being parsed, but the information is displayed in a developer-friendly, not a
 user-friendly way.

+.TP
+.B debug.tls=0
+Controls the GnuTLS log level.  For 'sync' debugging.
+
 .TP
 .B alias.rm=delete
 Taskwarrior supports command aliases.  This alias provides an alternate name
@@ -472,19 +479,19 @@ Enables the extension system.  Defaults to on.
 .SS DATES

 .TP
-.B dateformat=m/d/Y
+.B dateformat=Y-M-D
 .TP
-.B dateformat.report=m/d/Y
+.B dateformat.report=
 .TP
 .B dateformat.holiday=YMD
 .TP
-.B dateformat.edit=m/d/Y H:N:S
+.B dateformat.edit=Y-M-D H:N:S
 .TP
-.B dateformat.info=m/d/Y H:N:S
+.B dateformat.info=Y-M-D H:N:S
 .TP
-.B dateformat.annotation=m/d/Y
+.B dateformat.annotation=
 .TP
-.B report.X.dateformat=m/d/Y
+.B report.X.dateformat=Y-M-D
 This is a string of characters that defines how taskwarrior formats date values.
 The precedence order for the configuration variable is report.X.dateformat then
 dateformat.report then dateformat for formating the due dates in reports.
@@ -493,40 +500,58 @@ will be applied
 to the date.  Entered dates as well as all other displayed dates in reports
 are formatted according to dateformat.

-The default value is: m/d/Y.  The string should contain the characters:
+The default value is the ISO-8601 standard: Y-M-D.  The string can contain the
+characters:

 .RS
 .RS
-m  minimal-digit month,   for example 1 or 12
+m  minimal-digit month,    for example 1 or 12
 .br
-d  minimal-digit day,     for example 1 or 30
+d  minimal-digit day,      for example 1 or 30
 .br
-y  two-digit year,        for example 09
+y  two-digit year,         for example 09 or 12
 .br
-D  two-digit day,         for example 01 or 30
+D  two-digit day,          for example 01 or 30
 .br
-M  two-digit month,       for example 01 or 12
+M  two-digit month,        for example 01 or 12
 .br
-Y  four-digit year,       for example 2009
+Y  four-digit year,        for example 2009 or 2014
 .br
-a  short name of weekday, for example Mon or Wed
+a  short name of weekday,  for example Mon or Wed
 .br
-A  long name of weekday,  for example Monday or Wednesday
+A  long name of weekday,   for example Monday or Wednesday
 .br
-b  short name of month,   for example Jan or Aug
+b  short name of month,    for example Jan or Aug
 .br
-B  long name of month,    for example January or August
+B  long name of month,     for example January or August
 .br
-V  weeknumber,            for example 03 or 37
+v  minimal-digit week,     for example 3 or 37
 .br
-H  two-digit hour,        for example 03 or 11
+V  two-digit week,         for example 03 or 37
 .br
-N  two-digit minutes,     for example 05 or 42
+h  minimal-digit hour,     for example 3 or 21
 .br
-S  two-digit seconds,     for example 07 or 47
+n  minimal-digit minutes,  for example 5 or 42
+.br
+s  minimal-digit seconds,  for example 7 or 47
+.br
+H  two-digit hour,         for example 03 or 21
+.br
+N  two-digit minutes,      for example 05 or 42
+.br
+S  two-digit seconds,      for example 07 or 47
+.br
+J  three-digit Julian day, for example 023 or 365
+.br
+j  Julian day,             for example 23 or 365
 .RE
 .RE

+.RS
+The characters 'v', 'V', 'a' and 'A' can only be used for formatting printed
+dates (not to parse them).
+.RE
+
 .RS
 The string may also contain other characters to act as spacers, or formatting.
 Examples for other values of dateformat:
@@ -550,20 +575,36 @@ Examples for other values of dateformat.report:
 .RS
 .RS
 .br
-a D b Y (V)  would do an output as "Fri 24 Jul 2009 (30)"
+a D b Y (V)   would do an output as "Fri 24 Jul 2009 (30)"
 .br
-A, B D, Y    would do an output as "Friday, July 24, 2009"
+A, B D, Y     would do an output as "Friday, July 24, 2009"
 .br
-vV a Y-M-D   would do an output as "v30 Fri 2009-07-24"
+wV a Y-M-D    would do an output as "w30 Fri 2009-07-24"
 .br
-yMD.HN       would do an output as "110124.2342"
+yMD.HN        would do an output as "110124.2342"
 .br
-m/d/Y H:N    would do an output as "1/24/2011 10:42"
+m/d/Y H:N     would do an output as "1/24/2011 10:42"
 .br
 a D b Y H:N:S would do an output as "Mon 24 Jan 2011 11:19:42"
 .RE
 .RE

+.RS
+Undefined fields are put to their minimal valid values (1 for month and day and
+0 for hour, minutes and seconds) when there is at least one more global date
+field that is set.  Otherwise, they are set to the corresponding values of
+"now".  For example:
+.RE
+
+.RS
+.RS
+.br
+8/1/2013  with m/d/Y   implies August 1, 2013 at midnight (inferred)
+.br
+8/1 20:40 with m/d H:N implies August 1, 2013 (inferred) at 20:40
+.RE
+.RE
+
 .TP
 .B weekstart=Sunday
 Determines the day a week starts. Valid values are Sunday or Monday only. The
@@ -683,7 +724,7 @@ be included like this:
 .RS
 .RS
 .br
-include /usr/local/share/doc/task/rc/holidays.en-US.rc
+include ${CMAKE_INSTALL_PREFIX}/${TASK_RCDIR}/holidays.en-US.rc
 .RE
 .RE

@@ -815,6 +856,11 @@ Colors any task assigned to project X.
 Colors any task where the description or any annotation contains X.
 .RE

+.TP
+.B color.uda.X=on green
+Colors any task that has the user defined attribute X.
+.RE
+
 .TP
 .B color.error=green
 Colors any of the error messages.
@@ -934,11 +980,11 @@ a change that is to be reverted.
 .br
 .B color.sync.rejected=red
 .RS
-Colors the output of the merge command.
+Colors the output of the sync command.
 .RE

 .TP
-.B rule.precedence.color=due.today,active,blocking,blocked,overdue,due,scheduled,keyword.,project.,tag.,recurring,pri,tagged,completed,deleted
+.B rule.precedence.color=due.today,active,blocking,blocked,overdue,due,scheduled,keyword.,project.,tag.,uda.,recurring,pri.,tagged,completed,deleted
 .RS
 This setting specifies the precedence of the color rules, from highest to
 lowest.  Note that the prefix 'color.' is omitted (for brevity), and that any
@@ -1017,6 +1063,7 @@ Specific tag coefficient.
 .B urgency.user.project.<project>.coefficient=...
 .RS
 Specific project coefficient.
+.RE
 .B urgency.uda.<name>.coefficient=...
 .RS
 Presence/absence of UDA data.
@@ -1055,31 +1102,6 @@ shadow.notify=on
 When this value is set to "on", taskwarrior will display a message whenever the
 shadow file is updated by some task command.

-.SS PUSH/PULL/MERGE
-
-See the 'man task-synch' page for more details regarding usage.
-
-.TP
-.B merge.autopush=yes|no|ask
-.RS
-Determines post-merge behavior regarding automatic push.
-.RE
-
-.B merge.default.uri
-.RS
-Default merge URI.
-.RE
-
-.B pull.default.uri
-.RS
-Default pull URI.
-.RE
-
-.B push.default.uri
-.RS
-Default push URI.
-.RE
-
 .SS DEFAULTS

 .TP
@@ -1103,6 +1125,13 @@ Provides a default due date for the
 .I task add
 command, if you don't specify one.  The default is blank.

+.TP
+.B
+uda.<name>.default=...
+Provides default values for UDA fields when using the
+.I task add
+command, if you don't specify values.  The default is blank.
+
 .TP
 .B
 default.command=next
@@ -1150,11 +1179,8 @@ The description for report X when running the "task help" command.

 .TP
 .B report.X.columns
-The columns that will be used when generating the report X. Valid columns are:
-id, uuid, status, project, priority, priority_long, entry, start, end, due,
-countdown, countdown_compact, age, age_compact, active, tags, depends,
-description_only, description, recur, recurrence_indicator, tag_indicator and
-wait.  The IDs are separated by commas.
+This is a comma-separated list of columns and formatting specifiers.  See the
+command 'task columns' for a full list of options and examples.

 .TP
 .B report.X.labels
@@ -1168,7 +1194,7 @@ specified by using the column ids post-fixed by a "+" for ascending sort order
 or a "-" for descending sort order. The sort IDs are separated by commas.
 For example:

-    report.list.sort=due+,priority-,active-,project+
+    report.list.sort=due+,priority-,start.active-,project+

 .TP
 .B report.X.filter
@@ -1307,8 +1333,63 @@ of a task.
 .B uda.estimate.values=trivial,small,medium,large,huge
 .RE

+.SS SYNC
+
+These configuration settings are used to connect and sync tasks with the task
+server.
+
+.TP
+.B taskd.server=<host>:<port>
+.RS
+Specifies the hostname and port of the Taskserver.  Hostname may be an IPv4 or
+IPv6 address, or domain.  Port is an integer.
+.RE
+
+.TP
+.B taskd.credentials=<organization>/<user>/<key>
+.RS
+User identification for the Taskserver, which includes a private key.
+.RE
+
+.TP
+.B taskd.certificate=<path>
+.RS
+Specifies the path to the client certificate used for identification with the
+Taskserver.
+.RE
+
+.TP
+.B taskd.key=<path>
+.RS
+Specifies the path to the client key used for encrypted communication with the
+Taskserver.
+.RE
+
+.TP
+.B taskd.ca=<path>
+.RS
+Specifies the path to the CA certificate in the event that your Taskserver is
+using a self-signed certificate.  Optional.
+.RE
+
+.TP
+.B taskd.trust=yes|no
+.RS
+If you do not specify a CA certificate when your Taskserver is using a self-
+signed certificate, you can override the certificate validation by setting this
+value to 'yes'.  Default is not to trust a server certificate.
+.RE
+
+.TP
+.B taskd.ciphers=NORMAL
+Override of the cipher selection.  The set of ciphers used by TLS may be
+controlled by both server and client.  There must be some overlap between
+client and server supported ciphers, or communication cannot occur.
+Default is "NORMAL".  See GnuTLS documentation for full details.
+.RE
+
 .SH "CREDITS & COPYRIGHTS"
-Copyright (C) 2006 \- 2012 P. Beckingham, F. Hernandez.
+Copyright (C) 2006 \- 2014 P. Beckingham, F. Hernandez.

 This man page was originally written by Federico Hernandez.

@@ -1317,6 +1398,7 @@ http://www.opensource.org/licenses/mit-license.php for more information.

 .SH SEE ALSO
 .BR task(1),
+.BR tasksh(1),
 .BR task-tutorial(5),
 .BR task-faq(5),
 .BR task-color(5),
--- a/doc/man/tasksh.1.in
+++ b/doc/man/tasksh.1.in
@@ -0,0 +1,185 @@
+.TH tasksh 1 2014-01-15 "${PACKAGE_STRING}" "User Manuals"
+
+.SH NAME
+tasksh \- Interactive taskwarrior shell
+
+.SH SYNOPSIS
+.B tasksh [<commands-file>]
+.br
+.B tasksh --version
+.br
+.B tasksh --help
+
+.SH DESCRIPTION
+The tasksh program can be used to create a more immersive task environment.
+Any task command you run outside the shell can also be run inside the shell,
+without the need to prefix every command with "task".
+
+.br
+Moreover, task commands can be written in a file which can be passed or
+redirected to tasksh for batch execution.
+
+.RS
+$ tasksh
+.br
+.B task 2.3.0
+shell
+.br
+
+.br
+Enter any task command (such as 'list'), or hit 'Enter'.
+.br
+There is no need to include the 'task' command itself.
+.br
+Enter 'quit' to end the session.
+.br
+
+.br
+task> projects
+.br
+
+.br
+Project Tasks Pri:None Pri:L Pri:M Pri:H
+.br
+------- ----- -------- ----- ----- -----
+.br
+            7        7     0     0     0
+.br
+home        2        2     0     0     0
+.br
+party       6        3     0     0     3
+.br
+
+.br
+3 projects (15 tasks)
+.br
+task> tags
+.br
+
+.br
+Tag  Count
+.br
+mall     2
+.br
+
+.br
+1 tag (15 tasks)
+.br
+task> list
+.br
+
+.br
+ID Project Pri Due        Active Age   Description
+.br
+---------------------------------------------------------------------
+.br
+ 2 party   H   10/17/2010        2 hrs Select and book a venue
+.br
+ 5 party   H   10/22/2010        2 hrs Design invitations
+.br
+ 9 home        10/31/2010         1 hr Pay rent
+.br
+ 3 party                         2 hrs Mail invitations
+.br
+ 4 party                         2 hrs Select a caterer
+.br
+ 6 party                         2 hrs Print invitations
+.br
+
+.br
+ 8 tasks
+.br
+ task> quit
+.br
+ $
+.br
+ $ cat task.commands
+.br
+ add foo
+.br
+ add bar
+.br
+ $ tasksh task.commands
+.br
+ task 2.3.0 shell
+.br
+
+.br
+ Enter any task command (such as 'list'), or hit 'Enter'.
+.br
+ There is no need to include the 'task' command itself.
+.br
+ Enter 'quit' to end the session.
+.br
+
+.br
+ task> add foo
+.br
+ Created task 8.
+.br
+ task> add bar
+.br
+ Created task 9.
+.br
+ $
+.br
+ $ cat task.commands | tasksh
+.br
+ task 2.3.0 shell
+.br
+
+.br
+ Enter any task command (such as 'list'), or hit 'Enter'.
+.br
+ There is no need to include the 'task' command itself.
+.br
+ Enter 'quit' to end the session.
+.br
+
+.br
+ task> add foo
+.br
+ Created task 8.
+.br
+ task> add bar
+.br
+ Created task 9.
+.br
+
+.RE
+
+.SH "CREDITS & COPYRIGHTS"
+Copyright (C) 2006 \- 2014 P. Beckingham, F. Hernandez.
+
+This man page was originally written by Federico Hernandez.
+
+Taskwarrior is distributed under the MIT license. See
+http://www.opensource.org/licenses/mit-license.php for more information.
+
+.SH SEE ALSO
+.BR task(1),
+.BR task-tutorial(5),
+.BR taskrc(5),
+.BR task-faq(5),
+.BR task-color(5),
+.BR task-sync(5)
+
+For more information regarding taskwarrior, see the following:
+
+.TP
+The official site at
+<http://taskwarrior.org>
+
+.TP
+The official code repository at
+<git://tasktools.org/task.git/>
+
+.TP
+You can contact the project by emailing
+<support@taskwarrior.org>
+
+.SH REPORTING BUGS
+.TP
+Bugs in taskwarrior may be reported to the issue-tracker at
+<http://taskwarrior.org>
+
--- a/doc/misc/tutorial/01_intro/script.txt
+++ b/doc/misc/tutorial/01_intro/script.txt
@@ -0,0 +1,65 @@
+[Make window 116x32 for movie recording, light text, dark background]
+
+On the left are the typed commands.  On the right is the audio track.  Where the
+left and right are aligned, the audio should match the commands.
+
+
+---------------------------------------- Intro -----------------------------------------------------
+
+# Hi.                                    Hello, and welcome to Taskwarrior.  This is the first of
+                                         many tutorials, and covers first-time use.
+
+                                         As a first-time user, you are going to need a configuration
+                                         file and a data directory.  Taskwarrior will create both of
+                                         these for you, in your home directory, the first time you
+                                         run taskwarrior.
+
+task version                             Answer 'yes' to the question.  After creating the missing
+                                         file and directory, you'll see the current version
+                                         displayed.
+
+cat ~/.taskrc                            The configuration file contains very little.  This is
+                                         because Taskwarrior has a built-in set of sensible defaults
+                                         and the configuration file just contains overrides to those
+                                         defaults.
+
+ls -l ~/.task                            The task data directory is empty.  That's because we have
+                                         added no tasks.  Typically you won't need to look in that
+                                         directory.
+
+                                         ---
+
+                                         Let's get started with tasks.  Here is the 30-second
+                                         tutorial on basic takwarrior usage.
+
+task add Read task documents later       We Add two tasks.
+task add priority:H Pay bills            
+
+                                         Easy. Do you see that second one has a High priority?
+
+task ls                                  Now let's look at those tasks.  They are ordered by
+                                         priority. Let's mark number 2 as done:
+
+task 2 done
+task ls
+
+                                         Task 2 is now gone.  Now we can delete that remaining task,
+                                         because, well, why bother now we are already using task:
+
+task 1 delete
+task ls
+
+                                         And that's all you *need* to know.  These four commands
+                                         will allow you to use taskwarrior effectively.  If you are
+                                         new to taskwarrior, it is recommended that you stop here,
+                                         and go manage your task lists.  We don't want you to be
+                                         overwhelmed, when what you really need is a way to
+                                         organize and get things done.
+
+                                         When you are comfortable with basic taskwarrior usage,
+                                         there are many other features you can learn about.  While
+                                         you are not expected to learn all of them, or even find
+                                         them useful, you might just find exactly what you need.
+
+---------------------------------------- End -------------------------------------------------------
+
--- a/doc/misc/tutorial/02_help/script.txt
+++ b/doc/misc/tutorial/02_help/script.txt
@@ -0,0 +1,55 @@
+[Make window 116x32 for movie recording, light text, dark background]
+
+On the left are the typed commands.  On the right is the audio track.  Where the
+left and right are aligned, the audio should match the commands.
+
+
+---------------------------------------- Help ------------------------------------------------------
+
+                                         There are several forms of help available.  We will look at
+                                         the various options.
+
+# http//taskwarrior.org                  If you find you have any questions, you can get answers in
+                                         several ways.  The website has user forums, issue tracking
+                                         and online documentation, including this tutorial.
+
+                                         There is also a command reference PDF that we recommend
+                                         you download and use.  It shows all the supported commands
+                                         and options at a glance.
+
+# IRC #taskwarrior                       You can join the Taskwarrior IRC channel to pose questions,
+                                         or join in the discussion.
+
+# support@taskwarrior.org                Or you can submit your request by email.  The various
+                                         support options are all volunteer-run.
+
+task help                                There is a built in help page which summarizes commands,
+                                         reports and other details.
+
+man task                                 Finally, you have several man pages installed that contain
+                                         all the written documentation, including this tutorial.
+                                         The main man page offers syntax and command help.
+
+man taskrc                               The taskrc page describes all the supported configuration
+                                         options (and there are many), which you can use to
+                                         customize the behavior of taskwarrior.
+
+man task-color                           Use of color, color rules and themes are described in the
+                                         task color page.
+
+man task-tutorial                        The tutorial faq is simply an aggregated collection of all
+                                         the tutorials.
+
+man task-sync                            This page describes the various sync alternatives, with
+                                         examples to help you keep your tasks lists up to date.
+
+                                         ---
+
+                                         If you find a bug, or even suspect you found a bug, please
+                                         let us know.  Ideally you would send an email to
+                                         support@taskwarrior.org, describe the problem, and include
+task diagnostics                         information about your installation.  The 'diagnostics'
+                                         command provides the details we might need to diagnose the
+                                         problem.
+
+---------------------------------------- End -------------------------------------------------------
--- a/doc/misc/tutorial/NN_configuration/script.txt
+++ b/doc/misc/tutorial/NN_configuration/script.txt
@@ -0,0 +1,64 @@
+[Make window 116x32 for movie recording, light text, dark background]
+
+On the left are the typed commands.  On the right is the audio track.  Where the
+left and right are aligned, the audio should match the commands.
+
+
+---------------------------------------- Configuration ---------------------------------------------
+
+cat ~/.taskrc                            The taskwarrior configuration file is minimal.  This means
+                                         it contains only what is needed to override the default
+                                         settings.  Initially you see that the config file contains
+                                         just one setting which points to your data directory.
+
+task show                                The 'show' command displays all the configuration settings
+                                         with their current values.  These are all described in the
+                                         taskrc man page.
+
+task show hyph                           You can provide a pattern, to limit the results to only
+                                         settings that match the pattern.
+
+task config hypenate off                 The config command is used to modify the configuration,
+                                         here we are turning off hyphenation.  Notice that changes
+                                         require confirmation.
+
+task show hyph                           Now when we look at the setting, we see that it is now
+                                         highlighted to indicate that it not longer has the default
+                                         value.
+
+task config hyphenate on                 We can turn that setting back on.
+
+task config hyphenate                    Alternatively we can just remove the setting, and rely on
+                                         the default.  This is a better choice because it de-
+                                         clutters your configuration file.
+
+task config answer 42                    In this example, we set the configuration variable 'answer'
+                                         to have a value of 42.
+
+task show answer                         The 'show' command indicates that the setting is not
+                                         recognized.  This could indicate a mistake with the setting
+                                         name.  It is harmless to have unrecognized settings, but
+                                         also pointless.
+
+task config answer ''                    Specifying an empty value using quotes is how you would
+                                         set a blank value without restoring default settings.
+
+task config answer                       In this case, deleting the setting is correct.
+
+                                         ---
+
+task rc.hyphenate=off list               A very powerful feature is the ability to override the
+                                         configuration variables temporarily.  Here we are running
+                                         the 'list' report with hyphenation temporarily disabled.
+
+task rc.data.location=/other/path list   You can also override the data directory to use a different
+                                         task list ...
+
+task rc:~/.other_taskrc list             Or you can override the configuration file completely.
+
+TASKDATA=/other/path task list           The TASKDATA environment variable can also be used to
+                                         specify an alternate data directory, and ...
+
+TASKRC=~/.other_taskrc list              The TASKRC variable can override the configuration file.
+
+---------------------------------------- End -------------------------------------------------------
--- a/doc/misc/tutorial/README
+++ b/doc/misc/tutorial/README
@@ -0,0 +1,34 @@
+This is an outline of the tutorial contents.  The numbered directories indicate
+the general order in which the tutorials should be viewed, because the commands
+used build on prior knowledge.
+
+The non-numbered directories just represent the sections of the old tutorial.
+Because of the old 15-minute limit on video size, the old tutorial was broken
+into two parts, and edited down so that it fit.  This new effort avoids this by
+having many, smaller sections that explore features at a greater depth.
+
+01_intro
+  First time use
+    Setup
+    version
+  30-second Tutorial
+    add
+    ls
+    done
+    delete
+
+02_help
+  Support options
+    Web site
+    Command Reference 
+    IRC
+    Email
+    Man pages
+    Reporting bugs
+
+NN_configuration
+  show command
+  config command
+  rc overrides
+  TASKDATA, TASKRC
+
--- a/doc/misc/tutorial/active/run.200
+++ b/doc/misc/tutorial/active/run.200
@@ -306,20 +306,7 @@ 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
+# 17 Special tags
 echo Special tags --------------------------------------------------------------
 echo $ task 6 +nocolor
 task 6 +nocolor
@@ -330,7 +317,7 @@ task tags
 echo $ task 6 -nocolor
 task 6 -nocolor

-# 19 Waiting
+# 18 Waiting
 echo Waiting --------------------------------------------------------------
 echo $ task add Look for new apartment due:eoy
 task add Look for new apartment due:eoy
@@ -354,7 +341,7 @@ task list
 echo $ task 11 rc.confirmation:no delete
 task 11 rc.confirmation:no delete

-# 20 Dependencies
+# 19 Dependencies
 echo Dependencies --------------------------------------------------------------
 echo $ task list pro:party
 task list pro:party
@@ -385,7 +372,7 @@ echo 'y' | task  2 done
 echo $ task 1 info
 task  1 info

-# 21 Reports
+# 20 Reports
 echo Reports --------------------------------------------------------------
 echo $ task minimal
 task  minimal
@@ -414,7 +401,7 @@ task  timesheet
 echo $ task next
 task  next

-# 22 Custom report
+# 21 Custom report
 echo Custom report --------------------------------------------------------------
 echo 'report.foo.description=My own report'     >> x
 echo 'report.foo.columns=id,entry,description'  >> x
@@ -428,7 +415,7 @@ task  show report.foo
 echo $ task foo
 task  foo

-# 23 Charts
+# 22 Charts
 echo Charts --------------------------------------------------------------
 echo $ task history
 task history
@@ -441,7 +428,7 @@ task ghistory.annual
 echo $ task summary
 task summary

-# 24 Advanced filters
+# 23 Advanced filters
 echo Advanced filters --------------------------------------------------------------
 echo $ task list
 task  list
@@ -470,7 +457,7 @@ task  all status:pending
 echo $ task all status:waiting
 task  all status:waiting

-# 25 Import/export
+# 24 Import/export
 echo Import/export --------------------------------------------------------------
 echo $ task export.csv
 task  export.csv
@@ -507,7 +494,7 @@ printf "y\n" | task  import file.yaml
 echo $ task new limit:2
 task  new limit:2

-# 26 Help
+# 25 Help
 echo Help --------------------------------------------------------------
 echo $ task help
 task  help
@@ -524,7 +511,7 @@ echo $ man task-faq
 echo $ man task-sync
 #man task-sync

-# 27 Wrap up
+# 26 Wrap up
 echo Wrap up --------------------------------------------------------------
 echo $ task version
 task  version
--- a/doc/misc/tutorial/aliases/run.200
+++ b/doc/misc/tutorial/aliases/run.200
@@ -306,20 +306,7 @@ 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
+# 17 Special tags
 echo Special tags --------------------------------------------------------------
 echo $ task 6 +nocolor
 task 6 +nocolor
@@ -330,7 +317,7 @@ task tags
 echo $ task 6 -nocolor
 task 6 -nocolor

-# 19 Waiting
+# 18 Waiting
 echo Waiting --------------------------------------------------------------
 echo $ task add Look for new apartment due:eoy
 task add Look for new apartment due:eoy
@@ -354,7 +341,7 @@ task list
 echo $ task 11 rc.confirmation:no delete
 task 11 rc.confirmation:no delete

-# 20 Dependencies
+# 19 Dependencies
 echo Dependencies --------------------------------------------------------------
 echo $ task list pro:party
 task list pro:party
@@ -385,7 +372,7 @@ echo 'y' | task  2 done
 echo $ task 1 info
 task  1 info

-# 21 Reports
+# 20 Reports
 echo Reports --------------------------------------------------------------
 echo $ task minimal
 task  minimal
@@ -414,7 +401,7 @@ task  timesheet
 echo $ task next
 task  next

-# 22 Custom report
+# 21 Custom report
 echo Custom report --------------------------------------------------------------
 echo 'report.foo.description=My own report'     >> x
 echo 'report.foo.columns=id,entry,description'  >> x
@@ -428,7 +415,7 @@ task  show report.foo
 echo $ task foo
 task  foo

-# 23 Charts
+# 22 Charts
 echo Charts --------------------------------------------------------------
 echo $ task history
 task history
@@ -441,7 +428,7 @@ task ghistory.annual
 echo $ task summary
 task summary

-# 24 Advanced filters
+# 23 Advanced filters
 echo Advanced filters --------------------------------------------------------------
 echo $ task list
 task  list
@@ -470,7 +457,7 @@ task  all status:pending
 echo $ task all status:waiting
 task  all status:waiting

-# 25 Import/export
+# 24 Import/export
 echo Import/export --------------------------------------------------------------
 echo $ task export.csv
 task  export.csv
@@ -507,7 +494,7 @@ printf "y\n" | task  import file.yaml
 echo $ task new limit:2
 task  new limit:2

-# 26 Help
+# 25 Help
 echo Help --------------------------------------------------------------
 echo $ task help
 task  help
@@ -524,7 +511,7 @@ echo $ man task-faq
 echo $ man task-sync
 #man task-sync

-# 27 Wrap up
+# 26 Wrap up
 echo Wrap up --------------------------------------------------------------
 echo $ task version
 task  version
--- a/doc/misc/tutorial/annotations/run.200
+++ b/doc/misc/tutorial/annotations/run.200
@@ -306,20 +306,7 @@ 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
+# 17 Special tags
 echo Special tags --------------------------------------------------------------
 echo $ task 6 +nocolor
 task 6 +nocolor
@@ -330,7 +317,7 @@ task tags
 echo $ task 6 -nocolor
 task 6 -nocolor

-# 19 Waiting
+# 18 Waiting
 echo Waiting --------------------------------------------------------------
 echo $ task add Look for new apartment due:eoy
 task add Look for new apartment due:eoy
@@ -354,7 +341,7 @@ task list
 echo $ task 11 rc.confirmation:no delete
 task 11 rc.confirmation:no delete

-# 20 Dependencies
+# 19 Dependencies
 echo Dependencies --------------------------------------------------------------
 echo $ task list pro:party
 task list pro:party
@@ -385,7 +372,7 @@ echo 'y' | task  2 done
 echo $ task 1 info
 task  1 info

-# 21 Reports
+# 20 Reports
 echo Reports --------------------------------------------------------------
 echo $ task minimal
 task  minimal
@@ -414,7 +401,7 @@ task  timesheet
 echo $ task next
 task  next

-# 22 Custom report
+# 21 Custom report
 echo Custom report --------------------------------------------------------------
 echo 'report.foo.description=My own report'     >> x
 echo 'report.foo.columns=id,entry,description'  >> x
@@ -428,7 +415,7 @@ task  show report.foo
 echo $ task foo
 task  foo

-# 23 Charts
+# 22 Charts
 echo Charts --------------------------------------------------------------
 echo $ task history
 task history
@@ -441,7 +428,7 @@ task ghistory.annual
 echo $ task summary
 task summary

-# 24 Advanced filters
+# 23 Advanced filters
 echo Advanced filters --------------------------------------------------------------
 echo $ task list
 task  list
@@ -470,7 +457,7 @@ task  all status:pending
 echo $ task all status:waiting
 task  all status:waiting

-# 25 Import/export
+# 24 Import/export
 echo Import/export --------------------------------------------------------------
 echo $ task export.csv
 task  export.csv
@@ -507,7 +494,7 @@ printf "y\n" | task  import file.yaml
 echo $ task new limit:2
 task  new limit:2

-# 26 Help
+# 25 Help
 echo Help --------------------------------------------------------------
 echo $ task help
 task  help
@@ -524,7 +511,7 @@ echo $ man task-faq
 echo $ man task-sync
 #man task-sync

-# 27 Wrap up
+# 26 Wrap up
 echo Wrap up --------------------------------------------------------------
 echo $ task version
 task  version
--- a/doc/misc/tutorial/calendar/run.200
+++ b/doc/misc/tutorial/calendar/run.200
@@ -306,20 +306,7 @@ 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
+# 17 Special tags
 echo Special tags --------------------------------------------------------------
 echo $ task 6 +nocolor
 task 6 +nocolor
@@ -330,7 +317,7 @@ task tags
 echo $ task 6 -nocolor
 task 6 -nocolor

-# 19 Waiting
+# 18 Waiting
 echo Waiting --------------------------------------------------------------
 echo $ task add Look for new apartment due:eoy
 task add Look for new apartment due:eoy
@@ -354,7 +341,7 @@ task list
 echo $ task 11 rc.confirmation:no delete
 task 11 rc.confirmation:no delete

-# 20 Dependencies
+# 19 Dependencies
 echo Dependencies --------------------------------------------------------------
 echo $ task list pro:party
 task list pro:party
@@ -385,7 +372,7 @@ echo 'y' | task  2 done
 echo $ task 1 info
 task  1 info

-# 21 Reports
+# 20 Reports
 echo Reports --------------------------------------------------------------
 echo $ task minimal
 task  minimal
@@ -414,7 +401,7 @@ task  timesheet
 echo $ task next
 task  next

-# 22 Custom report
+# 21 Custom report
 echo Custom report --------------------------------------------------------------
 echo 'report.foo.description=My own report'     >> x
 echo 'report.foo.columns=id,entry,description'  >> x
@@ -428,7 +415,7 @@ task  show report.foo
 echo $ task foo
 task  foo

-# 23 Charts
+# 22 Charts
 echo Charts --------------------------------------------------------------
 echo $ task history
 task history
@@ -441,7 +428,7 @@ task ghistory.annual
 echo $ task summary
 task summary

-# 24 Advanced filters
+# 23 Advanced filters
 echo Advanced filters --------------------------------------------------------------
 echo $ task list
 task  list
@@ -470,7 +457,7 @@ task  all status:pending
 echo $ task all status:waiting
 task  all status:waiting

-# 25 Import/export
+# 24 Import/export
 echo Import/export --------------------------------------------------------------
 echo $ task export.csv
 task  export.csv
@@ -507,7 +494,7 @@ printf "y\n" | task  import file.yaml
 echo $ task new limit:2
 task  new limit:2

-# 26 Help
+# 25 Help
 echo Help --------------------------------------------------------------
 echo $ task help
 task  help
@@ -524,7 +511,7 @@ echo $ man task-faq
 echo $ man task-sync
 #man task-sync

-# 27 Wrap up
+# 26 Wrap up
 echo Wrap up --------------------------------------------------------------
 echo $ task version
 task  version
--- a/doc/misc/tutorial/charts/run.200
+++ b/doc/misc/tutorial/charts/run.200
@@ -306,20 +306,7 @@ 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
+# 17 Special tags
 echo Special tags --------------------------------------------------------------
 echo $ task 6 +nocolor
 task 6 +nocolor
@@ -330,7 +317,7 @@ task tags
 echo $ task 6 -nocolor
 task 6 -nocolor

-# 19 Waiting
+# 18 Waiting
 echo Waiting --------------------------------------------------------------
 echo $ task add Look for new apartment due:eoy
 task add Look for new apartment due:eoy
@@ -354,7 +341,7 @@ task list
 echo $ task 11 rc.confirmation:no delete
 task 11 rc.confirmation:no delete

-# 20 Dependencies
+# 19 Dependencies
 echo Dependencies --------------------------------------------------------------
 echo $ task list pro:party
 task list pro:party
@@ -385,7 +372,7 @@ echo 'y' | task  2 done
 echo $ task 1 info
 task  1 info

-# 21 Reports
+# 20 Reports
 echo Reports --------------------------------------------------------------
 echo $ task minimal
 task  minimal
@@ -414,7 +401,7 @@ task  timesheet
 echo $ task next
 task  next

-# 22 Custom report
+# 21 Custom report
 echo Custom report --------------------------------------------------------------
 echo 'report.foo.description=My own report'     >> x
 echo 'report.foo.columns=id,entry,description'  >> x
@@ -428,7 +415,7 @@ task  show report.foo
 echo $ task foo
 task  foo

-# 23 Charts
+# 22 Charts
 echo Charts --------------------------------------------------------------
 echo $ task history
 task history
@@ -441,7 +428,7 @@ task ghistory.annual
 echo $ task summary
 task summary

-# 24 Advanced filters
+# 23 Advanced filters
 echo Advanced filters --------------------------------------------------------------
 echo $ task list
 task  list
@@ -470,7 +457,7 @@ task  all status:pending
 echo $ task all status:waiting
 task  all status:waiting

-# 25 Import/export
+# 24 Import/export
 echo Import/export --------------------------------------------------------------
 echo $ task export.csv
 task  export.csv
@@ -507,7 +494,7 @@ printf "y\n" | task  import file.yaml
 echo $ task new limit:2
 task  new limit:2

-# 26 Help
+# 25 Help
 echo Help --------------------------------------------------------------
 echo $ task help
 task  help
@@ -524,7 +511,7 @@ echo $ man task-faq
 echo $ man task-sync
 #man task-sync

-# 27 Wrap up
+# 26 Wrap up
 echo Wrap up --------------------------------------------------------------
 echo $ task version
 task  version
--- a/doc/misc/tutorial/color/run.200
+++ b/doc/misc/tutorial/color/run.200
@@ -306,20 +306,7 @@ 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
+# 17 Special tags
 echo Special tags --------------------------------------------------------------
 echo $ task 6 +nocolor
 task 6 +nocolor
@@ -330,7 +317,7 @@ task tags
 echo $ task 6 -nocolor
 task 6 -nocolor

-# 19 Waiting
+# 18 Waiting
 echo Waiting --------------------------------------------------------------
 echo $ task add Look for new apartment due:eoy
 task add Look for new apartment due:eoy
@@ -354,7 +341,7 @@ task list
 echo $ task 11 rc.confirmation:no delete
 task 11 rc.confirmation:no delete

-# 20 Dependencies
+# 19 Dependencies
 echo Dependencies --------------------------------------------------------------
 echo $ task list pro:party
 task list pro:party
@@ -385,7 +372,7 @@ echo 'y' | task  2 done
 echo $ task 1 info
 task  1 info

-# 21 Reports
+# 20 Reports
 echo Reports --------------------------------------------------------------
 echo $ task minimal
 task  minimal
@@ -414,7 +401,7 @@ task  timesheet
 echo $ task next
 task  next

-# 22 Custom report
+# 21 Custom report
 echo Custom report --------------------------------------------------------------
 echo 'report.foo.description=My own report'     >> x
 echo 'report.foo.columns=id,entry,description'  >> x
@@ -428,7 +415,7 @@ task  show report.foo
 echo $ task foo
 task  foo

-# 23 Charts
+# 22 Charts
 echo Charts --------------------------------------------------------------
 echo $ task history
 task history
@@ -441,7 +428,7 @@ task ghistory.annual
 echo $ task summary
 task summary

-# 24 Advanced filters
+# 23 Advanced filters
 echo Advanced filters --------------------------------------------------------------
 echo $ task list
 task  list
@@ -470,7 +457,7 @@ task  all status:pending
 echo $ task all status:waiting
 task  all status:waiting

-# 25 Import/export
+# 24 Import/export
 echo Import/export --------------------------------------------------------------
 echo $ task export.csv
 task  export.csv
@@ -507,7 +494,7 @@ printf "y\n" | task  import file.yaml
 echo $ task new limit:2
 task  new limit:2

-# 26 Help
+# 25 Help
 echo Help --------------------------------------------------------------
 echo $ task help
 task  help
@@ -524,7 +511,7 @@ echo $ man task-faq
 echo $ man task-sync
 #man task-sync

-# 27 Wrap up
+# 26 Wrap up
 echo Wrap up --------------------------------------------------------------
 echo $ task version
 task  version
--- 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
@@ -306,20 +306,7 @@ 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
+# 17 Special tags
 echo Special tags --------------------------------------------------------------
 echo $ task 6 +nocolor
 task 6 +nocolor
@@ -330,7 +317,7 @@ task tags
 echo $ task 6 -nocolor
 task 6 -nocolor

-# 19 Waiting
+# 18 Waiting
 echo Waiting --------------------------------------------------------------
 echo $ task add Look for new apartment due:eoy
 task add Look for new apartment due:eoy
@@ -354,7 +341,7 @@ task list
 echo $ task 11 rc.confirmation:no delete
 task 11 rc.confirmation:no delete

-# 20 Dependencies
+# 19 Dependencies
 echo Dependencies --------------------------------------------------------------
 echo $ task list pro:party
 task list pro:party
@@ -385,7 +372,7 @@ echo 'y' | task  2 done
 echo $ task 1 info
 task  1 info

-# 21 Reports
+# 20 Reports
 echo Reports --------------------------------------------------------------
 echo $ task minimal
 task  minimal
@@ -414,7 +401,7 @@ task  timesheet
 echo $ task next
 task  next

-# 22 Custom report
+# 21 Custom report
 echo Custom report --------------------------------------------------------------
 echo 'report.foo.description=My own report'     >> x
 echo 'report.foo.columns=id,entry,description'  >> x
@@ -428,7 +415,7 @@ task  show report.foo
 echo $ task foo
 task  foo

-# 23 Charts
+# 22 Charts
 echo Charts --------------------------------------------------------------
 echo $ task history
 task history
@@ -441,7 +428,7 @@ task ghistory.annual
 echo $ task summary
 task summary

-# 24 Advanced filters
+# 23 Advanced filters
 echo Advanced filters --------------------------------------------------------------
 echo $ task list
 task  list
@@ -470,7 +457,7 @@ task  all status:pending
 echo $ task all status:waiting
 task  all status:waiting

-# 25 Import/export
+# 24 Import/export
 echo Import/export --------------------------------------------------------------
 echo $ task export.csv
 task  export.csv
@@ -507,7 +494,7 @@ printf "y\n" | task  import file.yaml
 echo $ task new limit:2
 task  new limit:2

-# 26 Help
+# 25 Help
 echo Help --------------------------------------------------------------
 echo $ task help
 task  help
@@ -524,7 +511,7 @@ echo $ man task-faq
 echo $ man task-sync
 #man task-sync

-# 27 Wrap up
+# 26 Wrap up
 echo Wrap up --------------------------------------------------------------
 echo $ task version
 task  version
--- a/doc/misc/tutorial/defaults/run.200
+++ b/doc/misc/tutorial/defaults/run.200
@@ -306,20 +306,7 @@ 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
+# 17 Special tags
 echo Special tags --------------------------------------------------------------
 echo $ task 6 +nocolor
 task 6 +nocolor
@@ -330,7 +317,7 @@ task tags
 echo $ task 6 -nocolor
 task 6 -nocolor

-# 19 Waiting
+# 18 Waiting
 echo Waiting --------------------------------------------------------------
 echo $ task add Look for new apartment due:eoy
 task add Look for new apartment due:eoy
@@ -354,7 +341,7 @@ task list
 echo $ task 11 rc.confirmation:no delete
 task 11 rc.confirmation:no delete

-# 20 Dependencies
+# 19 Dependencies
 echo Dependencies --------------------------------------------------------------
 echo $ task list pro:party
 task list pro:party
@@ -385,7 +372,7 @@ echo 'y' | task  2 done
 echo $ task 1 info
 task  1 info

-# 21 Reports
+# 20 Reports
 echo Reports --------------------------------------------------------------
 echo $ task minimal
 task  minimal
@@ -414,7 +401,7 @@ task  timesheet
 echo $ task next
 task  next

-# 22 Custom report
+# 21 Custom report
 echo Custom report --------------------------------------------------------------
 echo 'report.foo.description=My own report'     >> x
 echo 'report.foo.columns=id,entry,description'  >> x
@@ -428,7 +415,7 @@ task  show report.foo
 echo $ task foo
 task  foo

-# 23 Charts
+# 22 Charts
 echo Charts --------------------------------------------------------------
 echo $ task history
 task history
@@ -441,7 +428,7 @@ task ghistory.annual
 echo $ task summary
 task summary

-# 24 Advanced filters
+# 23 Advanced filters
 echo Advanced filters --------------------------------------------------------------
 echo $ task list
 task  list
@@ -470,7 +457,7 @@ task  all status:pending
 echo $ task all status:waiting
 task  all status:waiting

-# 25 Import/export
+# 24 Import/export
 echo Import/export --------------------------------------------------------------
 echo $ task export.csv
 task  export.csv
@@ -507,7 +494,7 @@ printf "y\n" | task  import file.yaml
 echo $ task new limit:2
 task  new limit:2

-# 26 Help
+# 25 Help
 echo Help --------------------------------------------------------------
 echo $ task help
 task  help
@@ -524,7 +511,7 @@ echo $ man task-faq
 echo $ man task-sync
 #man task-sync

-# 27 Wrap up
+# 26 Wrap up
 echo Wrap up --------------------------------------------------------------
 echo $ task version
 task  version
--- a/doc/misc/tutorial/dependencies/run.200
+++ b/doc/misc/tutorial/dependencies/run.200
@@ -306,20 +306,7 @@ 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
+# 17 Special tags
 echo Special tags --------------------------------------------------------------
 echo $ task 6 +nocolor
 task 6 +nocolor
@@ -330,7 +317,7 @@ task tags
 echo $ task 6 -nocolor
 task 6 -nocolor

-# 19 Waiting
+# 18 Waiting
 echo Waiting --------------------------------------------------------------
 echo $ task add Look for new apartment due:eoy
 task add Look for new apartment due:eoy
@@ -354,7 +341,7 @@ task list
 echo $ task 11 rc.confirmation:no delete
 task 11 rc.confirmation:no delete

-# 20 Dependencies
+# 19 Dependencies
 echo Dependencies --------------------------------------------------------------
 echo $ task list pro:party
 task list pro:party
@@ -385,7 +372,7 @@ echo 'y' | task  2 done
 echo $ task 1 info
 task  1 info

-# 21 Reports
+# 20 Reports
 echo Reports --------------------------------------------------------------
 echo $ task minimal
 task  minimal
@@ -414,7 +401,7 @@ task  timesheet
 echo $ task next
 task  next

-# 22 Custom report
+# 21 Custom report
 echo Custom report --------------------------------------------------------------
 echo 'report.foo.description=My own report'     >> x
 echo 'report.foo.columns=id,entry,description'  >> x
@@ -428,7 +415,7 @@ task  show report.foo
 echo $ task foo
 task  foo

-# 23 Charts
+# 22 Charts
 echo Charts --------------------------------------------------------------
 echo $ task history
 task history
@@ -441,7 +428,7 @@ task ghistory.annual
 echo $ task summary
 task summary

-# 24 Advanced filters
+# 23 Advanced filters
 echo Advanced filters --------------------------------------------------------------
 echo $ task list
 task  list
@@ -470,7 +457,7 @@ task  all status:pending
 echo $ task all status:waiting
 task  all status:waiting

-# 25 Import/export
+# 24 Import/export
 echo Import/export --------------------------------------------------------------
 echo $ task export.csv
 task  export.csv
@@ -507,7 +494,7 @@ printf "y\n" | task  import file.yaml
 echo $ task new limit:2
 task  new limit:2

-# 26 Help
+# 25 Help
 echo Help --------------------------------------------------------------
 echo $ task help
 task  help
@@ -524,7 +511,7 @@ echo $ man task-faq
 echo $ man task-sync
 #man task-sync

-# 27 Wrap up
+# 26 Wrap up
 echo Wrap up --------------------------------------------------------------
 echo $ task version
 task  version
--- a/doc/misc/tutorial/due/run.200
+++ b/doc/misc/tutorial/due/run.200
@@ -306,20 +306,7 @@ 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
+# 17 Special tags
 echo Special tags --------------------------------------------------------------
 echo $ task 6 +nocolor
 task 6 +nocolor
@@ -330,7 +317,7 @@ task tags
 echo $ task 6 -nocolor
 task 6 -nocolor

-# 19 Waiting
+# 18 Waiting
 echo Waiting --------------------------------------------------------------
 echo $ task add Look for new apartment due:eoy
 task add Look for new apartment due:eoy
@@ -354,7 +341,7 @@ task list
 echo $ task 11 rc.confirmation:no delete
 task 11 rc.confirmation:no delete

-# 20 Dependencies
+# 19 Dependencies
 echo Dependencies --------------------------------------------------------------
 echo $ task list pro:party
 task list pro:party
@@ -385,7 +372,7 @@ echo 'y' | task  2 done
 echo $ task 1 info
 task  1 info

-# 21 Reports
+# 20 Reports
 echo Reports --------------------------------------------------------------
 echo $ task minimal
 task  minimal
@@ -414,7 +401,7 @@ task  timesheet
 echo $ task next
 task  next

-# 22 Custom report
+# 21 Custom report
 echo Custom report --------------------------------------------------------------
 echo 'report.foo.description=My own report'     >> x
 echo 'report.foo.columns=id,entry,description'  >> x
@@ -428,7 +415,7 @@ task  show report.foo
 echo $ task foo
 task  foo

-# 23 Charts
+# 22 Charts
 echo Charts --------------------------------------------------------------
 echo $ task history
 task history
@@ -441,7 +428,7 @@ task ghistory.annual
 echo $ task summary
 task summary

-# 24 Advanced filters
+# 23 Advanced filters
 echo Advanced filters --------------------------------------------------------------
 echo $ task list
 task  list
@@ -470,7 +457,7 @@ task  all status:pending
 echo $ task all status:waiting
 task  all status:waiting

-# 25 Import/export
+# 24 Import/export
 echo Import/export --------------------------------------------------------------
 echo $ task export.csv
 task  export.csv
@@ -507,7 +494,7 @@ printf "y\n" | task  import file.yaml
 echo $ task new limit:2
 task  new limit:2

-# 26 Help
+# 25 Help
 echo Help --------------------------------------------------------------
 echo $ task help
 task  help
@@ -524,7 +511,7 @@ echo $ man task-faq
 echo $ man task-sync
 #man task-sync

-# 27 Wrap up
+# 26 Wrap up
 echo Wrap up --------------------------------------------------------------
 echo $ task version
 task  version
--- a/doc/misc/tutorial/extra.txt
+++ b/doc/misc/tutorial/extra.txt
@@ -1,30 +1,38 @@
-
 Calendar trick
  ln -s `which task` ./cal
  ./cal

-Synch
-  push
-  pull
-  merge
+Metadata

-Logo
+Sync
+  sync (needs 2.3.0 & Taskserver)
+
+Logo?

 Version

 Verbosity
+  on
+  off
+  nothing

 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

+Setup
+  Where the files are
+    themes
+    external scripts
+    TASKDATA=
+    TASKRC=
+  http://tasktools.org/latest
+
+Reporting bugs
+
+Holidays
+
--- a/doc/misc/tutorial/filters/run.200
+++ b/doc/misc/tutorial/filters/run.200
@@ -306,20 +306,7 @@ 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
+# 17 Special tags
 echo Special tags --------------------------------------------------------------
 echo $ task 6 +nocolor
 task 6 +nocolor
@@ -330,7 +317,7 @@ task tags
 echo $ task 6 -nocolor
 task 6 -nocolor

-# 19 Waiting
+# 18 Waiting
 echo Waiting --------------------------------------------------------------
 echo $ task add Look for new apartment due:eoy
 task add Look for new apartment due:eoy
@@ -354,7 +341,7 @@ task list
 echo $ task 11 rc.confirmation:no delete
 task 11 rc.confirmation:no delete

-# 20 Dependencies
+# 19 Dependencies
 echo Dependencies --------------------------------------------------------------
 echo $ task list pro:party
 task list pro:party
@@ -385,7 +372,7 @@ echo 'y' | task  2 done
 echo $ task 1 info
 task  1 info

-# 21 Reports
+# 20 Reports
 echo Reports --------------------------------------------------------------
 echo $ task minimal
 task  minimal
@@ -414,7 +401,7 @@ task  timesheet
 echo $ task next
 task  next

-# 22 Custom report
+# 21 Custom report
 echo Custom report --------------------------------------------------------------
 echo 'report.foo.description=My own report'     >> x
 echo 'report.foo.columns=id,entry,description'  >> x
@@ -428,7 +415,7 @@ task  show report.foo
 echo $ task foo
 task  foo

-# 23 Charts
+# 22 Charts
 echo Charts --------------------------------------------------------------
 echo $ task history
 task history
@@ -441,7 +428,7 @@ task ghistory.annual
 echo $ task summary
 task summary

-# 24 Advanced filters
+# 23 Advanced filters
 echo Advanced filters --------------------------------------------------------------
 echo $ task list
 task  list
@@ -470,7 +457,7 @@ task  all status:pending
 echo $ task all status:waiting
 task  all status:waiting

-# 25 Import/export
+# 24 Import/export
 echo Import/export --------------------------------------------------------------
 echo $ task export.csv
 task  export.csv
@@ -507,7 +494,7 @@ printf "y\n" | task  import file.yaml
 echo $ task new limit:2
 task  new limit:2

-# 26 Help
+# 25 Help
 echo Help --------------------------------------------------------------
 echo $ task help
 task  help
@@ -524,7 +511,7 @@ echo $ man task-faq
 echo $ man task-sync
 #man task-sync

-# 27 Wrap up
+# 26 Wrap up
 echo Wrap up --------------------------------------------------------------
 echo $ task version
 task  version
--- 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
@@ -306,20 +306,7 @@ 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
+# 17 Special tags
 echo Special tags --------------------------------------------------------------
 echo $ task 6 +nocolor
 task 6 +nocolor
@@ -330,7 +317,7 @@ task tags
 echo $ task 6 -nocolor
 task 6 -nocolor

-# 19 Waiting
+# 18 Waiting
 echo Waiting --------------------------------------------------------------
 echo $ task add Look for new apartment due:eoy
 task add Look for new apartment due:eoy
@@ -354,7 +341,7 @@ task list
 echo $ task 11 rc.confirmation:no delete
 task 11 rc.confirmation:no delete

-# 20 Dependencies
+# 19 Dependencies
 echo Dependencies --------------------------------------------------------------
 echo $ task list pro:party
 task list pro:party
@@ -385,7 +372,7 @@ echo 'y' | task  2 done
 echo $ task 1 info
 task  1 info

-# 21 Reports
+# 20 Reports
 echo Reports --------------------------------------------------------------
 echo $ task minimal
 task  minimal
@@ -414,7 +401,7 @@ task  timesheet
 echo $ task next
 task  next

-# 22 Custom report
+# 21 Custom report
 echo Custom report --------------------------------------------------------------
 echo 'report.foo.description=My own report'     >> x
 echo 'report.foo.columns=id,entry,description'  >> x
@@ -428,7 +415,7 @@ task  show report.foo
 echo $ task foo
 task  foo

-# 23 Charts
+# 22 Charts
 echo Charts --------------------------------------------------------------
 echo $ task history
 task history
@@ -441,7 +428,7 @@ task ghistory.annual
 echo $ task summary
 task summary

-# 24 Advanced filters
+# 23 Advanced filters
 echo Advanced filters --------------------------------------------------------------
 echo $ task list
 task  list
@@ -470,7 +457,7 @@ task  all status:pending
 echo $ task all status:waiting
 task  all status:waiting

-# 25 Import/export
+# 24 Import/export
 echo Import/export --------------------------------------------------------------
 echo $ task export.csv
 task  export.csv
@@ -507,7 +494,7 @@ printf "y\n" | task  import file.yaml
 echo $ task new limit:2
 task  new limit:2

-# 26 Help
+# 25 Help
 echo Help --------------------------------------------------------------
 echo $ task help
 task  help
@@ -524,7 +511,7 @@ echo $ man task-faq
 echo $ man task-sync
 #man task-sync

-# 27 Wrap up
+# 26 Wrap up
 echo Wrap up --------------------------------------------------------------
 echo $ task version
 task  version
--- a/doc/misc/tutorial/info/run.200
+++ b/doc/misc/tutorial/info/run.200
@@ -306,20 +306,7 @@ 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
+# 17 Special tags
 echo Special tags --------------------------------------------------------------
 echo $ task 6 +nocolor
 task 6 +nocolor
@@ -330,7 +317,7 @@ task tags
 echo $ task 6 -nocolor
 task 6 -nocolor

-# 19 Waiting
+# 18 Waiting
 echo Waiting --------------------------------------------------------------
 echo $ task add Look for new apartment due:eoy
 task add Look for new apartment due:eoy
@@ -354,7 +341,7 @@ task list
 echo $ task 11 rc.confirmation:no delete
 task 11 rc.confirmation:no delete

-# 20 Dependencies
+# 19 Dependencies
 echo Dependencies --------------------------------------------------------------
 echo $ task list pro:party
 task list pro:party
@@ -385,7 +372,7 @@ echo 'y' | task  2 done
 echo $ task 1 info
 task  1 info

-# 21 Reports
+# 20 Reports
 echo Reports --------------------------------------------------------------
 echo $ task minimal
 task  minimal
@@ -414,7 +401,7 @@ task  timesheet
 echo $ task next
 task  next

-# 22 Custom report
+# 21 Custom report
 echo Custom report --------------------------------------------------------------
 echo 'report.foo.description=My own report'     >> x
 echo 'report.foo.columns=id,entry,description'  >> x
@@ -428,7 +415,7 @@ task  show report.foo
 echo $ task foo
 task  foo

-# 23 Charts
+# 22 Charts
 echo Charts --------------------------------------------------------------
 echo $ task history
 task history
@@ -441,7 +428,7 @@ task ghistory.annual
 echo $ task summary
 task summary

-# 24 Advanced filters
+# 23 Advanced filters
 echo Advanced filters --------------------------------------------------------------
 echo $ task list
 task  list
@@ -470,7 +457,7 @@ task  all status:pending
 echo $ task all status:waiting
 task  all status:waiting

-# 25 Import/export
+# 24 Import/export
 echo Import/export --------------------------------------------------------------
 echo $ task export.csv
 task  export.csv
@@ -507,7 +494,7 @@ printf "y\n" | task  import file.yaml
 echo $ task new limit:2
 task  new limit:2

-# 26 Help
+# 25 Help
 echo Help --------------------------------------------------------------
 echo $ task help
 task  help
@@ -524,7 +511,7 @@ echo $ man task-faq
 echo $ man task-sync
 #man task-sync

-# 27 Wrap up
+# 26 Wrap up
 echo Wrap up --------------------------------------------------------------
 echo $ task version
 task  version
--- 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
@@ -306,20 +306,7 @@ 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
+# 17 Special tags
 echo Special tags --------------------------------------------------------------
 echo $ task 6 +nocolor
 task 6 +nocolor
@@ -330,7 +317,7 @@ task tags
 echo $ task 6 -nocolor
 task 6 -nocolor

-# 19 Waiting
+# 18 Waiting
 echo Waiting --------------------------------------------------------------
 echo $ task add Look for new apartment due:eoy
 task add Look for new apartment due:eoy
@@ -354,7 +341,7 @@ task list
 echo $ task 11 rc.confirmation:no delete
 task 11 rc.confirmation:no delete

-# 20 Dependencies
+# 19 Dependencies
 echo Dependencies --------------------------------------------------------------
 echo $ task list pro:party
 task list pro:party
@@ -385,7 +372,7 @@ echo 'y' | task  2 done
 echo $ task 1 info
 task  1 info

-# 21 Reports
+# 20 Reports
 echo Reports --------------------------------------------------------------
 echo $ task minimal
 task  minimal
@@ -414,7 +401,7 @@ task  timesheet
 echo $ task next
 task  next

-# 22 Custom report
+# 21 Custom report
 echo Custom report --------------------------------------------------------------
 echo 'report.foo.description=My own report'     >> x
 echo 'report.foo.columns=id,entry,description'  >> x
@@ -428,7 +415,7 @@ task  show report.foo
 echo $ task foo
 task  foo

-# 23 Charts
+# 22 Charts
 echo Charts --------------------------------------------------------------
 echo $ task history
 task history
@@ -441,7 +428,7 @@ task ghistory.annual
 echo $ task summary
 task summary

-# 24 Advanced filters
+# 23 Advanced filters
 echo Advanced filters --------------------------------------------------------------
 echo $ task list
 task  list
@@ -470,7 +457,7 @@ task  all status:pending
 echo $ task all status:waiting
 task  all status:waiting

-# 25 Import/export
+# 24 Import/export
 echo Import/export --------------------------------------------------------------
 echo $ task export.csv
 task  export.csv
@@ -507,7 +494,7 @@ printf "y\n" | task  import file.yaml
 echo $ task new limit:2
 task  new limit:2

-# 26 Help
+# 25 Help
 echo Help --------------------------------------------------------------
 echo $ task help
 task  help
@@ -524,7 +511,7 @@ echo $ man task-faq
 echo $ man task-sync
 #man task-sync

-# 27 Wrap up
+# 26 Wrap up
 echo Wrap up --------------------------------------------------------------
 echo $ task version
 task  version
--- a/doc/misc/tutorial/priorities/run.200
+++ b/doc/misc/tutorial/priorities/run.200
@@ -306,20 +306,7 @@ 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
+# 17 Special tags
 echo Special tags --------------------------------------------------------------
 echo $ task 6 +nocolor
 task 6 +nocolor
@@ -330,7 +317,7 @@ task tags
 echo $ task 6 -nocolor
 task 6 -nocolor

-# 19 Waiting
+# 18 Waiting
 echo Waiting --------------------------------------------------------------
 echo $ task add Look for new apartment due:eoy
 task add Look for new apartment due:eoy
@@ -354,7 +341,7 @@ task list
 echo $ task 11 rc.confirmation:no delete
 task 11 rc.confirmation:no delete

-# 20 Dependencies
+# 19 Dependencies
 echo Dependencies --------------------------------------------------------------
 echo $ task list pro:party
 task list pro:party
@@ -385,7 +372,7 @@ echo 'y' | task  2 done
 echo $ task 1 info
 task  1 info

-# 21 Reports
+# 20 Reports
 echo Reports --------------------------------------------------------------
 echo $ task minimal
 task  minimal
@@ -414,7 +401,7 @@ task  timesheet
 echo $ task next
 task  next

-# 22 Custom report
+# 21 Custom report
 echo Custom report --------------------------------------------------------------
 echo 'report.foo.description=My own report'     >> x
 echo 'report.foo.columns=id,entry,description'  >> x
@@ -428,7 +415,7 @@ task  show report.foo
 echo $ task foo
 task  foo

-# 23 Charts
+# 22 Charts
 echo Charts --------------------------------------------------------------
 echo $ task history
 task history
@@ -441,7 +428,7 @@ task ghistory.annual
 echo $ task summary
 task summary

-# 24 Advanced filters
+# 23 Advanced filters
 echo Advanced filters --------------------------------------------------------------
 echo $ task list
 task  list
@@ -470,7 +457,7 @@ task  all status:pending
 echo $ task all status:waiting
 task  all status:waiting

-# 25 Import/export
+# 24 Import/export
 echo Import/export --------------------------------------------------------------
 echo $ task export.csv
 task  export.csv
@@ -507,7 +494,7 @@ printf "y\n" | task  import file.yaml
 echo $ task new limit:2
 task  new limit:2

-# 26 Help
+# 25 Help
 echo Help --------------------------------------------------------------
 echo $ task help
 task  help
@@ -524,7 +511,7 @@ echo $ man task-faq
 echo $ man task-sync
 #man task-sync

-# 27 Wrap up
+# 26 Wrap up
 echo Wrap up --------------------------------------------------------------
 echo $ task version
 task  version
--- a/doc/misc/tutorial/projects/run.200
+++ b/doc/misc/tutorial/projects/run.200
@@ -306,20 +306,7 @@ 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
+# 17 Special tags
 echo Special tags --------------------------------------------------------------
 echo $ task 6 +nocolor
 task 6 +nocolor
@@ -330,7 +317,7 @@ task tags
 echo $ task 6 -nocolor
 task 6 -nocolor

-# 19 Waiting
+# 18 Waiting
 echo Waiting --------------------------------------------------------------
 echo $ task add Look for new apartment due:eoy
 task add Look for new apartment due:eoy
@@ -354,7 +341,7 @@ task list
 echo $ task 11 rc.confirmation:no delete
 task 11 rc.confirmation:no delete

-# 20 Dependencies
+# 19 Dependencies
 echo Dependencies --------------------------------------------------------------
 echo $ task list pro:party
 task list pro:party
@@ -385,7 +372,7 @@ echo 'y' | task  2 done
 echo $ task 1 info
 task  1 info

-# 21 Reports
+# 20 Reports
 echo Reports --------------------------------------------------------------
 echo $ task minimal
 task  minimal
@@ -414,7 +401,7 @@ task  timesheet
 echo $ task next
 task  next

-# 22 Custom report
+# 21 Custom report
 echo Custom report --------------------------------------------------------------
 echo 'report.foo.description=My own report'     >> x
 echo 'report.foo.columns=id,entry,description'  >> x
@@ -428,7 +415,7 @@ task  show report.foo
 echo $ task foo
 task  foo

-# 23 Charts
+# 22 Charts
 echo Charts --------------------------------------------------------------
 echo $ task history
 task history
@@ -441,7 +428,7 @@ task ghistory.annual
 echo $ task summary
 task summary

-# 24 Advanced filters
+# 23 Advanced filters
 echo Advanced filters --------------------------------------------------------------
 echo $ task list
 task  list
@@ -470,7 +457,7 @@ task  all status:pending
 echo $ task all status:waiting
 task  all status:waiting

-# 25 Import/export
+# 24 Import/export
 echo Import/export --------------------------------------------------------------
 echo $ task export.csv
 task  export.csv
@@ -507,7 +494,7 @@ printf "y\n" | task  import file.yaml
 echo $ task new limit:2
 task  new limit:2

-# 26 Help
+# 25 Help
 echo Help --------------------------------------------------------------
 echo $ task help
 task  help
@@ -524,7 +511,7 @@ echo $ man task-faq
 echo $ man task-sync
 #man task-sync

-# 27 Wrap up
+# 26 Wrap up
 echo Wrap up --------------------------------------------------------------
 echo $ task version
 task  version
--- a/doc/misc/tutorial/recurrence/run.200
+++ b/doc/misc/tutorial/recurrence/run.200
@@ -306,20 +306,7 @@ 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
+# 17 Special tags
 echo Special tags --------------------------------------------------------------
 echo $ task 6 +nocolor
 task 6 +nocolor
@@ -330,7 +317,7 @@ task tags
 echo $ task 6 -nocolor
 task 6 -nocolor

-# 19 Waiting
+# 18 Waiting
 echo Waiting --------------------------------------------------------------
 echo $ task add Look for new apartment due:eoy
 task add Look for new apartment due:eoy
@@ -354,7 +341,7 @@ task list
 echo $ task 11 rc.confirmation:no delete
 task 11 rc.confirmation:no delete

-# 20 Dependencies
+# 19 Dependencies
 echo Dependencies --------------------------------------------------------------
 echo $ task list pro:party
 task list pro:party
@@ -385,7 +372,7 @@ echo 'y' | task  2 done
 echo $ task 1 info
 task  1 info

-# 21 Reports
+# 20 Reports
 echo Reports --------------------------------------------------------------
 echo $ task minimal
 task  minimal
@@ -414,7 +401,7 @@ task  timesheet
 echo $ task next
 task  next

-# 22 Custom report
+# 21 Custom report
 echo Custom report --------------------------------------------------------------
 echo 'report.foo.description=My own report'     >> x
 echo 'report.foo.columns=id,entry,description'  >> x
@@ -428,7 +415,7 @@ task  show report.foo
 echo $ task foo
 task  foo

-# 23 Charts
+# 22 Charts
 echo Charts --------------------------------------------------------------
 echo $ task history
 task history
@@ -441,7 +428,7 @@ task ghistory.annual
 echo $ task summary
 task summary

-# 24 Advanced filters
+# 23 Advanced filters
 echo Advanced filters --------------------------------------------------------------
 echo $ task list
 task  list
@@ -470,7 +457,7 @@ task  all status:pending
 echo $ task all status:waiting
 task  all status:waiting

-# 25 Import/export
+# 24 Import/export
 echo Import/export --------------------------------------------------------------
 echo $ task export.csv
 task  export.csv
@@ -507,7 +494,7 @@ printf "y\n" | task  import file.yaml
 echo $ task new limit:2
 task  new limit:2

-# 26 Help
+# 25 Help
 echo Help --------------------------------------------------------------
 echo $ task help
 task  help
@@ -524,7 +511,7 @@ echo $ man task-faq
 echo $ man task-sync
 #man task-sync

-# 27 Wrap up
+# 26 Wrap up
 echo Wrap up --------------------------------------------------------------
 echo $ task version
 task  version
--- a/doc/misc/tutorial/reports/run.200
+++ b/doc/misc/tutorial/reports/run.200
@@ -306,20 +306,7 @@ 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
+# 17 Special tags
 echo Special tags --------------------------------------------------------------
 echo $ task 6 +nocolor
 task 6 +nocolor
@@ -330,7 +317,7 @@ task tags
 echo $ task 6 -nocolor
 task 6 -nocolor

-# 19 Waiting
+# 18 Waiting
 echo Waiting --------------------------------------------------------------
 echo $ task add Look for new apartment due:eoy
 task add Look for new apartment due:eoy
@@ -354,7 +341,7 @@ task list
 echo $ task 11 rc.confirmation:no delete
 task 11 rc.confirmation:no delete

-# 20 Dependencies
+# 19 Dependencies
 echo Dependencies --------------------------------------------------------------
 echo $ task list pro:party
 task list pro:party
@@ -385,7 +372,7 @@ echo 'y' | task  2 done
 echo $ task 1 info
 task  1 info

-# 21 Reports
+# 20 Reports
 echo Reports --------------------------------------------------------------
 echo $ task minimal
 task  minimal
@@ -414,7 +401,7 @@ task  timesheet
 echo $ task next
 task  next

-# 22 Custom report
+# 21 Custom report
 echo Custom report --------------------------------------------------------------
 echo 'report.foo.description=My own report'     >> x
 echo 'report.foo.columns=id,entry,description'  >> x
@@ -428,7 +415,7 @@ task  show report.foo
 echo $ task foo
 task  foo

-# 23 Charts
+# 22 Charts
 echo Charts --------------------------------------------------------------
 echo $ task history
 task history
@@ -441,7 +428,7 @@ task ghistory.annual
 echo $ task summary
 task summary

-# 24 Advanced filters
+# 23 Advanced filters
 echo Advanced filters --------------------------------------------------------------
 echo $ task list
 task  list
@@ -470,7 +457,7 @@ task  all status:pending
 echo $ task all status:waiting
 task  all status:waiting

-# 25 Import/export
+# 24 Import/export
 echo Import/export --------------------------------------------------------------
 echo $ task export.csv
 task  export.csv
@@ -507,7 +494,7 @@ printf "y\n" | task  import file.yaml
 echo $ task new limit:2
 task  new limit:2

-# 26 Help
+# 25 Help
 echo Help --------------------------------------------------------------
 echo $ task help
 task  help
@@ -524,7 +511,7 @@ echo $ man task-faq
 echo $ man task-sync
 #man task-sync

-# 27 Wrap up
+# 26 Wrap up
 echo Wrap up --------------------------------------------------------------
 echo $ task version
 task  version
--- a/doc/misc/tutorial/run.193
+++ b/doc/misc/tutorial/run.193
@@ -306,20 +306,7 @@ 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
+# 17 Special tags
 echo Special tags --------------------------------------------------------------
 echo $ task 6 +nocolor
 task 6 +nocolor
@@ -330,7 +317,7 @@ task tags
 echo $ task 6 -nocolor
 task 6 -nocolor

-# 19 Waiting
+# 18 Waiting
 echo Waiting --------------------------------------------------------------
 echo $ task add Look for new apartment due:eoy
 task add Look for new apartment due:eoy
@@ -354,7 +341,7 @@ task list
 echo $ task 11 rc.confirmation:no delete
 task 11 rc.confirmation:no delete

-# 20 Dependencies
+# 19 Dependencies
 echo Dependencies --------------------------------------------------------------
 echo $ task list pro:party
 task list pro:party
@@ -385,7 +372,7 @@ echo 'y' | task  2 done
 echo $ task 1 info
 task  1 info

-# 21 Reports
+# 20 Reports
 echo Reports --------------------------------------------------------------
 echo $ task minimal
 task  minimal
@@ -414,7 +401,7 @@ task  timesheet
 echo $ task next
 task  next

-# 22 Custom report
+# 21 Custom report
 echo Custom report --------------------------------------------------------------
 echo 'report.foo.description=My own report'     >> x
 echo 'report.foo.columns=id,entry,description'  >> x
@@ -428,7 +415,7 @@ task  show report.foo
 echo $ task foo
 task  foo

-# 23 Charts
+# 22 Charts
 echo Charts --------------------------------------------------------------
 echo $ task history
 task history
@@ -441,7 +428,7 @@ task ghistory.annual
 echo $ task summary
 task summary

-# 24 Advanced filters
+# 23 Advanced filters
 echo Advanced filters --------------------------------------------------------------
 echo $ task list
 task  list
@@ -470,7 +457,7 @@ task  all status:pending
 echo $ task all status:waiting
 task  all status:waiting

-# 25 Import/export
+# 24 Import/export
 echo Import/export --------------------------------------------------------------
 echo $ task export.csv
 task  export.csv
@@ -507,7 +494,7 @@ printf "y\n" | task  import file.yaml
 echo $ task new limit:2
 task  new limit:2

-# 26 Help
+# 25 Help
 echo Help --------------------------------------------------------------
 echo $ task help
 task  help
@@ -524,7 +511,7 @@ echo $ man task-faq
 echo $ man task-sync
 #man task-sync

-# 27 Wrap up
+# 26 Wrap up
 echo Wrap up --------------------------------------------------------------
 echo $ task version
 task  version
--- a/doc/misc/tutorial/run.200
+++ b/doc/misc/tutorial/run.200
@@ -306,20 +306,7 @@ 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
+# 17 Special tags
 echo Special tags --------------------------------------------------------------
 echo $ task 6 +nocolor
 task 6 +nocolor
@@ -330,7 +317,7 @@ task tags
 echo $ task 6 -nocolor
 task 6 -nocolor

-# 19 Waiting
+# 18 Waiting
 echo Waiting --------------------------------------------------------------
 echo $ task add Look for new apartment due:eoy
 task add Look for new apartment due:eoy
@@ -354,7 +341,7 @@ task list
 echo $ task 11 rc.confirmation:no delete
 task 11 rc.confirmation:no delete

-# 20 Dependencies
+# 19 Dependencies
 echo Dependencies --------------------------------------------------------------
 echo $ task list pro:party
 task list pro:party
@@ -385,7 +372,7 @@ echo 'y' | task  2 done
 echo $ task 1 info
 task  1 info

-# 21 Reports
+# 20 Reports
 echo Reports --------------------------------------------------------------
 echo $ task minimal
 task  minimal
@@ -414,7 +401,7 @@ task  timesheet
 echo $ task next
 task  next

-# 22 Custom report
+# 21 Custom report
 echo Custom report --------------------------------------------------------------
 echo 'report.foo.description=My own report'     >> x
 echo 'report.foo.columns=id,entry,description'  >> x
@@ -428,7 +415,7 @@ task  show report.foo
 echo $ task foo
 task  foo

-# 23 Charts
+# 22 Charts
 echo Charts --------------------------------------------------------------
 echo $ task history
 task history
@@ -441,7 +428,7 @@ task ghistory.annual
 echo $ task summary
 task summary

-# 24 Advanced filters
+# 23 Advanced filters
 echo Advanced filters --------------------------------------------------------------
 echo $ task list
 task  list
@@ -470,7 +457,7 @@ task  all status:pending
 echo $ task all status:waiting
 task  all status:waiting

-# 25 Import/export
+# 24 Import/export
 echo Import/export --------------------------------------------------------------
 echo $ task export.csv
 task  export.csv
@@ -507,7 +494,7 @@ printf "y\n" | task  import file.yaml
 echo $ task new limit:2
 task  new limit:2

-# 26 Help
+# 25 Help
 echo Help --------------------------------------------------------------
 echo $ task help
 task  help
@@ -524,7 +511,7 @@ echo $ man task-faq
 echo $ man task-sync
 #man task-sync

-# 27 Wrap up
+# 26 Wrap up
 echo Wrap up --------------------------------------------------------------
 echo $ task version
 task  version
--- a/doc/misc/tutorial/shell/run.200
+++ b/doc/misc/tutorial/shell/run.200
@@ -306,20 +306,7 @@ 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
+# 17 Special tags
 echo Special tags --------------------------------------------------------------
 echo $ task 6 +nocolor
 task 6 +nocolor
@@ -330,7 +317,7 @@ task tags
 echo $ task 6 -nocolor
 task 6 -nocolor

-# 19 Waiting
+# 18 Waiting
 echo Waiting --------------------------------------------------------------
 echo $ task add Look for new apartment due:eoy
 task add Look for new apartment due:eoy
@@ -354,7 +341,7 @@ task list
 echo $ task 11 rc.confirmation:no delete
 task 11 rc.confirmation:no delete

-# 20 Dependencies
+# 19 Dependencies
 echo Dependencies --------------------------------------------------------------
 echo $ task list pro:party
 task list pro:party
@@ -385,7 +372,7 @@ echo 'y' | task  2 done
 echo $ task 1 info
 task  1 info

-# 21 Reports
+# 20 Reports
 echo Reports --------------------------------------------------------------
 echo $ task minimal
 task  minimal
@@ -414,7 +401,7 @@ task  timesheet
 echo $ task next
 task  next

-# 22 Custom report
+# 21 Custom report
 echo Custom report --------------------------------------------------------------
 echo 'report.foo.description=My own report'     >> x
 echo 'report.foo.columns=id,entry,description'  >> x
@@ -428,7 +415,7 @@ task  show report.foo
 echo $ task foo
 task  foo

-# 23 Charts
+# 22 Charts
 echo Charts --------------------------------------------------------------
 echo $ task history
 task history
@@ -441,7 +428,7 @@ task ghistory.annual
 echo $ task summary
 task summary

-# 24 Advanced filters
+# 23 Advanced filters
 echo Advanced filters --------------------------------------------------------------
 echo $ task list
 task  list
@@ -470,7 +457,7 @@ task  all status:pending
 echo $ task all status:waiting
 task  all status:waiting

-# 25 Import/export
+# 24 Import/export
 echo Import/export --------------------------------------------------------------
 echo $ task export.csv
 task  export.csv
@@ -507,7 +494,7 @@ printf "y\n" | task  import file.yaml
 echo $ task new limit:2
 task  new limit:2

-# 26 Help
+# 25 Help
 echo Help --------------------------------------------------------------
 echo $ task help
 task  help
@@ -524,7 +511,7 @@ echo $ man task-faq
 echo $ man task-sync
 #man task-sync

-# 27 Wrap up
+# 26 Wrap up
 echo Wrap up --------------------------------------------------------------
 echo $ task version
 task  version
--- a/doc/misc/tutorial/shell/script.200.txt
+++ b/doc/misc/tutorial/shell/script.200.txt
@@ -10,7 +10,7 @@ task-tutorial.5 man page.

 ---------------------------------------- Shell -----------------------------------------------------

-task shell                               You can use the shell command to create a more immersive
+tasksh                                   You can use the tasksh shell to create a more immersive
 task> projects                           environment.  Any task command you run outside the shell
 task> tags                               can also be run inside the shell, without the need to prefix
 task> list                               every command with "task".
@@ -18,5 +18,3 @@ task> quit

 ---------------------------------------- End -------------------------------------------------------

-Show use of rlwrap.
-
--- a/doc/misc/tutorial/tags/run.200
+++ b/doc/misc/tutorial/tags/run.200
@@ -306,20 +306,7 @@ 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
+# 17 Special tags
 echo Special tags --------------------------------------------------------------
 echo $ task 6 +nocolor
 task 6 +nocolor
@@ -330,7 +317,7 @@ task tags
 echo $ task 6 -nocolor
 task 6 -nocolor

-# 19 Waiting
+# 18 Waiting
 echo Waiting --------------------------------------------------------------
 echo $ task add Look for new apartment due:eoy
 task add Look for new apartment due:eoy
@@ -354,7 +341,7 @@ task list
 echo $ task 11 rc.confirmation:no delete
 task 11 rc.confirmation:no delete

-# 20 Dependencies
+# 19 Dependencies
 echo Dependencies --------------------------------------------------------------
 echo $ task list pro:party
 task list pro:party
@@ -385,7 +372,7 @@ echo 'y' | task  2 done
 echo $ task 1 info
 task  1 info

-# 21 Reports
+# 20 Reports
 echo Reports --------------------------------------------------------------
 echo $ task minimal
 task  minimal
@@ -414,7 +401,7 @@ task  timesheet
 echo $ task next
 task  next

-# 22 Custom report
+# 21 Custom report
 echo Custom report --------------------------------------------------------------
 echo 'report.foo.description=My own report'     >> x
 echo 'report.foo.columns=id,entry,description'  >> x
@@ -428,7 +415,7 @@ task  show report.foo
 echo $ task foo
 task  foo

-# 23 Charts
+# 22 Charts
 echo Charts --------------------------------------------------------------
 echo $ task history
 task history
@@ -441,7 +428,7 @@ task ghistory.annual
 echo $ task summary
 task summary

-# 24 Advanced filters
+# 23 Advanced filters
 echo Advanced filters --------------------------------------------------------------
 echo $ task list
 task  list
@@ -470,7 +457,7 @@ task  all status:pending
 echo $ task all status:waiting
 task  all status:waiting

-# 25 Import/export
+# 24 Import/export
 echo Import/export --------------------------------------------------------------
 echo $ task export.csv
 task  export.csv
@@ -507,7 +494,7 @@ printf "y\n" | task  import file.yaml
 echo $ task new limit:2
 task  new limit:2

-# 26 Help
+# 25 Help
 echo Help --------------------------------------------------------------
 echo $ task help
 task  help
@@ -524,7 +511,7 @@ echo $ man task-faq
 echo $ man task-sync
 #man task-sync

-# 27 Wrap up
+# 26 Wrap up
 echo Wrap up --------------------------------------------------------------
 echo $ task version
 task  version
--- a/doc/misc/tutorial/waiting/run.200
+++ b/doc/misc/tutorial/waiting/run.200
@@ -306,20 +306,7 @@ 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
+# 17 Special tags
 echo Special tags --------------------------------------------------------------
 echo $ task 6 +nocolor
 task 6 +nocolor
@@ -330,7 +317,7 @@ task tags
 echo $ task 6 -nocolor
 task 6 -nocolor

-# 19 Waiting
+# 18 Waiting
 echo Waiting --------------------------------------------------------------
 echo $ task add Look for new apartment due:eoy
 task add Look for new apartment due:eoy
@@ -354,7 +341,7 @@ task list
 echo $ task 11 rc.confirmation:no delete
 task 11 rc.confirmation:no delete

-# 20 Dependencies
+# 19 Dependencies
 echo Dependencies --------------------------------------------------------------
 echo $ task list pro:party
 task list pro:party
@@ -385,7 +372,7 @@ echo 'y' | task  2 done
 echo $ task 1 info
 task  1 info

-# 21 Reports
+# 20 Reports
 echo Reports --------------------------------------------------------------
 echo $ task minimal
 task  minimal
@@ -414,7 +401,7 @@ task  timesheet
 echo $ task next
 task  next

-# 22 Custom report
+# 21 Custom report
 echo Custom report --------------------------------------------------------------
 echo 'report.foo.description=My own report'     >> x
 echo 'report.foo.columns=id,entry,description'  >> x
@@ -428,7 +415,7 @@ task  show report.foo
 echo $ task foo
 task  foo

-# 23 Charts
+# 22 Charts
 echo Charts --------------------------------------------------------------
 echo $ task history
 task history
@@ -441,7 +428,7 @@ task ghistory.annual
 echo $ task summary
 task summary

-# 24 Advanced filters
+# 23 Advanced filters
 echo Advanced filters --------------------------------------------------------------
 echo $ task list
 task  list
@@ -470,7 +457,7 @@ task  all status:pending
 echo $ task all status:waiting
 task  all status:waiting

-# 25 Import/export
+# 24 Import/export
 echo Import/export --------------------------------------------------------------
 echo $ task export.csv
 task  export.csv
@@ -507,7 +494,7 @@ printf "y\n" | task  import file.yaml
 echo $ task new limit:2
 task  new limit:2

-# 26 Help
+# 25 Help
 echo Help --------------------------------------------------------------
 echo $ task help
 task  help
@@ -524,7 +511,7 @@ echo $ man task-faq
 echo $ man task-sync
 #man task-sync

-# 27 Wrap up
+# 26 Wrap up
 echo Wrap up --------------------------------------------------------------
 echo $ task version
 task  version
--- a/doc/rc/dark-16.theme
+++ b/doc/rc/dark-16.theme
@@ -3,7 +3,7 @@
 #
 # taskwarrior - a command line task list manager.
 #
-# Copyright 2006-2012, Paul Beckingham, Federico Hernandez.
+# Copyright 2006-2014, Paul Beckingham, Federico Hernandez.
 #
 # Permission is hereby granted, free of charge, to any person obtaining a copy
 # of this software and associated documentation files (the "Software"), to deal
--- a/doc/rc/dark-256.theme
+++ b/doc/rc/dark-256.theme
@@ -3,7 +3,7 @@
 #
 # taskwarrior - a command line task list manager.
 #
-# Copyright 2006-2012, Paul Beckingham, Federico Hernandez.
+# Copyright 2006-2014, Paul Beckingham, Federico Hernandez.
 #
 # Permission is hereby granted, free of charge, to any person obtaining a copy
 # of this software and associated documentation files (the "Software"), to deal
--- a/doc/rc/dark-blue-256.theme
+++ b/doc/rc/dark-blue-256.theme
@@ -3,7 +3,7 @@
 #
 # taskwarrior - a command line task list manager.
 #
-# Copyright 2006-2012, Paul Beckingham, Federico Hernandez.
+# Copyright 2006-2014, Paul Beckingham, Federico Hernandez.
 #
 # Permission is hereby granted, free of charge, to any person obtaining a copy
 # of this software and associated documentation files (the "Software"), to deal
--- a/doc/rc/dark-gray-256.theme
+++ b/doc/rc/dark-gray-256.theme
@@ -3,7 +3,7 @@
 #
 # taskwarrior - a command line task list manager.
 #
-# Copyright 2006-2012, Paul Beckingham, Federico Hernandez.
+# Copyright 2006-2014, Paul Beckingham, Federico Hernandez.
 #
 # Permission is hereby granted, free of charge, to any person obtaining a copy
 # of this software and associated documentation files (the "Software"), to deal
--- a/doc/rc/dark-green-256.theme
+++ b/doc/rc/dark-green-256.theme
@@ -3,7 +3,7 @@
 #
 # taskwarrior - a command line task list manager.
 #
-# Copyright 2006-2012, Paul Beckingham, Federico Hernandez.
+# Copyright 2006-2014, Paul Beckingham, Federico Hernandez.
 #
 # Permission is hereby granted, free of charge, to any person obtaining a copy
 # of this software and associated documentation files (the "Software"), to deal
--- a/doc/rc/dark-red-256.theme
+++ b/doc/rc/dark-red-256.theme
@@ -3,7 +3,7 @@
 #
 # taskwarrior - a command line task list manager.
 #
-# Copyright 2006-2012, Paul Beckingham, Federico Hernandez.
+# Copyright 2006-2014, Paul Beckingham, Federico Hernandez.
 #
 # Permission is hereby granted, free of charge, to any person obtaining a copy
 # of this software and associated documentation files (the "Software"), to deal
--- a/doc/rc/dark-violets-256.theme
+++ b/doc/rc/dark-violets-256.theme
@@ -3,7 +3,7 @@
 #
 # taskwarrior - a command line task list manager.
 #
-# Copyright 2006-2012, Paul Beckingham, Federico Hernandez.
+# Copyright 2006-2014, Paul Beckingham, Federico Hernandez.
 #
 # Permission is hereby granted, free of charge, to any person obtaining a copy
 # of this software and associated documentation files (the "Software"), to deal
--- a/doc/rc/dark-yellow-green.theme
+++ b/doc/rc/dark-yellow-green.theme
@@ -3,7 +3,7 @@
 #
 # taskwarrior - a command line task list manager.
 #
-# Copyright 2006-2012, Paul Beckingham, Federico Hernandez.
+# Copyright 2006-2014, Paul Beckingham, Federico Hernandez.
 #
 # Permission is hereby granted, free of charge, to any person obtaining a copy
 # of this software and associated documentation files (the "Software"), to deal
--- a/doc/rc/holidays.be-BY.rc
+++ b/doc/rc/holidays.be-BY.rc
@@ -1,9 +1,9 @@
 ###############################################################################
 # International Holiday Data provided by Holidata.net
-# http://holidata.net/be-BY/2012.json
 # http://holidata.net/be-BY/2013.json
+# http://holidata.net/be-BY/2014.json
 #
-# Copyright 2006-2012, Paul Beckingham, Federico Hernandez.
+# Copyright 2006-2014, Paul Beckingham, Federico Hernandez.
 #
 # Permission is hereby granted, free of charge, to any person obtaining a copy
 # of this software and associated documentation files (the "Software"), to deal
@@ -28,42 +28,42 @@
 ###############################################################################

 holiday.be-BY1.name=Новы Год
-holiday.be-BY1.date=20120101
+holiday.be-BY1.date=20130101
 holiday.be-BY2.name=Раство Хрыстова(праваслаўнае)
-holiday.be-BY2.date=20120107
+holiday.be-BY2.date=20130107
 holiday.be-BY3.name=Міжнародны жаночы дзень
-holiday.be-BY3.date=20120803
+holiday.be-BY3.date=20130803
 holiday.be-BY4.name=Пасха(праваслаўная)
-holiday.be-BY4.date=20120415
+holiday.be-BY4.date=20130505
 holiday.be-BY5.name=Радуніца
-holiday.be-BY5.date=20120424
+holiday.be-BY5.date=20130514
 holiday.be-BY6.name=Свята працы
-holiday.be-BY6.date=20120501
+holiday.be-BY6.date=20130501
 holiday.be-BY7.name=Дзень Перамогі
-holiday.be-BY7.date=20120509
+holiday.be-BY7.date=20130509
 holiday.be-BY8.name=Дзень незалежнаці
-holiday.be-BY8.date=20120703
+holiday.be-BY8.date=20130703
 holiday.be-BY9.name=Дзень Кастрычніцкай рэвалюцыі
-holiday.be-BY9.date=20121107
+holiday.be-BY9.date=20131107
 holiday.be-BY10.name=Раство Хрыстова(у заходніх хрысціян)
-holiday.be-BY10.date=20121225
+holiday.be-BY10.date=20131225
 holiday.be-BY11.name=Новы Год
-holiday.be-BY11.date=20130101
+holiday.be-BY11.date=20140101
 holiday.be-BY12.name=Раство Хрыстова(праваслаўнае)
-holiday.be-BY12.date=20130107
+holiday.be-BY12.date=20140107
 holiday.be-BY13.name=Міжнародны жаночы дзень
-holiday.be-BY13.date=20130803
+holiday.be-BY13.date=20140803
 holiday.be-BY14.name=Пасха(праваслаўная)
-holiday.be-BY14.date=20130505
+holiday.be-BY14.date=20140420
 holiday.be-BY15.name=Радуніца
-holiday.be-BY15.date=20130514
+holiday.be-BY15.date=20140529
 holiday.be-BY16.name=Свята працы
-holiday.be-BY16.date=20130501
+holiday.be-BY16.date=20140501
 holiday.be-BY17.name=Дзень Перамогі
-holiday.be-BY17.date=20130509
+holiday.be-BY17.date=20140509
 holiday.be-BY18.name=Дзень незалежнаці
-holiday.be-BY18.date=20130703
+holiday.be-BY18.date=20140703
 holiday.be-BY19.name=Дзень Кастрычніцкай рэвалюцыі
-holiday.be-BY19.date=20131107
+holiday.be-BY19.date=20141107
 holiday.be-BY20.name=Раство Хрыстова(у заходніх хрысціян)
-holiday.be-BY20.date=20131225
+holiday.be-BY20.date=20141225
--- a/doc/rc/holidays.cs-CZ.rc
+++ b/doc/rc/holidays.cs-CZ.rc
@@ -1,9 +1,9 @@
 ###############################################################################
 # International Holiday Data provided by Holidata.net
-# http://holidata.net/cs-CZ/2012.json
 # http://holidata.net/cs-CZ/2013.json
+# http://holidata.net/cs-CZ/2014.json
 #
-# Copyright 2006-2012, Paul Beckingham, Federico Hernandez.
+# Copyright 2006-2014, Paul Beckingham, Federico Hernandez.
 #
 # Permission is hereby granted, free of charge, to any person obtaining a copy
 # of this software and associated documentation files (the "Software"), to deal
@@ -28,54 +28,54 @@
 ###############################################################################

 holiday.cs-CZ1.name=Nový rok
-holiday.cs-CZ1.date=20120101
+holiday.cs-CZ1.date=20130101
 holiday.cs-CZ2.name=Den obnovy samostatnosti českého státu
-holiday.cs-CZ2.date=20120101
+holiday.cs-CZ2.date=20130101
 holiday.cs-CZ3.name=Velikonoční pondělí
-holiday.cs-CZ3.date=20120409
+holiday.cs-CZ3.date=20130401
 holiday.cs-CZ4.name=Svátek práce
-holiday.cs-CZ4.date=20120501
+holiday.cs-CZ4.date=20130501
 holiday.cs-CZ5.name=Den vítězství
-holiday.cs-CZ5.date=20120508
+holiday.cs-CZ5.date=20130508
 holiday.cs-CZ6.name=Den slovanských věrozvěstů
-holiday.cs-CZ6.date=20120705
+holiday.cs-CZ6.date=20130705
 holiday.cs-CZ7.name=Den upálení mistra Jana Husa
-holiday.cs-CZ7.date=20120706
+holiday.cs-CZ7.date=20130706
 holiday.cs-CZ8.name=Den české státnosti
-holiday.cs-CZ8.date=20120928
+holiday.cs-CZ8.date=20130928
 holiday.cs-CZ9.name=Den vzniku samostatného československého státu
-holiday.cs-CZ9.date=20121028
+holiday.cs-CZ9.date=20131028
 holiday.cs-CZ10.name=Den boje za svobodu a demokracii
-holiday.cs-CZ10.date=20121117
+holiday.cs-CZ10.date=20131117
 holiday.cs-CZ11.name=Štědrý den
-holiday.cs-CZ11.date=20121224
+holiday.cs-CZ11.date=20131224
 holiday.cs-CZ12.name=1. svátek vánoční
-holiday.cs-CZ12.date=20121225
+holiday.cs-CZ12.date=20131225
 holiday.cs-CZ13.name=2. svátek vánoční
-holiday.cs-CZ13.date=20121226
+holiday.cs-CZ13.date=20131226
 holiday.cs-CZ14.name=Nový rok
-holiday.cs-CZ14.date=20130101
+holiday.cs-CZ14.date=20140101
 holiday.cs-CZ15.name=Den obnovy samostatnosti českého státu
-holiday.cs-CZ15.date=20130101
+holiday.cs-CZ15.date=20140101
 holiday.cs-CZ16.name=Velikonoční pondělí
-holiday.cs-CZ16.date=20130401
+holiday.cs-CZ16.date=20140421
 holiday.cs-CZ17.name=Svátek práce
-holiday.cs-CZ17.date=20130501
+holiday.cs-CZ17.date=20140501
 holiday.cs-CZ18.name=Den vítězství
-holiday.cs-CZ18.date=20130508
+holiday.cs-CZ18.date=20140508
 holiday.cs-CZ19.name=Den slovanských věrozvěstů
-holiday.cs-CZ19.date=20130705
+holiday.cs-CZ19.date=20140705
 holiday.cs-CZ20.name=Den upálení mistra Jana Husa
-holiday.cs-CZ20.date=20130706
+holiday.cs-CZ20.date=20140706
 holiday.cs-CZ21.name=Den české státnosti
-holiday.cs-CZ21.date=20130928
+holiday.cs-CZ21.date=20140928
 holiday.cs-CZ22.name=Den vzniku samostatného československého státu
-holiday.cs-CZ22.date=20131028
+holiday.cs-CZ22.date=20141028
 holiday.cs-CZ23.name=Den boje za svobodu a demokracii
-holiday.cs-CZ23.date=20131117
+holiday.cs-CZ23.date=20141117
 holiday.cs-CZ24.name=Štědrý den
-holiday.cs-CZ24.date=20131224
+holiday.cs-CZ24.date=20141224
 holiday.cs-CZ25.name=1. svátek vánoční
-holiday.cs-CZ25.date=20131225
+holiday.cs-CZ25.date=20141225
 holiday.cs-CZ26.name=2. svátek vánoční
-holiday.cs-CZ26.date=20131226
+holiday.cs-CZ26.date=20141226
--- a/doc/rc/holidays.da-DK.rc
+++ b/doc/rc/holidays.da-DK.rc
@@ -1,9 +1,9 @@
 ###############################################################################
 # International Holiday Data provided by Holidata.net
-# http://holidata.net/da-DK/2012.json
 # http://holidata.net/da-DK/2013.json
+# http://holidata.net/da-DK/2014.json
 #
-# Copyright 2006-2012, Paul Beckingham, Federico Hernandez.
+# Copyright 2006-2014, Paul Beckingham, Federico Hernandez.
 #
 # Permission is hereby granted, free of charge, to any person obtaining a copy
 # of this software and associated documentation files (the "Software"), to deal
@@ -28,50 +28,26 @@
 ###############################################################################

 holiday.da-DK1.name=Nytårsdag
-holiday.da-DK1.date=20120101
+holiday.da-DK1.date=20130101
 holiday.da-DK2.name=Palmesøndag
-holiday.da-DK2.date=20120401
+holiday.da-DK2.date=20130324
 holiday.da-DK3.name=Skærtorsdag
-holiday.da-DK3.date=20120405
+holiday.da-DK3.date=20130328
 holiday.da-DK4.name=Langfredag
-holiday.da-DK4.date=20120406
+holiday.da-DK4.date=20130329
 holiday.da-DK5.name=Påskedag
-holiday.da-DK5.date=20120408
+holiday.da-DK5.date=20130331
 holiday.da-DK6.name=Anden påskedag
-holiday.da-DK6.date=20120409
+holiday.da-DK6.date=20130401
 holiday.da-DK7.name=Store bededag
-holiday.da-DK7.date=20120504
+holiday.da-DK7.date=20130426
 holiday.da-DK8.name=Kristi himmelfartsdag
-holiday.da-DK8.date=20120517
+holiday.da-DK8.date=20130509
 holiday.da-DK9.name=Pinsedag
-holiday.da-DK9.date=20120527
+holiday.da-DK9.date=20130519
 holiday.da-DK10.name=Anden pinsedag
-holiday.da-DK10.date=20120528
+holiday.da-DK10.date=20130520
 holiday.da-DK11.name=Juledag
-holiday.da-DK11.date=20121225
+holiday.da-DK11.date=20131225
 holiday.da-DK12.name=Anden juledag
-holiday.da-DK12.date=20121226
-holiday.da-DK13.name=Nytårsdag
-holiday.da-DK13.date=20130101
-holiday.da-DK14.name=Palmesøndag
-holiday.da-DK14.date=20130324
-holiday.da-DK15.name=Skærtorsdag
-holiday.da-DK15.date=20130328
-holiday.da-DK16.name=Langfredag
-holiday.da-DK16.date=20130329
-holiday.da-DK17.name=Påskedag
-holiday.da-DK17.date=20130331
-holiday.da-DK18.name=Anden påskedag
-holiday.da-DK18.date=20130401
-holiday.da-DK19.name=Store bededag
-holiday.da-DK19.date=20130426
-holiday.da-DK20.name=Kristi himmelfartsdag
-holiday.da-DK20.date=20130509
-holiday.da-DK21.name=Pinsedag
-holiday.da-DK21.date=20130519
-holiday.da-DK22.name=Anden pinsedag
-holiday.da-DK22.date=20130520
-holiday.da-DK23.name=Juledag
-holiday.da-DK23.date=20131225
-holiday.da-DK24.name=Anden juledag
-holiday.da-DK24.date=20131226
+holiday.da-DK12.date=20131226
--- a/doc/rc/holidays.de-AT.rc
+++ b/doc/rc/holidays.de-AT.rc
@@ -1,9 +1,9 @@
 ###############################################################################
 # International Holiday Data provided by Holidata.net
-# http://holidata.net/de-AT/2012.json
 # http://holidata.net/de-AT/2013.json
+# http://holidata.net/de-AT/2014.json
 #
-# Copyright 2006-2012, Paul Beckingham, Federico Hernandez.
+# Copyright 2006-2014, Paul Beckingham, Federico Hernandez.
 #
 # Permission is hereby granted, free of charge, to any person obtaining a copy
 # of this software and associated documentation files (the "Software"), to deal
@@ -28,94 +28,48 @@
 ###############################################################################

 holiday.de-AT1.name=Neujahr
-holiday.de-AT1.date=20120101
+holiday.de-AT1.date=20130101
 holiday.de-AT2.name=Heilige drei KÃ¶nige
-holiday.de-AT2.date=20120106
+holiday.de-AT2.date=20130106
 holiday.de-AT3.name=Josef (K, St, T, V)
-holiday.de-AT3.date=20120319
+holiday.de-AT3.date=20130319
 holiday.de-AT4.name=Karfreitag
-holiday.de-AT4.date=20120406
+holiday.de-AT4.date=20130329
 holiday.de-AT5.name=Ostersonntag
-holiday.de-AT5.date=20120408
+holiday.de-AT5.date=20130331
 holiday.de-AT6.name=Ostermontag
-holiday.de-AT6.date=20120409
+holiday.de-AT6.date=20130401
 holiday.de-AT7.name=Staatsfeiertag
-holiday.de-AT7.date=20120501
+holiday.de-AT7.date=20130501
 holiday.de-AT8.name=Florian (O)
-holiday.de-AT8.date=20120504
+holiday.de-AT8.date=20130504
 holiday.de-AT9.name=Christi Himmelfahrt
-holiday.de-AT9.date=20120517
+holiday.de-AT9.date=20130509
 holiday.de-AT10.name=Pfingstsonntag
-holiday.de-AT10.date=20120527
+holiday.de-AT10.date=20130519
 holiday.de-AT11.name=Pfingstmontag
-holiday.de-AT11.date=20120528
+holiday.de-AT11.date=20130520
 holiday.de-AT12.name=Fronleichnam
-holiday.de-AT12.date=20120607
+holiday.de-AT12.date=20130530
 holiday.de-AT13.name=Mariä Himmelfahrt
-holiday.de-AT13.date=20120815
+holiday.de-AT13.date=20130815
 holiday.de-AT14.name=Rupert (S)
-holiday.de-AT14.date=20120924
+holiday.de-AT14.date=20130924
 holiday.de-AT15.name=Tag der Volksabstimmung (K)
-holiday.de-AT15.date=20121010
+holiday.de-AT15.date=20131010
 holiday.de-AT16.name=Allerheiligen
-holiday.de-AT16.date=20121101
+holiday.de-AT16.date=20131101
 holiday.de-AT17.name=Martin (B)
-holiday.de-AT17.date=20121111
+holiday.de-AT17.date=20131111
 holiday.de-AT18.name=Leopold (W, N)
-holiday.de-AT18.date=20121115
+holiday.de-AT18.date=20131115
 holiday.de-AT19.name=Mariä Empfängnis
-holiday.de-AT19.date=20121208
+holiday.de-AT19.date=20131208
 holiday.de-AT20.name=Heiliger Abend
-holiday.de-AT20.date=20121224
+holiday.de-AT20.date=20131224
 holiday.de-AT21.name=Christtag
-holiday.de-AT21.date=20121225
+holiday.de-AT21.date=20131225
 holiday.de-AT22.name=Stefanitag
-holiday.de-AT22.date=20121226
+holiday.de-AT22.date=20131226
 holiday.de-AT23.name=Silvester
-holiday.de-AT23.date=20121231
-holiday.de-AT24.name=Neujahr
-holiday.de-AT24.date=20130101
-holiday.de-AT25.name=Heilige drei KÃ¶nige
-holiday.de-AT25.date=20130106
-holiday.de-AT26.name=Josef (K, St, T, V)
-holiday.de-AT26.date=20130319
-holiday.de-AT27.name=Karfreitag
-holiday.de-AT27.date=20130329
-holiday.de-AT28.name=Ostersonntag
-holiday.de-AT28.date=20130331
-holiday.de-AT29.name=Ostermontag
-holiday.de-AT29.date=20130401
-holiday.de-AT30.name=Staatsfeiertag
-holiday.de-AT30.date=20130501
-holiday.de-AT31.name=Florian (O)
-holiday.de-AT31.date=20130504
-holiday.de-AT32.name=Christi Himmelfahrt
-holiday.de-AT32.date=20130509
-holiday.de-AT33.name=Pfingstsonntag
-holiday.de-AT33.date=20130519
-holiday.de-AT34.name=Pfingstmontag
-holiday.de-AT34.date=20130520
-holiday.de-AT35.name=Fronleichnam
-holiday.de-AT35.date=20130530
-holiday.de-AT36.name=Mariä Himmelfahrt
-holiday.de-AT36.date=20130815
-holiday.de-AT37.name=Rupert (S)
-holiday.de-AT37.date=20130924
-holiday.de-AT38.name=Tag der Volksabstimmung (K)
-holiday.de-AT38.date=20131010
-holiday.de-AT39.name=Allerheiligen
-holiday.de-AT39.date=20131101
-holiday.de-AT40.name=Martin (B)
-holiday.de-AT40.date=20131111
-holiday.de-AT41.name=Leopold (W, N)
-holiday.de-AT41.date=20131115
-holiday.de-AT42.name=Mariä Empfängnis
-holiday.de-AT42.date=20131208
-holiday.de-AT43.name=Heiliger Abend
-holiday.de-AT43.date=20131224
-holiday.de-AT44.name=Christtag
-holiday.de-AT44.date=20131225
-holiday.de-AT45.name=Stefanitag
-holiday.de-AT45.date=20131226
-holiday.de-AT46.name=Silvester
-holiday.de-AT46.date=20131231
+holiday.de-AT23.date=20131231
--- a/doc/rc/holidays.de-DE.rc
+++ b/doc/rc/holidays.de-DE.rc
@@ -1,9 +1,9 @@
 ###############################################################################
 # International Holiday Data provided by Holidata.net
-# http://holidata.net/de-DE/2012.json
 # http://holidata.net/de-DE/2013.json
+# http://holidata.net/de-DE/2014.json
 #
-# Copyright 2006-2012, Paul Beckingham, Federico Hernandez.
+# Copyright 2006-2014, Paul Beckingham, Federico Hernandez.
 #
 # Permission is hereby granted, free of charge, to any person obtaining a copy
 # of this software and associated documentation files (the "Software"), to deal
@@ -28,138 +28,78 @@
 ###############################################################################

 holiday.de-DE1.name=Neujahr
-holiday.de-DE1.date=20120101
+holiday.de-DE1.date=20130101
 holiday.de-DE2.name=Heilige drei Könige
-holiday.de-DE2.date=20120106
-holiday.de-DE3.name=Heilige drei Könige
-holiday.de-DE3.date=20120106
-holiday.de-DE4.name=Heilige drei Könige
-holiday.de-DE4.date=20120106
-holiday.de-DE5.name=Karfreitag
-holiday.de-DE5.date=20120406
-holiday.de-DE6.name=Ostern
-holiday.de-DE6.date=20120408
-holiday.de-DE7.name=Ostermontag
-holiday.de-DE7.date=20120409
-holiday.de-DE8.name=Erster Maifeiertag
-holiday.de-DE8.date=20120501
-holiday.de-DE9.name=Christi Himmelfahrt
-holiday.de-DE9.date=20120517
-holiday.de-DE10.name=Pfingstsonntag
-holiday.de-DE10.date=20120527
-holiday.de-DE11.name=Pfingstmontag
-holiday.de-DE11.date=20120528
-holiday.de-DE12.name=Fronleichnam
-holiday.de-DE12.date=20120607
-holiday.de-DE13.name=Fronleichnam
-holiday.de-DE13.date=20120607
-holiday.de-DE14.name=Fronleichnam
-holiday.de-DE14.date=20120607
-holiday.de-DE15.name=Fronleichnam
-holiday.de-DE15.date=20120607
-holiday.de-DE16.name=Fronleichnam
-holiday.de-DE16.date=20120607
-holiday.de-DE17.name=Fronleichnam
-holiday.de-DE17.date=20120607
-holiday.de-DE18.name=Mariä Himmelfahrt
-holiday.de-DE18.date=20120815
-holiday.de-DE19.name=Tag der Deutschen Einheit
-holiday.de-DE19.date=20121003
-holiday.de-DE20.name=Reformationstag
-holiday.de-DE20.date=20121031
-holiday.de-DE21.name=Reformationstag
-holiday.de-DE21.date=20121031
-holiday.de-DE22.name=Reformationstag
-holiday.de-DE22.date=20121031
-holiday.de-DE23.name=Reformationstag
-holiday.de-DE23.date=20121031
-holiday.de-DE24.name=Reformationstag
-holiday.de-DE24.date=20121031
-holiday.de-DE25.name=Allerheiligen
-holiday.de-DE25.date=20121101
-holiday.de-DE26.name=Allerheiligen
-holiday.de-DE26.date=20121101
-holiday.de-DE27.name=Allerheiligen
-holiday.de-DE27.date=20121101
-holiday.de-DE28.name=Allerheiligen
-holiday.de-DE28.date=20121101
-holiday.de-DE29.name=Allerheiligen
-holiday.de-DE29.date=20121101
-holiday.de-DE30.name=Buss und Bettag
-holiday.de-DE30.date=20121121
-holiday.de-DE31.name=Heilig Abend
-holiday.de-DE31.date=20121224
-holiday.de-DE32.name=Weihnachtstag
-holiday.de-DE32.date=20121225
-holiday.de-DE33.name=Zweiter Weihnachtstag
-holiday.de-DE33.date=20121226
-holiday.de-DE34.name=Sylvester
-holiday.de-DE34.date=20121231
-holiday.de-DE35.name=Neujahr
-holiday.de-DE35.date=20130101
-holiday.de-DE36.name=Heilige drei Könige
-holiday.de-DE36.date=20130106
-holiday.de-DE37.name=Heilige drei Könige
-holiday.de-DE37.date=20130106
-holiday.de-DE38.name=Heilige drei Könige
-holiday.de-DE38.date=20130106
-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
+holiday.de-DE2.date=20130106
+holiday.de-DE3.name=Karfreitag
+holiday.de-DE3.date=20130329
+holiday.de-DE4.name=Ostern
+holiday.de-DE4.date=20130331
+holiday.de-DE5.name=Ostermontag
+holiday.de-DE5.date=20130401
+holiday.de-DE6.name=Erster Maifeiertag
+holiday.de-DE6.date=20130501
+holiday.de-DE7.name=Christi Himmelfahrt
+holiday.de-DE7.date=20130509
+holiday.de-DE8.name=Pfingstsonntag
+holiday.de-DE8.date=20130519
+holiday.de-DE9.name=Pfingstmontag
+holiday.de-DE9.date=20130520
+holiday.de-DE10.name=Fronleichnam
+holiday.de-DE10.date=20130530
+holiday.de-DE11.name=Mariä Himmelfahrt
+holiday.de-DE11.date=20130815
+holiday.de-DE12.name=Tag der Deutschen Einheit
+holiday.de-DE12.date=20131003
+holiday.de-DE13.name=Reformationstag
+holiday.de-DE13.date=20131031
+holiday.de-DE14.name=Allerheiligen
+holiday.de-DE14.date=20131101
+holiday.de-DE15.name=Buss und Bettag
+holiday.de-DE15.date=20131120
+holiday.de-DE16.name=Heilig Abend
+holiday.de-DE16.date=20131224
+holiday.de-DE17.name=Weihnachtstag
+holiday.de-DE17.date=20131225
+holiday.de-DE18.name=Zweiter Weihnachtstag
+holiday.de-DE18.date=20131226
+holiday.de-DE19.name=Sylvester
+holiday.de-DE19.date=20131231
+holiday.de-DE20.name=Neujahr
+holiday.de-DE20.date=20140101
+holiday.de-DE21.name=Heilige drei Könige
+holiday.de-DE21.date=20140106
+holiday.de-DE22.name=Karfreitag
+holiday.de-DE22.date=20140418
+holiday.de-DE23.name=Ostern
+holiday.de-DE23.date=20140420
+holiday.de-DE24.name=Ostermontag
+holiday.de-DE24.date=20140421
+holiday.de-DE25.name=Erster Maifeiertag
+holiday.de-DE25.date=20140501
+holiday.de-DE26.name=Christi Himmelfahrt
+holiday.de-DE26.date=20140529
+holiday.de-DE27.name=Pfingstsonntag
+holiday.de-DE27.date=20140608
+holiday.de-DE28.name=Pfingstmontag
+holiday.de-DE28.date=20140609
+holiday.de-DE29.name=Fronleichnam
+holiday.de-DE29.date=20140619
+holiday.de-DE30.name=Mariä Himmelfahrt
+holiday.de-DE30.date=20140815
+holiday.de-DE31.name=Tag der Deutschen Einheit
+holiday.de-DE31.date=20141003
+holiday.de-DE32.name=Reformationstag
+holiday.de-DE32.date=20141031
+holiday.de-DE33.name=Allerheiligen
+holiday.de-DE33.date=20141101
+holiday.de-DE34.name=Buss und Bettag
+holiday.de-DE34.date=20141119
+holiday.de-DE35.name=Heilig Abend
+holiday.de-DE35.date=20141224
+holiday.de-DE36.name=Weihnachtstag
+holiday.de-DE36.date=20141225
+holiday.de-DE37.name=Zweiter Weihnachtstag
+holiday.de-DE37.date=20141226
+holiday.de-DE38.name=Sylvester
+holiday.de-DE38.date=20141231
--- a/doc/rc/holidays.en-CA.rc
+++ b/doc/rc/holidays.en-CA.rc
@@ -1,9 +1,9 @@
 ###############################################################################
 # International Holiday Data provided by Holidata.net
-# http://holidata.net/en-CA/2012.json
 # http://holidata.net/en-CA/2013.json
+# http://holidata.net/en-CA/2014.json
 #
-# Copyright 2006-2012, Paul Beckingham, Federico Hernandez.
+# Copyright 2006-2014, Paul Beckingham, Federico Hernandez.
 #
 # Permission is hereby granted, free of charge, to any person obtaining a copy
 # of this software and associated documentation files (the "Software"), to deal
@@ -28,58 +28,28 @@
 ###############################################################################

 holiday.en-CA1.name=New Year's Day
-holiday.en-CA1.date=20120101
-holiday.en-CA2.name=New Year's Day (obs.)
-holiday.en-CA2.date=20120102
-holiday.en-CA3.name=Family Day
-holiday.en-CA3.date=20120220
-holiday.en-CA4.name=Good Friday
-holiday.en-CA4.date=20120406
-holiday.en-CA5.name=Easter Monday
-holiday.en-CA5.date=20120409
-holiday.en-CA6.name=Victoria Day
-holiday.en-CA6.date=20120521
-holiday.en-CA7.name=Canada Day
-holiday.en-CA7.date=20120701
-holiday.en-CA8.name=Canada Day (obs.)
-holiday.en-CA8.date=20120702
-holiday.en-CA9.name=First Monday of August
-holiday.en-CA9.date=20120806
-holiday.en-CA10.name=Labour Day
-holiday.en-CA10.date=20120903
-holiday.en-CA11.name=Thanksgiving Day
-holiday.en-CA11.date=20121008
-holiday.en-CA12.name=Remembrance Day
-holiday.en-CA12.date=20121111
-holiday.en-CA13.name=Christmas Day
-holiday.en-CA13.date=20121225
-holiday.en-CA14.name=Boxing Day
-holiday.en-CA14.date=20121226
-holiday.en-CA15.name=New Year's Eve
-holiday.en-CA15.date=20121231
-holiday.en-CA16.name=New Year's Day
-holiday.en-CA16.date=20130101
-holiday.en-CA17.name=Family Day
-holiday.en-CA17.date=20130218
-holiday.en-CA18.name=Good Friday
-holiday.en-CA18.date=20130329
-holiday.en-CA19.name=Easter Monday
-holiday.en-CA19.date=20130401
-holiday.en-CA20.name=Victoria Day
-holiday.en-CA20.date=20130520
-holiday.en-CA21.name=Canada Day
-holiday.en-CA21.date=20130701
-holiday.en-CA22.name=First Monday of August
-holiday.en-CA22.date=20130805
-holiday.en-CA23.name=Labour Day
-holiday.en-CA23.date=20130902
-holiday.en-CA24.name=Thanksgiving Day
-holiday.en-CA24.date=20131014
-holiday.en-CA25.name=Remembrance Day
-holiday.en-CA25.date=20131111
-holiday.en-CA26.name=Christmas Day
-holiday.en-CA26.date=20131225
-holiday.en-CA27.name=Boxing Day
-holiday.en-CA27.date=20131226
-holiday.en-CA28.name=New Year's Eve
-holiday.en-CA28.date=20131231
+holiday.en-CA1.date=20130101
+holiday.en-CA2.name=Family Day
+holiday.en-CA2.date=20130218
+holiday.en-CA3.name=Good Friday
+holiday.en-CA3.date=20130329
+holiday.en-CA4.name=Easter Monday
+holiday.en-CA4.date=20130401
+holiday.en-CA5.name=Victoria Day
+holiday.en-CA5.date=20130520
+holiday.en-CA6.name=Canada Day
+holiday.en-CA6.date=20130701
+holiday.en-CA7.name=First Monday of August
+holiday.en-CA7.date=20130805
+holiday.en-CA8.name=Labour Day
+holiday.en-CA8.date=20130902
+holiday.en-CA9.name=Thanksgiving Day
+holiday.en-CA9.date=20131014
+holiday.en-CA10.name=Remembrance Day
+holiday.en-CA10.date=20131111
+holiday.en-CA11.name=Christmas Day
+holiday.en-CA11.date=20131225
+holiday.en-CA12.name=Boxing Day
+holiday.en-CA12.date=20131226
+holiday.en-CA13.name=New Year's Eve
+holiday.en-CA13.date=20131231
--- a/doc/rc/holidays.en-GB.rc
+++ b/doc/rc/holidays.en-GB.rc
@@ -1,9 +1,9 @@
 ###############################################################################
 # International Holiday Data provided by Holidata.net
-# http://holidata.net/en-GB/2012.json
 # http://holidata.net/en-GB/2013.json
+# http://holidata.net/en-GB/2014.json
 #
-# Copyright 2006-2012, Paul Beckingham, Federico Hernandez.
+# Copyright 2006-2014, Paul Beckingham, Federico Hernandez.
 #
 # Permission is hereby granted, free of charge, to any person obtaining a copy
 # of this software and associated documentation files (the "Software"), to deal
@@ -28,38 +28,34 @@
 ###############################################################################

 holiday.en-GB1.name=New Year's Day
-holiday.en-GB1.date=20120101
-holiday.en-GB2.name=New Year's Day Holiday
-holiday.en-GB2.date=20120102
-holiday.en-GB3.name=Good Friday
-holiday.en-GB3.date=20120406
-holiday.en-GB4.name=Easter Monday
-holiday.en-GB4.date=20120409
-holiday.en-GB5.name=Early May Bank Holiday
-holiday.en-GB5.date=20120507
-holiday.en-GB6.name=Spring Bank Holiday
-holiday.en-GB6.date=20120604
-holiday.en-GB7.name=Queen's Diamond Jubilee
-holiday.en-GB7.date=20120605
-holiday.en-GB8.name=August Bank Holiday
-holiday.en-GB8.date=20120827
-holiday.en-GB9.name=Christmas Day
-holiday.en-GB9.date=20121225
-holiday.en-GB10.name=Boxing Day
-holiday.en-GB10.date=20121226
-holiday.en-GB11.name=New Year's Day
-holiday.en-GB11.date=20130101
-holiday.en-GB12.name=Good Friday
-holiday.en-GB12.date=20130329
-holiday.en-GB13.name=Easter Monday
-holiday.en-GB13.date=20130401
-holiday.en-GB14.name=Early May Bank Holiday
-holiday.en-GB14.date=20130506
-holiday.en-GB15.name=Spring Bank Holiday
-holiday.en-GB15.date=20130527
-holiday.en-GB16.name=August Bank Holiday
-holiday.en-GB16.date=20130826
-holiday.en-GB17.name=Christmas Day
-holiday.en-GB17.date=20131225
-holiday.en-GB18.name=Boxing Day
-holiday.en-GB18.date=20131226
+holiday.en-GB1.date=20130101
+holiday.en-GB2.name=Good Friday
+holiday.en-GB2.date=20130329
+holiday.en-GB3.name=Easter Monday
+holiday.en-GB3.date=20130401
+holiday.en-GB4.name=Early May Bank Holiday
+holiday.en-GB4.date=20130506
+holiday.en-GB5.name=Spring Bank Holiday
+holiday.en-GB5.date=20130527
+holiday.en-GB6.name=August Bank Holiday
+holiday.en-GB6.date=20130826
+holiday.en-GB7.name=Christmas Day
+holiday.en-GB7.date=20131225
+holiday.en-GB8.name=Boxing Day
+holiday.en-GB8.date=20131226
+holiday.en-GB9.name=New Year's Day
+holiday.en-GB9.date=20140101
+holiday.en-GB10.name=Good Friday
+holiday.en-GB10.date=20140418
+holiday.en-GB11.name=Easter Monday
+holiday.en-GB11.date=20140421
+holiday.en-GB12.name=Early May Bank Holiday
+holiday.en-GB12.date=20140505
+holiday.en-GB13.name=Spring Bank Holiday
+holiday.en-GB13.date=20140526
+holiday.en-GB14.name=August Bank Holiday
+holiday.en-GB14.date=20140825
+holiday.en-GB15.name=Christmas Day
+holiday.en-GB15.date=20141225
+holiday.en-GB16.name=Boxing Day
+holiday.en-GB16.date=20141226
--- a/doc/rc/holidays.en-NZ.rc
+++ b/doc/rc/holidays.en-NZ.rc
@@ -1,9 +1,9 @@
 ###############################################################################
 # International Holiday Data provided by Holidata.net
-# http://holidata.net/en-NZ/2012.json
 # http://holidata.net/en-NZ/2013.json
+# http://holidata.net/en-NZ/2014.json
 #
-# Copyright 2006-2012, Paul Beckingham, Federico Hernandez.
+# Copyright 2006-2014, Paul Beckingham, Federico Hernandez.
 #
 # Permission is hereby granted, free of charge, to any person obtaining a copy
 # of this software and associated documentation files (the "Software"), to deal
@@ -28,42 +28,22 @@
 ###############################################################################

 holiday.en-NZ1.name=New Year's Day
-holiday.en-NZ1.date=20120101
+holiday.en-NZ1.date=20130101
 holiday.en-NZ2.name=Day after New Years Day
-holiday.en-NZ2.date=20120102
+holiday.en-NZ2.date=20130102
 holiday.en-NZ3.name=Waitangi Day
-holiday.en-NZ3.date=20120206
+holiday.en-NZ3.date=20130206
 holiday.en-NZ4.name=Good Friday
-holiday.en-NZ4.date=20120406
+holiday.en-NZ4.date=20130329
 holiday.en-NZ5.name=Easter Monday
-holiday.en-NZ5.date=20120409
+holiday.en-NZ5.date=20130401
 holiday.en-NZ6.name=ANZAC Day
-holiday.en-NZ6.date=20120425
+holiday.en-NZ6.date=20130425
 holiday.en-NZ7.name=Queen's Birthday
-holiday.en-NZ7.date=20120604
+holiday.en-NZ7.date=20130603
 holiday.en-NZ8.name=Labour Day
-holiday.en-NZ8.date=20121022
+holiday.en-NZ8.date=20131028
 holiday.en-NZ9.name=Christmas Day
-holiday.en-NZ9.date=20121225
+holiday.en-NZ9.date=20131225
 holiday.en-NZ10.name=Boxing Day
-holiday.en-NZ10.date=20121226
-holiday.en-NZ11.name=New Year's Day
-holiday.en-NZ11.date=20130101
-holiday.en-NZ12.name=Day after New Years Day
-holiday.en-NZ12.date=20130102
-holiday.en-NZ13.name=Waitangi Day
-holiday.en-NZ13.date=20130206
-holiday.en-NZ14.name=Good Friday
-holiday.en-NZ14.date=20130329
-holiday.en-NZ15.name=Easter Monday
-holiday.en-NZ15.date=20130401
-holiday.en-NZ16.name=ANZAC Day
-holiday.en-NZ16.date=20130425
-holiday.en-NZ17.name=Queen's Birthday
-holiday.en-NZ17.date=20130603
-holiday.en-NZ18.name=Labour Day
-holiday.en-NZ18.date=20131028
-holiday.en-NZ19.name=Christmas Day
-holiday.en-NZ19.date=20131225
-holiday.en-NZ20.name=Boxing Day
-holiday.en-NZ20.date=20131226
+holiday.en-NZ10.date=20131226
--- a/doc/rc/holidays.en-US.rc
+++ b/doc/rc/holidays.en-US.rc
@@ -1,9 +1,9 @@
 ###############################################################################
 # International Holiday Data provided by Holidata.net
-# http://holidata.net/en-US/2012.json
 # http://holidata.net/en-US/2013.json
+# http://holidata.net/en-US/2014.json
 #
-# Copyright 2006-2012, Paul Beckingham, Federico Hernandez.
+# Copyright 2006-2014, Paul Beckingham, Federico Hernandez.
 #
 # Permission is hereby granted, free of charge, to any person obtaining a copy
 # of this software and associated documentation files (the "Software"), to deal
@@ -28,48 +28,46 @@
 ###############################################################################

 holiday.en-US1.name=New Year's Day
-holiday.en-US1.date=20120101
-holiday.en-US2.name=New Year's Day
-holiday.en-US2.date=20120102
-holiday.en-US3.name=Birthday of Martin Luther King, Jr.
-holiday.en-US3.date=20120116
-holiday.en-US4.name=Washington's Birthday
-holiday.en-US4.date=20120220
-holiday.en-US5.name=Patriots' Day
-holiday.en-US5.date=20120416
-holiday.en-US7.name=Memorial Day
-holiday.en-US7.date=20120528
-holiday.en-US8.name=Independence Day
-holiday.en-US8.date=20120704
-holiday.en-US9.name=Labor Day
-holiday.en-US9.date=20120903
-holiday.en-US10.name=Columbus Day
-holiday.en-US10.date=20121008
-holiday.en-US11.name=Veterans Day
-holiday.en-US11.date=20121112
-holiday.en-US12.name=Thanksgiving Day
-holiday.en-US12.date=20121122
-holiday.en-US13.name=Christmas Day
-holiday.en-US13.date=20121225
-holiday.en-US14.name=New Year's Day
-holiday.en-US14.date=20130101
-holiday.en-US15.name=Birthday of Martin Luther King, Jr.
-holiday.en-US15.date=20130121
-holiday.en-US16.name=Washington's Birthday
-holiday.en-US16.date=20130218
-holiday.en-US18.name=Patriots' Day
-holiday.en-US18.date=20130415
-holiday.en-US19.name=Memorial Day
-holiday.en-US19.date=20130527
-holiday.en-US20.name=Independence Day
-holiday.en-US20.date=20130704
-holiday.en-US21.name=Labor Day
-holiday.en-US21.date=20130902
-holiday.en-US22.name=Columbus Day
-holiday.en-US22.date=20131014
-holiday.en-US23.name=Veterans Day
-holiday.en-US23.date=20131111
-holiday.en-US24.name=Thanksgiving Day
-holiday.en-US24.date=20131128
-holiday.en-US25.name=Christmas Day
-holiday.en-US25.date=20131225
+holiday.en-US1.date=20130101
+holiday.en-US2.name=Birthday of Martin Luther King, Jr.
+holiday.en-US2.date=20130121
+holiday.en-US3.name=Washington's Birthday
+holiday.en-US3.date=20130218
+holiday.en-US4.name=Patriots' Day
+holiday.en-US4.date=20130415
+holiday.en-US5.name=Memorial Day
+holiday.en-US5.date=20130527
+holiday.en-US6.name=Independence Day
+holiday.en-US6.date=20130704
+holiday.en-US7.name=Labor Day
+holiday.en-US7.date=20130902
+holiday.en-US8.name=Columbus Day
+holiday.en-US8.date=20131014
+holiday.en-US9.name=Veterans Day
+holiday.en-US9.date=20131111
+holiday.en-US10.name=Thanksgiving Day
+holiday.en-US10.date=20131128
+holiday.en-US11.name=Christmas Day
+holiday.en-US11.date=20131225
+holiday.en-US12.name=New Year's Day
+holiday.en-US12.date=20140101
+holiday.en-US13.name=Birthday of Martin Luther King, Jr.
+holiday.en-US13.date=20140120
+holiday.en-US14.name=Washington's Birthday
+holiday.en-US14.date=20140217
+holiday.en-US15.name=Patriots' Day
+holiday.en-US15.date=20140421
+holiday.en-US16.name=Memorial Day
+holiday.en-US16.date=20140526
+holiday.en-US17.name=Independence Day
+holiday.en-US17.date=20140704
+holiday.en-US18.name=Labor Day
+holiday.en-US18.date=20140901
+holiday.en-US19.name=Columbus Day
+holiday.en-US19.date=20141013
+holiday.en-US20.name=Veterans Day
+holiday.en-US20.date=20141111
+holiday.en-US21.name=Thanksgiving Day
+holiday.en-US21.date=20141127
+holiday.en-US22.name=Christmas Day
+holiday.en-US22.date=20141225
--- a/doc/rc/holidays.es-ES.rc
+++ b/doc/rc/holidays.es-ES.rc
@@ -1,9 +1,9 @@
 ###############################################################################
 # International Holiday Data provided by Holidata.net
-# http://holidata.net/es-ES/2012.json
 # http://holidata.net/es-ES/2013.json
+# http://holidata.net/es-ES/2014.json
 #
-# Copyright 2006-2012, Paul Beckingham, Federico Hernandez.
+# Copyright 2006-2014, Paul Beckingham, Federico Hernandez.
 #
 # Permission is hereby granted, free of charge, to any person obtaining a copy
 # of this software and associated documentation files (the "Software"), to deal
@@ -28,52 +28,54 @@
 ###############################################################################

 holiday.es-ES1.name=Año Nuevo
-holiday.es-ES1.date=20120101
+holiday.es-ES1.date=20130101
 holiday.es-ES2.name=Día de los Reyes
-holiday.es-ES2.date=20120106
+holiday.es-ES2.date=20130106
 holiday.es-ES3.name=Viernes Santo
-holiday.es-ES3.date=20120406
-holiday.es-ES4.name=Fiesta del Trabajo
-holiday.es-ES4.date=20120501
-holiday.es-ES5.name=Asunción de la Virgen
-holiday.es-ES5.date=20120815
-holiday.es-ES6.name=Fiesta Nacional de España
-holiday.es-ES6.date=20121012
-holiday.es-ES7.name=Dia de todos los Santos
-holiday.es-ES7.date=20121101
-holiday.es-ES8.name=Dia de la Constitución
-holiday.es-ES8.date=20121206
-holiday.es-ES9.name=Inmaculada Concepción
-holiday.es-ES9.date=20121208
-holiday.es-ES10.name=Noche Buena
-holiday.es-ES10.date=20121224
-holiday.es-ES11.name=Navidad
-holiday.es-ES11.date=20121225
-holiday.es-ES12.name=Noche Vieja
-holiday.es-ES12.date=20121231
-holiday.es-ES13.name=Año Nuevo
-holiday.es-ES13.date=20130101
-holiday.es-ES14.name=Día de los Reyes
-holiday.es-ES14.date=20130106
-holiday.es-ES15.name=Viernes Santo
-holiday.es-ES15.date=20130329
-holiday.es-ES16.name=Pascua
-holiday.es-ES16.date=20130331
-holiday.es-ES17.name=Fiesta del Trabajo
-holiday.es-ES17.date=20130501
-holiday.es-ES18.name=Asunción de la Virgen
-holiday.es-ES18.date=20130815
-holiday.es-ES19.name=Fiesta Nacional de España
-holiday.es-ES19.date=20131012
-holiday.es-ES20.name=Dia de todos los Santos
-holiday.es-ES20.date=20131101
-holiday.es-ES21.name=Dia de la Constitución
-holiday.es-ES21.date=20131206
-holiday.es-ES22.name=Inmaculada Concepción
-holiday.es-ES22.date=20131208
-holiday.es-ES23.name=Noche Buena
-holiday.es-ES23.date=20131224
-holiday.es-ES24.name=Navidad
-holiday.es-ES24.date=20131225
-holiday.es-ES25.name=Noche Vieja
-holiday.es-ES25.date=20131231
+holiday.es-ES3.date=20130329
+holiday.es-ES4.name=Pascua
+holiday.es-ES4.date=20130331
+holiday.es-ES5.name=Fiesta del Trabajo
+holiday.es-ES5.date=20130501
+holiday.es-ES6.name=Asunción de la Virgen
+holiday.es-ES6.date=20130815
+holiday.es-ES7.name=Fiesta Nacional de España
+holiday.es-ES7.date=20131012
+holiday.es-ES8.name=Dia de todos los Santos
+holiday.es-ES8.date=20131101
+holiday.es-ES9.name=Dia de la Constitución
+holiday.es-ES9.date=20131206
+holiday.es-ES10.name=Inmaculada Concepción
+holiday.es-ES10.date=20131208
+holiday.es-ES11.name=Noche Buena
+holiday.es-ES11.date=20131224
+holiday.es-ES12.name=Navidad
+holiday.es-ES12.date=20131225
+holiday.es-ES13.name=Noche Vieja
+holiday.es-ES13.date=20131231
+holiday.es-ES14.name=Año Nuevo
+holiday.es-ES14.date=20140101
+holiday.es-ES15.name=Día de los Reyes
+holiday.es-ES15.date=20140106
+holiday.es-ES16.name=Viernes Santo
+holiday.es-ES16.date=20140418
+holiday.es-ES17.name=Pascua
+holiday.es-ES17.date=20140420
+holiday.es-ES18.name=Fiesta del Trabajo
+holiday.es-ES18.date=20140501
+holiday.es-ES19.name=Asunción de la Virgen
+holiday.es-ES19.date=20140815
+holiday.es-ES20.name=Fiesta Nacional de España
+holiday.es-ES20.date=20141012
+holiday.es-ES21.name=Dia de todos los Santos
+holiday.es-ES21.date=20141101
+holiday.es-ES22.name=Dia de la Constitución
+holiday.es-ES22.date=20141206
+holiday.es-ES23.name=Inmaculada Concepción
+holiday.es-ES23.date=20141208
+holiday.es-ES24.name=Noche Buena
+holiday.es-ES24.date=20141224
+holiday.es-ES25.name=Navidad
+holiday.es-ES25.date=20141225
+holiday.es-ES26.name=Noche Vieja
+holiday.es-ES26.date=20141231
--- a/doc/rc/holidays.fr-FR.rc
+++ b/doc/rc/holidays.fr-FR.rc
@@ -1,9 +1,9 @@
 ###############################################################################
 # International Holiday Data provided by Holidata.net
-# http://holidata.net/fr-FR/2012.json
 # http://holidata.net/fr-FR/2013.json
+# http://holidata.net/fr-FR/2014.json
 #
-# Copyright 2006-2012, Paul Beckingham, Federico Hernandez.
+# Copyright 2006-2014, Paul Beckingham, Federico Hernandez.
 #
 # Permission is hereby granted, free of charge, to any person obtaining a copy
 # of this software and associated documentation files (the "Software"), to deal
@@ -28,46 +28,24 @@
 ###############################################################################

 holiday.fr-FR1.name=Jour de l'an
-holiday.fr-FR1.date=20120101
+holiday.fr-FR1.date=20130101
 holiday.fr-FR2.name=Lundi de Pâques
-holiday.fr-FR2.date=20120409
+holiday.fr-FR2.date=20130401
 holiday.fr-FR3.name=Fête du premier mai
-holiday.fr-FR3.date=20120501
+holiday.fr-FR3.date=20130501
 holiday.fr-FR4.name=Armistice 1945
-holiday.fr-FR4.date=20120508
+holiday.fr-FR4.date=20130508
 holiday.fr-FR5.name=Ascencion
-holiday.fr-FR5.date=20120517
+holiday.fr-FR5.date=20130509
 holiday.fr-FR6.name=Pentecôte
-holiday.fr-FR6.date=20120528
+holiday.fr-FR6.date=20130519
 holiday.fr-FR7.name=Fête nationale
-holiday.fr-FR7.date=20120714
+holiday.fr-FR7.date=20130714
 holiday.fr-FR8.name=Assomption
-holiday.fr-FR8.date=20120815
+holiday.fr-FR8.date=20130815
 holiday.fr-FR9.name=Toussaint
-holiday.fr-FR9.date=20121101
+holiday.fr-FR9.date=20131101
 holiday.fr-FR10.name=Armistice 1918
-holiday.fr-FR10.date=20121111
+holiday.fr-FR10.date=20131111
 holiday.fr-FR11.name=Noël
-holiday.fr-FR11.date=20121225
-holiday.fr-FR12.name=Jour de l'an
-holiday.fr-FR12.date=20130101
-holiday.fr-FR13.name=Lundi de Pâques
-holiday.fr-FR13.date=20130401
-holiday.fr-FR14.name=Fête du premier mai
-holiday.fr-FR14.date=20130501
-holiday.fr-FR15.name=Armistice 1945
-holiday.fr-FR15.date=20130508
-holiday.fr-FR16.name=Ascencion
-holiday.fr-FR16.date=20130509
-holiday.fr-FR17.name=Pentecôte
-holiday.fr-FR17.date=20130519
-holiday.fr-FR18.name=Fête nationale
-holiday.fr-FR18.date=20130714
-holiday.fr-FR19.name=Assomption
-holiday.fr-FR19.date=20130815
-holiday.fr-FR20.name=Toussaint
-holiday.fr-FR20.date=20131101
-holiday.fr-FR21.name=Armistice 1918
-holiday.fr-FR21.date=20131111
-holiday.fr-FR22.name=Noël
-holiday.fr-FR22.date=20131225
+holiday.fr-FR11.date=20131225
--- a/doc/rc/holidays.it-IT.rc
+++ b/doc/rc/holidays.it-IT.rc
@@ -1,9 +1,9 @@
 ###############################################################################
 # International Holiday Data provided by Holidata.net
-# http://holidata.net/it-IT/2012.json
 # http://holidata.net/it-IT/2013.json
+# http://holidata.net/it-IT/2014.json
 #
-# Copyright 2006-2012, Paul Beckingham, Federico Hernandez.
+# Copyright 2006-2014, Paul Beckingham, Federico Hernandez.
 #
 # Permission is hereby granted, free of charge, to any person obtaining a copy
 # of this software and associated documentation files (the "Software"), to deal
@@ -28,50 +28,26 @@
 ###############################################################################

 holiday.it-IT1.name=Capodanno
-holiday.it-IT1.date=20120101
+holiday.it-IT1.date=20130101
 holiday.it-IT2.name=Epifania
-holiday.it-IT2.date=20120106
+holiday.it-IT2.date=20130106
 holiday.it-IT3.name=Carnevale
-holiday.it-IT3.date=20120308
+holiday.it-IT3.date=20130210
 holiday.it-IT4.name=Pasqua
-holiday.it-IT4.date=20120409
+holiday.it-IT4.date=20130401
 holiday.it-IT5.name=Festa della liberazione
-holiday.it-IT5.date=20120425
+holiday.it-IT5.date=20130425
 holiday.it-IT6.name=Festa del lavoro
-holiday.it-IT6.date=20120501
+holiday.it-IT6.date=20130501
 holiday.it-IT7.name=Festa della repubblica
-holiday.it-IT7.date=20120602
+holiday.it-IT7.date=20130602
 holiday.it-IT8.name=Assunzione (ferragosto)
-holiday.it-IT8.date=20120815
+holiday.it-IT8.date=20130815
 holiday.it-IT9.name=Ognissanti
-holiday.it-IT9.date=20121101
+holiday.it-IT9.date=20131101
 holiday.it-IT10.name=Immacolata concezione
-holiday.it-IT10.date=20121208
+holiday.it-IT10.date=20131208
 holiday.it-IT11.name=Natale
-holiday.it-IT11.date=20121225
+holiday.it-IT11.date=20131225
 holiday.it-IT12.name=S.to Stefano
-holiday.it-IT12.date=20121226
-holiday.it-IT13.name=Capodanno
-holiday.it-IT13.date=20130101
-holiday.it-IT14.name=Epifania
-holiday.it-IT14.date=20130106
-holiday.it-IT15.name=Carnevale
-holiday.it-IT15.date=20130210
-holiday.it-IT16.name=Pasqua
-holiday.it-IT16.date=20130401
-holiday.it-IT17.name=Festa della liberazione
-holiday.it-IT17.date=20130425
-holiday.it-IT18.name=Festa del lavoro
-holiday.it-IT18.date=20130501
-holiday.it-IT19.name=Festa della repubblica
-holiday.it-IT19.date=20130602
-holiday.it-IT20.name=Assunzione (ferragosto)
-holiday.it-IT20.date=20130815
-holiday.it-IT21.name=Ognissanti
-holiday.it-IT21.date=20131101
-holiday.it-IT22.name=Immacolata concezione
-holiday.it-IT22.date=20131208
-holiday.it-IT23.name=Natale
-holiday.it-IT23.date=20131225
-holiday.it-IT24.name=S.to Stefano
-holiday.it-IT24.date=20131226
+holiday.it-IT12.date=20131226
--- a/doc/rc/holidays.jp-JP.rc
+++ b/doc/rc/holidays.jp-JP.rc
@@ -1,9 +1,9 @@
 ###############################################################################
 # International Holiday Data provided by Holidata.net
-# http://holidata.net/jp-JP/2012.json
 # http://holidata.net/jp-JP/2013.json
+# http://holidata.net/jp-JP/2014.json
 #
-# Copyright 2006-2012, Paul Beckingham, Federico Hernandez.
+# Copyright 2006-2014, Paul Beckingham, Federico Hernandez.
 #
 # Permission is hereby granted, free of charge, to any person obtaining a copy
 # of this software and associated documentation files (the "Software"), to deal
@@ -28,72 +28,36 @@
 ###############################################################################

 holiday.jp-JP1.name=元日
-holiday.jp-JP1.date=20120101
-holiday.jp-JP2.name=振替休日
-holiday.jp-JP2.date=20120102
-holiday.jp-JP3.name=成人の日
-holiday.jp-JP3.date=20120109
-holiday.jp-JP4.name=建国記念の日
-holiday.jp-JP4.date=20120211
-holiday.jp-JP5.name=春分の日
-holiday.jp-JP5.date=20120320
-holiday.jp-JP6.name=昭和の日
-holiday.jp-JP6.date=20120429
-holiday.jp-JP7.name=振替休日
-holiday.jp-JP7.date=20120430
-holiday.jp-JP8.name=憲法記念日
-holiday.jp-JP8.date=20120503
-holiday.jp-JP9.name=みどりの日
-holiday.jp-JP9.date=20120504
-holiday.jp-JP10.name=こどもの日
-holiday.jp-JP10.date=20120505
-holiday.jp-JP11.name=海の日
-holiday.jp-JP11.date=20120716
-holiday.jp-JP12.name=敬老の日
-holiday.jp-JP12.date=20120917
-holiday.jp-JP13.name=秋分の日
-holiday.jp-JP13.date=20120922
-holiday.jp-JP14.name=体育の日
-holiday.jp-JP14.date=20121008
-holiday.jp-JP15.name=文化の日
-holiday.jp-JP15.date=20121103
+holiday.jp-JP1.date=20130101
+holiday.jp-JP2.name=成人の日
+holiday.jp-JP2.date=20130114
+holiday.jp-JP3.name=建国記念の日
+holiday.jp-JP3.date=20130211
+holiday.jp-JP4.name=春分の日
+holiday.jp-JP4.date=20130320
+holiday.jp-JP5.name=昭和の日
+holiday.jp-JP5.date=20130429
+holiday.jp-JP6.name=憲法記念日
+holiday.jp-JP6.date=20130503
+holiday.jp-JP7.name=みどりの日
+holiday.jp-JP7.date=20130504
+holiday.jp-JP8.name=こどもの日
+holiday.jp-JP8.date=20130505
+holiday.jp-JP9.name=振替休日
+holiday.jp-JP9.date=20130506
+holiday.jp-JP10.name=海の日
+holiday.jp-JP10.date=20130715
+holiday.jp-JP11.name=敬老の日
+holiday.jp-JP11.date=20130919
+holiday.jp-JP12.name=秋分の日
+holiday.jp-JP12.date=20130923
+holiday.jp-JP13.name=体育の日
+holiday.jp-JP13.date=20131014
+holiday.jp-JP14.name=文化の日
+holiday.jp-JP14.date=20131103
+holiday.jp-JP15.name=振替休日
+holiday.jp-JP15.date=20131104
 holiday.jp-JP16.name=勤労感謝の日
-holiday.jp-JP16.date=20121123
+holiday.jp-JP16.date=20131123
 holiday.jp-JP17.name=天皇誕生日
-holiday.jp-JP17.date=20121223
-holiday.jp-JP18.name=振替休日
-holiday.jp-JP18.date=20121224
-holiday.jp-JP19.name=元日
-holiday.jp-JP19.date=20130101
-holiday.jp-JP20.name=成人の日
-holiday.jp-JP20.date=20130114
-holiday.jp-JP21.name=建国記念の日
-holiday.jp-JP21.date=20130211
-holiday.jp-JP22.name=春分の日
-holiday.jp-JP22.date=20130320
-holiday.jp-JP23.name=昭和の日
-holiday.jp-JP23.date=20130429
-holiday.jp-JP24.name=憲法記念日
-holiday.jp-JP24.date=20130503
-holiday.jp-JP25.name=みどりの日
-holiday.jp-JP25.date=20130504
-holiday.jp-JP26.name=こどもの日
-holiday.jp-JP26.date=20130505
-holiday.jp-JP27.name=振替休日
-holiday.jp-JP27.date=20130506
-holiday.jp-JP28.name=海の日
-holiday.jp-JP28.date=20130715
-holiday.jp-JP29.name=敬老の日
-holiday.jp-JP29.date=20130919
-holiday.jp-JP30.name=秋分の日
-holiday.jp-JP30.date=20130923
-holiday.jp-JP31.name=体育の日
-holiday.jp-JP31.date=20131014
-holiday.jp-JP32.name=文化の日
-holiday.jp-JP32.date=20131103
-holiday.jp-JP33.name=振替休日
-holiday.jp-JP33.date=20131104
-holiday.jp-JP34.name=勤労感謝の日
-holiday.jp-JP34.date=20131123
-holiday.jp-JP35.name=天皇誕生日
-holiday.jp-JP35.date=20131223
+holiday.jp-JP17.date=20131223
--- a/doc/rc/holidays.nb-NO.rc
+++ b/doc/rc/holidays.nb-NO.rc
@@ -1,9 +1,9 @@
 ###############################################################################
 # International Holiday Data provided by Holidata.net
-# http://holidata.net/nb-NO/2012.json
 # http://holidata.net/nb-NO/2013.json
+# http://holidata.net/nb-NO/2014.json
 #
-# Copyright 2006-2012, Paul Beckingham, Federico Hernandez.
+# Copyright 2006-2014, Paul Beckingham, Federico Hernandez.
 #
 # Permission is hereby granted, free of charge, to any person obtaining a copy
 # of this software and associated documentation files (the "Software"), to deal
@@ -28,70 +28,36 @@
 ###############################################################################

 holiday.nb-NO1.name=Nyttårsdag
-holiday.nb-NO1.date=20120101
+holiday.nb-NO1.date=20130101
 holiday.nb-NO2.name=Fastelavn
-holiday.nb-NO2.date=20120219
+holiday.nb-NO2.date=20130210
 holiday.nb-NO3.name=Palmesøndag
-holiday.nb-NO3.date=20120401
+holiday.nb-NO3.date=20130324
 holiday.nb-NO4.name=Skjærtorsdag
-holiday.nb-NO4.date=20120405
+holiday.nb-NO4.date=20130328
 holiday.nb-NO5.name=Langfredag
-holiday.nb-NO5.date=20120406
+holiday.nb-NO5.date=20130329
 holiday.nb-NO6.name=Påskedag
-holiday.nb-NO6.date=20120408
+holiday.nb-NO6.date=20130331
 holiday.nb-NO7.name=Påskedag
-holiday.nb-NO7.date=20120409
+holiday.nb-NO7.date=20130401
 holiday.nb-NO8.name=Offentlig Høytidsdag
-holiday.nb-NO8.date=20120501
+holiday.nb-NO8.date=20130501
 holiday.nb-NO9.name=Frigjøringsdag 1945
-holiday.nb-NO9.date=20120508
+holiday.nb-NO9.date=20130508
 holiday.nb-NO10.name=Grunnlovsdag
-holiday.nb-NO10.date=20120517
+holiday.nb-NO10.date=20130517
 holiday.nb-NO11.name=Kristi Himmelfartsdag
-holiday.nb-NO11.date=20120517
+holiday.nb-NO11.date=20130509
 holiday.nb-NO12.name=Pinsedag
-holiday.nb-NO12.date=20120527
+holiday.nb-NO12.date=20130519
 holiday.nb-NO13.name=Pinsedag
-holiday.nb-NO13.date=20120528
+holiday.nb-NO13.date=20130520
 holiday.nb-NO14.name=Julaften
-holiday.nb-NO14.date=20121224
+holiday.nb-NO14.date=20131224
 holiday.nb-NO15.name=Juledag
-holiday.nb-NO15.date=20121225
+holiday.nb-NO15.date=20131225
 holiday.nb-NO16.name=Juledag
-holiday.nb-NO16.date=20121226
+holiday.nb-NO16.date=20131226
 holiday.nb-NO17.name=Nyttårsaften
-holiday.nb-NO17.date=20121231
-holiday.nb-NO18.name=Nyttårsdag
-holiday.nb-NO18.date=20130101
-holiday.nb-NO19.name=Fastelavn
-holiday.nb-NO19.date=20130210
-holiday.nb-NO20.name=Palmesøndag
-holiday.nb-NO20.date=20130324
-holiday.nb-NO21.name=Skjærtorsdag
-holiday.nb-NO21.date=20130328
-holiday.nb-NO22.name=Langfredag
-holiday.nb-NO22.date=20130329
-holiday.nb-NO23.name=Påskedag
-holiday.nb-NO23.date=20130331
-holiday.nb-NO24.name=Påskedag
-holiday.nb-NO24.date=20130401
-holiday.nb-NO25.name=Offentlig Høytidsdag
-holiday.nb-NO25.date=20130501
-holiday.nb-NO26.name=Frigjøringsdag 1945
-holiday.nb-NO26.date=20130508
-holiday.nb-NO27.name=Grunnlovsdag
-holiday.nb-NO27.date=20130517
-holiday.nb-NO28.name=Kristi Himmelfartsdag
-holiday.nb-NO28.date=20130509
-holiday.nb-NO29.name=Pinsedag
-holiday.nb-NO29.date=20130519
-holiday.nb-NO30.name=Pinsedag
-holiday.nb-NO30.date=20130520
-holiday.nb-NO31.name=Julaften
-holiday.nb-NO31.date=20131224
-holiday.nb-NO32.name=Juledag
-holiday.nb-NO32.date=20131225
-holiday.nb-NO33.name=Juledag
-holiday.nb-NO33.date=20131226
-holiday.nb-NO34.name=Nyttårsaften
-holiday.nb-NO34.date=20131231
+holiday.nb-NO17.date=20131231
--- a/doc/rc/holidays.nl-NL.rc
+++ b/doc/rc/holidays.nl-NL.rc
@@ -1,9 +1,9 @@
 ###############################################################################
 # International Holiday Data provided by Holidata.net
-# http://holidata.net/nl-NL/2012.json
 # http://holidata.net/nl-NL/2013.json
+# http://holidata.net/nl-NL/2014.json
 #
-# Copyright 2006-2012, Paul Beckingham, Federico Hernandez.
+# Copyright 2006-2014, Paul Beckingham, Federico Hernandez.
 #
 # Permission is hereby granted, free of charge, to any person obtaining a copy
 # of this software and associated documentation files (the "Software"), to deal
@@ -28,58 +28,30 @@
 ###############################################################################

 holiday.nl-NL1.name=Nieuwjaar
-holiday.nl-NL1.date=20120101
+holiday.nl-NL1.date=20130101
 holiday.nl-NL2.name=Goede Vrijdag
-holiday.nl-NL2.date=20120406
+holiday.nl-NL2.date=20130329
 holiday.nl-NL3.name=Pasen
-holiday.nl-NL3.date=20120408
+holiday.nl-NL3.date=20130331
 holiday.nl-NL4.name=Tweede Pasdag
-holiday.nl-NL4.date=20120409
+holiday.nl-NL4.date=20130401
 holiday.nl-NL5.name=Koninginnedag
-holiday.nl-NL5.date=20120430
+holiday.nl-NL5.date=20130430
 holiday.nl-NL6.name=Dodenherdenking
-holiday.nl-NL6.date=20120504
+holiday.nl-NL6.date=20130504
 holiday.nl-NL7.name=Bevrijdingsdag
-holiday.nl-NL7.date=20120505
+holiday.nl-NL7.date=20130505
 holiday.nl-NL8.name=Hemelvaartsdag
-holiday.nl-NL8.date=20120517
+holiday.nl-NL8.date=20130509
 holiday.nl-NL9.name=Pinksteren
-holiday.nl-NL9.date=20120527
+holiday.nl-NL9.date=20130519
 holiday.nl-NL10.name=Tweede Pinksterdag
-holiday.nl-NL10.date=20120528
+holiday.nl-NL10.date=20130520
 holiday.nl-NL11.name=Sinterklaas
-holiday.nl-NL11.date=20121205
+holiday.nl-NL11.date=20131205
 holiday.nl-NL12.name=Koninkrijksdag
-holiday.nl-NL12.date=20121215
+holiday.nl-NL12.date=20131215
 holiday.nl-NL13.name=Kerstmis
-holiday.nl-NL13.date=20121225
+holiday.nl-NL13.date=20131225
 holiday.nl-NL14.name=Tweede Kerstdag
-holiday.nl-NL14.date=20121226
-holiday.nl-NL15.name=Nieuwjaar
-holiday.nl-NL15.date=20130101
-holiday.nl-NL16.name=Goede Vrijdag
-holiday.nl-NL16.date=20130329
-holiday.nl-NL17.name=Pasen
-holiday.nl-NL17.date=20130331
-holiday.nl-NL18.name=Tweede Pasdag
-holiday.nl-NL18.date=20130401
-holiday.nl-NL19.name=Koninginnedag
-holiday.nl-NL19.date=20130430
-holiday.nl-NL20.name=Dodenherdenking
-holiday.nl-NL20.date=20130504
-holiday.nl-NL21.name=Bevrijdingsdag
-holiday.nl-NL21.date=20130505
-holiday.nl-NL22.name=Hemelvaartsdag
-holiday.nl-NL22.date=20130509
-holiday.nl-NL23.name=Pinksteren
-holiday.nl-NL23.date=20130519
-holiday.nl-NL24.name=Tweede Pinksterdag
-holiday.nl-NL24.date=20130520
-holiday.nl-NL25.name=Sinterklaas
-holiday.nl-NL25.date=20131205
-holiday.nl-NL26.name=Koninkrijksdag
-holiday.nl-NL26.date=20131215
-holiday.nl-NL27.name=Kerstmis
-holiday.nl-NL27.date=20131225
-holiday.nl-NL28.name=Tweede Kerstdag
-holiday.nl-NL28.date=20131226
+holiday.nl-NL14.date=20131226
--- a/doc/rc/holidays.sv-SE.rc
+++ b/doc/rc/holidays.sv-SE.rc
@@ -1,9 +1,9 @@
 ###############################################################################
 # International Holiday Data provided by Holidata.net
-# http://holidata.net/sv-SE/2012.json
 # http://holidata.net/sv-SE/2013.json
+# http://holidata.net/sv-SE/2014.json
 #
-# Copyright 2006-2012, Paul Beckingham, Federico Hernandez.
+# Copyright 2006-2014, Paul Beckingham, Federico Hernandez.
 #
 # Permission is hereby granted, free of charge, to any person obtaining a copy
 # of this software and associated documentation files (the "Software"), to deal
@@ -28,70 +28,70 @@
 ###############################################################################

 holiday.sv-SE1.name=Nyårsdagen
-holiday.sv-SE1.date=20120101
+holiday.sv-SE1.date=20130101
 holiday.sv-SE2.name=Trettondedag jul
-holiday.sv-SE2.date=20120106
+holiday.sv-SE2.date=20130106
 holiday.sv-SE3.name=Långfredagen
-holiday.sv-SE3.date=20120406
+holiday.sv-SE3.date=20130329
 holiday.sv-SE4.name=Påskdagen
-holiday.sv-SE4.date=20120408
+holiday.sv-SE4.date=20130331
 holiday.sv-SE5.name=Annandag påsk
-holiday.sv-SE5.date=20120409
+holiday.sv-SE5.date=20130401
 holiday.sv-SE6.name=Valborgmässoafton
-holiday.sv-SE6.date=20120430
+holiday.sv-SE6.date=20130430
 holiday.sv-SE7.name=Första maj
-holiday.sv-SE7.date=20120501
+holiday.sv-SE7.date=20130501
 holiday.sv-SE8.name=Kristi Himmelsfärdsdag
-holiday.sv-SE8.date=20120517
+holiday.sv-SE8.date=20130509
 holiday.sv-SE9.name=Pingstdagen
-holiday.sv-SE9.date=20120527
+holiday.sv-SE9.date=20130519
 holiday.sv-SE10.name=Nationaldagen
-holiday.sv-SE10.date=20120606
+holiday.sv-SE10.date=20130606
 holiday.sv-SE11.name=Midsommarafton
-holiday.sv-SE11.date=20120622
+holiday.sv-SE11.date=20130621
 holiday.sv-SE12.name=Midsommardagen
-holiday.sv-SE12.date=20120623
+holiday.sv-SE12.date=20130622
 holiday.sv-SE13.name=Alla Helgons Dag
-holiday.sv-SE13.date=20121103
+holiday.sv-SE13.date=20131102
 holiday.sv-SE14.name=Julafton
-holiday.sv-SE14.date=20121224
+holiday.sv-SE14.date=20131224
 holiday.sv-SE15.name=Juldagen
-holiday.sv-SE15.date=20121225
+holiday.sv-SE15.date=20131225
 holiday.sv-SE16.name=Annandag jul
-holiday.sv-SE16.date=20121226
+holiday.sv-SE16.date=20131226
 holiday.sv-SE17.name=Nyårsafton
-holiday.sv-SE17.date=20121231
+holiday.sv-SE17.date=20131231
 holiday.sv-SE18.name=Nyårsdagen
-holiday.sv-SE18.date=20130101
+holiday.sv-SE18.date=20140101
 holiday.sv-SE19.name=Trettondedag jul
-holiday.sv-SE19.date=20130106
+holiday.sv-SE19.date=20140106
 holiday.sv-SE20.name=Långfredagen
-holiday.sv-SE20.date=20130329
+holiday.sv-SE20.date=20140418
 holiday.sv-SE21.name=Påskdagen
-holiday.sv-SE21.date=20130331
+holiday.sv-SE21.date=20140420
 holiday.sv-SE22.name=Annandag påsk
-holiday.sv-SE22.date=20130401
+holiday.sv-SE22.date=20140421
 holiday.sv-SE23.name=Valborgmässoafton
-holiday.sv-SE23.date=20130430
+holiday.sv-SE23.date=20140430
 holiday.sv-SE24.name=Första maj
-holiday.sv-SE24.date=20130501
+holiday.sv-SE24.date=20140501
 holiday.sv-SE25.name=Kristi Himmelsfärdsdag
-holiday.sv-SE25.date=20130509
+holiday.sv-SE25.date=20140529
 holiday.sv-SE26.name=Pingstdagen
-holiday.sv-SE26.date=20130519
+holiday.sv-SE26.date=20140608
 holiday.sv-SE27.name=Nationaldagen
-holiday.sv-SE27.date=20130606
+holiday.sv-SE27.date=20140606
 holiday.sv-SE28.name=Midsommarafton
-holiday.sv-SE28.date=20130621
+holiday.sv-SE28.date=20140620
 holiday.sv-SE29.name=Midsommardagen
-holiday.sv-SE29.date=20130622
+holiday.sv-SE29.date=20140621
 holiday.sv-SE30.name=Alla Helgons Dag
-holiday.sv-SE30.date=20131102
+holiday.sv-SE30.date=20141031
 holiday.sv-SE31.name=Julafton
-holiday.sv-SE31.date=20131224
+holiday.sv-SE31.date=20141224
 holiday.sv-SE32.name=Juldagen
-holiday.sv-SE32.date=20131225
+holiday.sv-SE32.date=20141225
 holiday.sv-SE33.name=Annandag jul
-holiday.sv-SE33.date=20131226
+holiday.sv-SE33.date=20141226
 holiday.sv-SE34.name=Nyårsafton
-holiday.sv-SE34.date=20131231
+holiday.sv-SE34.date=20141231
--- a/doc/rc/light-16.theme
+++ b/doc/rc/light-16.theme
@@ -3,7 +3,7 @@
 #
 # taskwarrior - a command line task list manager.
 #
-# Copyright 2006-2012, Paul Beckingham, Federico Hernandez.
+# Copyright 2006-2014, Paul Beckingham, Federico Hernandez.
 #
 # Permission is hereby granted, free of charge, to any person obtaining a copy
 # of this software and associated documentation files (the "Software"), to deal
--- a/doc/rc/light-256.theme
+++ b/doc/rc/light-256.theme
@@ -3,7 +3,7 @@
 #
 # taskwarrior - a command line task list manager.
 #
-# Copyright 2006-2012, Paul Beckingham, Federico Hernandez.
+# Copyright 2006-2014, Paul Beckingham, Federico Hernandez.
 #
 # Permission is hereby granted, free of charge, to any person obtaining a copy
 # of this software and associated documentation files (the "Software"), to deal
--- a/doc/rc/solarized-dark-256.theme
+++ b/doc/rc/solarized-dark-256.theme
@@ -3,7 +3,7 @@
 #
 # taskwarrior - a command line task list manager.
 #
-# Copyright 2006-2012, Paul Beckingham, Federico Hernandez.
+# Copyright 2006-2014, Paul Beckingham, Federico Hernandez.
 # 
 # Colors used are based on the Solarized palette created by Ethan Schoonover 
 # <http://ethanschoonover.com/solarized>
--- a/doc/rc/solarized-light-256.theme
+++ b/doc/rc/solarized-light-256.theme
@@ -3,7 +3,7 @@
 #
 # taskwarrior - a command line task list manager.
 #
-# Copyright 2006-2012, Paul Beckingham, Federico Hernandez.
+# Copyright 2006-2014, Paul Beckingham, Federico Hernandez.
 # 
 # Colors used are based on the Solarized palette created by Ethan Schoonover 
 # <http://ethanschoonover.com/solarized>
--- a/doc/ref/task-ref.pages/Data/tw-l.png
+++ b/doc/ref/task-ref.pages/Data/tw-l.png
--- a/doc/ref/task-ref.pages/Data/tw-xl-small.png
+++ b/doc/ref/task-ref.pages/Data/tw-xl-small.png
--- a/doc/ref/task-ref.pages/Data/tw-xl.pdf
+++ b/doc/ref/task-ref.pages/Data/tw-xl.pdf
--- a/doc/ref/task-ref.pages/Index.zip
+++ b/doc/ref/task-ref.pages/Index.zip
--- a/doc/ref/task-ref.pages/Metadata/BuildVersionHistory.plist
+++ b/doc/ref/task-ref.pages/Metadata/BuildVersionHistory.plist
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+<array>
+	<string>pages-trunk-20080703_5</string>
+	<string>pages-trunk-20080829_1</string>
+	<string>pages-trunk-20080921_1</string>
+	<string>local build-Jul  1 2011</string>
+	<string>local build-Nov 15 2011</string>
+	<string>local build-Jul  1 2011</string>
+	<string>local build-Jun 29 2012</string>
+	<string>local build-Oct 16 2012</string>
+	<string>M5.0.1-1478-1</string>
+</array>
+</plist>
--- a/doc/ref/task-ref.pages/Metadata/DocumentIdentifier
+++ b/doc/ref/task-ref.pages/Metadata/DocumentIdentifier
@@ -0,0 +1 @@
+714E6D35-304F-4CB0-BD91-DD74C9A9979E
--- a/doc/ref/task-ref.pages/Metadata/Properties.plist
+++ b/doc/ref/task-ref.pages/Metadata/Properties.plist
--- a/doc/ref/task-ref.pages/preview-micro.jpg
+++ b/doc/ref/task-ref.pages/preview-micro.jpg
--- a/doc/ref/task-ref.pages/preview-web.jpg
+++ b/doc/ref/task-ref.pages/preview-web.jpg
--- a/doc/ref/task-ref.pages/preview.jpg
+++ b/doc/ref/task-ref.pages/preview.jpg
--- a/doc/ref/task-ref.pdf
+++ b/doc/ref/task-ref.pdf
--- a/i18n/tips.en-US
+++ b/i18n/tips.en-US
@@ -1,7 +1,7 @@
 %
 For bash users, try 'alias t=task' to save some keystrokes.
 %
-Have you tried 'task edit 1' to use your text editor to modify all aspects of
+Have you tried 'task 1 edit' to use your text editor to modify all aspects of
 task 1?
 %
 Did you know that 'task 1 wait:eom' will hide task 1 until the end of the
--- a/i18n/tips.es-ES
+++ b/i18n/tips.es-ES
@@ -0,0 +1,72 @@
+%
+Para usuarios de bash, pruebe 'alias t=task' para ahorrarse algo de tecleo.
+%
+¿Ha probado 'task 1 edit', que permite usar su editor para modificar cualquier
+aspecto de la tarea 1?
+%
+¿Sabía que 'task 1 wait:eom' ocultará la tarea 1 hasta final de mes? Puede ver
+todas las tareas en espera con 'task waiting'.
+%
+¿Sabía que 'task 1 wait:' restaurará el estatus de una tarea en espera a
+pendiente?
+%
+Si pone 'default.command=list project:home' en su fichero .taskrc, lanzando
+simplemente 'task' se ejecutará automáticamente 'task list project:home'.
+¡Ahorre algo de tecleo!
+%
+Si edita su fichero pending.data asegúrese de que su editor no elimina los
+caracteres \n al final del archivo.
+%
+Si tiene que editar su fichero pending.data asegúrese de que su editor no
+transforma la codificación Unix en DOS.
+%
+¿Tiene instalada la última versión de task? Compruebe http://taskwarrior.org
+periódicamente en busca de noticias y actualizaciones. Esa característica que
+quería puede estar lista...
+%
+No olvide la documentación en línea en http://taskwarrior.org/wiki/taskwarrior,
+y si encuentra errores, por favor, háganoslo saber. Por otra parte, se trata de
+una wiki, así que siéntase libre de corregirlos usted mismo.
+%
+No olvide la documentación en línea en http://taskwarrior.org/wiki/taskwarrior,
+pero si no puede encontrar información sobre algo en particular, cree un ticket
+solicitándola, escriba a support@taskwarrior.org pidiéndola o empiécela usted
+mismo.
+%
+¿Sabía que hay páginas de manual para task? Pruebe 'man task', 'man taskrc',
+'man task-tutorial', 'man task-color' y 'man task-faq'.
+%
+¿Sabía que hay varios temas en 256 colores disponibles para task?
+%
+¿Sabía que al ejecutar 'task show' se llevarán a cabo varias comprobaciones
+en su fichero .taskrc, buscando errores?
+%
+¿Está sacando lo mejor del color? Pruebe 'task color' para ver que colores
+soporta su sistema.
+%
+¿Está usando proyectos? Si lo hace, taskwarrior hará un seguimiento del
+porcentaje de finalización del proyecto y le informará cada vez que cambie.
+%
+¿Sabía que puede listar las tareas que tienen prioridad, como 'task list
+priority.above:L'?
+%
+El URL http://tasktools.org/latest puede decirle cual es la versión mas
+reciente.
+%
+Para que las tareas en su lista sean claras y aplicables, descríbalas siempre
+con un verbo al principio, como "llamar" o "limpiar" o "conseguir".
+%
+¿No le gusta el nombre de un comando? Cree un alias.
+%
+Puede elegir si sus búsquedas son sensibles a la diferencia entre mayúsculas y
+minúsculas o no, ejecutando 'task config search.case.sensitive yes' .
+%
+Resguarde sus ficheros de datos haciendo copias del archivo ~/.taskrc y del
+directorio ~/.task .
+%
+¿Ha cambiado una tarea sin querer? El comando undo hace inmediato recuperarse
+de cualquier cambio no deseado -- ¡incluso un borrado!
+%
+¿Quiere ver una lista de todos los cambios que a hecho en una tarea? El informe
+info mostrará una historia completa de cambios.
+%
--- a/i18n/tips.fr-FR
+++ b/i18n/tips.fr-FR
@@ -0,0 +1,76 @@
+%
+Si vous utilisez bash, essayez 'alias t=task' pour économiser quelques
+frappes de clavier.
+%
+Avez-vous essayé 'task 1 edit' pour modifier n'importe quel aspect de
+la tâche 1 à l'aide de votre éditeur de texte ?
+%
+Saviez-vous que 'task 1 wait:eom' permet de masquer la tâche 1 jusqu'à
+la fin du mois ?  Vous pouvez alors voir toutes les tâches différées
+avec 'task waiting'.
+%
+Saviez-vous que 'task 1 wait:' permet de restaurer une tâche de l'état
+différée à imminente ?
+%
+Si vous avez mis 'default.command=list project:maison' dans votre
+fichier .taskrc, alors quand vous exécuterez la commande 'task' seule,
+cela exécutera automatiquement 'task list project:maison' pour vous.
+Épargnez vous quelques frappes de clavier !
+%
+Si vous modifiez votre fichier pending.data, faites attention à ce que
+votre éditeur de texte ne supprime les caractères \n situés à la fin.
+%
+Si vous modifiez votre fichier pending.data, faites attention à ce que
+votre éditeur de texte ne change pas son encodage de Unix à DOS.
+%
+Avez-vous la dernière version de task installée ?  Suivez les annonces
+de nouvelles versions à http://taskwarrior.org.  La fonctionnalité
+que vous voulez est peut-être disponible...
+%
+N'oubliez pas les documentations en ligne à
+http://taskwarrior.org/wiki/taskwarrior, et si vous trouvez des
+erreurs, faites le nous savoir s'il vous plaît.  Encore une fois,
+c'est un wiki, alors n'hésitez pas à corriger par vous-même.
+%
+N'oubliez pas les documentations en ligne à
+http://taskwarrior.org/wiki/taskwarrior, mais si vous ne trouvez pas
+de documentation sur un sujet particulier, vous pouvez soit créer un
+ticket pour en demander, soit la demander à supporte@taskwarrior.org
+ou encore commencer à l'écrire vous-même.
+%
+Saviez-vous qu'il y a des pages man pour task ?  Essayez 'man task',
+'man taskrc', 'man task-tutorial', 'man task-color' et 'man task-faq'.
+%
+Saviez-vous qu'il y a de nombreux jeux de couleurs disponibles pour
+task ?
+%
+Saviez-vous que 'task show' permet de vérifier votre fichier .taskrc ?
+%
+Vous êtes sensible aux couleurs ?  Essayez 'task color' pour voir les
+couleurs supportées par votre système.
+%
+Vous fonctionnez par projets ?  task tient à jour un pourcentage
+d'accomplissement de chaque projet et vous prévient quand il change.
+%
+Saviez-vous que vous pouvez lister les tâches ayant une certaine
+priorité avec 'task list priority.above:L' ?
+%
+L'URL http://tasktools.org/latest vous indique la dernière version de task.
+%
+Pour rendre vos tâches claires et plus concrètes, décrivez les
+toujours en commençant par un verbe, comme "appeler" ou "écrire".
+%
+Vous n'aimez pas le nom d'une commande ?  Créez un alias !
+%
+Vous voulez que vos recherches soient insensibles à la casse ?
+Exécutez la commande 'task config search.case.sensitive no'
+%
+Sauvegardez vos données en copiant le fichier ~/.taskrc et le
+répertoire ~/.task !
+%
+Vous avez accidentellement modifié une tâche ?  La commande 'undo'
+vous permet d'annuler tout changement, même une suppression de tâche.
+%
+Vous voulez voir une liste des changements que vous avez fait à vos
+tâches ? La commande 'info' vous affichera un historique complet.
+%
--- a/Show More
+++ b/Show More