Release date for 2.0.0

Bumped date in man pages to release date
Feature Pulled
2012-03-17 21:34:41 +01:00 · 2012-03-17 21:32:00 +01:00 · 2012-03-17 10:46:05 -04:00 · 2012-03-17 10:11:55 -04:00 · 2012-03-15 22:34:37 -04:00 · 2012-03-15 20:41:15 -04:00
770 changed files with 66412 additions and 39218 deletions
--- a/.gitignore
+++ b/.gitignore
@@ -1,19 +1,19 @@
-aclocal.m4
+cmake.h
-autom4te.cache
+auto.h
-auto.h*
+commit.h
 config.h.in
 config.status
 src/.deps
 src/Makefile
 */*task
 stamp-h1
 Makefile
-Makefile.in
+*/*task
-configure
+*/*libtask.a
-config.log
+*/*/libcommands.a
-www.xls
+*/*/libcolumns.a
 src/tests/all.log
 src/tests/*.data
 *~
 .*.swp
 package-config/osx/binary/task
 CMakeFiles
 CMakeCache.txt
 cmake_install.cmake
 install_manifest.txt
 _CPack_Packages
 CPackConfig.cmake
 CPackSourceConfig.cmake
 doc/misc/tutorial
--- a/87
+++ b/87
@@ -1,11 +1,18 @@
-The development of task was made possible by the significant contributions of the following people:
+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)
  David J Patrick    (Designer)
  John Florian       (Contributing Author)
  Cory Donnelly      (Contributing Author)
  Johannes Schlatow  (Contributing Author)
  Dirk Deimeke       (Technical Advisor & Marketing)
  Wim Schuermann     (Contributing Author)
  Owen Clarke        (Contributing Author)
 The following submitted code, packages or analysis, and deserve special thanks:
  Damian Glenny
  Andy Lester
  H. İbrahim Güngör
@@ -21,12 +28,51 @@ The following submitted code, packages or analysis, and deserve special thanks:
  Pietro Cerutti
  Alexander Neumann
  Emil Sköldberg
  Johannes Schlatow
  Michal Josífko
  Ed Neville
  Kevin Owens
  Mick Koch
  Kathryn Andersen
  Alexander Schremmer
  Jostein Berntsen
  Andraž 'ruskie' Levstik
  Irfan Siddiqui
  Itay Perl
  Sander Marechal
  Stephen Heywood
  Nicola Busanello
  Eric Fluger
  Andreas Poisel
  Timm Reitinger
  Dan White
  Alexei Romanoff
  Tomas Cech
  Duane Waddle
  Stefan Keel
  Christopher J. Pilkington
  Fumihito Yoshida
  Michael McCann
  Ben Boeckel
  Bryce Harrington
  Brendan O'Flaherty
  Matt Kraai
  Daniel Kullmann
  Takanobu Watanabe
  Paolo Almeida
  Michelle Crane
  Greg Grossmeier
  Barton Meeks
  Martin Klepsch
  Ralph Bean
  Uli Martens
  Michal Vyskocil
  Steve Rader
  Luke Macken
  Sam Stuck
 Thanks to the following, who submitted detailed bug reports and excellent
 suggestions:
 Thanks to the following, who submitted detailed bug reports and excellent suggestions:
  Eugene Kramer
  Srijith K
  Bruce Israel
@@ -50,6 +96,37 @@ Thanks to the following, who submitted detailed bug reports and excellent sugges
  Juergen Daubert
  Rich Mintz
  Seneca Cunningham
-  Dirk Deimeke
+  Alexander Schremmer
-  Michelle Crane
+  Elizabeth Maxson
  Peter De Poorter
  Max Muller
  Thomas Sattler
  Erlan Sergaziev
  Andy Kriger
  Patrick R McDonald
  Pete Lewis
  Stefan Hacker
  Alan Barton
  Jonathan Hankins
  Andreas Kalex
  Adam Wolk
  Tom Duffy
  Miguel de Val Borro
  Yann Davin
  John Hammond
  Arkady Grudzinsky
  Bernhard B
  Aikido Guy
  Gour-Gadadhara Dasa
  Aaron Jackson
  Dmitriy Samborskiy
  Eli Lev
  Paul-Gheorghe Barbu
  Jennifer Cormier
  Joe Holloway
  Peter Lewis
  Najmi Ahmad Zabidi
  Philipp Woelfel
  Tuomas Toivola
  Adam Gibbins
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -0,0 +1,125 @@
 cmake_minimum_required (VERSION 2.8)
 set(CMAKE_LEGACY_CYGWIN_WIN32 0) # Remove when CMake >= 2.8.4 is required
 include (CheckFunctionExists)
 set (HAVE_CMAKE true)
 project (task)
 set (PROJECT_VERSION "2.0.0")
 SET (TASK_MAN1DIR share/man/man1 CACHE STRING "Installation directory for man pages, section 1")
 SET (TASK_MAN5DIR share/man/man5 CACHE STRING "Installation directory for man pages, section 5")
 SET (TASK_DOCDIR  share/doc/task CACHE STRING "Installation directory for doc files")
 SET (TASK_BINDIR  bin            CACHE STRING "Installation directory for the binary")
 if (${CMAKE_SYSTEM_NAME} MATCHES "Linux")
  set (LINUX true)
 elseif (${CMAKE_SYSTEM_NAME} MATCHES "Darwin")
  set (DARWIN true)
 elseif (${CMAKE_SYSTEM_NAME} MATCHES "FreeBSD")
  set (FREEBSD true)
 elseif (${CMAKE_SYSTEM_NAME} MATCHES "SunOS")
  set (SOLARIS true)
 else (${CMAKE_SYSTEM_NAME} MATCHES "Linux")
  set (UNKNOWN true)
 endif (${CMAKE_SYSTEM_NAME} MATCHES "Linux")
 message ("-- Looking for SHA1 references")
 if (EXISTS ${CMAKE_SOURCE_DIR}/.git/index)
  set (HAVE_COMMIT true)
  execute_process (COMMAND git log -1 --pretty=format:%h
                   WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}
                   OUTPUT_VARIABLE COMMIT)
  configure_file ( ${CMAKE_SOURCE_DIR}/commit.h.in
                   ${CMAKE_SOURCE_DIR}/commit.h)
  message ("-- Found SHA1 reference: ${COMMIT}")
 endif (EXISTS ${CMAKE_SOURCE_DIR}/.git/index)
 set (PACKAGE "${PROJECT_NAME}")
 set (VERSION "${PROJECT_VERSION}")
 set (PACKAGE_BUGREPORT "support@taskwarrior.org")
 set (PACKAGE_NAME "${PACKAGE}")
 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 pthread")
 #find_path (PTHREAD_INCLUDE_DIR pthread.h)
 #find_library (PTHREAD_LIBRARY NAMES pthread)
 #if (PTHREAD_INCLUDE_DIR AND PTHREAD_LIBRARY)
 #  message ("-- Found pthread: ${PTHREAD_LIBRARY}")
 #  set (HAVE_LIBPTHREAD true)
 #  set (TASK_INCLUDE_DIRS ${TASK_INCLUDE_DIRS} ${PTHREAD_INCLUDE_DIR})
 #  set (TASK_LIBRARIES    ${TASK_LIBRARIES}    ${PTHREAD_LIBRARIES})
 #endif (PTHREAD_INCLUDE_DIR AND PTHREAD_LIBRARY)
 check_function_exists (random  HAVE_RANDOM)
 check_function_exists (srandom HAVE_SRANDOM)
 message ("-- Looking for libuuid")
 if (DARWIN)
  # Apple includes the uuid functions in their libc, rather than libuuid
  set (HAVE_UUID true)
  check_function_exists (uuid_unparse_lower HAVE_UUID_UNPARSE_LOWER)
 else (DARWIN)
  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)
  endif (UUID_INCLUDE_DIR AND UUID_LIBRARY)
 endif (DARWIN)
 if (HAVE_UUID AND HAVE_UUID_UNPARSE_LOWER)
  message ("-- Found libuuid")
 elseif (HAVE_UUID AND NOT 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)
 message ("-- Configuring cmake.h")
 configure_file (
  ${CMAKE_SOURCE_DIR}/cmake.h.in
  ${CMAKE_SOURCE_DIR}/cmake.h)
 add_subdirectory (src)
 add_subdirectory (src/commands)
 add_subdirectory (src/columns)
 add_subdirectory (doc)
 add_subdirectory (i18n)
 add_subdirectory (scripts)
 if (EXISTS test)
  add_subdirectory (test EXCLUDE_FROM_ALL)
 endif (EXISTS test)
 set (doc_FILES NEWS ChangeLog README INSTALL AUTHORS COPYING)
 foreach (doc_FILE ${doc_FILES})
  install (FILES ${doc_FILE}  DESTINATION ${TASK_DOCDIR})
 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$"
                                "/\\.gitignore" "/\\.git/" "swp$")
 include (CPack)
--- a/294
+++ b/294
@@ -1,281 +1,23 @@
-		    GNU GENERAL PUBLIC LICENSE
+taskwarrior - a command line task list manager.
 		       Version 2, June 1991
- Copyright (C) 1989, 1991 Free Software Foundation, Inc.
+Copyright 2006-2012, Paul Beckingham, Federico Hernandez.
     51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
 Everyone is permitted to copy and distribute verbatim copies
 of this license document, but changing it is not allowed.
-			    Preamble
+Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal
 in the Software without restriction, including without limitation the rights
 to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
 copies of the Software, and to permit persons to whom the Software is
 furnished to do so, subject to the following conditions:
-  The licenses for most software are designed to take away your
+The above copyright notice and this permission notice shall be included
-freedom to share and change it.  By contrast, the GNU General Public
+in all copies or substantial portions of the Software.
 License is intended to guarantee your freedom to share and change free
 software--to make sure the software is free for all its users.  This
 General Public License applies to most of the Free Software
 Foundation's software and to any other program whose authors commit to
 using it.  (Some other Free Software Foundation software is covered by
 the GNU Library General Public License instead.)  You can apply it to
 your programs, too.
-  When we speak of free software, we are referring to freedom, not
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
-price.  Our General Public Licenses are designed to make sure that you
+OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-have the freedom to distribute copies of free software (and charge for
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
-this service if you wish), that you receive source code or can get it
+THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-if you want it, that you can change the software or use pieces of it
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-in new free programs; and that you know you can do these things.
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-
+SOFTWARE.
  To protect your rights, we need to make restrictions that forbid
 anyone to deny you these rights or to ask you to surrender the rights.
 These restrictions translate to certain responsibilities for you if you
 distribute copies of the software, or if you modify it.
  For example, if you distribute copies of such a program, whether
 gratis or for a fee, you must give the recipients all the rights that
 you have.  You must make sure that they, too, receive or can get the
 source code.  And you must show them these terms so they know their
 rights.
  We protect your rights with two steps: (1) copyright the software, and
 (2) offer you this license which gives you legal permission to copy,
 distribute and/or modify the software.
  Also, for each author's protection and ours, we want to make certain
 that everyone understands that there is no warranty for this free
 software.  If the software is modified by someone else and passed on, we
 want its recipients to know that what they have is not the original, so
 that any problems introduced by others will not reflect on the original
 authors' reputations.
  Finally, any free program is threatened constantly by software
 patents.  We wish to avoid the danger that redistributors of a free
 program will individually obtain patent licenses, in effect making the
 program proprietary.  To prevent this, we have made it clear that any
 patent must be licensed for everyone's free use or not licensed at all.
  The precise terms and conditions for copying, distribution and
 modification follow.
 		    GNU GENERAL PUBLIC LICENSE
   TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
  0. This License applies to any program or other work which contains
 a notice placed by the copyright holder saying it may be distributed
 under the terms of this General Public License.  The "Program", below,
 refers to any such program or work, and a "work based on the Program"
 means either the Program or any derivative work under copyright law:
 that is to say, a work containing the Program or a portion of it,
 either verbatim or with modifications and/or translated into another
 language.  (Hereinafter, translation is included without limitation in
 the term "modification".)  Each licensee is addressed as "you".
 Activities other than copying, distribution and modification are not
 covered by this License; they are outside its scope.  The act of
 running the Program is not restricted, and the output from the Program
 is covered only if its contents constitute a work based on the
 Program (independent of having been made by running the Program).
 Whether that is true depends on what the Program does.
  1. You may copy and distribute verbatim copies of the Program's
 source code as you receive it, in any medium, provided that you
 conspicuously and appropriately publish on each copy an appropriate
 copyright notice and disclaimer of warranty; keep intact all the
 notices that refer to this License and to the absence of any warranty;
 and give any other recipients of the Program a copy of this License
 along with the Program.
 You may charge a fee for the physical act of transferring a copy, and
 you may at your option offer warranty protection in exchange for a fee.
  2. You may modify your copy or copies of the Program or any portion
 of it, thus forming a work based on the Program, and copy and
 distribute such modifications or work under the terms of Section 1
 above, provided that you also meet all of these conditions:
    a) You must cause the modified files to carry prominent notices
    stating that you changed the files and the date of any change.
    b) You must cause any work that you distribute or publish, that in
    whole or in part contains or is derived from the Program or any
    part thereof, to be licensed as a whole at no charge to all third
    parties under the terms of this License.
    c) If the modified program normally reads commands interactively
    when run, you must cause it, when started running for such
    interactive use in the most ordinary way, to print or display an
    announcement including an appropriate copyright notice and a
    notice that there is no warranty (or else, saying that you provide
    a warranty) and that users may redistribute the program under
    these conditions, and telling the user how to view a copy of this
    License.  (Exception: if the Program itself is interactive but
    does not normally print such an announcement, your work based on
    the Program is not required to print an announcement.)
 These requirements apply to the modified work as a whole.  If
 identifiable sections of that work are not derived from the Program,
 and can be reasonably considered independent and separate works in
 themselves, then this License, and its terms, do not apply to those
 sections when you distribute them as separate works.  But when you
 distribute the same sections as part of a whole which is a work based
 on the Program, the distribution of the whole must be on the terms of
 this License, whose permissions for other licensees extend to the
 entire whole, and thus to each and every part regardless of who wrote it.
 Thus, it is not the intent of this section to claim rights or contest
 your rights to work written entirely by you; rather, the intent is to
 exercise the right to control the distribution of derivative or
 collective works based on the Program.
 In addition, mere aggregation of another work not based on the Program
 with the Program (or with a work based on the Program) on a volume of
 a storage or distribution medium does not bring the other work under
 the scope of this License.
  3. You may copy and distribute the Program (or a work based on it,
 under Section 2) in object code or executable form under the terms of
 Sections 1 and 2 above provided that you also do one of the following:
    a) Accompany it with the complete corresponding machine-readable
    source code, which must be distributed under the terms of Sections
    1 and 2 above on a medium customarily used for software interchange; or,
    b) Accompany it with a written offer, valid for at least three
    years, to give any third party, for a charge no more than your
    cost of physically performing source distribution, a complete
    machine-readable copy of the corresponding source code, to be
    distributed under the terms of Sections 1 and 2 above on a medium
    customarily used for software interchange; or,
    c) Accompany it with the information you received as to the offer
    to distribute corresponding source code.  (This alternative is
    allowed only for noncommercial distribution and only if you
    received the program in object code or executable form with such
    an offer, in accord with Subsection b above.)
 The source code for a work means the preferred form of the work for
 making modifications to it.  For an executable work, complete source
 code means all the source code for all modules it contains, plus any
 associated interface definition files, plus the scripts used to
 control compilation and installation of the executable.  However, as a
 special exception, the source code distributed need not include
 anything that is normally distributed (in either source or binary
 form) with the major components (compiler, kernel, and so on) of the
 operating system on which the executable runs, unless that component
 itself accompanies the executable.
 If distribution of executable or object code is made by offering
 access to copy from a designated place, then offering equivalent
 access to copy the source code from the same place counts as
 distribution of the source code, even though third parties are not
 compelled to copy the source along with the object code.
  4. You may not copy, modify, sublicense, or distribute the Program
 except as expressly provided under this License.  Any attempt
 otherwise to copy, modify, sublicense or distribute the Program is
 void, and will automatically terminate your rights under this License.
 However, parties who have received copies, or rights, from you under
 this License will not have their licenses terminated so long as such
 parties remain in full compliance.
  5. You are not required to accept this License, since you have not
 signed it.  However, nothing else grants you permission to modify or
 distribute the Program or its derivative works.  These actions are
 prohibited by law if you do not accept this License.  Therefore, by
 modifying or distributing the Program (or any work based on the
 Program), you indicate your acceptance of this License to do so, and
 all its terms and conditions for copying, distributing or modifying
 the Program or works based on it.
  6. Each time you redistribute the Program (or any work based on the
 Program), the recipient automatically receives a license from the
 original licensor to copy, distribute or modify the Program subject to
 these terms and conditions.  You may not impose any further
 restrictions on the recipients' exercise of the rights granted herein.
 You are not responsible for enforcing compliance by third parties to
 this License.
  7. If, as a consequence of a court judgment or allegation of patent
 infringement or for any other reason (not limited to patent issues),
 conditions are imposed on you (whether by court order, agreement or
 otherwise) that contradict the conditions of this License, they do not
 excuse you from the conditions of this License.  If you cannot
 distribute so as to satisfy simultaneously your obligations under this
 License and any other pertinent obligations, then as a consequence you
 may not distribute the Program at all.  For example, if a patent
 license would not permit royalty-free redistribution of the Program by
 all those who receive copies directly or indirectly through you, then
 the only way you could satisfy both it and this License would be to
 refrain entirely from distribution of the Program.
 If any portion of this section is held invalid or unenforceable under
 any particular circumstance, the balance of the section is intended to
 apply and the section as a whole is intended to apply in other
 circumstances.
 It is not the purpose of this section to induce you to infringe any
 patents or other property right claims or to contest validity of any
 such claims; this section has the sole purpose of protecting the
 integrity of the free software distribution system, which is
 implemented by public license practices.  Many people have made
 generous contributions to the wide range of software distributed
 through that system in reliance on consistent application of that
 system; it is up to the author/donor to decide if he or she is willing
 to distribute software through any other system and a licensee cannot
 impose that choice.
 This section is intended to make thoroughly clear what is believed to
 be a consequence of the rest of this License.
  8. If the distribution and/or use of the Program is restricted in
 certain countries either by patents or by copyrighted interfaces, the
 original copyright holder who places the Program under this License
 may add an explicit geographical distribution limitation excluding
 those countries, so that distribution is permitted only in or among
 countries not thus excluded.  In such case, this License incorporates
 the limitation as if written in the body of this License.
  9. The Free Software Foundation may publish revised and/or new versions
 of the General Public License from time to time.  Such new versions will
 be similar in spirit to the present version, but may differ in detail to
 address new problems or concerns.
 Each version is given a distinguishing version number.  If the Program
 specifies a version number of this License which applies to it and "any
 later version", you have the option of following the terms and conditions
 either of that version or of any later version published by the Free
 Software Foundation.  If the Program does not specify a version number of
 this License, you may choose any version ever published by the Free Software
 Foundation.
  10. If you wish to incorporate parts of the Program into other free
 programs whose distribution conditions are different, write to the author
 to ask for permission.  For software which is copyrighted by the Free
 Software Foundation, write to the Free Software Foundation; we sometimes
 make exceptions for this.  Our decision will be guided by the two goals
 of preserving the free status of all derivatives of our free software and
 of promoting the sharing and reuse of software generally.
 			    NO WARRANTY
  11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY
 FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW.  EXCEPT WHEN
 OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES
 PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED
 OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
 MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.  THE ENTIRE RISK AS
 TO THE QUALITY AND PERFORMANCE OF THE PROGRAM IS WITH YOU.  SHOULD THE
 PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING,
 REPAIR OR CORRECTION.
  12. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
 WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR
 REDISTRIBUTE THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES,
 INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING
 OUT OF THE USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED
 TO LOSS OF DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY
 YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER
 PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE
 POSSIBILITY OF SUCH DAMAGES.
 		     END OF TERMS AND CONDITIONS
 http://www.opensource.org/licenses/mit-license.php
--- a/526
+++ b/526
@@ -1,7 +1,529 @@
 ------ current release ---------------------------
-1.9.2 (7/10/2010)
+2.0.0 (2012-03-17)
 # Untracked Features, biggest first.
 + autoconf eliminated.
 + New 'ids' command that returns a filtered set of task ID numbers, instead
   of the actual tasks.  Similarly there is a 'uuids' commands.
 + Corrected sorting to use std::stable_sort instead of std::sort, which is not
   guaranteed stable (thanks to Stefan Hacker).
 + Enhanced diagnostics command.
 + Performance enhancements.
 + The old 'curses' configuration variable is now replaced by 'detection', and
   has the same meaning - whether or not to auto-detect terminal size.
 + Added Czech Republic holiday files (thanks to Tomas Cech).
 + Added Japanese holiday files (thanks to Takanobu Watanabe).
 + All holiday files have been renamed to include a locale, rather than just a
   country code.  For example: holidays.en-US.rc.
 + Now ships with an add-on script, update-holidays.pl, which contacts
   http://holidata.net, and brings the installed holiday files up to date.
 + Extension system now controlled by the 'extensions' configuration variable.
 + HTML export in the form of an external scripts export-html.pl.
 + Two additional solarized theme files, solarized-dark-256.theme and
   solarized-light-256.theme (thanks to Stefan Keel).
 + New 'dependency.indicator' configuration variable for the depends.indicator
   report field.
 + New 'indent.annotation' for the 'description.default' field format.
 + New 'color.label' for colorizing the report column labels.
 + The 'blanklines' configuration variable now replaced by the 'verbose' token
   'blanklines'.
 + The 'verbose' configuration variable now accepts a specific list of items to
   be verbose about.  See taskrc(5).
 + New 'execute' command that runs external programs.
 + The default export format is now JSON.
 + The configuration variable 'json.array' determines whether 'query' command
   output is enclosed by '[...]'.
 + The duration 'm' is now interpreted as 'months', not 'minutes'.
 + Urgency now has an 'age' component.
 + Improved text wrapping of UTF8 text.
 + When duplicating a parent recurring task, a new recurring parent task is
   created.  When a child recurring task is duplicated, a plain task is created.
 + The 'diagnostics' command now checks for duplicate UUID values in the data.
 # Tracked Features, sorted by ID.
 + Added feature #52, which provides improved text-wrapping support for UTF-8
   descriptions.
 + Added feature #278, which provides a more consistent command line grammar.
 + Added feature #318, which shows a full edit history in the 'info' report,
   when enabled by 'journal.info=on'
 + Added feature #330, which supports the 'inverse' color attribute.
 + Added feature #340, which implements new color rules 'color.completed' and
   'color.deleted'.
 + Added feature #422, #566 and #639, which allow task modifications during
   'done', 'delete', 'start', 'stop' and 'duplicate' commands (thanks to Max
   Muller).
 + Added feature #474, which means the 'info' command accepts filters.
 + Added feature #479, which enables filtering for the 'calendar' command.
 + Added feature #496, which allows rc.default.command to be supplemented with
   a filter, so that 'task project:Home' applies the project filter to the
   default command.
 + Added feature #507, which provides an alternative mechanism for inverting
   attribute modifiers, in the form of new algebraic filters (thanks to Michelle
   Crane).
 + Added feature #514, which allows duplication of tasks based on a generalized
   filter, rather than just IDs (thanks to Peter De Poorter).
 + Added feature #523 & #659, adding 'status' as a reportable field (thanks to
   Peter De Poorter and Bryce Harrington).
 + Added feature #545, #610, #611, #646, which support complex aliases.
 + Added feature #559, that causes Taskwarrior to exit if the ~/.task (or
   rc.data.location override) does not exist, controlled by the
   rc.exit.on.missing.db configuration variable (thanks to Sander Marechal).
 + Added feature #571, which provides descriptive feedback when a special tag
   is applied.
 + Added feature #607, which allows modification of a task during annotation
   (thanks to Peter De Poorter).
 + Added feature #609, which allows suppression of output labels and verbose
   text.
 + Added feature #612, so that the 'info' command displays the sum of all
   active (start/stop) times for a task, if the 'journal.info' configuration
   variable is set (thanks to Andy Kriger).
 + Added feature #632, which allows environment variables TASKRC and TASKDATA
   to override .taskrc and .task directory locations (thanks to Steve Rader).
 + Added feature #657 & #658, using the 'ids' command, tasks matching a filter
   can now be modified as a group (thanks to Bryce Harrington, Eric Fluger).
 + Added feature #679, which makes color rules match project names in a left-
   most fashion, like filters (thanks to ch077179).
 + Added feature #682, which allows the configuration variable 'defaultheight'
   to override the assumed height of 24 lines when 'detection' is not enabled
   (thanks to Steve Rader).
 + Added feature #700, which adds tab-completion of built-in tags.
 + Added feature #710, which adds an attribute modifier prefix to return the
   complement of a filtered set (thanks to Dan White).
 + Added feature #714, including Belarus holidays (thanks to Alexei Romanoff).
 + Added feature #725, which provides feedback when tasks become unblocked.
 + Added feature #733, including Czech holidays (thanks to Tomas Cech).
 + Added feature #740, that allows for indented annotations, controlled by the
   'indent.annotation' configuration variable (thanks to Steve Rader, Tomas
   Cech).
 + Added feature #755, adding a new command 'reports' that lists reports and
   their descriptions.
 + Added feature #779, which uses more relevant and consistent terms on the
   'burndown' charts.
 + Added feature #800, adding a new command 'columns' that lists all the columns
   available for custom reports, and includes their formatting options (thanks
   to T. Charles Yun).
 + Added feature #806, which provides the ability to compare dates using the
   relational operator '>=' (thanks to Miguel de Val Borro).
 + Added feature #811, which makes the 'execute' command optional, and
   controlled by '#define HAVE_EXECUTE 1' in cmake.h.  This allows a build
   that does not have the potential security hole, in the event that taskwarrior
   is run at elevated privilege, or run in the context of a web server.
 + Added feature #813, new "eoq" and "soq" dates for the end and start of
   quarter.  (thanks to Dave French and Paulo Almeida for the patch).
 + Added feature #827, which allows augmentation of default.command with extra
   arguments, when default.command itself contains mulitple arguments (thanks to
   Aikido Guy).
 + Added feature #891, which allows for leftmost partial matches of UUID values.
 # Tracked Bugs, sorted by ID.
 + Fixed bug #208, which addresses various problems with recurring tasks, and
   change propagation.
 + Fixed bug #403, which disambiguates certain commands involving numbers.
 + Fixed bug #447, #942, which only allowed dates to be edited if they changed
   day (thanks to Michelle Crane and Owen Clarke).
 + Fixed bug #458, removing the ambiguous 'm' as a duration, leaving 'mi[nutes]'
   and 'mo[nths]' requiring at least two characters for a match.
 + Fixed bug #475, which allowed a blank annotation command to be entered
   (thanks to Andreas Kalex).
 + Fixed bug #511, which caused display problem on Cygwin when colored output
   used the full width of the terminal.  The 'avoidlastcolumn' configuration
   variable forces taskwarrior to never use the last column.
 + Fixed bugs #533 and #536, which prevented having correct paths for themes
   in .taskrc (thanks to Juergen Daubert)
 + Fixed bug #552, where 'rc.verbose=off' suppressed warnings (thanks to Peter
   De Poorter).
 + Fixed bug #594, which broke the 'all' report with a combination of bad regex
   handling and a formatting bug (thanks to Steve Rader).
 + Fixed bug #605, which gave misleading project completion percentages under
   certain circumstances (thanks to Steve Rader).
 + Fixed bug #636, which causes the burndown reports to not honor the
   _forcecolor=off setting (thanks to Steve Rader, Uli Martens).
 + Fixed bug #645 & #660, which prevented logically combining report filters
   (thanks to Bryce Harrington).
 + Fixed bug #683, in which the 'config' command sometimes edited comments
   instead of the proper line in .taskrc (thanks to Erlan Sergaziev).
 + Fixed bug #691, which was a mis-reporting of file lock state even when file
   locking was turned off (thanks to Tom Duffy).
 + Fixed bug #694, which allows attributes to be modified while annotating a
   task (thanks to Aikido Guy).
 + Fixed bug #696, where the command line parser was confused by a single '-'
   or '+' character.
 + Fixed bug #699, truncated ssh://... during autopush after merge.
 + Fixed bug #703, where global substitutions didn't make all expected
   annotation changes.
 + Fixed bug #704, which improved wording of journal messages.
 + Fixed bug #706, where deletions were recorded in the journal twice.
 + Fixed bug #707, which had inverted logic with the urgency calculation for
   blocked tasks.
 + Fixed bug #708, which corrected bad math in project % complete calculations
   (thanks to Michelle Crane).
 + Fixed bug #713, which fixes typos in the holidays-UK.rc file (thanks to
   Alexei Romanoff).
 + Fixed bug #720, so that when the 'info' report renders total active time,
   it uses a lossless format (thanks to Bernhard B).
 + Fixed bug #722, #801, so that all recurring task change propagations are
   confirmed (thanks to Arkady Grudzinsky).
 + Fixed bug #723, which displayed a misleading message when the output was
   truncated to a page.
 + Fixed bug #732, which fixes misleading messages and documentation for
   merge/push/pull URIs (thanks to Tomas Cech).
 + Fixed bug #737, which allows wait dates after due dates, but provides a
   warning (thanks to Arkady Grudzinsky).
 + Fixed bug #741, which miscounted columns widths when a table header used
   unicode characters (thanks to Tomas Cech).
 + Fixed bug #744, which omitted new ID feedback for all but the first
   duplicated task (thanks to Uli Martens).
 + Fixed bug #745, which allows projects names with spaces, provided the values
   are quoted (thanks to Duane Waddle).
 + Applied patch for Bug #746, which added missing documentation for the 'entry'
   report column (thanks to Duane Waddle).
 + Fixed bug #761, in which the 'prepend' and 'append' commands failed to
   generate an error when no text was provided (thanks to Aikido Guy).
 + Fixed bug #762, #763, so that modifications to tasks are considered 'write'
   commands, and therefore update shadow files (thanks to Aikido Guy).
 + Applied patch for Bug #770, which fixed a broken build (thanks to Christopher
   J. Pilkington).
 + Applied patch for Bug #771, which looks for libuuid if uuid_unparse_lower is
   not located (thanks to Christopher J. Pilkington).
 + Fixed bug #777, which prevented _query command output from passing JSON
   validation due to missing [] around the task list.
 + Fixed bug #781, which prevented tasks with dependencies from showing on the
   'next' report (thanks to Wim Schuermann).
 + Fixed bug #783, which fixes completed and deleted tasks still showing as
   active (thanks to Adam Wolk).
 + Fixed bug #785, which fixes a broken build on Solaris (thanks to Owen
   Clarke).
 + Fixed bug #788, which reported regex and readline versions, even though they
   are not used.
 + Applied patches for bugs #792, #793, #794 and #795, so that cmake now
   recognizes and builds on Solaris (thanks to Owen Clarke).
 + Applied patch for bug #797 which corrects a build problem with 'srandom'
   (thanks to Owen Clarke).
 + Applied patches for bug #798 which allows out-of-source builds (thanks to
   Ben Boeckel).
 + Applied documentation patch for #799, fixing a broken link in the man page
   (thanks to Bryce Harrington).
 + Applied patch for #803, allowing rc.confirmation to bypass confirmation of
   the deletion of a recurring task (thanks to Matt Kraai).
 + Addressed bug #804 by allowing rc.hyphenate to control whether hyphens are
   inserted when long lines are broken.  This may help prevent xterm from
   mis-parsing URLs in task annotations, when wrapped (thanks to Yann Davin).
 + Fixed bug #807, which caused a lack of Lua to prevent tests from building
   (thanks to Owen Clarke).
 + Fixed bug #808, which generated compiler warnings on Solarix (thanks to
   Owen Clarke).
 + Fixed bug #817, which caused a build problem with a Core2 Duo processor on a
   Mac OSX 10.6 machine.  Notes updated in INSTALL file (thanks to John
   Hammond).
 + Fixed bug #818, which caused partial tag matching (thanks to Joe Holloway).
 + Fixed bug #822, #845, which generated incorrect IDs (thanks to Matt Kraai and
   Michelle Crane).
 + Fixed bug #823, so that recurring task change propagations are now always
   confirmed (thanks to Miguel de Val Borro).
 + Fixed bug #824, which caused probles when completing recurring tasks (thanks
   to Matt Kraai).
 + Fixed bug #831, which prevented some date fields from being properly parsed.
 + Fixed bug #835, which prevented hierarchical projects from being recognized.
 + Fixed bug #836, which preserves numeric arguments as-is (thanks to Matt Kraai
   for the patch).
 + Fixed bug #837, which caused incorrect urgency calculations for tasks that
   have completed dependencies, and problems when editing those tasks (thanks
   to Matt Kraai).
 + Fixed bug #839, which caused problems when recurrence frequencies of '1m'
   were used.  This is an obsolete form, and should now be '1mo' (thanks to
   Gour D).
 + Fixed bug #846, which prevented the default.command configuration from
   handling multiple arguments (thanks to Uli Martens).
 + Fixed bug #850, which failed when newline characters were in a modified task
   description.  They are now stripped (thanks to Aikido Guy).
 + Fixed bug #851, which failed to recognize durations like '1day' when
   filtering date attributes (thanks to Philipp Woelfel).
 + Fixed bug #856, which prevented filters on missing project from working
   (thanks to Michelle Crane).
 + Fixed bug #859, which used only one color for the 'ghistory.*' report
   legends (thanks to Uli Martens).
 + Fixed bug #860, which prevented lower-case priority values from being
   accepted (thanks to Michelle Crane).
 + Fixed bug #862, which suppressed feedback from the 'denotate' command.
 + Fixed bug #863, which suppressed report labels with rc.verbose=off (thanks to
   Michelle Crane).
 + Fixed bugs #865 and #886, which caused silent failure of unrecognized dates
   (thanks to Michelle Crane).
 + Fixed bug #879, which mis-parsed escaped characters in the data file (thanks
   to Michelle Crane).
 + Fixed bug #880, which listed the wrong file paths for themes (thanks to Peter
   Lewis).
 + Fixed bug #892, which caused a segfault due to misuse of
   std::map::operator[] (thanks to Dmitriy Samborskiy).
 + Fixed bug #897, which adds the UUID field to the 'completed' report
   (thanks to Eli Lev).
 + Fixed bug #899, which displayed incorrect project completion numbers (thanks
   to Paul-Gheorghe Barbu).
 + Fixed bug #901, which was preventing multiple IDs and UUIDs from being used
   as a filter (thanks to Bryce Harrington).
 + Fixed bug #906, which caused problems with inverted project matching (thanks
   to Uli Martens).
 + Fixed bug #910, which caused unexpected behavior when duplicating a recurring
   task (thanks to Jennifer Cormier).
 + Fixed bug #917, which mis-encoded quotes (thanks to Uli Martens).
 + Fixed bug #929, which corrected argument handling for aliases (thanks to Uli
   Martens).
 + Fixed bug #932, which fixed change propagation for recurring tasks (thanks to
   Jennifer Cormier).
 + Fixed bug #936, which caused tests to fail on Solaris (thanks to Owen Clarke).
 + Fixed bug #937, which failed 'stat' calls on Solaris (thanks to Owen Clarke).
 + Fixed bug #938, which corrected compiler warnings on Solaris (thanks to Owen
   Clarke).
 + Fixed bug #944, which caused a test to fail when it was run on an NFS share.
 + Fixed bug #946, which caused 'edit' command problems when
   'dateformat.annotation' did not contain any date elements (thanks to Tuomas
   Toivola).
 + Fixed bug #950, which warned about dependency chain problems during
   annotation, which makes no sense (thanks to Uli Martens).
 + Fixed bug #951, which caused tag filtering to fail (thanks to Max Muller).
 + Fixed bug #952, which generated cmake warnings on Cygwin.
 # Untracked Bugs, biggest first.
 + Fixed bug that required the '%YAML' prologue in a YAML import.
 + Fixed bug that showed the 'due' date, under the heading 'until' date, in the
   info report (thanks to Michael McCann).
 + Fixed burndown chart y-axis height calculation (thanks to Ben Boeckel).
 + Fixed missing recurrence values in zsh completion script (thanks to Ben
   Boeckel).
 + Fixed problem with DOM-checking the 'limit' pseudo-attribute (thanks to
   Barton Meeks).
 + Fixed problem with duplicate 'project changed' messages (thanks to Owen
   Clarke).
 + Fixed problem with non-UTC defaults for "TZ" (thanks to Owen Clarke).
 + Removed use of Lua API call that is deprecated in 5.1 and removed from 5.2
   (thanks to Michal Vyskocil).
 + Fixed problem where update-holidays.pl did not properly handle UTF8 JSON
   data.
 + Fixed problem where update-holidays.pl did not use the YYYYMMDD date foramt.
 + Fixed problem where urgency was not properly calculated for waiting tasks.
 + Fixed problem where 'project' was not supported as a verbosity token (thanks
   to Adam Gibbins).
 ------ old releases ------------------------------
 1.9.4 (03/03/2011) b9bae255f4fa03970eced3ac0876935271d1d7a1
 + Added burndown charts - 'burndown.daily', 'burndown.weekly',
   'burndown.monthly', that use 'color.burndown.pending', 'color.burndown.started'
   and 'color.burndown.done' colors.
 + Added highlighting for the 'show' command that indicates which values differ
   from the defaults.
 + Added change log display to the 'info' command, controlled by the
   'journal.info' configuration setting.
 + Added 'description+' to all reports with duplicate sort keys, to stabilize
   the sequence.
 + Added ability to temporarily suspend GC (rc.gc:0) for a given command, which
   helps scriptwriters implement shadow files externally (thanks to Sander
   Marechal).
 + Added alias 'export.json' that maps to the new _query helper command.
 + Added new dark-gray-256 color theme.
 + Added feature #30, which eliminates the dependency on ncurses (thanks to
   Johan Friis).
 + Added feature #41, XML export in the form of add-on script export-xml.pl,
   export-xml.py and export-xml.rb.
 + Added feature #157, which implements the _query command, a helper command for
   script writers, which accepts a filter like any other report, but returns
   only full JSON.
 + Added feature #158, regular expression support for filters and substitutions.
 + Added feature #247, providing infinite width reports when redirecting output
   to a file, by setting defaultwidth to 0.
 + Added feature #309, which sets the xterm title when reports are run,
   according to the configuration variable 'xterm.title', which defaults to off.
 + Added feature #546, which is a 'count' command that counts tasks, and is
   intended to help scripts that manipulate task output.
 + Added feature #567, which makes it possible to apply an offset to the first
   month to be displayed in the calendar report (thanks to Michelle Crane).
 + Added feature #574, default due dates (thanks to Erlan Sergaziev).
 + Added feature #575, including Danish holidays (thanks to Irfan Siddiqui).
 + Added feature #608, and now completing a task, with journal.time turned on
   will stop the task first (thanks to Andy Kriger).
 + Added feature #629, a new holiday configuration file for New Zealand
   (thanks to Stephen Haywood).
 + Added feature #638, a wait:later possibility (thanks to Clément Bœsch).
 + Added feature #46, proper sortable age column.
 + Added new holiday configuration file for Italy (thanks to Nicola Busanello).
 + Added new holiday configuration file for Austria (thanks to Andreas Poisel).
 + Eliminated dependency on ncurses.
 + The dependency columns are now right-justified (thanks to Eric Fluger).
 + When a date fails to parse, the expected format is displayed, as a reminder
   (thanks to Eric Fluger).
 + Fixed bug that caused the 'done' command to always exit with a non-zero
   status (thanks to Steve Rader).
 + Fixed bug that caused entry, end, start and wait dates to not use report-
   specific date format overrides (thanks to Eric Fluger).
 + Fixed bug #485, which caused filters of 'recur' to fail for partial matches
   (thanks to T. Charles Yun).
 + Fixed bug #515, which displayed an incorrect message after duplicating a
   non-existent task (thanks to Peter De Poorter).
 + Fixed bug #529, where the 'depends' attribute was not mentioned in the
   task man page (thanks to Dirk Deimeke).
 + Fixed bug #530, where unrecognized periods on recurring tasks were not
   being properly handled (thanks to T. Charles Yun).
 + Fixed bug #535 which omitted the holidays-NO.rc file from the packages
   (thanks to Jostein Berntsen).
 + Fixed bug #537, where the man page task-sync(5) mis-specified some URIs.
 + Fixed bug #538, where some color legend items were not readable.
 + Fixed bug #539, where the man page task-color(5) contained a line that
   began with a ' and was not displayed.
 + Fixed bug #540, where user names containing @s could not be parsed.
 + Fixed bug #541, which prevented sorting by 'age' column in some situations.
 + Fixed bug #542, which sorted the countdown columns incorrectly (thanks to
   Michelle Crane).
 + Fixed bug #555, which caused a segfault when logging a task with a project
   (thanks to Itay Perl).
 + Fixed bug #564, which allowed the deletion of parent recurring tasks (thanks
   to Peter De Poorter).
 + Fixed bug #570, which used unsupported brace expansion with dash (default
   /bin/sh in Ubuntu).
 + Fixed bug #579, which displayed incorrect counts when using the 'limit:N'
   filter (thanks to Thomas Sattler).
 + Fixed bug #580, where reusing the merge uri for autopush failed when the
   uri was taken from taskrc.
 + Applied patch to fix bug #581, in which backslashes in annotations and
   descriptions caused problems (thanks to Itay Perl).
 + Fixed bug #587, where the man page needed clarification on quoting some
   arguments to prevent them from being broken up by the shell (thanks to
   Steve Rader).
 + Fixed bug #589, where the man page did not adequately describe searching
   or usage of attribute modifiers (thanks to Steve Rader).
 + Applied patch to fix bug #590, which makes the yes/no/all/quit confirmation
   prompts consistent (thanks to Steve Rader).
 + Fixed bug #595, where taskwarrior ignored changes to the wait date during
   the edit command, consequently not changing task status (thanks to Eric
   Fluger).
 + Fixed bug #597, which caused a missing project to be counted as a project
   in the projects command (thanks to Steve Rader).
 + Fixed bug #603, which caused no feedback when task IDs were not specified
   (thanks to Steve Rader).
 + Applied patch to fix bug #613, so that the summary report and the projects
   command now consistently show a missing project as "(none)" (thanks to
   Steve Rader).
 + Applied patch to fix bug #618, so that the configuration setting
   'edit.verbose' can be set to 'no' and eliminate the help text when using
   the 'task edit' command (thanks to Steve Rader).
 + Enhanced unit tests in response to bug #624 (thanks to Steve Rader).
 + Fixed bug #628, where dateformats containing spaces were not properly
   parsed (thanks to Steve Rader).
 + Fixed bug #634, so that 'undo' obeys the 'confirmation' setting (thanks to
   Steve Rader).
 + Fixed bug #641, where certain reports broke when 'dateformat' differed from
   'dateformat.report'.
 + Fixed bug #651, which broke the edit command when a task description
   contained certain tokens (like 'Due:').
 + Fixed bug #653, which caused undo information to be recorded when no changes
   were made by the 'edit' command.
 + Fixed bug #654, which broke the info command when a task had no journal
   entries.
 + Fixed bug #656, which caused multiple recurring child tasks to be created
   (thanks to Bryce Harrington).
 + Fixed bug #671, removing the claim in the 'edit' command claims that
   description text can wrap over multiple lines, because it cannot.
 ------ old releases ------------------------------
 1.9.3 (11/08/2010) bf36b47593a33e6347425d47a36477b627310e65
 + Added feature #43, now task supports relative dates like '3wks',
   '1 month', '4d' for 'due', 'wait' and 'until' dates.  Essentially
   durations are now allowed where dates are expected, and are treated
   as relative to the current date/time.
 + Added feature #189, that records the start and stop times as an
   annotation for a task.
 + Added features #244, #272, #273, #274, #275 and #279, which support
   import and export of YAML 1.1.  YAML is now the default export format
   for task.
 + Added feature #391, now the 'task color legend' command will show
   samples of all the defined colors and color rules from your .taskrc
   and theme.
 + Added feature #410, and now task supports dependencies between tasks
   with the syntax 'task 1 depends:2' to add a dependency, or 'task 1
   depends:-2' to remove a dependency.
 + Added feature #421, and now task can sync data files from two sources
   via the 'merge' command.
 + Added feature #423, now custom report filters allow rc overrides.
 + Added feature #428, preparing the new structure for the NEWS file.
 + Added feature #429, which improves the 'all' report to exclude deleted.
   tasks, provide a new sort order and include the 'end' column.
 + Added feature #431, which improves feedback after running the 'log'
   command.
 + Added feature #446, task supports now 'sow', 'som' and 'soy' as dates
   for 'due', 'wait' and 'until' (thanks to T. Charles Yun).
   Added as well synonyms soww/eoww plus new socw/eocw for calendar weeks.
 + Fixed bug #467, where recurring tasks were not honoring wait values.
 + Added feature #471, which makes greater use of projects by reporting
   changes to the completion percentage when it changes.
 + Added feature #478, which uses the colorization rules in the 'info'
   report.
 + Added feature #481, allowing for user control of the color rule order
   of precedence via the 'rule.precedence.color' configuration variable.
 + Added feature #499, giving an extra line in the message output when
   doing bulk done changes (thanks to T. Charles Yun).
 + New 'depends' column for custom reports.
 + New 'blocked' report for showing blocked tasks.
 + New 'unblocked' report for showing tasks that are not blocked.
 + Improved man pages (thanks to Andy Lester).
 + Default .taskrc files are now largely empty, and rely almost completed
   on default values.
 + Special tags 'nocal', 'nocolor' and 'nonag' are implemented.
 + The 'tags' command highlights special tags.
 + The 'stats' and 'info' reports not obey color.alternate.
 + New fish shell tab completion script (thanks to Mick Koch).
 + Color rules now obey the rc.search.case.sensitive configuration option.
 + The color.keyword.XXX color rule now applies to annotations too.
 + Importing the same YAML twice now generates an error.
 + Two new color themes (thanks to Kathryn Andersen).
 + More localized holiday files for US, CA, SE, DE, FR, UK, ES, NL and NO
   (thanks to T. Charles Yun, Jostein Berntsen).
 + Added new 'diagnostics' command to help with bug submission, testing.
 + Fixed bug #427, preventing the task edit command to parse annotation
   dates with spaces.
 + Fixed bug #433, making task command output more consistent.
 + Fixed bug #434, allowing users to complete tasks with status 'waiting'
 + Fixed bug #438, correcting the sorting of the entry_time, start_time
   and end_time columns (thanks to Michelle Crane).
 + Fixed bug #439, which ignored dateformat.annotation for sparse annotations.
 + Fixed bug #440, which prevented simultaneous append/prepend and substitution.
 + Fixed bug #441, which misparsed '/a/a:/' as an attribute, rather than a
   substitution (thanks to Michelle Crane).
 + Fixed bug #444, which made task shell unusable after canceling out of an
   undo command.
 + Fixed bug #445, which caused task to not notice that the command 'h' is
   ambiguous.
 + Fixed bug #449, so the wait: attribute can be applied to a task at any
   time, not just on add.
 + Fixed bug #452, which defines a higher resolution division between due
   and overdue.
 + Fixed bug #459, which showed a confusing message when 'limit:page' was
   used, with few tasks.
 + Fixed bug #461, in which the filter 'due:today' failed, but 'due.is:today'
   worked.
 + Fixed bug #466, which gave the wrong error message when a custom report
   was missing a direction indicator for the sort order.
 + Fixed bug #470, which caused task to not support the color 'none'.
 + Fixed bug #476, so that task now issues a warning when a wait date falls
   after a due date (thanks to T. Charles Yun).
 + Fixed bug #480, which didn't properly support @ characters in tags.  This
   also now supports $ and #.
 + Fixed bug #489, which caused the filter 'tags.none:' to fail.
 + Fixed bug #493, which made waiting, recurring tasks invisible (thanks to
   Alexander Schremmer).
 + Fixed bug #494, causing imported text files to ultimately lack uuids
   (thanks to Elizabeth Maxson).
 + Fixed problem with command line configuration overrides that had no
   values. 
 + Fixed problem with the 'undo' command not observing the rc.color or the
   rc._forcecolor settings.
 + Fixed problem with extra blank line in the ghistory reports.
 + Fixed a precision problem with average age on the summary report.
 + Clarified the documentation regarding the project name (taskwarrior) and
   the program name (task).
 1.9.2 (7/10/2010) a13989f18eb34b3363f433c965084b6491425b9f
 + Added feature #320, so the command "task 123" is interpreted as an implicit
   "task info 123" command (thanks to John Florian).
 + Added feature #326, allowing tasks to be added in the completed state, by
@@ -61,8 +583,6 @@
 + Fixed wording (support issue #383) when modifying a recurring task (thanks
   to T. Charles Yun).
 ------ old releases ------------------------------
 1.9.1 (5/22/2010) 60a99725b858be134ad538cb7c1a32c98de70e67
 + Summary report bar colors can now be specified with color.summary.bar
   and color.summary.background configuration variables.
--- a/120
+++ b/120
@@ -0,0 +1,120 @@
 This file is intended to convey the current efforts, priorities and needs of the
 codebase.  It is for developers looking for a way to start contributing.
 Deprecated Code
  This is code that is going to be phased out soon, and therefore is not worth
  fixing or documenting.  Don't waste your time.
  - There is no deprecated code at the moment.  I'm sure there will be soon.
 New Code Needs
  This is code that needs to be written, usually down at the C++ function level.
  - Need export_viz.yy script.  Any language.  This would have value as an
    example, or template script serving as a starting-point for anyone who
    needed this format.
  - Need new export_xxx.yy scripts - the more the better.  Any language.
  - The JSON.{h,cpp} code is fast and efficient up to a point, but has a non-
    linear performance curve, implying a slowdown due to fragmentation.  Fix it.
  - Need a function that can optimize color codes.  For example, if a string
    contains this:
      <red>one two </red><red>three four</red>
    It can be shortened to:
      <red>one two three four</red>
    This is only possible if there is nothing between </red> and <red> and the
    colors match.
 Documentation Needed
  Various forms of documentation that are needed, or are in need of review or
  update.
  - Wiki/How-To: Date Handling
  - Wiki/How-To: Custom Reports, including performance considerations
  - Wiki/How-To: Aliases, particularly new enhanced aliases
  - Wiki/Features: All sections
 Unit Tests Needed
  There are always more unit tests needed.  More specifically, better unit tests
  are always needed.  The convention is that there are four types of unit test:
  1. High level tests that exercise large features, or combinations of commands.
     For example, dependencies.t runs through a long list of commands that test
     dependencies, but do so by using 'add', 'modify', 'done' and 'delete'.
  2. Regression tests that ensure certain bugs are fixed and stay fixed.  These
     tests are named bug.NNN.t where NNN refers to the Redmine issue number.
     While it is not worth creating tests for small fixes like typos, it is for
     changes to the logic.
  3. Small feature tests.  When small features are added, we would like small,
     low-level feature tests named feature.NNN.t, where NNN is the Redmine
     issue number.
  4. Code tests.  These are tests written in C++ that exercise C++ objects, or
     function calls.  These are the lowest level tests.  It is important that
     these kind of tests be extensive and thorough, because the software depends
     on this code the most.
  The tests are mainly written in Perl, and all use TAP.  Here is how to get the
  code and run the test suite:
     git clone git://tasktools.org:task.git
     cd task.git
     cmake .
     make
     make test
  Alternately, you go to the test directory and run the following:
     cd task.git/test
     make
     make test
  Either way, a TAP file 'all.log' is written that contains all test results.
  once this file is created, you can see the failing tests using this script:
    task.git/test/problems
  If you make a habit of running the test suite, consider downloading the
  vramsteg utility to show a colorful progress bar, from:
    git://tasktools.org/vramsteg.git     
  Tests needed:
  - The basic.t unit tests are a misnomer, and should be either removed or
    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.
  - None of the current unit tests remove the 'extensions' directory, and they
    all should.
  - Test propagation of modifications to recurring tasks.
  - Test regex support.
  - Need unit tests for each bug in the issue list, if suitable.
  - 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.
  * Note that running the unit tests require the Perl JSON module to be
    installed.
 Work in Progress
  Things that are currently in flux, which is another way of saying leave it
  alone while it is being worked on.
  - None.
 Current Codebase Condition
  'master' branch:
    - 1.9.4 release, current, locked.
  '2.0.0' branch:
    - Rapidly approaching completion, and merged to master.
  '2.0.1' branch:
    - Will be ready for any emergency fixes.
  '2.1.0' branch:
    - Future development effort.
 ---
 2012-03-03 Updated text, removed old history info.
--- a/201
+++ b/201
@@ -0,0 +1,201 @@
 Startup
  On startup, main creates a global Context object, then calls the
  Context::initialize and Context::run methods.
  Context is a large object that holds all task information, both in terms of
  the task data, and intermediate run-time data.  Having one global Context
  object means we don't have 50 global variables.  Context is therefore just a
  big global bucket of data.
  Context::initialize sets up all the data and processes the command line.  The
  initialization process is a big chicken-and-egg problem, because the command
  line depends on configuration (aliases) and the command line can force a
  reload of configuration (rc:foo).  This is solved by look-ahead: the command
  line is scanned for 'rc:xxx' and 'rc.data.location:xxx' arguments, then later
  for overrides.
  The Context::run method handles all the debug output and exceptions.  Its
  main purpose is to set up exception handling and call Context::dispatch.
 Command Line Parsing
  Command line parsing is difficult because of all the ambiguity.  The solution
  is to make several passes over the command line.  For example, the task
  command determines whether subsequent arguments are interpreted as part of a
  filter or set of modifications.
 Dispatch
  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
  string.  This means the 'done' string is an index to the CmdDone object that
  implements the functionality.
 Command Objects
  Every task command is implemented by a command object.  The command object
  provides metadata, usage and one-line help in addition to the ::execute method
  that implements the command.
 Column Objects
  There is a 1:1 correspondence between attributes stored in the data files and
  the columns that may be reported.  These are represented by column objects,
  which are responsible for validating input, measuring space needed according
  to various formats, and for rendering data for reports.
 TDB2
  The TDB2 object is a layered, transactioned I/O manager.  Its purpose is to
  isolate code from file I/O, locking, synching, and parsing details.  It is
  also responsible for minimizing reads, writes and parsing of data files.
  All input is assumed to be UTF8.  All stored data is UTF8.
 GC
  Garbage Collection is the process that moves tasks between the pending.data
  and completed.data files.  It is also responsible for waking tasks out of the
  wait state.
  Every command that displays task IDs will cause a GC to be run first, which
  minimizes the number of changes necessary to the task IDs.  This means that
  when a report shows task IDs, those IDs will remain valid while subsequent
  write commands are issued.  The next report run may show different IDs.
  Minimizing the size of pending.data is important for performance, because it
  is the file that is accessed most.
 Files
  The data files used are all kept in the rc.data.location directory, which
  defaults to ~/.task.  The files are:
    pending.data
    completed.data
    undo.data
    backlog.data
    synch.key
  The pending.data file aspires to contain only pending, waiting and recurring
  tasks, but this is only correct after a GC, and before any tasks are modified.
  This file tends to be relatively stable in size, reflecting the length of the
  task list.
  The completed.data file accumulates data over time, and grows unbounded.
  The undo.data file accumulates changes over time, and grows unbounded.  It
  provides all the necessary metadata to support the 'undo' command and the
  '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'
  commands.
  The synch.key file contains a synch receipt that is used to optimize synch
  operations.
 Filter
  A filter is simply a set of command line arguments, but is only a subset of
  the complete command line.  These arguments (Arg objects) are grouped into
  a set by the A3 (Args) object according to whether the command found is a
  read or write command.
  There is a Command::filter method for applying a filter to a set of tasks,
  yielding a result set.  It does this by creating an expression from the
  filter using the E9 object, then evaluating the expression for each task,
  such that the result set contains only tasks for which the expression
  evaluates to Boolean true.
 Sorting
  Sorting is performed on a set of tasks.  More specifically, the list that is
  sorted is a set of numeric indexes to tasks that are stored in a separate
  list.  This minimizes the amount of data copying involved to just integers
  rather than Task objects, but at the expense of one level of indirection.
  Memory fragmentation is a bigger problem than the performance of vector
  indexing.
  The actual sorting is performed by std::stable_sort, but the compare function
  is custom.
 Render
  There are two rendering objects, ViewTask and ViewText.  These both have the
  same tabular grid rendering capabilities.  ViewText maintains a 2D vector of
  strings to contain the data to be rendered, so it is used for things like the
  help command output.  ViewTask does not copy data, but assumes all data is
  stored externally in a vector of Tasks, which minimizes data copying.
  ViewTask contains projection data in the form of a set of Column objects that
  represent the X axis.  The Y axis is represented by a vector of tasks.
  The rendering process is complex.  It involves dynamically setting column
  widths based on (1) available terminal width, (2) the columns to be included
  in the output, (3) ability to wrap text for certain columns and (4) the size
  of the data to be rendered, which involves added complexity when UTF8 is used.
  The Column objects determine minimum width for a column and the maximum width
  which then allows ViewT* to make choices.
 Test Suite
  A strong and diverse test suite is critical to the successful release of any
  software.  With the complex command set and its myriad permutations, a test
  suite is the only way to ensure quality levels, and guarantee that big changes
  are sound.
  It is intended that the test suite continues growing, mostly adding more
  regression tests (bug.*.t) and more feature tests (feature.*.t).  The test are
  mostly written in Perl, and utilize the Test::More module to generate TAP
  output.  Some tests are written in C++ and also generate TAP.
  There are currently around 5,000 unit tests, that take a minute or two to run
  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.
    http://tasktools.org/tinderbox/task.html
  When making code changes, it is important that the test suite be run to verify
  that functionality was not broken.
 Debugging
  The 'rc.debug=on' override provides the following additional information which
  is useful during debugging:
    - Timing of various components (used to generate the data for the charts at
      http://tasktools.org/performance).
    - Data load times.
    - Terminal size, color capabilities.
    - Command line parsing steps, shown in colorful diagrams.
    - TDB2 layer and I/O information.
 Patches
  Patches are encouraged and welcomed.  Either attach them to the appropriate
  Redmine issue, or send them to support@taskwarrior.org.  A good patch:
    - Maintains the MIT license, and does not contain code lifted from other
      sources.
    - Precisely addresses one issue only.
    - Doesn't break unit tests.
    - Doesn't introduce dependencies.
    - Is accompanied by unit tests, where appropriate.
    - Is accompanied by documentation changes, where appropriate.
    - Conforms to the prevailing coding standards - in other words, it should
      fit right in with the existing code.
  A patch may be rejected for any of the above reasons, and more.  Bad patches
  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/291
+++ b/291
@@ -1,234 +1,153 @@
 Installation Instructions
-*************************
+-------------------------
-Copyright (C) 1994, 1995, 1996, 1999, 2000, 2001, 2002, 2004, 2005,
+Please follow the instructions below to build task with cmake.
-2006 Free Software Foundation, Inc.
+
 Pre-requisites
 --------------
 You will need the CMake build system installed in order to build taskwarrior
 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.
 This file is free documentation; the Free Software Foundation gives
 unlimited permission to copy, distribute and modify it.
 Basic Installation
-==================
+------------------
-Briefly, the shell commands `./configure; make; make install' should
+Briefly, these shell commands will unpack, build and install taskwarrior:
 configure, build, and install this package.  The following
 more-detailed instructions are generic; see the `README' file for
 instructions specific to this package.
-   The `configure' shell script attempts to guess correct values for
+  $ tar xzf task-X.Y.Z.tar.gz                     [1]
-various system-dependent variables used during compilation.  It uses
+  $ cd task-X.Y.Z                                 [2]
-those values to create a `Makefile' in each directory of the package.
+  $ cmake .                                       [3]
-It may also create one or more `.h' files containing system-dependent
+  $ make                                          [4]
-definitions.  Finally, it creates a shell script `config.status' that
+  $ sudo make install                             [5]
-you can run in the future to recreate the current configuration, and a
+  $ cd .. ; rm -r task-X.Y.Z                      [6]
 file `config.log' containing compiler output (useful mainly for
 debugging `configure').
-   It can also use an optional file (typically called `config.cache'
+These commands are explained below:
 and enabled with `--cache-file=config.cache' or simply `-C') that saves
 the results of its tests to speed up reconfiguring.  Caching is
 disabled by default to prevent problems with accidental use of stale
 cache files.
-   If you need to do unusual things to compile the package, please try
+  1. Unpacks the source tarball.  This creates the directory task-X.Y.Z,
-to figure out how `configure' could check whether to do them, and mail
+     containing all the code.
 diffs or instructions to the address given in the `README' so they can
 be considered for the next release.  If you are using the cache, and at
 some point `config.cache' contains results you don't want to keep, you
 may remove or edit it.
-   The file `configure.ac' (or `configure.in') is used to create
+  2. Change directory to the root of the distribution.
 `configure' by a program called `autoconf'.  You need `configure.ac' if
 you want to change it or regenerate `configure' using a newer version
 of `autoconf'.
-The simplest way to compile this package is:
+  3. Invokes CMake to scan for dependencies and machine-specific details, then
     generate the makefiles.  This may take a minute.
-  1. `cd' to the directory containing the package's source code and type
+  4. Builds taskwarrior.  This may take a minute.
     `./configure' to configure the package for your system.
-     Running `configure' might take a while.  While running, it prints
+  5. Installs the program, documentation and other data files.
     some messages telling which features it is checking for.
-  2. Type `make' to compile the package.
+  6. Removes the temporary directory.
  3. Optionally, type `make check' to run any self-tests that come with
     the package.
-  4. Type `make install' to install the programs and any data files and
+Build and configurations options
-     documentation.
+--------------------------------
-  5. You can remove the program binaries and object files from the
+You can customize the configuration run with cmake variables. This will modify
-     source code directory by typing `make clean'.  To also remove the
+the installation process:
     files that `configure' created (so you can compile the package for
     a different kind of computer), type `make distclean'.  There is
     also a `make maintainer-clean' target, but that is intended mainly
     for the package's developers.  If you use it, you may have to get
     all sorts of other programs in order to regenerate files that came
     with the distribution.
-Compilers and Options
+To change the installation directory you use the following configuration
-=====================
+variable:
-Some systems require unusual options for compilation or linking that the
+  $ cmake -DCMAKE_INSTALL_PREFIX=<path-to-installation-dir> .
 `configure' script does not know about.  Run `./configure --help' for
 details on some of the pertinent environment variables.
-   You can give `configure' initial values for configuration parameters
+cmake configuration variables are applied with the -D option and consist of a
-by setting variables in the command line or in the environment.  Here
+<name> and a <value>:
 is an example:
-     ./configure CC=c99 CFLAGS=-g LIBS=-lposix
+  $ cmake -D<name>=<value> .
-   *Note Defining Variables::, for more details.
+Four more variables can customize the installation process. The following table
 lists them and their defaults plus the CMAKE_INSTALL_PREFIX:
-Compiling For Multiple Architectures
+  CMAKE_INSTALL_PREFIX  /usr/local
-====================================
+  TASK_BINDIR           bin
  TASK_DOCDIR           share/doc/task
  TASK_MAN1DIR          share/man/man1
  TASK_MAN5DIR          share/man/man5
-You can compile the package for more than one kind of computer at the
+The corresponding TASK_* variables will be combined with CMAKE_INSTALL_PREFIX to
-same time, by placing the object files for each architecture in their
+get absolute installation directoris:
 own directory.  To do this, you can use GNU `make'.  `cd' to the
 directory where you want the object files and executables to go and run
 the `configure' script.  `configure' automatically checks for the
 source code in the directory that `configure' is in and in `..'.
-   With a non-GNU `make', it is safer to compile the package for one
+  CMAKE_INSTALL_PREFIZ/TASK_BINDIR   /usr/local/bin
-architecture at a time in the source code directory.  After you have
+  CMAKE_INSTALL_PREFIZ/TASK_DOCDIR   /usr/local/share/doc/task
-installed the package for one architecture, use `make distclean' before
+  CMAKE_INSTALL_PREFIZ/TASK_MAN1DIR  /usr/local/share/man/man1
-reconfiguring for another architecture.
+  CMAKE_INSTALL_PREFIZ/TASK_MAN5DIR  /usr/local/share/man/man5
 Installation Names
 ==================
-By default, `make install' installs the package's commands under
+Uninstallation
-`/usr/local/bin', include files under `/usr/local/include', etc.  You
+--------------
 can specify an installation prefix other than `/usr/local' by giving
 `configure' the option `--prefix=PREFIX'.
-   You can specify separate installation prefixes for
+To uninstall taskwarrior, you need the Makefiles, so if you deleted them in
-architecture-specific files and architecture-independent files.  If you
+step 7 above, they must first be regenerated by following steps [1], [2] and
-pass the option `--exec-prefix=PREFIX' to `configure', the package uses
+[3].  Then simply run:
 PREFIX as the prefix for installing programs and libraries.
 Documentation and other data files still use the regular prefix.
-   In addition, if you use an unusual directory layout you can give
+  $ sudo make uninstall TODO TODO TODO -- cmake doesn't include uninstall
 options like `--bindir=DIR' to specify different values for particular
 kinds of files.  Run `configure --help' for a list of the directories
 you can set and what kinds of files go in them.
   If the package supports it, you can cause programs to be installed
 with an extra prefix or suffix on their names by giving `configure' the
 option `--program-prefix=PREFIX' or `--program-suffix=SUFFIX'.
-Optional Features
+Taskwarrior Build Notes
-=================
+-----------------------
-Some packages pay attention to `--enable-FEATURE' options to
+Taskwarrior has dependencies that are detected by cmake in almost all cases, but
-`configure', where FEATURE indicates an optional part of the package.
+there are situations and operating systems that mean you will need to offer a
-They may also pay attention to `--with-PACKAGE' options, where PACKAGE
+little help.
 is something like `gnu-as' or `x' (for the X Window System).  The
 `README' should mention any `--enable-' and `--with-' options that the
 package recognizes.
-   For packages that use the X Window System, `configure' can usually
+If taskwarrior will not build on your system, first take a look at the Operating
-find the X include and library files automatically, but if it doesn't,
+System notes below.  If this doesn't help, then go to the Troubleshooting
-you can use the `configure' options `--x-includes=DIR' and
+section, which includes instructions on how to contact us for help.
 `--x-libraries=DIR' to specify their locations.
 Specifying the System Type
 ==========================
-There may be some features `configure' cannot figure out automatically,
+Operating System Notes
-but needs to determine by the type of machine the package will run on.
+----------------------
 Usually, assuming the package is built to be run on the _same_
 architectures, `configure' can figure that out, but if it prints a
 message saying it cannot guess the machine type, give it the
 `--build=TYPE' option.  TYPE can either be a short name for the system
 type, such as `sun4', or a canonical name which has the form:
-     CPU-COMPANY-SYSTEM
+Cygwin
  If 'make install' fails when writing to the /usr/local/share/ directory,
  this may be because your current login doesn't have permission to write
  to the Windows directory containing your Cygwin installation. Either
  login to Windows as an Administrator and try the 'make install' process
  again, or reinstall Cygwin under your normal Windows login.
 where SYSTEM can have one of these forms:
-     OS KERNEL-OS
+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.
-   See the file `config.sub' for the possible values of each field.  If
+Darwin, 32bit
-`config.sub' isn't included in this package, then this package doesn't
+  The taskwarrior packages will not work on a 32-bit OSX installation on Core
-need to know the machine type.
+  Duo hardware.  You will need to build Taskwarrior from source, and use this
  configure command:
-   If you are _building_ compiler tools for cross-compiling, you should
+    cmake -DCMAKE_C_FLAGS=-m32 -DCMAKE_CXX_FLAGS=-m32 -DCMAKE_EXE_LINKER_FLAGS=-m32 .
 use the option `--target=TYPE' to select the type of system they will
 produce code for.
-   If you want to _use_ a cross compiler, that generates code for a
+ See:  http://taskwarrior.org/issues/817
-platform different from the build platform, you should specify the
+       http://stackoverflow.com/questions/3261909/build-32bit-on-64-bit-linux-using-a-configure-script
-"host" platform (i.e., that on which the generated programs will
+       http://stackoverflow.com/questions/2617508/cmake-gcc-cuda-and-m32-wtf
-eventually be run) with `--host=TYPE'.
+       http://stackoverflow.com/questions/6077414/cmake-how-to-set-the-ldflags-in-cmakelists-txt
 Sharing Defaults
 ================
-If you want to set default values for `configure' scripts to share, you
+Troubleshooting
-can create a site shell script called `config.site' that gives default
+---------------
 values for variables like `CC', `cache_file', and `prefix'.
 `configure' looks for `PREFIX/share/config.site' if it exists, then
 `PREFIX/etc/config.site' if it exists.  Or, you can set the
 `CONFIG_SITE' environment variable to the location of the site script.
 A warning: not all `configure' scripts look for a site script.
-Defining Variables
+If you've recently made changes to dependencies (by reinstalling Lua, for
-==================
+example) be sure to rerun 'cmake .' before trying to execute 'make' again.
-Variables not defined in a site shell script can be set in the
+CMake will run and locate all the necessary pieces for the build, and create
-environment passed to `configure'.  However, some packages may run
+a Makefile.  There may be errors and warnings when running CMake, or there
-configure again during the build, and the customized values of these
+may be compiler errors and warnings when running 'make'.  Sometimes you will run
-variables may be lost.  In order to avoid this problem, you should set
+CMake with no reported problems, and the build will fail later.  This is
-them in the `configure' command line, using `VAR=value'.  For example:
+almost always because CMake is mistaken about some assumption.
-     ./configure CC=/usr/local2/bin/gcc
+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.
-causes the specified `gcc' to be used as the C compiler (unless it is
+If CMake runs but taskwarrior does not build, please send the contents of the
-overridden in the site shell script).
+above files as well as a transcript from the build, which is not written to a
-
+file and must be captured from the terminal.
 Unfortunately, this technique does not work for `CONFIG_SHELL' due to
 an Autoconf bug.  Until the bug is fixed you can use this workaround:
     CONFIG_SHELL=/bin/bash /bin/bash ./configure CONFIG_SHELL=/bin/bash
 `configure' Invocation
 ======================
 `configure' recognizes the following options to control how it operates.
 `--help'
 `-h'
     Print a summary of the options to `configure', and exit.
 `--version'
 `-V'
     Print the version of Autoconf used to generate the `configure'
     script, and exit.
 `--cache-file=FILE'
     Enable the cache: use and save the results of the tests in FILE,
     traditionally `config.cache'.  FILE defaults to `/dev/null' to
     disable caching.
 `--config-cache'
 `-C'
     Alias for `--cache-file=config.cache'.
 `--quiet'
 `--silent'
 `-q'
     Do not print messages saying which checks are being made.  To
     suppress all normal output, redirect it to `/dev/null' (any error
     messages will still be shown).
 `--srcdir=DIR'
     Look for the package's source code in directory DIR.  Usually
     `configure' can determine that directory automatically.
 `configure' also accepts some other, not widely useful, options.  Run
 `configure --help' for more details.
 ---
--- a/23
+++ b/23
@@ -0,0 +1,23 @@
 taskwarrior - a command line task list manager.
 Copyright 2006-2012, Paul Beckingham, Federico Hernandez.
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal
 in the Software without restriction, including without limitation the rights
 to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
 copies of the Software, and to permit persons to whom the Software is
 furnished to do so, subject to the following conditions:
 The above copyright notice and this permission notice shall be included
 in all copies or substantial portions of the Software.
 THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
 OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
 FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
 THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
 LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
 OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 SOFTWARE.
 http://www.opensource.org/licenses/mit-license.php
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,24 +0,0 @@
 SUBDIRS = src
 dist_man_MANS = doc/man/task.1 doc/man/taskrc.5 doc/man/task-tutorial.5 doc/man/task-faq.5 doc/man/task-color.5
 #docdir = $(datadir)/doc/${PACKAGE}-${VERSION}
 doc_DATA = AUTHORS ChangeLog COPYING NEWS README
 EXTRA_DIST = INSTALL README.build
 bashscriptsdir = $(docdir)
 nobase_dist_bashscripts_DATA = scripts/bash/task_completion.sh
 zshscriptsdir = $(docdir)
 nobase_dist_zshscripts_DATA = scripts/zsh/_task
 vimscriptsdir = $(docdir)
 nobase_dist_vimscripts_DATA = scripts/vim/README scripts/vim/ftdetect/task.vim scripts/vim/syntax/taskdata.vim scripts/vim/syntax/taskedit.vim scripts/vim/syntax/taskrc.vim
 i18ndir = $(docdir)
 nobase_dist_i18n_DATA = i18n/strings.de-DE i18n/strings.en-US i18n/strings.es-ES i18n/strings.fr-FR i18n/strings.nl-NL i18n/strings.sv-SE i18n/tips.de-DE i18n/tips.en-US i18n/tips.sv-SE
 rcfiledir = $(docdir)/rc
 dist_rcfile_DATA = doc/rc/holidays-US.rc doc/rc/holidays-SE.rc doc/rc/dark-16.theme doc/rc/dark-256.theme doc/rc/light-16.theme doc/rc/light-256.theme doc/rc/dark-blue-256.theme doc/rc/dark-green-256.theme doc/rc/dark-red-256.theme
--- a/106
+++ b/106
@@ -1,38 +1,112 @@
-New Features in task 1.9.2
+New Features in taskwarrior 2.0.0
-  - New 'log' command to add tasks that are already completed.
+  - New 'ids' command that returns a filtered set of task ID numbers, instead
-  - New annual history and ghistory command variations.
+    of the actual tasks.  Similarly, there is a 'uuids' command.
-  - Alias support in shell completion scripts.
+  - Attribute modifiers may be prefixed with '~' to return the opposite of a
-  - New iCalendar/vcalendar export format (RFC-2445, RFC-5545, RFC-5546).
+    filter's results.
-  - New 'show' command to display configuration settings.
+  - Status attribute can now be used in report.
-  - New 'denotate' command to delete annotations.
+  - Project names may now contain spaces.
-  - New 16-color and 256-color themes included.
+  - New export-html.pl script.
-  - New limit:page filter to show only one page of tasks.
+  - Now supports the 'inverse' color attribute.
  - Reports may now be sorted by columns that are not displayed (example: ID,
    project, due date and description sorted by urgency).
  - Performance enhancements.
  - New 'next' report, that gauges urgency and reports the most urgent tasks.
  - The 'next' report is now the default command.
  - Fine control of verbosity through the 'verbose=' configuration variable.
  - New 'execute' command that runs external scripts/programs.
  - JSON is the new default export format.
  - New 'reports' command that lists reports and their descriptions.
  - New complex aliases.
  - Filtering now available on most read-only commands.
  - The done, delete, start and stop commands now allow modification to the
    task and annotations.
  - New 'columns' command to list the supported columns and formats.
  - New 'eoq' and 'soq' dates to refer to the end and start of the quarter.
  - Urgency now has an 'age' component.
  Please refer to the ChangeLog file for full details.  There are too many to
  list here.
-Task has been built and tested on the following configurations:
+New commands in taskwarrior 2.0.0
-  * OS X 10.6 Snow Leopard and 10.5 Leopard
+  - "ids" command that accepts filters, and returns an ID sequence.
-  * Fedora 13 Goddard, 12 Constantine
+
-  * Ubuntu 10.04 Lucid Lynx, 9.10 Karmic Koala
+New configuration options in taskwarrior 2.0.0
  - Now includes Belarus, Czech Republic and Japanese holiday data.  Please note
    that the holiday file names now include a full locale.  For example:
    'holidays.en-US.rc' instead of 'holidays-US.rc'.
  - The old 'curses' configuration variable is renamed to 'detection', but
    retains the original meaning, which is whether or not to auto-detect the
    dimensions of the terminal window.
  - Extension system now controlled by the 'extensions' configuration variable.
  - Two new solarized color themes.
  - New 'dependency.indicator' for the 'depends.indicator' report field format.
  - New 'indent.annotation' for the description.default field format.
  - New 'color.label' for report column labels.
  - New 'verbose=...' support for individual verbosity settings.
  - New 'avoidlastcolumn' support for Cygwin users.
  - New 'patterns' enables/disables command line pattern support.
  - New 'expressions' enables/disables command line expression support.
  - New 'dom' enables/disables DOM support for the command line.
  - New 'json.array' determines whether 'query' command output is enclosed by
    '[...]'.
  - New 'regex' control determines whether substitutions use Regular Expressions
    or simple text patterns.
  - New 'exit.on.missing.db' control causes an exit if the ~/.task directory
    (or override) is missing.
  - New 'color.completed' and 'color.deleted' color rules.
  - New 'abbreviation.minimum' setting controls how short an abbreviated
    command or value may be.
  - New 'hyphenate' setting controls whether long lines are hyphenated when
    broken during text-wrapping.
  - New 'defaultheight' setting overrides the assumed 24 lines when 'detection'
    is disabled.  This setting only affects charts.
  - New 'urgency.age.coefficient' and 'urgency.age.max' settings control the new
    age component to the urgency value.
 Newly deprecated features in taskwarrior 2.0.0
  - The 'next' configuration variable has been removed.
  - Use of 'fg:' and 'bg:' attributes are deprecated.
  - Use of 'echo.command' configuration variable.  Use verbosity token
    'affected' instead.
  - Use of 'edit.verbose' configuration variable.  Use verbosity token 'edit'
    instead.
  - Use of 'export.ical.class' configuration variable.  Value is now specified
    in the scripts/add-ons/export-ical.pl script.
  - Use of 'report.<name>.limit' configuration variable.  This is now handled
    in the report filter as 'limit:<tasks>'.
  - Use of 't', '+', 'enable' and 'enabled' in configuration values to mean
    'on/yes/true'.
 ---
 Taskwarrior has been built and tested on the following configurations:
  * OS X 10.7 Lion, 10.6 Snow Leopard and 10.5 Leopard
  * Fedora 14 Laughlin, 13 Goddard
  * Ubuntu 10.10 Maverick Meerkat, 10.04 Lucid Lynx
  * Debian Sid
  * Slackware 12.2
  * Arch Linux
  * Gentoo Linux
  * SliTaz Linux
  * CRUX Linux
  * SuSE 11.3
  * Solaris 10 and 8
  * OpenBSD 4.5
  * FreeBSD
  * NetBSD
  * Cygwin 1.7 and 1.5
  * Haiku R1/alpha1
-While Task has undergone testing, bugs are sure to remain.  If you encounter a
+---
-bug, please enter a new issue at:
+
 While Taskwarrior has undergone testing, bugs are sure to remain.  If you
 encounter a bug, please enter a new issue at:
  http://taskwarrior.org/projects/taskwarrior/issues/new
@@ -45,5 +119,3 @@ Or just send a message to:
  support@taskwarrior.org
 Thank you.
 ---
--- a/15
+++ b/15
@@ -1,10 +1,10 @@
-Thank you for taking a look at task!
+Thank you for taking a look at taskwarrior!
-Task is a GTD, todo list, task management, command line utility with a multitude
+Taskwarrior is a GTD, todo list, task management, command line utility with a
-of features.  It is a portable, well supported, very active project, and it is
+multitude of features.  It is a portable, well supported, very active project,
-Open Source.  Task has binary distributions, online documentation, demonstration
+and it is Open Source.  Taskwarrior has binary distributions, online
-movies, and you'll find all the details at:
+documentation, demonstration movies, and you'll find all the details at:
    http://taskwarrior.org
@@ -18,6 +18,9 @@ Please send your support questions and code patches to:
    support@taskwarrior.org
-Consider joining taskwarrior.org and participating in the future of task.
+Consider joining taskwarrior.org and participating in the future of taskwarrior.
 ---
 taskwarrior is released under the MIT license. For details check the LICENSE
 file.
--- a/README.build
+++ b/README.build
@@ -1,98 +0,0 @@
 Task Build Notes
 ----------------
 Task 1.9 has dependencies that are detected by the configure program in almost
 all cases, but there are situations and operating systems that mean you will
 need to offer configure a little help.
 If task will not build on your system, first take a look at the Operating System
 notes below.  If this doesn't help, then go to the Troubleshooting section,
 which includes instructions on how to contact us for help.
 Operating System Notes
 ----------------------
 Cygwin 1.7
  Building task on Cygwin 1.7 requires a configure option:
    ./configure --with-ncurses-inc=/usr/include/ncurses
  This is because the ncurses include files are in a different location to
  Cygwin 1.5.
 Haiku Alpha/R1
  Task must be built with gcc version 4.x, so make sure you run:
    $ setgcc gcc4
  To switch from gcc 2.95 to gcc 4.x.
 Troubleshooting
 ---------------
 In most cases, it is sufficient to run the configure program like this:
  $ ./configure
 Configure will run and locate all the necessary pieces for the build, and create
 a Makefile.  There may be errors and warnings when running configure, or there
 may be compiler errors and warnings when running 'make'.  Sometimes you will run
 configure with no reported problems, and the build will fail later.  This is
 almost always because configure is mistaken about some assumption.
 The configure program can accept several options that help with its ability to
 locate and use the ncurses library.  They are:
  --with-ncurses
    This option tells configure that no matter what it thinks, ncurses is
    definitely on this system and should be enabled.  If needed, this option
    probable needs to be accompanied by the next two options.
  --with-ncurses-inc=/usr/include
    If configure cannot find ncurses header files, this option will tell it
    exactly where to look.  The path specified in this example is the default,
    so that probably won't help you.  The path should be the directory in which
    the file 'ncurses.h' resides.  Here are some possible values to try:
      /usr/include                    (the default shown above)
      /usr/include/ncurses
      /usr/local/include
      /usr/local/include/ncurses
    This should cover most systems, but new variations keeps cropping up.
  --with-ncurses-lib=/usr/lib
    If configure cannot find the ncurses library, this option will tell it
    exactly where to look.  The path specified in this example is the default,
    so that probably won't help you.  The path should be the directory in which
    the file 'libncurses.a' (or your system's equivalent) resides.  Here are
    some possible values to try:
      /usr/lib
      /usr/local/lib
    This should cover most systems, but new variations keeps cropping up.
  --without-ncurses
    This disables ncurses support in task, and should really be used as a last
    resort.  We know of no systems where this is needed.
 If trying these options does not succeed, please send the contents of the
 'config.log' files to support@taskwarrior.org, or post a message in the support
 forums at taskwarrior.org along with the information.
 If configure runs, but task does not build, when ideally you would send both the
 contents of config.log, and a transcript from the build, which is not written to
 a file, and must be captured from the terminal.
 ---
--- a/cmake.h.in
+++ b/cmake.h.in
@@ -0,0 +1,66 @@
 /* cmake.h.in. Creates cmake.h during a cmake run */
 #define L10N                                           // Localization complete.
 /* Package information */
 #define PACKAGE           "${PACKAGE}"
 #define VERSION           "${VERSION}"
 #define PACKAGE_BUGREPORT "${PACKAGE_BUGREPORT}"
 #define PACKAGE_NAME      "${PACKAGE_NAME}"
 #define PACKAGE_TARNAME   "${PACKAGE_TARNAME}"
 #define PACKAGE_VERSION   "${PACKAGE_VERSION}"
 #define PACKAGE_STRING    "${PACKAGE_STRING}"
 /* Installation details */
 #define TASK_RCDIR "${CMAKE_INSTALL_PREFIX}/${TASK_DOCDIR}/rc"
 /* Localization */
 #define PACKAGE_LANGUAGE  1
 #define LANGUAGE_EN_US 1
 /*
 Override PACKAGE_LANGUAGE, then
 #define LANGUAGE_XX_YY 2
 */
 /* git information */
 #cmakedefine HAVE_COMMIT
 /* cmake information */
 #cmakedefine HAVE_CMAKE
 #define CMAKE_VERSION "${CMAKE_VERSION}"
 /* Compiling platform */
 #cmakedefine LINUX
 #cmakedefine DARWIN
 #cmakedefine CYGWIN
 #cmakedefine FREEBSD
 #cmakedefine OPENBSD
 #cmakedefine HAIKU
 #cmakedefine SOLARIS
 #cmakedefine WIN32
 #cmakedefine UNKNOWN
 /* Found the lua library */
 #cmakedefine HAVE_LIBLUA
 /* 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 the uuid library */
 #cmakedefine HAVE_UUID
 #cmakedefine HAVE_UUID_UNPARSE_LOWER
 /* Undefine this to eliminate the execute command */
 #define HAVE_EXECUTE 1
--- a/commit.h.in
+++ b/commit.h.in
@@ -0,0 +1,5 @@
 /* commit.h.in. Creates commit.h during a cmake run */
 #define L10N                                           // Localization complete.
 /* git information */
 #define COMMIT "${COMMIT}"
--- a/configure.ac
+++ b/configure.ac
@@ -1,201 +0,0 @@
 #                                               -*- Autoconf -*-
 # Process this file with autoconf to produce a configure script.
 AC_PREREQ(2.61)
 AC_INIT(task, 1.9.2, support@taskwarrior.org)
 # Source type.
 AC_PROG_CXX
 AC_PROG_CC
 AC_LANG(C++)
 # Local copies for modification and later AC_SUBST.
 CFLAGS="${CFLAGS=}"
 CXXFLAGS="${CXXFLAGS=}"
 # this macro is used to get the arguments supplied
 # to the configure script (./configure --enable-debug)
 # Check if we have enable debug support.
 AC_MSG_CHECKING(whether to enable debugging)
 debug_default="no"
 AC_ARG_ENABLE(debug, [  --enable-debug=[no/yes] turn on debugging
                       [default=$debug_default]],, enable_debug=$debug_default)
 if test "x$enable_debug" = "xyes"; then
  CFLAGS="$CFLAGS -Wall -pedantic -ggdb3 -DDEBUG"
  CXXFLAGS="$CXXFLAGS -Wall -pedantic -ggdb3 -DDEBUG"
  AC_MSG_RESULT(yes)
 else
  CFLAGS="$CFLAGS -Wall -pedantic -O3"
  CXXFLAGS="$CXXFLAGS -Wall -pedantic -O3"
  AC_MSG_RESULT(no)
 fi
 # Check for OS.
 OS=`uname|sed -e 'y/ABCDEFGHIJKLMNOPQRSTUVWXYZ/abcdefghijklmnopqrstuvwxyz/'|cut -c 1-5`
 if test "$OS" = "sunos"; then
  AC_MSG_NOTICE([OS Solaris detected])
  AC_DEFINE([SOLARIS], [], [Compiling on Solaris])
 elif test "$OS" = "darwi"; then
  AC_MSG_NOTICE([OS Darwin detected])
  AC_DEFINE([DARWIN], [], [Compiling on Darwin])
 elif test "$OS" = "cygwi"; then
  AC_MSG_NOTICE([OS Cygwin detected])
  AC_DEFINE([CYGWIN], [], [Compiling on Cygwin])
 elif test "$OS" = "openb"; then
  AC_MSG_NOTICE([OS OpenBSD detected])
  AC_DEFINE([OPENBSD], [], [Compiling on OpenBSD])
 elif test "$OS" = "haiku"; then
  AC_MSG_NOTICE([OS Haiku detected])
  AC_DEFINE([HAIKU], [], [Compiling on Haiku])
 elif test "$OS" = "freeb"; then
  AC_MSG_NOTICE([OS FreeBSD detected])
  AC_DEFINE([FREEBSD], [], [Compiling on FreeBSD])
 elif test "$OS" = "linux"; then
  AC_MSG_NOTICE([OS Linux detected])
  AC_DEFINE([LINUX], [], [Compiling on Linux])
 else
  AC_MSG_NOTICE([OS not detected])
  AC_DEFINE([UNKNOWN], [], [Compiling on Unknown])
 fi
 # ncurses enabled by default.
 AC_ARG_WITH([ncurses],
            [AS_HELP_STRING([--without-ncurses], [disable support for ncurses])],
            [with_ncurses=no],
            [with_ncurses=yes])
 AC_ARG_WITH([ncurses-inc],
            [AS_HELP_STRING ([--with-ncurses-inc=DIR], [ncurses include files are in DIR])],
            [ncurses_inc=$withval],
            [ncurses_inc=''])
 AC_ARG_WITH([ncurses-lib],
            [AS_HELP_STRING ([--with-ncurses-lib=DIR], [ncurses lib files are in DIR])],
            [ncurses_lib=$withval],
            [ncurses_lib=''])
 if test "x$with_ncurses" = "xyes" ; then
  AC_DEFINE([HAVE_LIBNCURSES], [1], [Defined if you have libncurses])
  if test -n "$ncurses_inc"; then
    CFLAGS="$CFLAGS -I$ncurses_inc"
    CXXFLAGS="$CXXFLAGS -I$ncurses_inc"
  fi
  if test -n "$ncurses_lib"; then
    LDFLAGS="$LDFLAGS -L$ncurses_lib"
  fi
  AC_CHECK_LIB([ncurses],[main])
 fi
 # Readline enabled by default.
 #AC_ARG_WITH([readline],
 #            [AS_HELP_STRING([--without-readline], [disable support for readline])],
 #            [with_readline=no],
 #            [with_readline=yes])
 #
 #AC_ARG_WITH([readline-inc],
 #            [AS_HELP_STRING ([--with-readline-inc=DIR], [readline include files are in DIR])],
 #            [readline_inc=$withval],
 #            [readline_inc=''])
 #
 #AC_ARG_WITH([readline-lib],
 #            [AS_HELP_STRING ([--with-readline-lib=DIR], [readline lib files are in DIR])],
 #            [readline_lib=$withval],
 #            [readline_lib=''])
 #
 #if test "x$with_readline" = "xyes" ; then
 #  AC_DEFINE([HAVE_LIBREADLINE], [1], [Defined if you have libreadline])
 #  if test -n "$readline_inc"; then
 #    CFLAGS="$CFLAGS -I$readline_inc"
 #    CXXFLAGS="$CXXFLAGS -I$readline_inc"
 #  fi
 #
 #  if test -n "$readline_lib"; then
 #    LDFLAGS="$LDFLAGS -L$readline_lib"
 #  fi
 #
 #  AC_CHECK_LIB([readline],[main])
 #fi
 # Lua disabled by default.
 AC_ARG_WITH([lua],
            [AS_HELP_STRING([--with-lua], [enable support for lua])],
            [with_lua=yes],
            [with_lua=no])
 AC_ARG_WITH([lua-inc],
            [AS_HELP_STRING ([--with-lua-inc=DIR], [lua include files are in DIR])],
            [lua_inc=$withval],
            [lua_inc=''])
 AC_ARG_WITH([lua-lib],
            [AS_HELP_STRING ([--with-lua-lib=DIR], [lua lib files are in DIR])],
            [lua_lib=$withval],
            [lua_lib=''])
 if test "x$with_lua" = "xyes" ; then
  AC_DEFINE([HAVE_LIBLUA], [1], [Defined if you have liblua])
  if test -n "$lua_inc"; then
    CFLAGS="$CFLAGS -I$lua_inc"
    CXXFLAGS="$CXXFLAGS -I$lua_inc"
  fi
  if test -n "$lua_lib"; then
    LDFLAGS="$LDFLAGS -L$lua_lib"
  fi
  AC_CHECK_LIB([lua],[main])
 fi
 # Allow the changes above to take effect.
 AC_SUBST(CFLAGS)
 AC_SUBST(CXXFLAGS)
 AC_SUBST(LDFLAGS)
 # Now the smaller details.
 AM_INIT_AUTOMAKE
 AC_CONFIG_SRCDIR([src/main.cpp])
 AC_CONFIG_HEADER([auto.h])
 # Checks for header files.
 AC_HEADER_STDC
 AC_CHECK_HEADERS([stdlib.h sys/file.h sys/stat.h sys/time.h unistd.h])
 AC_CHECK_HEADERS([sstream string vector map])
 # Checks for typedefs, structures, and compiler characteristics.
 AC_HEADER_STDBOOL
 AC_C_CONST
 AC_TYPE_PID_T
 AC_TYPE_SIZE_T
 AC_HEADER_TIME
 AC_STRUCT_TM
 # Checks for library functions.
 AC_FUNC_MKTIME
 AC_FUNC_SELECT_ARGTYPES
 AC_CHECK_FUNCS([select])
 AC_CHECK_FUNC(uuid_unparse_lower, [AC_DEFINE([HAVE_UUID], [1], [Found uuid_unparse_lower])])
 AC_CHECK_FUNC(random, [AC_DEFINE([HAVE_RANDOM], [1], [Found random])])
 AC_CHECK_FUNC(srandom, [AC_DEFINE([HAVE_SRANDOM], [1], [Found srandom])])
 # Generate the Makefiles.
 AC_CONFIG_FILES([Makefile src/Makefile])
 AC_OUTPUT
 # End.
--- a/584
+++ b/584
@@ -1,584 +0,0 @@
 #! /bin/sh
 # depcomp - compile a program generating dependencies as side-effects
 scriptversion=2006-10-15.18
 # Copyright (C) 1999, 2000, 2003, 2004, 2005, 2006 Free Software
 # Foundation, Inc.
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
 # the Free Software Foundation; either version 2, or (at your option)
 # any later version.
 # This program is distributed in the hope that it will be useful,
 # but WITHOUT ANY WARRANTY; without even the implied warranty of
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 # GNU General Public License for more details.
 # You should have received a copy of the GNU General Public License
 # along with this program; if not, write to the Free Software
 # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
 # 02110-1301, USA.
 # As a special exception to the GNU General Public License, if you
 # distribute this file as part of a program that contains a
 # configuration script generated by Autoconf, you may include it under
 # the same distribution terms that you use for the rest of that program.
 # Originally written by Alexandre Oliva <oliva@dcc.unicamp.br>.
 case $1 in
  '')
     echo "$0: No command.  Try \`$0 --help' for more information." 1>&2
     exit 1;
     ;;
  -h | --h*)
    cat <<\EOF
 Usage: depcomp [--help] [--version] PROGRAM [ARGS]
 Run PROGRAMS ARGS to compile a file, generating dependencies
 as side-effects.
 Environment variables:
  depmode     Dependency tracking mode.
  source      Source file read by `PROGRAMS ARGS'.
  object      Object file output by `PROGRAMS ARGS'.
  DEPDIR      directory where to store dependencies.
  depfile     Dependency file to output.
  tmpdepfile  Temporary file to use when outputing dependencies.
  libtool     Whether libtool is used (yes/no).
 Report bugs to <bug-automake@gnu.org>.
 EOF
    exit $?
    ;;
  -v | --v*)
    echo "depcomp $scriptversion"
    exit $?
    ;;
 esac
 if test -z "$depmode" || test -z "$source" || test -z "$object"; then
  echo "depcomp: Variables source, object and depmode must be set" 1>&2
  exit 1
 fi
 # Dependencies for sub/bar.o or sub/bar.obj go into sub/.deps/bar.Po.
 depfile=${depfile-`echo "$object" |
  sed 's|[^\\/]*$|'${DEPDIR-.deps}'/&|;s|\.\([^.]*\)$|.P\1|;s|Pobj$|Po|'`}
 tmpdepfile=${tmpdepfile-`echo "$depfile" | sed 's/\.\([^.]*\)$/.T\1/'`}
 rm -f "$tmpdepfile"
 # Some modes work just like other modes, but use different flags.  We
 # parameterize here, but still list the modes in the big case below,
 # to make depend.m4 easier to write.  Note that we *cannot* use a case
 # here, because this file can only contain one case statement.
 if test "$depmode" = hp; then
  # HP compiler uses -M and no extra arg.
  gccflag=-M
  depmode=gcc
 fi
 if test "$depmode" = dashXmstdout; then
   # This is just like dashmstdout with a different argument.
   dashmflag=-xM
   depmode=dashmstdout
 fi
 case "$depmode" in
 gcc3)
 ## gcc 3 implements dependency tracking that does exactly what
 ## we want.  Yay!  Note: for some reason libtool 1.4 doesn't like
 ## it if -MD -MP comes after the -MF stuff.  Hmm.
 ## Unfortunately, FreeBSD c89 acceptance of flags depends upon
 ## the command line argument order; so add the flags where they
 ## appear in depend2.am.  Note that the slowdown incurred here
 ## affects only configure: in makefiles, %FASTDEP% shortcuts this.
  for arg
  do
    case $arg in
    -c) set fnord "$@" -MT "$object" -MD -MP -MF "$tmpdepfile" "$arg" ;;
    *)  set fnord "$@" "$arg" ;;
    esac
    shift # fnord
    shift # $arg
  done
  "$@"
  stat=$?
  if test $stat -eq 0; then :
  else
    rm -f "$tmpdepfile"
    exit $stat
  fi
  mv "$tmpdepfile" "$depfile"
  ;;
 gcc)
 ## There are various ways to get dependency output from gcc.  Here's
 ## why we pick this rather obscure method:
 ## - Don't want to use -MD because we'd like the dependencies to end
 ##   up in a subdir.  Having to rename by hand is ugly.
 ##   (We might end up doing this anyway to support other compilers.)
 ## - The DEPENDENCIES_OUTPUT environment variable makes gcc act like
 ##   -MM, not -M (despite what the docs say).
 ## - Using -M directly means running the compiler twice (even worse
 ##   than renaming).
  if test -z "$gccflag"; then
    gccflag=-MD,
  fi
  "$@" -Wp,"$gccflag$tmpdepfile"
  stat=$?
  if test $stat -eq 0; then :
  else
    rm -f "$tmpdepfile"
    exit $stat
  fi
  rm -f "$depfile"
  echo "$object : \\" > "$depfile"
  alpha=ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz
 ## The second -e expression handles DOS-style file names with drive letters.
  sed -e 's/^[^:]*: / /' \
      -e 's/^['$alpha']:\/[^:]*: / /' < "$tmpdepfile" >> "$depfile"
 ## This next piece of magic avoids the `deleted header file' problem.
 ## The problem is that when a header file which appears in a .P file
 ## is deleted, the dependency causes make to die (because there is
 ## typically no way to rebuild the header).  We avoid this by adding
 ## dummy dependencies for each header file.  Too bad gcc doesn't do
 ## this for us directly.
  tr ' ' '
 ' < "$tmpdepfile" |
 ## Some versions of gcc put a space before the `:'.  On the theory
 ## that the space means something, we add a space to the output as
 ## well.
 ## Some versions of the HPUX 10.20 sed can't process this invocation
 ## correctly.  Breaking it into two sed invocations is a workaround.
    sed -e 's/^\\$//' -e '/^$/d' -e '/:$/d' | sed -e 's/$/ :/' >> "$depfile"
  rm -f "$tmpdepfile"
  ;;
 hp)
  # This case exists only to let depend.m4 do its work.  It works by
  # looking at the text of this script.  This case will never be run,
  # since it is checked for above.
  exit 1
  ;;
 sgi)
  if test "$libtool" = yes; then
    "$@" "-Wp,-MDupdate,$tmpdepfile"
  else
    "$@" -MDupdate "$tmpdepfile"
  fi
  stat=$?
  if test $stat -eq 0; then :
  else
    rm -f "$tmpdepfile"
    exit $stat
  fi
  rm -f "$depfile"
  if test -f "$tmpdepfile"; then  # yes, the sourcefile depend on other files
    echo "$object : \\" > "$depfile"
    # Clip off the initial element (the dependent).  Don't try to be
    # clever and replace this with sed code, as IRIX sed won't handle
    # lines with more than a fixed number of characters (4096 in
    # IRIX 6.2 sed, 8192 in IRIX 6.5).  We also remove comment lines;
    # the IRIX cc adds comments like `#:fec' to the end of the
    # dependency line.
    tr ' ' '
 ' < "$tmpdepfile" \
    | sed -e 's/^.*\.o://' -e 's/#.*$//' -e '/^$/ d' | \
    tr '
 ' ' ' >> $depfile
    echo >> $depfile
    # The second pass generates a dummy entry for each header file.
    tr ' ' '
 ' < "$tmpdepfile" \
   | sed -e 's/^.*\.o://' -e 's/#.*$//' -e '/^$/ d' -e 's/$/:/' \
   >> $depfile
  else
    # The sourcefile does not contain any dependencies, so just
    # store a dummy comment line, to avoid errors with the Makefile
    # "include basename.Plo" scheme.
    echo "#dummy" > "$depfile"
  fi
  rm -f "$tmpdepfile"
  ;;
 aix)
  # The C for AIX Compiler uses -M and outputs the dependencies
  # in a .u file.  In older versions, this file always lives in the
  # current directory.  Also, the AIX compiler puts `$object:' at the
  # start of each line; $object doesn't have directory information.
  # Version 6 uses the directory in both cases.
  stripped=`echo "$object" | sed 's/\(.*\)\..*$/\1/'`
  tmpdepfile="$stripped.u"
  if test "$libtool" = yes; then
    "$@" -Wc,-M
  else
    "$@" -M
  fi
  stat=$?
  if test -f "$tmpdepfile"; then :
  else
    stripped=`echo "$stripped" | sed 's,^.*/,,'`
    tmpdepfile="$stripped.u"
  fi
  if test $stat -eq 0; then :
  else
    rm -f "$tmpdepfile"
    exit $stat
  fi
  if test -f "$tmpdepfile"; then
    outname="$stripped.o"
    # Each line is of the form `foo.o: dependent.h'.
    # Do two passes, one to just change these to
    # `$object: dependent.h' and one to simply `dependent.h:'.
    sed -e "s,^$outname:,$object :," < "$tmpdepfile" > "$depfile"
    sed -e "s,^$outname: \(.*\)$,\1:," < "$tmpdepfile" >> "$depfile"
  else
    # The sourcefile does not contain any dependencies, so just
    # store a dummy comment line, to avoid errors with the Makefile
    # "include basename.Plo" scheme.
    echo "#dummy" > "$depfile"
  fi
  rm -f "$tmpdepfile"
  ;;
 icc)
  # Intel's C compiler understands `-MD -MF file'.  However on
  #    icc -MD -MF foo.d -c -o sub/foo.o sub/foo.c
  # ICC 7.0 will fill foo.d with something like
  #    foo.o: sub/foo.c
  #    foo.o: sub/foo.h
  # which is wrong.  We want:
  #    sub/foo.o: sub/foo.c
  #    sub/foo.o: sub/foo.h
  #    sub/foo.c:
  #    sub/foo.h:
  # ICC 7.1 will output
  #    foo.o: sub/foo.c sub/foo.h
  # and will wrap long lines using \ :
  #    foo.o: sub/foo.c ... \
  #     sub/foo.h ... \
  #     ...
  "$@" -MD -MF "$tmpdepfile"
  stat=$?
  if test $stat -eq 0; then :
  else
    rm -f "$tmpdepfile"
    exit $stat
  fi
  rm -f "$depfile"
  # Each line is of the form `foo.o: dependent.h',
  # or `foo.o: dep1.h dep2.h \', or ` dep3.h dep4.h \'.
  # Do two passes, one to just change these to
  # `$object: dependent.h' and one to simply `dependent.h:'.
  sed "s,^[^:]*:,$object :," < "$tmpdepfile" > "$depfile"
  # Some versions of the HPUX 10.20 sed can't process this invocation
  # correctly.  Breaking it into two sed invocations is a workaround.
  sed 's,^[^:]*: \(.*\)$,\1,;s/^\\$//;/^$/d;/:$/d' < "$tmpdepfile" |
    sed -e 's/$/ :/' >> "$depfile"
  rm -f "$tmpdepfile"
  ;;
 hp2)
  # The "hp" stanza above does not work with aCC (C++) and HP's ia64
  # compilers, which have integrated preprocessors.  The correct option
  # to use with these is +Maked; it writes dependencies to a file named
  # 'foo.d', which lands next to the object file, wherever that
  # happens to be.
  # Much of this is similar to the tru64 case; see comments there.
  dir=`echo "$object" | sed -e 's|/[^/]*$|/|'`
  test "x$dir" = "x$object" && dir=
  base=`echo "$object" | sed -e 's|^.*/||' -e 's/\.o$//' -e 's/\.lo$//'`
  if test "$libtool" = yes; then
    tmpdepfile1=$dir$base.d
    tmpdepfile2=$dir.libs/$base.d
    "$@" -Wc,+Maked
  else
    tmpdepfile1=$dir$base.d
    tmpdepfile2=$dir$base.d
    "$@" +Maked
  fi
  stat=$?
  if test $stat -eq 0; then :
  else
     rm -f "$tmpdepfile1" "$tmpdepfile2"
     exit $stat
  fi
  for tmpdepfile in "$tmpdepfile1" "$tmpdepfile2"
  do
    test -f "$tmpdepfile" && break
  done
  if test -f "$tmpdepfile"; then
    sed -e "s,^.*\.[a-z]*:,$object:," "$tmpdepfile" > "$depfile"
    # Add `dependent.h:' lines.
    sed -ne '2,${; s/^ *//; s/ \\*$//; s/$/:/; p;}' "$tmpdepfile" >> "$depfile"
  else
    echo "#dummy" > "$depfile"
  fi
  rm -f "$tmpdepfile" "$tmpdepfile2"
  ;;
 tru64)
   # The Tru64 compiler uses -MD to generate dependencies as a side
   # effect.  `cc -MD -o foo.o ...' puts the dependencies into `foo.o.d'.
   # At least on Alpha/Redhat 6.1, Compaq CCC V6.2-504 seems to put
   # dependencies in `foo.d' instead, so we check for that too.
   # Subdirectories are respected.
   dir=`echo "$object" | sed -e 's|/[^/]*$|/|'`
   test "x$dir" = "x$object" && dir=
   base=`echo "$object" | sed -e 's|^.*/||' -e 's/\.o$//' -e 's/\.lo$//'`
   if test "$libtool" = yes; then
      # With Tru64 cc, shared objects can also be used to make a
      # static library.  This mechanism is used in libtool 1.4 series to
      # handle both shared and static libraries in a single compilation.
      # With libtool 1.4, dependencies were output in $dir.libs/$base.lo.d.
      #
      # With libtool 1.5 this exception was removed, and libtool now
      # generates 2 separate objects for the 2 libraries.  These two
      # compilations output dependencies in $dir.libs/$base.o.d and
      # in $dir$base.o.d.  We have to check for both files, because
      # one of the two compilations can be disabled.  We should prefer
      # $dir$base.o.d over $dir.libs/$base.o.d because the latter is
      # automatically cleaned when .libs/ is deleted, while ignoring
      # the former would cause a distcleancheck panic.
      tmpdepfile1=$dir.libs/$base.lo.d   # libtool 1.4
      tmpdepfile2=$dir$base.o.d          # libtool 1.5
      tmpdepfile3=$dir.libs/$base.o.d    # libtool 1.5
      tmpdepfile4=$dir.libs/$base.d      # Compaq CCC V6.2-504
      "$@" -Wc,-MD
   else
      tmpdepfile1=$dir$base.o.d
      tmpdepfile2=$dir$base.d
      tmpdepfile3=$dir$base.d
      tmpdepfile4=$dir$base.d
      "$@" -MD
   fi
   stat=$?
   if test $stat -eq 0; then :
   else
      rm -f "$tmpdepfile1" "$tmpdepfile2" "$tmpdepfile3" "$tmpdepfile4"
      exit $stat
   fi
   for tmpdepfile in "$tmpdepfile1" "$tmpdepfile2" "$tmpdepfile3" "$tmpdepfile4"
   do
     test -f "$tmpdepfile" && break
   done
   if test -f "$tmpdepfile"; then
      sed -e "s,^.*\.[a-z]*:,$object:," < "$tmpdepfile" > "$depfile"
      # That's a tab and a space in the [].
      sed -e 's,^.*\.[a-z]*:[	 ]*,,' -e 's,$,:,' < "$tmpdepfile" >> "$depfile"
   else
      echo "#dummy" > "$depfile"
   fi
   rm -f "$tmpdepfile"
   ;;
 #nosideeffect)
  # This comment above is used by automake to tell side-effect
  # dependency tracking mechanisms from slower ones.
 dashmstdout)
  # Important note: in order to support this mode, a compiler *must*
  # always write the preprocessed file to stdout, regardless of -o.
  "$@" || exit $?
  # Remove the call to Libtool.
  if test "$libtool" = yes; then
    while test $1 != '--mode=compile'; do
      shift
    done
    shift
  fi
  # Remove `-o $object'.
  IFS=" "
  for arg
  do
    case $arg in
    -o)
      shift
      ;;
    $object)
      shift
      ;;
    *)
      set fnord "$@" "$arg"
      shift # fnord
      shift # $arg
      ;;
    esac
  done
  test -z "$dashmflag" && dashmflag=-M
  # Require at least two characters before searching for `:'
  # in the target name.  This is to cope with DOS-style filenames:
  # a dependency such as `c:/foo/bar' could be seen as target `c' otherwise.
  "$@" $dashmflag |
    sed 's:^[  ]*[^: ][^:][^:]*\:[    ]*:'"$object"'\: :' > "$tmpdepfile"
  rm -f "$depfile"
  cat < "$tmpdepfile" > "$depfile"
  tr ' ' '
 ' < "$tmpdepfile" | \
 ## Some versions of the HPUX 10.20 sed can't process this invocation
 ## correctly.  Breaking it into two sed invocations is a workaround.
    sed -e 's/^\\$//' -e '/^$/d' -e '/:$/d' | sed -e 's/$/ :/' >> "$depfile"
  rm -f "$tmpdepfile"
  ;;
 dashXmstdout)
  # This case only exists to satisfy depend.m4.  It is never actually
  # run, as this mode is specially recognized in the preamble.
  exit 1
  ;;
 makedepend)
  "$@" || exit $?
  # Remove any Libtool call
  if test "$libtool" = yes; then
    while test $1 != '--mode=compile'; do
      shift
    done
    shift
  fi
  # X makedepend
  shift
  cleared=no
  for arg in "$@"; do
    case $cleared in
    no)
      set ""; shift
      cleared=yes ;;
    esac
    case "$arg" in
    -D*|-I*)
      set fnord "$@" "$arg"; shift ;;
    # Strip any option that makedepend may not understand.  Remove
    # the object too, otherwise makedepend will parse it as a source file.
    -*|$object)
      ;;
    *)
      set fnord "$@" "$arg"; shift ;;
    esac
  done
  obj_suffix="`echo $object | sed 's/^.*\././'`"
  touch "$tmpdepfile"
  ${MAKEDEPEND-makedepend} -o"$obj_suffix" -f"$tmpdepfile" "$@"
  rm -f "$depfile"
  cat < "$tmpdepfile" > "$depfile"
  sed '1,2d' "$tmpdepfile" | tr ' ' '
 ' | \
 ## Some versions of the HPUX 10.20 sed can't process this invocation
 ## correctly.  Breaking it into two sed invocations is a workaround.
    sed -e 's/^\\$//' -e '/^$/d' -e '/:$/d' | sed -e 's/$/ :/' >> "$depfile"
  rm -f "$tmpdepfile" "$tmpdepfile".bak
  ;;
 cpp)
  # Important note: in order to support this mode, a compiler *must*
  # always write the preprocessed file to stdout.
  "$@" || exit $?
  # Remove the call to Libtool.
  if test "$libtool" = yes; then
    while test $1 != '--mode=compile'; do
      shift
    done
    shift
  fi
  # Remove `-o $object'.
  IFS=" "
  for arg
  do
    case $arg in
    -o)
      shift
      ;;
    $object)
      shift
      ;;
    *)
      set fnord "$@" "$arg"
      shift # fnord
      shift # $arg
      ;;
    esac
  done
  "$@" -E |
    sed -n -e '/^# [0-9][0-9]* "\([^"]*\)".*/ s:: \1 \\:p' \
       -e '/^#line [0-9][0-9]* "\([^"]*\)".*/ s:: \1 \\:p' |
    sed '$ s: \\$::' > "$tmpdepfile"
  rm -f "$depfile"
  echo "$object : \\" > "$depfile"
  cat < "$tmpdepfile" >> "$depfile"
  sed < "$tmpdepfile" '/^$/d;s/^ //;s/ \\$//;s/$/ :/' >> "$depfile"
  rm -f "$tmpdepfile"
  ;;
 msvisualcpp)
  # Important note: in order to support this mode, a compiler *must*
  # always write the preprocessed file to stdout, regardless of -o,
  # because we must use -o when running libtool.
  "$@" || exit $?
  IFS=" "
  for arg
  do
    case "$arg" in
    "-Gm"|"/Gm"|"-Gi"|"/Gi"|"-ZI"|"/ZI")
 	set fnord "$@"
 	shift
 	shift
 	;;
    *)
 	set fnord "$@" "$arg"
 	shift
 	shift
 	;;
    esac
  done
  "$@" -E |
  sed -n '/^#line [0-9][0-9]* "\([^"]*\)"/ s::echo "`cygpath -u \\"\1\\"`":p' | sort | uniq > "$tmpdepfile"
  rm -f "$depfile"
  echo "$object : \\" > "$depfile"
  . "$tmpdepfile" | sed 's% %\\ %g' | sed -n '/^\(.*\)$/ s::	\1 \\:p' >> "$depfile"
  echo "	" >> "$depfile"
  . "$tmpdepfile" | sed 's% %\\ %g' | sed -n '/^\(.*\)$/ s::\1\::p' >> "$depfile"
  rm -f "$tmpdepfile"
  ;;
 none)
  exec "$@"
  ;;
 *)
  echo "Unknown depmode $depmode" 1>&2
  exit 1
  ;;
 esac
 exit 0
 # Local Variables:
 # mode: shell-script
 # sh-indentation: 2
 # eval: (add-hook 'write-file-hooks 'time-stamp)
 # time-stamp-start: "scriptversion="
 # time-stamp-format: "%:y-%02m-%02d.%02H"
 # time-stamp-end: "$"
 # End:
--- a/doc/CMakeLists.txt
+++ b/doc/CMakeLists.txt
@@ -0,0 +1,16 @@
 cmake_minimum_required (VERSION 2.8)
 message ("-- Configuring man pages")
 set (man_FILES task-color.5 task-faq.5 task-sync.5 task-tutorial.5 task.1 taskrc.5)
 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}
                                                      FILES_MATCHING PATTERN "*.1")
 install (DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/man/   DESTINATION ${TASK_MAN5DIR}
                                                      FILES_MATCHING PATTERN "*.5")
 install (DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/rc     DESTINATION ${TASK_DOCDIR})
 install (FILES ${CMAKE_CURRENT_SOURCE_DIR}/ref/task-ref.pdf DESTINATION ${TASK_DOCDIR})
--- a/doc/man/.gitignore
+++ b/doc/man/.gitignore
@@ -0,0 +1,6 @@
 task-color.5
 task-faq.5
 task-sync.5
 task-tutorial.5
 task.1
 taskrc.5
--- a/doc/man/task-color.5.in
+++ b/doc/man/task-color.5.in
@@ -1,7 +1,7 @@
-.TH task-color 5 2010-05-22 "task 1.9.2" "User Manuals"
+.TH task-color 5 2012-03-17 "${PACKAGE_STRING}" "User Manuals"
 .SH NAME
-task-color \- A color tutorial for the task(1) command line todo manager.
+task-color \- A color tutorial for the taskwarrior command line todo manager.
 .SH SETUP
 The first thing you need is a terminal program that supports color.  All
@@ -18,8 +18,8 @@ which shell you use).  If this is a new setting, you will need to either run
 that profile script, or close and reopen the terminal window (which does the
 same thing).
-Now tell task that you want to use color.  This is the default for task, so
+Now tell taskwarrior that you want to use color.  This is the default for
-the following step may be unnecessary.
+taskwarrior, so the following step may be unnecessary.
    $ task config color on
@@ -28,27 +28,27 @@ like:
    color=on
-Now task is ready.
+Now taskwarrior is ready.
 .SH AUTOMATIC MONOCHROME
-It should be mentioned that task is aware of whether it's output is going to a
+It should be mentioned that taskwarrior is aware of whether its output is going
-terminal, or to a file or through a pipe.  When task output goes to a terminal,
+to a terminal, or to a file or through a pipe.  When taskwarrior output goes to
-color is desirable, but consider the following command:
+a terminal, color is desirable, but consider the following command:
    $ task list > file.txt
-Do we really want all those color control codes in the file?  Task assumes that
+Do we really want all those color control codes in the file?  Taskwarrior
-you do not, and temporarily sets color to 'off' while generating the output.
+assumes that you do not, and temporarily sets color to 'off' while generating
-This explains the output from the following command:
+the output.  This explains the output from the following command:
-    $ task config | grep '^color '
+    $ task show | grep '^color '
    color                        off
-it always returns 'off', no matter what the setting.
+it always returns 'off', no matter what the setting, because the output is being
 sent to a pipe.
-The reason is that the task output gets piped into grep, and the color is
+If you wanted those color codes, you can override this behavior by setting the
-disabled.  If you wanted those color codes, you can override this behavior by
+_forcecolor variable to on, like this:
 setting the _forcecolor variable to on, like this:
    $ task config _forcecolor on
    $ task config | grep '^color '
@@ -60,7 +60,7 @@ or by temporarily overriding it like this:
    color                        on
 .SH AVAILABLE COLORS
-Task has a 'color' command that will show all the colors it is capable of
+Taskwarrior has a 'color' command that will show all the colors it is capable of
 displaying.  Try this:
    $ task color
@@ -106,7 +106,12 @@ There is an additional 'underline' attribute that may be used:
    underline bright red on black
-Task has a command that helps you visualize these color combinations.  Try this:
+And an 'inverse' attribute:
    inverse red
 Taskwarrior has a command that helps you visualize these color combinations.
 Try this:
    $ task color underline bright red on black
@@ -116,7 +121,7 @@ the sample requested.
 Some combinations look very nice, some look terrible.  Different terminal
 programs do implement slightly different versions of 'red', for example, so you
-may see some unwanted variation due to the program.  The brightness of your
+may see some unexpected variation across machines.  The brightness of your
 display is also a factor.
 .SH 256-COLOR SUPPORT
@@ -187,16 +192,25 @@ combination:
    red on gray3
-you are mixing a 16-color and 256-color specification.  Task will map red to
+you are mixing a 16-color and 256-color specification.  Taskwarrior will map red
-color1, and proceed.  Note that red and color1 are not quite the same.
+to color1, and proceed.  Note that red and color1 are not quite the same tone.
 Note also that there is no bold or bright attributes when dealing with 256
 colors, but there is still underline available.
 .SH LEGEND
 Taskwarrior will show examples of all defined colors used in your .taskrc, or
 theme, if you run this command:
    $ task color legend
 This gives you an example of each of the colors, so you can see the effect,
 without necessarily creating a set of tasks that meet each of the rule criteria.
 .SH RULES
-Task supports colorization rules.  These are configuration values that specify
+Taskwarrior supports colorization rules.  These are configuration values that
-a color, and the conditions under which that color is used.  By example, let's
+specify a color, and the conditions under which that color is used.  By example,
-add a few tasks:
+let us add a few tasks:
    $ task add project:Home priority:H pay the bills               (1)
    $ task add project:Home            clean the rug               (2)
@@ -205,13 +219,13 @@ add a few tasks:
 We can add a color rule that uses a blue background for all tasks in the Home
 project:
-    $ task config color.project.Home on blue
+    $ task config color.project.Home 'on blue'
-We use quotes around "on blue" because there are two words, but they represent
+We use quotes around 'on blue' because there are two words, but they represent
-one value in the .taskrc file.  Now suppose we which to use a bold yellow text
+one value in the .taskrc file.  Now suppose we wish to use a bold yellow text
 color for all cleaning work:
-    $ task config color.keyword.clean bold yellow
+    $ task config color.keyword.clean 'bold yellow'
 Now what happens to task 2, which belongs to project Home (blue background), and
 is also a cleaning task (bold yellow foreground)?  The colors are combined, and
@@ -226,56 +240,83 @@ It is possible to create a very colorful mix of rules.  With 256-color support,
 those colors can be made subtle, and complementary, but without care, this can
 be a visual mess.  Beware!
 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
 These are just the color rules with the 'color.' prefix removed.  The
 rule 'color.due.today' is the highest precedence, and 'color.deleted' is the lowest.
 The keyword rule shown here as 'keyword' corresponds to a wildcard pattern,
 meaning 'color.keyword.*', or in other words all the keyword rules.  Similarly
 for the 'color.tag.*' and 'color.project.*' rules.
 There is also 'color.project.none', 'color.tag.none' and 'color.pri.none' to
 specifically represent missing data.
 .SH THEMES
-Task supports themes.  What this really means is that with the ability to
+Taskwarrior supports themes.  What this really means is that with the ability to
 include other files into the .taskrc file, different sets of color rules can
 be included.
 To get a good idea of what a color theme looks like, try adding this entry to
-your .taskrc file:
+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
 .RE
-You can use any of the standard task themes:
+You can use any of the standard taskwarrior themes:
 .RS
 light-16.theme
 .br
 light-256.theme
 .br
 dark-16.theme
 .br
 dark-256.theme
 .br
-dark-red-256.theme
+dark-blue-256.theme
 .br
 dark-gray-256.theme
 .br
 dark-green-256.theme
 .br
-dark-blue-256.theme
+dark-red-256.theme
 .br
 dark-violets-256.theme
 .br
 dark-yellow-green.theme
 .br
 light-16.theme
 .br
 light-256.theme
 .br
 solarized-dark-256.theme
 .br
 solarized-light-256.theme
 .RE
 You can also see how the theme will color the various tasks with the command:
    $ task color legend
 Better yet, create your own, and share it.  We will gladly host the theme file
 on <http://taskwarrior.org>.
 .SH "CREDITS & COPYRIGHTS"
-task was written by P. Beckingham <paul@beckingham.net>.
+Copyright (C) 2006 \- 2012 P. Beckingham, F. Hernandez.
 .br
 Copyright (C) 2006 \- 2010 P. Beckingham
-This man page was originally written by Paul Beckingham.
+Taskwarrior is distributed under the MIT license. See
-
+http://www.opensource.org/licenses/mit-license.php for more information.
 task is distributed under the GNU General Public License. See
 http://www.gnu.org/licenses/gpl-2.0.txt for more information.
 .SH SEE ALSO
 .BR task(1),
 .BR taskrc(5),
-.BR task-faq(5)
+.BR task-faq(5),
-.BR task-tutorial(5)
+.BR task-tutorial(5),
 .BR task-sync(5)
-For more information regarding task, the following may be referenced:
+For more information regarding taskwarrior, the following may be referenced:
 .TP
 The official site at
@@ -291,5 +332,5 @@ You can contact the project by writing an email to
 .SH REPORTING BUGS
 .TP
-Bugs in task may be reported to the issue-tracker at
+Bugs in taskwarrior may be reported to the issue-tracker at
 <http://taskwarrior.org>
--- a/doc/man/task-faq.5
+++ b/doc/man/task-faq.5
@@ -1,322 +0,0 @@
 .TH task-faq 5 2010-05-22 "task 1.9.2" "User Manuals"
 .SH NAME
 task-faq \- A FAQ for the task(1) command line todo manager.
 .SH DESCRIPTION
 Task is a command line TODO list manager. It maintains a list of tasks that you
 want to do, allowing you to add/remove, and otherwise manipulate them.  Task
 has a rich list of commands that allow you to do various things with it.
 .SH WELCOME
 Welcome to the task FAQ.  If you have would like to see a question answered
 here, please send us a note at <support@taskwarrior.org>.
 .TP
 .B Q: When I redirect the output of task to a file, I lose all the colors.  How do I fix this?
 A: Task knows (or thinks it knows) when the output is not going directly to a
 terminal, and strips out all the color control characters.  This is based on
 the assumption that the color control codes are not wanted in the file.  Prevent
 this with the following entry in your .taskrc file:
   _forcecolor=on
 .TP
 .B Q: How do I backup my task data files? Where are they?
 A: Task writes all pending tasks to the file
    ~/.task/pending.data
 and all completed and deleted tasks to
    ~/.task/completed.data
 They are text files, so they can just be copied to another location for
 safekeeping.  Don't forget there is also the ~/.taskrc file that contains your
 task configuration data.  To be sure, and to future-proof your backup, consider
 backing up all the files in the ~/.task directory.
 .TP
 .B Q: How can I separate my work tasks from my home tasks? Specifically, can I keep them completely separate?
 A: You can do this by creating an alternate .taskrc file, then using shell
 aliases. Here are example Bash commands to achieve this:
    % cp ~/.taskrc ~/.taskrc_home
    % (now edit .taskrc_home to change the value of data.location)
    % alias wtask="task" 
    % alias htask="task rc:~/.taskrc_home" 
 This gives you two commands, 'wtask' and 'htask' that operate using two
 different sets of task data files.
 .TP
 .B Q: Can I revert to a previous version of task? How?
 A: Yes, you can revert to a previous version of task, simply by downloading an
 older version and installing it. If you find a bug in task, then this may be the
 only way to work around the bug, until a patch release is made.
 Note that it is possible that the task file format will change. For example, the
 format changed between versions 1.5.0 and 1.6.0. Task will automatically upgrade
 the file but if you need to revert to a previous version of task, there is the
 file format to consider. This is yet another good reason to back up your task
 data files!
 .TP
 .B Q: I'm using Ubuntu 9.04, and I want task to word-wrap descriptions. How do I do this?
 A: You need to install ncurses, by doing this:
    % sudo apt-get install libncurses5-dev
 Then you need to rebuild task from scratch, starting with
    % cd task-X.X.X
    % ./configure
    ...
 The result should be a task program that knows the width of the terminal window,
 and wraps accordingly.
 Note that there are binary packages that all include this capability.
 .TP
 .B Q: How do I build task under Cygwin?
 A: Task is built the same way everywhere. But under Cygwin, you'll need to make
 sure you have the following packages available first:
    gcc
    make
    libncurses-devel
    libncurses8
 The gcc and make packages allow you to compile the code, and are therefore
 required, but the ncurses packages are optional. Ncurses will allow task to
 determine the width of the window, and therefore use the whole width and wrap
 text accordingly, for a more aesthetically pleasing display.
 Note that there are binary packages that all include this capability.
 .TP
 .B Q: Do colors work under Cygwin?
 A: They do, but only in a limited way. You can use regular foreground colors
 (black, red, green ...) and you can regular background colors (on_black, on_red,
 on_green ...), but underline and bold are not supported.
 If you run the command:
    % task colors
 Task will display all the colors it can use, and you will see which ones you can use.
 See the 'man task-color' for more details on which colors can be used.
 .TP
 .B Q: Where does task store the data?
 By default, task creates a .taskrc file in your home directory and populates it
 with defaults.  Task also creates a .task directory in your home directory and
 puts data files there.
 .TP
 .B Q: Can I edit that data?
 Of course you can.  It is a simple text file, and looks somewhat like the JSON
 format, and if you are careful not to break the format, there is no reason not
 to edit it.  But task provides a rich command set to do that manipulation for
 you, so it is probably best to leave those files alone.
 .TP
 .B Q: How do I restore my .taskrc file to defaults?
 If you delete (or rename) your .taskrc file, task will offer to create a default
 one for you.  Another way to do this is with the command:
    $ task rc:new-file version
 Task will create 'new-file' if it doesn't already exist.  Note that this is a
 good way to learn about new configuration settings, if your .taskrc file was
 created by an older version of task.
 .TP
 .B Q: Do I need to back up my task data?
 Yes.  You should back up your ~/.task directory, and probably your ~/.taskrc
 file too.
 .TP
 .B Q: Can I share my tasks between different machines?
 Yes, you can.  Most people have success with a DropBox - a free and secure file
 synching tool.  Simply configure task to store it's data in a dropbox folder, by
 modifying the:
    data.location=...
 configuration variable.  Check out DropBox at http://www.dropbox.com.
 .TP
 .B Q: The undo.data file gets very large - do I need it?
 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 task, because
 task never reads it until you want to undo.  Otherwise task only appends to the
 file.
 .TP
 .B Q: How do I know whether my terminal support 256 colors?
 You will need to make sure your TERM environment variable is set to xterm-color,
 otherwise the easiest way is to just try it!  With task 1.9 or later, you simply
 run
    $ task color
 and a full color palette is displayed.  If you see only 8 or 16 colors, perhaps
 with those colors repeated, then your terminal does not support 256 colors.
 See the task-color(5) man page for more details.
 .TP
 .B Q: How do I make use of all these colors?
 See the task-color(5) man page for an in-depth explanation of the task color
 rules.
 .TP
 .B Q: How can I make task put the command in the terminal window title?
 You cannot.  But you can make the shell do it, and you can make the shell
 call the task program.  Here is a Bash script that does this:
    #! /bin/bash
    printf "\\033]0;task $*\a"
    /usr/local/bin/task $*
 You just need to run the script, and let the script run task.  Here is a Bash
 function that does the same thing:
    t ()
    {
      printf "\\033]0;task $*\a"
      /usr/local/bin/task $*
    }
 .TP
 .B Q: Task searches in a case-sensitive fashion - can I change that?
 You can.  Just set the following value in your .taskrc file:
    search.case.sensitive=no
 This will affect searching for keywords:
    $ task list Document
 task will perform a caseless search in the description and any annotations for
 the keyword 'Document'.  It also affects description and annotation
 substitutions:
    $ task 1 /teh/the/
 The pattern on the left will now be a caseless search term.
 .TP
 .B Q: Why do the task ID numbers change?
 Task does this to always show you the smallest numbers it can.  The idea is that
 if your tasks are numbered 1 - 33, for example, those are easy to type in.  If
 instead task kept a rolling sequence number, after a while your tasks might be
 numbered 481 - 513, which makes it more likely to enter one incorrectly, because
 there are more digits.
 When you run a report (such as "list"), task assigns the numbers before it
 displays them.  For example, you can do this:
    $ task list
    $ task do 12
    $ task add Pay the rent
    $ task delete 31
 Those id numbers are then good until the next report is run.  This is because
 task performs a garbage-collect operation on the pending tasks file when a
 report is run, which moves the deleted and completed tasks from the pending.data
 file to the completed.data file.  This keeps the pending tasks file small, and
 therefore keeps task fast.  The completed data file is the one that grows
 unbounded with use, but that one isn't accessed as much, so it doesn't matter as
 much.  So in all, the ID number resequencing is about efficiency.
 .TP
 .B Q: How do I list tasks that are either priority 'H' or 'M', but not 'L'?
 Task's filters are all combined with and implicit logical AND operator, so if
 you were to try this:
    $ task list priority:H priority:M
 There would be no results, because the priority could not simultaneously be 'H'
 AND 'M'.  What is required is some way to use OR instead of an AND operator. The
 solution is to invert the filter in this way:
    $ task list priority.not:L priority.any:
 This filter states that the priority must not be 'L', AND there must be a
 priority assigned.  This filter then properly lists tasks that are 'H' or 'M',
 because the two logical restrictions are not mutually exclusive as in the
 original filter.
 Some of you may be familiar with DeMorgan's laws of formal logic that relate
 the AND and OR operators in terms of each other via negation, which can be used
 to construct task filters.
 .TP
 .B Q: How do I delete an annotation?
 Task now has a 'denotate' command to remove annotations.  First here is an
 example task:
    $ task add Original task
    $ task 1 annotate foo
    $ task 1 annotate bar
    $ task 1 annotate foo bar
 Now to delete the first annotation, use:
    $ task 1 denotate foo
 This takes the fragment 'foo' and compares it to each of the annotations. In
 this example, it will remove the first annotation, not the third, because it is
 an exact match.  If there are no exact matches, it will remove the first
 non-exact match:
    $ task 1 denotate ar
 This will remove the second annotation - the first non-exact match.
 .SH "CREDITS & COPYRIGHTS"
 task was written by P. Beckingham <paul@beckingham.net>.
 .br
 Copyright (C) 2006 \- 2010 P. Beckingham
 This man page was originally written by P. Beckingham.
 task is distributed under the GNU General Public License.  See
 http://www.gnu.org/licenses/gpl-2.0.txt for more information.
 .SH SEE ALSO
 .BR task(1),
 .BR taskrc(5),
 .BR task-tutorial(5)
 .BR task-color(5)
 For more information regarding task, the following may be referenced:
 .TP
 The official site at
 <http://taskwarrior.org>
 .TP
 The official code repository at
 <git://tasktools.org/task.git/>
 .TP
 You can contact the project by writing an email to
 <support@taskwarrior.org>
 .SH REPORTING BUGS
 .TP
 Bugs in task may be reported to the issue-tracker at
 <http://taskwarrior.org>
--- a/doc/man/task-faq.5.in
+++ b/doc/man/task-faq.5.in
@@ -0,0 +1,380 @@
 .TH task-faq 5 2012-03-17 "${PACKAGE_STRING}" "User Manuals"
 .SH NAME
 task-faq \- A FAQ for the task(1) command line todo manager.
 .SH WELCOME
 Welcome to the taskwarrior FAQ.  If you have would like to see a question answered
 here, please send us a note at <support@taskwarrior.org>.
 .TP
 .B Q: When I redirect the output to a file, I lose all the colors.  How do I fix this?
 Taskwarrior knows when the output is not going directly to a terminal, and
 strips out all the color control characters.  This is based on the assumption
 that the color control codes are not wanted in the file.  Prevent this with the
 following entry in your .taskrc file:
    _forcecolor=on
 or by temporarily overriding the value on the command line:
    task ... rc._forcecolor=on
 There is an additional problem using pagers such as 'less' and 'more', because
 color control codes are stripped.  When using less, these options will preserve
 the color codes:
    task ... | less -FrX
 There have been problems reported with the Linux 'more' pager, which inserts
 newline characters.
 .TP
 .B Q: How do I backup my taskwarrior data files?  Where are they?
 Taskwarrior writes all data to files in this location:
    ~/.task/
 You may have overridden this location with the 'data.location' configuration
 setting, in which case backup that instead.  All files in this location should
 be backed up.  Making sure all the files in this location are backed up, and not
 just a named subset will ensure that you properly backup future versions of
 taskwarrior, which will likely introduce more files in this location.
 Don't forget there is also the ~/.taskrc file that contains your taskwarrior
 configuration data.
 .TP
 .B Q: How can I separate my work tasks from my home tasks? Specifically, can I keep them completely separate?
 You can do this by creating an alternate .taskrc file, then using shell
 aliases. Here are example Bash commands to achieve this:
    % cp ~/.taskrc ~/.taskrc_home
    % (now edit .taskrc_home to change the value of data.location)
    % alias wtask="task"
    % alias htask="task rc:~/.taskrc_home"
 This gives you two commands, 'wtask' and 'htask' that operate using two
 different sets of task data files.  Bash shell functions are a good alternative.
 .TP
 .B Q: Can I revert to a previous version of taskwarrior? How?
 Yes, you can revert to a previous version of task, simply by downloading an
 older version and installing it. If you find a bug in task, then this may be the
 only way to work around the bug, until a patch release is made.
 Note that it is possible that the taskwarrior file format will change. For
 example, the format changed between versions 1.5.0 and 1.6.0. Taskwarrior will
 automatically upgrade the file but if you need to revert to a previous version
 of taskwarrior, there is the file format to consider. This is yet another good
 reason to back up your task data files!
 .TP
 .B Q: Can I have two separate versions of taskwarrior installed?  How?
 Yes, and here is one simple way to do that.  Install the older version of
 taskwarrior, and then rename the 'task' binary to something like 't194' to
 reflect the version number.  Then install the newer version, which will be
 named 'task'.  Now you have 't194' and 'task' both installed, both using the
 same configuration and data.
 Note that the older version will not be aware of any new configuration settings
 and so will complain about them in the 'show' command.  This can be ignored.
 Likewise the newer version may complain about obsolete entries in the
 configuration.
 Note also that the man pages will overwrite, which is why it is suggested that
 the older version be installed first, so that you benefit from improved
 documentation.
 .TP
 .B Q: How do I build a Darwin 32bit version of task
 The taskwarrior packages will not work on a 32-bit OSX installation on Core
 Duo hardware.  You will need to build Taskwarrior from source, and use this
 configure command:
      ./configure "CFLAGS=-m32" "CXXFLAGS=-m32" "LDFLAGS=-m32"
 See:  http://taskwarrior.org/issues/817
      http://stackoverflow.com/questions/3261909/build-32bit-on-64-bit-linux-using-a-configure-script
 .TP
 .B Q: How do I build taskwarrior under Cygwin?
 Take a look at the README.build file, where the latest information on build
 issues is kept.  Taskwarrior is built the same way everywhere. But under Cygwin,
 you'll need to make sure you have the following packages available first:
    gcc
    make
 The gcc and make packages allow you to compile the code, and are therefore
 required.
 .TP
 .B Q: Do colors work under Cygwin?
 They do, but only in a limited way. You can use regular foreground colors
 (black, red, green ...) and you can regular background colors (on_black, on_red,
 on_green ...), but underline and bold are not supported.
 If you run the command:
    % task colors
 Taskwarrior will display all the colors it can use, and you will see which ones
 you can use.
 Note that if you install the 'mintty' shell in Cygwin, then you can use 256
 colors.
 See the 'man task-color' page for more details on which colors can be used.
 .TP
 .B Q: Where does taskwarrior store the data?
 By default, taskwarrior creates a .taskrc file in your home directory and
 populates it with defaults.  Taskwarrior also creates a .task directory in your
 home directory and puts data files there.
 .TP
 .B Q: Can I edit that data?
 Of course you can.  It is a simple text file, and looks somewhat like the JSON
 format, and if you are careful not to break the format, there is no reason not
 to edit it.  But taskwarrior provides a rich command set to do that manipulation
 for you, so it is probably best to leave those files alone.
 .TP
 .B Q: How do I restore my .taskrc file to defaults?
 If you delete (or rename) your .taskrc file, taskwarrior will offer to create a
 default one for you.  Another way to do this is with the command:
    task rc:new-file version
 Taskwarrior will create 'new-file' if it doesn't already exist.  There will not
 be much in it though - taskwarrior relies heavily on default values, which can
 be seen with this command:
    task show
 This lists all the currently known settings.  If you have just created a
 new file, then this command lists only the defaults.
 Note that this is a good way to learn about new configuration settings,
 particularly if your .taskrc file was created by an older version.
 .TP
 .B Q: Do I need to back up my taskwarrior data?
 Yes you do, like all your other files.  You should back up all the files in your
 ~/.task directory, and your ~/.taskrc file too.
 .TP
 .B Q: Can I share my tasks between different machines?
 Yes, you can.  Most people have success with a DropBox - a free and secure file
 synching tool.  Simply configure taskwarrior to store it's data in a dropbox
 folder, by modifying the:
    data.location=...
 configuration variable.  Check out DropBox at http://www.dropbox.com.
 .TP
 .B Q: I don't want to use dropbox. Is there another way to synchronize my tasks?
 Of course. Especially if you want to modify tasks offline on both machines and
 synchronize them later on. For this purpose there is a 'merge' command which is
 is able to insert the modifications you made to one of your task databases into
 a second database.
 Here is a basic example of the procedure:
    task merge ssh://user@myremotehost/.task/
    task push ssh://user@myremotehost/.task/
 The first command fetches the undo.data file from the remote system, reads the
 changes made and updates the local database. When this merge command completes,
 you should copy all the local .data files to the remote system either by using
 the push command explicitly or by activating the merge.autopush feature in the 
 ~/.taskrc file. This way you ensure that both systems are fully synchronized.
 .TP
 .B Q: The undo.data file gets very large - do I need it?
 You need it if you want the undo capability, or the merge capability mentioned
 above.  But if it gets large, you can certainly truncate it to save space, just
 be careful to delete lines from the top of the file, up to and including a
 separator '---'.  The simplest way is to simply delete the undo.data file.  Note
 that it does not slow down taskwarrior, because it is never read until you want
 to undo.  Otherwise taskwarrior only appends to the file.
 It is not recommended that you delete the undo.data file.
 .TP
 .B Q: How do I know whether my terminal support 256 colors?
 You will need to make sure your TERM environment variable is set to xterm-color,
 otherwise the easiest way is to just try it!  With version 1.9 or later, you
 simply run
    task color
 and a full color palette is displayed.  If you see only 8 or 16 colors, perhaps
 with those colors repeated, then your terminal does not support 256 colors.
 See the task-color(5) man page for more details.
 .TP
 .B Q: How do I make use of all these colors?
 Use one of our provided color themes, or create your own - after all, they are
 just collections of color settings.
 See the task-color(5) man page for an in-depth explanation of the color rules.
 .TP
 .B Q: How can I make taskwarrior put the command in the terminal window title?
 Just set the following value in your .taskrc file:
    xterm.title=on
 .TP
 .B Q: Taskwarrior searches in a case-sensitive fashion - can I change that?
 You can.  Just set the following value in your .taskrc file:
    search.case.sensitive=no
 This will affect searching for keywords:
    task Document list
 taskwarrior will perform a caseless search in the description and any
 annotations for the keyword 'Document'.  It also affects description and
 annotation substitutions:
    task 1 modify /teh/the/
 The pattern on the left will now be a caseless search term.
 .TP
 .B Q: Why do the ID numbers change?
 Taskwarrior does this to always show you the smallest numbers it can.  The idea
 is that if your tasks are numbered 1 - 33, for example, those are easy to type
 in.  If instead task kept a rolling sequence number, after a while your tasks
 might be numbered 481 - 513, which makes it more likely to enter one
 incorrectly, because there are more digits.
 When you run a report (such as "list"), the numbers are assigned before display.
 For example, you can do this:
    task list
    task 12 done
    task add Pay the rent
    task 31 delete
 Those id numbers are then good until the next report is run.  This is because
 taskwarrior performs a garbage-collect operation on the pending tasks file when
 a report is run, which moves the deleted and completed tasks from the
 pending.data file to the completed.data file.  This keeps the pending tasks file
 small, and therefore keeps taskwarrior fast.  The completed data file is the one
 that grows unbounded with use, but that one isn't accessed as much, so it
 doesn't matter as much.  So in all, the ID number resequencing is about
 efficiency.
 .TP
 .B Q: How do I list tasks that are either priority 'H' or 'M', but not 'L'?
 Taskwarrior's filters are all by default combined with and implicit logical AND
 operator, so if you were to try this:
    task priority:H priority:M list
 There would be no results, because the priority could not simultaneously be 'H'
 AND 'M'.  Instead, you have a choice.  You can do this:
    task '(priority:H or priority:M)' list
 Note that the quotes are one way of escaping the ( ) characters that are
 otherwise interpreted by the shell before taskwarrior sees them.  You can also
 do this:
    task priority.not:L priority.any: list
 This filter states that the priority must not be 'L', AND there must be a
 priority assigned.  This filter then properly lists tasks that are 'H' or 'M',
 because the two logical restrictions are not mutually exclusive as in the
 original filter.
 Some of you may be familiar with DeMorgan's laws of formal logic that relate
 the AND and OR operators in terms of each other via negation, which can be used
 to construct task filters.
 .TP
 .B Q: How do I delete an annotation?
 Taskwarrior now has a 'denotate' command to remove annotations.  Here is an
 example:
    task add Original task
    task 1 annotate foo
    task 1 annotate bar
    task 1 annotate foo bar
 Now to delete the first annotation, use:
    task 1 denotate foo
 This takes the fragment 'foo' and compares it to each of the annotations. In
 this example, it will remove the first annotation, not the third, because it is
 an exact match.  If there are no exact matches, it will remove the first
 non-exact match:
    task 1 denotate ar
 This will remove the second annotation - the first non-exact match.
 .TP
 .B Q: Why Lua as an extension language?
 Lua has many positive attributes:
 - Lua is written using tight, fast, standard C
 - Lua is a breeze to integrate into any product
 - The Lua source code is beautifully written
 - Lua is a small language
 Guile, Scheme and Neko were also considered.
 .TP
 .B Q: How can I help?
 There are lots of ways.  Here are some:
 - Provide feedback on what works, what does not
 - Tell us how task does or does not fit your workflow
 - Tell people about task
 - Report bugs when you see them
 - Contribute to our Wiki
 - Suggest features
 - Write unit tests
 - Write add-on scripts, and share them
 - Fix bugs
 .SH "CREDITS & COPYRIGHTS"
 Copyright (C) 2006 \- 2012 P. Beckingham, F. Hernandez.
 Taskwarrior is distributed under the MIT license. See
 http://www.opensource.org/licenses/mit-license.php for more information.
 .SH SEE ALSO
 .BR task(1),
 .BR taskrc(5),
 .BR task-tutorial(5),
 .BR task-color(5),
 .BR task-sync(5)
 For more information regarding task, the following may be referenced:
 .TP
 The official site at
 <http://taskwarrior.org>
 .TP
 The official code repository at
 <git://tasktools.org/task.git/>
 .TP
 You can contact the project by writing an email to
 <support@taskwarrior.org>
 .SH REPORTING BUGS
 .TP
 Bugs in taskwarrior may be reported to the issue-tracker at
 <http://taskwarrior.org>
--- a/doc/man/task-sync.5.in
+++ b/doc/man/task-sync.5.in
@@ -0,0 +1,388 @@
 .TH task-sync 5 2012-03-17 "${PACKAGE_STRING}" "User Manuals"
 .SH NAME
 task-sync \- A tutorial for the 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.
 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:
 .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:
 .br
 .RS
 $ task merge ~/work/
 .RE
 This URI (~/work/) is a path name, which means the remote database is on the
 same computer.  Taskwarrior will fetch the data from the URI, and merge it with
 your local data in ~/.task.
 When complete, you will be asked whether you would like to push the combined
 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.
 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:
 .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:
 .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:
 .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):
 .br
 .RS
 ssh://[user@]host[:port]/absolute/path/to/.task/
 .br
 [user@]host:/absolute/path/to/.task/
 .RE
 In both cases paths are considered to be absolute. You can specify paths relative to the
 users home directory as follows:
 .br
 .RS
 ssh://[user@]host[:port]/.task/
 .br
 [user@]host:.task/
 .RE
 or even shorter
 .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:
 .br
 .RS
 ssh://configured-host/~[username]/.task/
 .br
 configured-host:~[username]/.task/
 .RE
 Rsync is another supported protocol that minimizes network traffic, by a clever
 algorithm that doesn't copy files that have not changed:
 .br
 .RS
 rsync://[user@]host.xz[:port]/path/to/.task/
 .RE
 Curl supports several protocols that can transfer data using HTTP, HTTPS and
 FTP:
 .br
 .RS
 http://host[:port]/path/to/.task/
 .br
 https://host[:port]/path/to/.task/
 .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.
 .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.
 Taskwarrior is distributed under the MIT license. See
 http://www.opensource.org/licenses/mit-license.php for more information.
 .SH SEE ALSO
 .BR task(1),
 .BR taskrc(5),
 .BR task-faq(5),
 .BR task-color(5),
 .BR task-tutorial(5),
 .BR ssh_config(5)
 For more information regarding task, the following may be referenced:
 .TP
 The official site at
 <http://taskwarrior.org>
 .TP
 The official code repository at
 <git://tasktools.org/task.git/>
 .TP
 You can contact the project by writing an email to
 <support@taskwarrior.org>
 .SH REPORTING BUGS
 .TP
 Bugs in task may be reported to the issue-tracker at
 <http://taskwarrior.org>
--- a/doc/man/task-tutorial.5
+++ b/doc/man/task-tutorial.5
@@ -1,407 +0,0 @@
 .TH task-tutorial 5 2010-05-22 "task 1.9.2" "User Manuals"
 .SH NAME
 task-tutorial \- A tutorial for the task(1) command line todo manager.
 .SH NOTE
 Please note that this tutorial was written for task 1.7.0. Though it is still
 accurate on the general usage of task, it might not longer be 100% correct in
 all details. A new tutorial for task is planned for task 2.0.0.
 .SH DESCRIPTION
 Task is a command line TODO list manager. It maintains a list of tasks that you
 want to do, allowing you to add/remove, and otherwise manipulate them.  Task
 has a rich list of commands that allow you to do various things with it.
 .SH 30 second tutorial
 For the excessively lazy. Add two tasks:
 .br
 .RS
 $ task add Read task documents later
 .br
 $ task add priority:H Pay bills
 .RE
 Easy. See that second one has a High priority? Now let's look at those tasks:
 .br
 .RS
 $ task ls
 .br
 ID Project Pri Description
 .br
 2         H   Pay bills
 .br
 1             Read task documents later
 .RE
 They are ordered by priority. Let's mark number 2 as done:
 .br
 .RS
 $ task 2 done
 .br
 $ task ls
 .br
 ID Project Pri Description
 .br
 1             Read task documents later
 .RE
 Gone. Now let's delete that remaining task, because, well, why bother
 now we are already using task:
 .br
 .RS
 $ task delete 1
 .br
 $ task ls
 .br
 No matches
 .RE
 That's how easy managing your task list can be.  But now consider learning what
 task can really do...
 .SH Simple usage of task
 Let us begin by adding some tasks:
 .br
 .RS
 $ task add Book plane ticket
 .br
 $ task add Rent a tux
 .br
 $ task add Reserve a rental car
 .br
 $ task add Reserve a hotel room
 .RE
 You'll notice immediately that task has a very minimalist interface. Let us take
 a look at those tasks:
 .br
 .RS
 $ task ls
 .br
 ID Project Pri Description
 .br
 1             Book plane ticket
 .br
 2             Rent a tux
 .br
 3             Reserve a rental car
 .br
 4             Send John a birthday card
 .RE
 The 'ls' command provides the most minimal list of tasks. Each task has
 been given an id number, and you can see that there are no projects or
 priorities assigned. Wait a minute - I own a tux, I don't need to rent
 one. Let us delete task 2:
 .br
 .RS
 $ task 2 delete
 .br
 Permanently delete task? (y/n) y
 .RE
 Task wants you to confirm deletions. To suppress the confirmation, edit
 your .taskrc file and change the line:
 .br
 .RS
 confirmation=yes
 .RE
 .br
 to have a value of "no".  If the entry is not there, then add it.
 While the use of projects and priorities are not essential, they can be very
 useful when the list of tasks grows large.  Let's assign projects to these
 tasks:
 .br
 .RS
 $ task 1 project:Wedding
 .br
 $ task 3 project:Wedding
 .br
 $ task 4 project:Family
 .br
 $ task ls
 .br
 ID Project Pri Description
 .br
 3 Family      Send John a birthday card
 .br
 2 Wedding     Reserve a rental car
 .br
 1 Wedding     Book plane ticket
 .RE
 Notice that the id numbers have changed. When tasks get deleted, or have
 their attributes changed (project, for example), the ids are prone to change.
 But the id numbers will remain valid until the next 'ls' command is run.
 You should only use the ids from the most recent 'ls' command. The ids change,
 because task is always trying to use small numbers so that it is easy for you
 to enter them correctly. Now that projects are assigned, we can look at just
 the Wedding project tasks:
 Subprojects are supported. If you have a project "Wedding", you can specify
 that a task is a subproject "Transport" of "Wedding" by assigning the project
 "Wedding.Transport". Let's do this:
 .br
 .RS
 $ task 2 project:Wedding.Transport
 .br
 $ task ls
 .br
 ID Project           Pri Description
 .br
 3 Family                Send John a birthday card
 .br
 2 Wedding.Transport     Reserve a rental car
 .br
 1 Wedding               Book plane ticket
 .RE
 Task matches the leftmost part of the project when searching, so projects may be
 abbreviated:
 .br
 .RS
 $ task ls project:Wedding.Tra
 .br
 ID Project           Pri Description
 .br
 2 Wedding.Transport     Reserve a rental car
 .RE
 This way of matching projects can be used to see all tasks under the "Wedding"
 project and all subprojects:
 .br
 .RS
 $ task ls project:Wedding
 .br
 ID Project           Pri Description
 .br
 2 Wedding.Transport     Reserve a rental car
 .br
 1 Wedding               Book plane ticket
 .RE
 Let's reassign 2 back to the "Wedding" project:
 .br
 .RS
 $ task 2 project:Wedding
 .RE
 Now that projects are assigned, we can look at just the Wedding project tasks:
 .br
 .RS
 $ task ls project:Wedding
 .br
 ID Project Pri Description
 .br
 1 Wedding     Book plane ticket
 .br
 2 Wedding     Reserve a rental car
 .RE
 Any command arguments after the 'ls' are used for filtering the output.
 We could also have requested:
 .br
 .RS
 $ task ls ticket plane
 .br
 ID Project Pri Description
 .br
 1 Wedding     Book plane ticket
 .RE
 Now let's prioritize. Priorities can be H, M or L (High, Medium, Low).
 .br
 .RS
 $ task ls
 .br
 ID Project Pri Description
 .br
 3 Family      Send John a birthday card
 .br
 2 Wedding     Reserve a rental car
 .br
 1 Wedding     Book plane ticket
 .br
 $ task 1 priority:H
 .br
 $ task 2 prior:M
 .br
 $ task 3 pr:H
 .br
 Ambiguous attribute 'pr' - could be either of project, priority
 .br
 $ task 3 pri:H
 .br
 $ task ls
 .br
 ID Project Pri Description
 .br
 3 Family  H   Send John a birthday card
 .br
 1 Wedding H   Book plane ticket
 .br
 2 Wedding M   Reserve a rental car
 .RE
 Notice that task supports the abbreviation of words such as priority and
 project. Priority can be abbreviated to pri, but not pr, because it is
 ambiguous. Now that tasks have been prioritized, you can see that the tasks are
 being sorted by priority, with the highest priority tasks at the top.
 These attributes can all be provided when the task is added, instead of applying
 them afterwards, as shown. The following command shows how to set all the
 attributes at once:
 .br
 .RS
 $ task add project:Wedding priority:H Book plane ticket
 .RE
 The sequence of those arguments is not important, so you could have entered the
 following command instead:
 .br
 .RS
 $ task project:Wedding add Book plane priority:H ticket
 .RE
 This is because task knows what attributes look like (name:value), knows what
 commands it supports (add, ...), and just assumes the rest is part of the
 description.  Incidentally, if you wanted 'priority:H' to be part of your task
 description, you need to fool task into ignoring it as an attribute.  That can
 be done in two ways:
 .br
 .RS
 $ task add "quoting makes task consider priority:H part of one big argument"
 $ task add -- the hyphens make task treat everything after it as description
 .RE
 The 'ls' command provides the least information for each task. The 'list'
 command provides more:
 .br
 .RS
 $ task list
 .br
 ID Project Pri Due Active Age    Description
 .br
 3 Family  H              4 mins Send John a birthday card
 .br
 1 Wedding H              5 mins Book plane ticket
 .br
 2 Wedding M              5 mins Reserve a rental car
 .RE
 Notice that a task can have a due date, and can be active. The task lists are
 sorted by due date, then priority. Let's add due dates:
 .br
 .RS
 $ task 3 due:6/25/2008
 .br
 $ task 1 due:7/31/2008
 .br
 $ task list
 .br
 ID Project Pri Due       Active Age    Description
 .br
 3 Family  H   6/25/2008        6 mins Send John a birthday card
 .br
 1 Wedding H   7/31/2008        7 mins Book plane ticket
 .br
 2 Wedding M                    7 mins Reserve a rental car
 .RE
 Note that due tasks may be colored to highlight the importance.  See the
 task-color(5) man page for full details.
 Tagging tasks is a good way to group them, aside from specifying a project.
 To add a tag to a task:
 .br
 .RS
 $ task <id> +tag
 .RE
 The plus sign indicates that this is a tag. Any number of tags may be applied to a
 task, and then used for searching. Tags are just single words that are labels.
 .br
 .RS
 $ task list
 .br
 ID Project Pri Due       Active Age    Description
 .br
 3 Family  H   6/25/2008        8 mins Send John a birthday card
 .br
 1 Wedding H   7/31/2008        9 mins Book plane ticket
 .br
 2 Wedding M                    9 mins Reserve a rental car
 .br
 $ task 1 +phone
 .br
 $ task 2 +phone
 .br
 $ task 3 +shopping
 .br
 $ task 3 +john
 .br
 $ task list +phone
 .br
 ID Project Pri Due       Active Age    Description
 .br
 1 Wedding H   7/31/2008        9 mins Book plane ticket
 .br
 2 Wedding M                    9 mins Reserve a rental car
 .RE
 To remove a tag from a task, use the minus sign:
 .br
 .RS
 $ task 3 \-john
 .RE
 To add a task that you have already completed, use the log command:
 .br
 .RS
 $ task log Notify postal service
 .RE
 This is equivalent to first adding a new task, then marking that new task
 as done.  It is simple a shortcut.
 .SH Advanced usage of task
 Advanced examples of the usage of task can be found at the official site at
 <http://taskwarrior.org>
 .SH "CREDITS & COPYRIGHTS"
 task was written by P. Beckingham <paul@beckingham.net>.
 .br
 Copyright (C) 2006 \- 2010 P. Beckingham
 This man page was originally written by Federico Hernandez.
 task is distributed under the GNU General Public License. See
 http://www.gnu.org/licenses/gpl-2.0.txt for more information.
 .SH SEE ALSO
 .BR task(1),
 .BR taskrc(5),
 .BR task-faq(5)
 .BR task-color(5)
 For more information regarding task, the following may be referenced:
 .TP
 The official site at
 <http://taskwarrior.org>
 .TP
 The official code repository at
 <git://tasktools.org/task.git/>
 .TP
 You can contact the project by writing an email to
 <support@taskwarrior.org>
 .SH REPORTING BUGS
 .TP
 Bugs in task may be reported to the issue-tracker at
 <http://taskwarrior.org>
--- a/doc/man/task-tutorial.5.in
+++ b/doc/man/task-tutorial.5.in
--- a/doc/man/task.1
+++ b/doc/man/task.1
@@ -1,547 +0,0 @@
 .TH task 1 2010-05-22 "task 1.9.2" "User Manuals"
 .SH NAME
 task \- A command line todo manager.
 .SH SYNOPSIS
 .B task [subcommand] [args]
 .SH DESCRIPTION
 Task is a command line todo list manager. It maintains a list of tasks that you
 want to do, allowing you to add/remove, and otherwise manipulate them.  Task
 has a rich list of subcommands that allow you to do various things with it.
 At the core, task is a list processing program. You add text and additional
 related parameters and task redisplays the information in a nice way.  It turns
 into a todo list program when you add due dates and recurrence. It turns into an
 organized todo list program when you add priorities, tags (one word descriptors),
 project groups, etc.  Task turns into an organized to do list program when you
 modify the configuration file to have the output displayed the way you want to
 see it.
 .SH SUBCOMMANDS
 .TP
 .B add [tags] [attrs] description
 Adds a new task to the task list.
 .TP
 .B log [tags] [attrs] description
 Adds a new task that is already completed, to the task list.
 .TP
 .B annotate ID description
 Adds an annotation to an existing task.
 .TP
 .B denotate ID description
 Deletes an annotation for the specified task. If the provided description matches an
 annotation exactly, the corresponding annotation is deleted. If the provided description
 matches annotations partly, the first partly matched annotation is deleted.
 .TP
 .B info ID
 Shows all data and metadata for the specified task.
 .TP
 .B ID
 With an ID but no specific command, task runs the "info" command.
 .TP
 .B undo
 Reverts the most recent action.
 .TP
 .B shell
 Launches an interactive shell with all the task commands available.
 .TP
 .B duplicate ID [tags] [attrs] [description]
 Duplicates the specified task and allows modifications.
 .TP
 .B delete ID
 Deletes the specified task from task list.
 .TP
 .B start ID
 Marks the specified task as started.
 .TP
 .B stop ID
 Removes the
 .I start
 time from the specified task.
 .TP
 .B done ID [tags] [attrs] [description]
 Marks the specified task as done.
 .TP
 .B projects
 Lists all project names that are currently used by pending tasks, and the
 number of tasks for each.
 .TP
 .B tags
 Show a list of all tags used.
 .TP
 .B summary
 Shows a report of task status by project.
 .TP
 .B timesheet [weeks]
 Shows a weekly report of tasks completed and started.
 .TP
 .B history
 Shows a report of task history by month.  Alias to history.monthly.
 .TP
 .B history.annual
 Shows a report of task history by year.
 .TP
 .B ghistory
 Shows a graphical report of task status by month.  Alias to ghistory.monthly.
 .TP
 .B ghistory.annual
 Shows a graphical report of task status by year.
 .TP
 .B calendar [ y | due [y] | month year [y] | year ]
 Shows a monthly calendar with due tasks marked.
 .TP
 .B stats
 Shows task database statistics.
 .TP
 .B import \fIfile
 Imports tasks from a variety of formats.
 .TP
 .B export
 Exports all tasks in CSV format.  This command is an alias to the export.csv command.
 Redirect the output to a file, if you wish to save it, or pipe it to another command.
 .TP
 .B export.ical
 Exports all tasks in iCalendar format.
 Redirect the output to a file, if you wish to save it, or pipe it to another command.
 .TP
 .B color [sample]
 Displays all possible colors, or a sample.
 .TP
 .B version
 Shows the task version number
 .TP
 .B help
 Shows the long usage text.
 .TP 
 .B show [all | substring]"
 Shows all the current settings in the task configuration file. If a substring
 is specified just the settings containing that substring will be displayed.
 .TP
 .B config [name [value | '']]
 Add, modify and remove settings directly in the task configuration.
 This command either modifies the 'name' setting with a new value of 'value',
 or adds a new entry that is equivalent to 'name=value':
    task config name value
 This command sets a blank value.  This has the effect of suppressing any
 default value:
    task config name ''
 Finally, this command removes any 'name=...' entry from the .taskrc file:
    task config name
 .SH MODIFYING SUBCOMMANDS
 .TP
 .B ID [tags] [attrs] [description]
 Modifies the existing task with provided information.
 .TP
 .B ID /from/to/
 Performs one substitution on task description and annotation for fixing mistakes.
 .TP
 .B ID /from/to/g
 Performs all substitutions on task description and annotation for fixing mistakes.
 .TP
 .B edit ID
 Launches an editor to let you modify all aspects of a task directly.
 Use carefully.
 .TP
 .B append [tags] [attrs] description
 Appends information to an existing task.
 .TP
 .B prepend [tags] [attrs] description
 Prepends information to an existing task.
 .SH REPORT SUBCOMMANDS
 A report is a listing of information from the task database. There are several
 reports currently predefined in task. The output and sort behavior of these
 reports can be configured in the configuration file. See also the man page taskrc(5).
 .TP
 .B active [tags] [attrs] [description]
 Shows all tasks matching the specified criteria
 that are started but not completed.
 .TP
 .B all [tags] [attrs] [description]
 Shows all tasks matching the specified criteria.
 .TP
 .B completed [tags] [attrs] [description]
 Shows all tasks matching the specified criteria
 that are completed.
 .TP
 .B minimal [tags] [attrs] [description]
 Provides a minimal listing of tasks with specified criteria.
 .TP
 .B ls [tags] [attrs] [description]
 Provides a short listing of tasks with specified criteria.
 .TP
 .B list [tags] [attrs] [description]
 Provides a more detailed listing of tasks with specified criteria.
 .TP
 .B long [tags] [attrs] [description]
 Provides the most detailed listing of tasks with specified criteria.
 .TP
 .B newest [tags] [attrs] [description]
 Shows the newest tasks with specified criteria.
 .TP
 .B oldest [tags] [attrs] [description]
 Shows the oldest tasks with specified criteria
 .TP
 .B overdue [tags] [attrs] [description]
 Shows all incomplete tasks matching the specified criteria
 that are beyond their due date.
 .TP
 .B recurring [tags] [attrs] [description]
 Shows all recurring tasks matching the specified criteria.
 .TP
 .B waiting [tags] [attrs] [description]
 Shows all waiting tasks matching the specified criteria.
 .TP
 .B next [tags] [attrs] [description]
 Shows all tasks with upcoming due dates matching the specified criteria.
 .SH ATTRIBUTES AND METADATA
 .TP
 .B ID
 Tasks can be specified uniquely by IDs, which are simply the index of the
 task in a report. Be careful, as the IDs of tasks may change after a
 modification to the database. Always run a report to check you have the right
 ID for a task. IDs can be given to task as a sequences, for example,
 .br
 .B
 task del 1,4-10,19
 .TP
 .B +tag|-tag
 Tags are arbitrary words associated with a task. Use + to add a tag and - to
 remove a tag from a task. A task can have any quantity of tags
 .TP
 .B project:<project-name>
 Specifies the project to which a task is related to.
 .TP
 .B priority:H|M|L|N
 Specifies High, Medium, Low and No priority for a task.
 .TP
 .B due:<due-date>
 Specifies the due-date of a task.
 .TP
 .B recur:<frequency>
 Specifies the frequency of a recurrence of a task.
 .TP
 .B until:<end-date-of-recurrence>
 Specifies the Recurrence end-date of a task.
 .TP
 .B fg:<color-spec>
 Specifies foreground color.
 .TP
 .B bg:<color-spec>
 Specifies background color.
 .TP
 .B limit:<number-of-rows>
 Specifies the desired number of tasks a report should show, if a positive
 integer is given.  The value 'page' may also be used, and will limit the
 report output to as many lines of text as will fit on screen.  This defaults
 to 25 lines, if ncurses is not installed or enabled.
 .TP
 .B wait:<wait-date>
 Date until task becomes pending.
 .SH ATTRIBUTE MODIFIERS
 Attribute modifiers improve filters.  Supported modifiers are:
 .RS
 .B before     (synonyms under, below)
 .br
 .B  after      (synonyms over, above)
 .br
 .B  none
 .br
 .B  any
 .br
 .B  is         (synonym equals)
 .br
 .B  isnt       (synonym not)
 .br
 .B  has        (synonym contain)
 .br
 .B  hasnt
 .br
 .B  startswith (synonym left)
 .br
 .B  endswith   (synonym right)
 .br
 .B  word
 .br
 .B  noword
 .RE
 For example:
 .RS
 task list due.before:eom priority.not:L
 .RE
 .SH SPECIFYING DATES AND FREQUENCIES
 .SS DATES
 Task reads dates from the command line and displays dates in the
 reports.  The expected and desired date format is determined by the
 configuration variable
 .I dateformat
 in the task configuration file.
 .RS
 .TP
 Exact specification
 task ... due:7/14/2008
 .TP
 Relative wording
 task ... due:today
 .br
 task ... due:yesterday
 .br
 task ...  due:tomorrow
 .TP
 Day number with ordinal
 task ... due:23rd
 .TP
 End of week (Friday), month and year
 task ... due:eow
 .br
 task ... due:eom
 .br
 task ... due:eoy
 .TP
 Next occurring weekday
 task ... due:fri
 .RE
 .SS FREQUENCIES
 Recurrence periods. Task supports several ways of specifying the
 .I frequency
 of recurring tasks.
 .RS
 .TP
 daily, day, 1d, 2d, ...
 Every day or a number of days.
 .TP
 weekdays
 Mondays, Tuesdays, Wednesdays, Thursdays, Fridays and skipping weekend days.
 .TP
 weekly, 1w, 2w, ...
 Every week or a number of weeks.
 .TP
 biweekly, fortnight
 Every two weeks.
 .TP
 quarterly, 1q, 2q, ...
 Every three months, a quarter, or a number of quarters.
 .TP
 semiannual
 Every six months.
 .TP
 annual, yearly, 1y, 2y, ...
 Every year or a number of years.
 .TP
 biannual, biyearly, 2y
 Every two years.
 .RE
 .SH COMMAND ABBREVIATION
 All task commands may be abbreviated as long as a unique prefix is used. E.g.
 .RS
 $ task li
 .RE
 is an unambiguous abbreviation for
 .RS
 $ task list
 .RE
 but
 .RS
 $ task l
 .RE
 could be list, ls or long.
 .SH SPECIFYING DESCRIPTIONS
 Some task descriptions need to be escaped because of the shell
 and the special meaning of some characters to the shell. This can be
 done either by adding quotes to the description or escaping the special
 character:
 .RS
 $ task add "quoted ' quote"
 .br
 $ task add escaped \\' quote
 .RE
 The argument \-\- (a double dash) tells task to treat all other args
 as description:
 .RS
 $ task add -- project:Home needs scheduling
 .RE
 .SH CONFIGURATION FILE AND OVERRIDE OPTIONS
 Task stores its configuration in a file in the user's home directory:
 ~/.taskrc . The default configuration file can be overridden with
 .TP
 .B task rc:<path-to-alternate-file>
 Specifies an alternate configuration file.
 .TP
 .B task rc.<name>:<value> ...
 Specifies individual configuration file overrides.
 .SH EXAMPLES
 For examples please see the task tutorial man page at
 .RS
 man task-tutorial
 .RE
 or the online documentation starting at
 .RS
 <http://taskwarrior.org/wiki/taskwarrior/Simple>
 .RE
 .SH FILES
 .TP
 ~/.taskrc User configuration file - see also taskrc(5).
 .TP
 ~/.task The default directory where task stores its data files. The location
 can be configured in the configuration file.
 .TP
 ~/.task/pending.data The file that contains the tasks that are not yet done.
 .TP
 ~/.task/completed.data The file that contains the completed "done" tasks.
 .TP
 ~/.task/undo.data The file that contains the information to the "undo" command.
 .SH "CREDITS & COPYRIGHTS"
 task was written by P. Beckingham <paul@beckingham.net>.
 .br
 Copyright (C) 2006 \- 2010 P. Beckingham
 This man page was originally written by P.C. Shyamshankar, and has been modified
 and supplemented by Federico Hernandez.
 Thank also to T. Charles Yun.
 task is distributed under the GNU General Public License.  See
 http://www.gnu.org/licenses/gpl-2.0.txt for more information.
 .SH SEE ALSO
 .BR taskrc(5),
 .BR task-tutorial(5),
 .BR task-faq(5)
 .BR task-color(5)
 For more information regarding task, the following may be referenced:
 .TP
 The official site at
 <http://taskwarrior.org>
 .TP
 The official code repository at
 <git://tasktools.org/task.git/>
 .TP
 You can contact the project by writing an email to
 <support@taskwarrior.org>
 .SH REPORTING BUGS
 .TP
 Bugs in task may be reported to the issue-tracker at
 <http://taskwarrior.org>
--- a/doc/man/task.1.in
+++ b/doc/man/task.1.in
--- a/doc/man/taskrc.5
+++ b/doc/man/taskrc.5
@@ -1,889 +0,0 @@
 .TH taskrc 5 2010-05-22 "task 1.9.2" "User Manuals"
 .SH NAME
 taskrc \- Configuration file for the task(1) command
 .SH SYNOPSIS
 .B $HOME/.taskrc
 .br
 .B task rc:<directory-path>/.taskrc
 .SH DESCRIPTION
 .B task
 obtains its configuration data from a file called
 .I .taskrc
 \&. This file is normally located in the user's home directory:
 .RS
 $HOME/.taskrc
 .RE
 The default location can be overridden using the
 .I rc:
 attribute when running task:
 .RS
 $ task rc:<directory-path>/.taskrc
 .RE
 Individual option can be overridden by using the
 .I rc.<name>: 
 attribute when running task:
 .RS
 $ task rc.<name>:<value> ...
 .RE
 If
 .B task
 is run without an existing configuration file it will ask if it should create a
 default, sample
 .I .taskrc
 file in the user's home directory.
 The task configuration file consists of a series of "assignments" in each line.
 The "assignments" have the syntax:
 .RS
 <name-of-configuration-variable>=<value-to-be-set>
 .RE
 where:
 .RS
 .TP
 <name-of-configuration-variable>
 is one of the variables described below
 .TP
 <value-to-be-set>
 is the value the variable is to be set to.
 .RE
 and set a configuration variable to a certain value. The equal sign ("=") is
 used to separate the variable name from the value to be set.
 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.
 Note that task is flexible about the values used to represent Boolean items.
 You can use "on", "yes", "y", "1", "true", "t", "+", "enabled".  Anything else
 means "off".
 .SH EDITING
 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!"
 .RE
 To delete an entry, use this command:
 .RS
 $ task config nag
 .RE
 Task will then use the default value.  To explicitly set a value to blank, and
 therefore avoid using the default value, use this command:
 .RS
 $ task config nag ""
 .RE
 Task will also display all your settings with this command:
 .RS
 $ task config
 .RE
 and in addition, will also perform a check of all the values in the file,
 warning you of anything it finds amiss.
 .SH NESTING CONFIGURATION FILES
 The .taskrc can include other files containing configuration settings by using the
 .B include
 statement:
 .RS
 include <path/to/the/configuration/file/to/be/included>
 .RE
 By using include files you can divide your main configuration file into several 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-US.rc
 .br
 include /usr/local/share/doc/task/rc/dark-16.theme
 .RE
 This includes two standard files that are distributed with task, which define a
 set of US holidays, and set up a 16-color theme for task to use, to color the
 reports and calendar.
 .SH CONFIGURATION VARIABLES
 Valid variable names and their default values are:
 .SS FILES
 .TP
 .B data.location=$HOME/.task
 This is a path to the directory containing all the task files. By default, it is
 set up to be ~/.task, for example: /home/paul/.task
 Note that you can use the
 .B ~
 shell meta character, which will be properly expanded.
 .TP
 .B locking=on
 Determines whether task uses file locking when accessing the pending.data and
 completed.data files.  Defaults to "on". Solaris users who store the task data
 files on an NFS mount may need to set locking to "off". Note that there is
 danger in setting this value to "off" - another program (or another instance of
 task) may write to the task.pending file at the same time.
 .SS TERMINAL
 .TP
 .B curses=on
 Determines whether task uses ncurses to establish the size of the window you are
 using, for text wrapping.
 .TP
 .B defaultwidth=80
 The width of tables used when ncurses support is not available. Defaults to 80.
 .TP
 .B editor=vi
 Specifies which text editor you wish to use for when the
 .B task edit <ID>
 command is used. Task will first look for this configuration variable. If found,
 it is used.  Otherwise task will look for the $VISUAL or $EDITOR environment
 variables, before it defaults to using "vi".
 .SS MISCELLANEOUS
 .TP
 .B locale=en-US
 The locale is a combination of ISO 639-1 language code and ISO 3166 country
 code.  If not specified, task will assume en-US.  If specified, task will locate
 the correct file of localized strings and proceed.  It is an error to specify a
 locale for which there is no strings file.
 .TP
 .B confirmation=yes
 May be "yes" or "no", and determines whether task will ask for confirmation
 before deleting a task or doing bulk changes.  The default value is "yes".
 .TP
 .B echo.command=yes
 May be "yes" or "no", and causes task to display the ID and description of any
 task when you run the start, stop, do, undo or delete commands. The default
 value is "yes".
 .TP
 .B annotations=full
 .TP
 .B report.X.annotations=full
 Controls the display of annotations in reports. Defaults to full - all
 annotations are displayed. Set to "sparse" only the last (newest) annotation
 is displayed and if there are more than one present for a task a "+" sign is
 added to the description. Set to "none" the output of annotations is disabled
 and a "+" sign will be added if there are any annotations present.  The default
 value is "full".
 .TP
 .B next=2
 Is a number, defaulting to 2, which is the number of tasks for each project that
 are shown in the
 .B task next
 command.
 .TP
 .B bulk=2
 Is a number, defaulting to 2.  When more than this number of tasks are modified
 in a single command, confirmation will be required, unless the
 .B confirmation
 variable is "no".
 This is useful for preventing large-scale unintended changes.
 .TP
 .B nag=You have higher priority 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. The "task next"
 command lists important tasks, and completing one of those does not generate
 this nagging. Default value is: You have higher priority tasks.  It is a gentle
 reminder that you are contradicting your own priority settings.
 .TP
 .B complete.all.projects=yes
 May be yes or no, and determines whether the tab completion scripts consider all
 the project names you have used, or just the ones used in active tasks.  The
 default value is "no".
 .TP
 .B list.all.projects=yes
 May be yes or no, and determines whether 'projects' command lists all the project
 names you have used, or just the ones used in active tasks.  The default value is
 "no".
 .TP
 .B complete.all.tags=yes
 May be yes or no, and determines whether the tab completion scripts consider all
 the tag names you have used, or just the ones used in active tasks.  The default
 value is "no".
 .TP
 .B list.all.tags=yes
 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 search.case.sensitive=yes
 May be yes or no, and determines whether keyword lookup and substitutions on the
 description and annotations are done in a case sensitive way.  Defaults to yes.
 .TP
 .B _forcecolor=no
 Task shuts off color automatically when the output is not sent directly to a
 a TTY.  For example, this command:
 .RS
 .RS
 $ task list > file
 .RE
 will not use any color.  To override this, use:
 .RS
 $ task rc._forcecolor=yes list > file
 .RE
 .RE
 .TP
 .B blanklines=yes
 Turning this value off causes task to generate a more vertically compact output.
 .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 active column.  Defaults to *.
 .TP
 .B tag.indicator=+
 The character or string to show in the tag_indicator column.  Defaults to +.
 .TP
 .B recurrence.indicator=R
 The character or string to show in the recurrence_indicator column.  Defaults to R.
 .TP
 .B recurrence.limit=1
 The number of future recurring tasks to show.  Defaults to 1.  For example, if a
 weekly recurring task is added with a due date of tomorrow, and recurrence.limit
 is set to 2, then a report will list 2 pending recurring tasks, one for tomorrow,
 and one for a week from tomorrow.
 .TP
 .B undo.style=side
 When the 'undo' command is run, task presents a before and after comparison of the
 data.  This can be in either the 'side' style, which compares values side-by-side
 in a table, or 'diff' style, which uses a format similar to the 'diff' command.
 .TP
 .B debug=off
 Task has a debug mode that causes diagnostic output to be displayed.  Typically
 this is not something anyone would want, but when reporting a bug, 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 alias.rm=delete
 Task supports command aliases.  This alias provides an alternate name (rm) for
 the delete command.  You can use aliases to provide alternate names for any of
 task's commands.  Several commands you may use are actually aliases - 'history',
 for example, or 'export'.
 .SS DATES
 .TP
 .B dateformat=m/d/Y
 .TP
 .B dateformat.report=m/d/Y
 .TP
 .B dateformat.holiday=YMD
 .TP
 .B dateformat.annotation=m/d/Y
 .TP
 .B report.X.dateformat=m/d/Y
 This is a string of characters that define how task formats date values. The
 precedence order for the configuration variable is report.X.dateformat then
 reportdateformat then dateformat.  While report.X.dateformat only formats the
 due date in reports, reportdateformat formats the due date both in reports
 and "task info".  If both of these are not set then dateformat will be applied
 to the due 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:
 .RS
 .RS
 m  minimal-digit month,   for example 1 or 12
 .br
 d  minimal-digit day,     for example 1 or 30
 .br
 y  two-digit year,        for example 09
 .br
 D  two-digit day,         for example 01 or 30
 .br
 M  two-digit month,       for example 01 or 12
 .br
 Y  four-digit year,       for example 2009
 .br
 a  short name of weekday, for example Mon or Wed
 .br
 A  long name of weekday,  for example Monday or Wednesday
 .br
 b  short name of month,   for example Jan or Aug
 .br
 B  long name of month,    for example January or August
 .br
 V  weeknumber,            for example 03 or 37
 .br
 H  two-digit hour,        for example 03 or 11
 .br
 N  two-digit minutes,     for example 05 or 42
 .br
 S  two-digit seconds,     for example 07 or 47
 .RE
 .RE
 .RS
 The string may also contain other characters to act as spacers, or formatting.
 Examples for other values of dateformat:
 .RE
 .RS
 .RS
 .br
 d/m/Y  would use for input and output 24/7/2009
 .br
 yMD    would use for input and output 090724
 .br
 M-D-Y  would use for input and output 07-24-2009
 .RE
 .RE
 .RS
 Examples for other values of reportdateformat:
 .RE
 .RS
 .RS
 .br
 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"
 .br
 vV a Y-M-D   would do an output as "v30 Fri 2009-07.24"
 .RE
 .RE
 .TP
 .B weekstart=Sunday
 Determines the day a week starts. Valid values are Sunday or Monday only. The
 default value is "Sunday".
 .TP
 .B displayweeknumber=yes
 Determines if week numbers are displayed when using the "task calendar" command.
 The week number is dependent on the day a week starts.  The default value is
 "yes".
 .TP
 .B due=7
 This is the number of days into the future that define when a task is
 considered due, and is colored accordingly.  The default value is 7.
 .TP
 .B calendar.details=sparse
 If set to full running "task calendar" will display the details of tasks with
 due dates that fall into the calendar period.  The corresponding days will be
 color-coded in the calendar.  If set to sparse only the corresponding days will
 be color coded and no details will be displayed.  The displaying of due dates
 with details is turned off by setting the variable to none.  The default value
 is "sparse".
 .TP
 .B calendar.details.report=list
 The report to run when displaying the details of tasks with due date when
 running the "task calendar" command.  The default value is "list".
 .TP
 .B calendar.holidays=full
 If set to full running "task calendar" will display holidays in the calendar by
 color-coding the corresponding days.  A detailed list with the dates and names
 of the holidays is also shown.  If set to sparse only the days are color-coded
 and no details on the holidays will be displayed. The displaying of holidays is
 turned off by setting the variable to none.  The default value is "none".
 .TP
 .B Holidays
 Holidays are entered either directly in the .taskrc file or via an include file
 that is specified in .taskrc.  For each holiday the name and the date is
 required to be given:
 .RS
 .RS
 .br
 holiday.towel.name=Day of the towel
 .br
 holiday.towel.date=20100525
 .br
 holiday.sysadmin.name=System Administrator Appreciation Day
 .br
 holiday.sysadmin.date=20100730
 .RE
 .RE
 .RS
 Dates are to be entered according to the setting in the dateformat.holiday
 variable.
 .RE
 .RS
 The following holidays are computed automatically: Good Friday (goodfriday), Easter (easter), Easter monday (eastermonday), Ascension (ascension), Pentecost (pentecost). The date for these holidays is the given keyword:
 .RE
 .RS
 .RS
 .br
 holiday.eastersunday.name=Easter
 .br
 holiday.eastersunday.date=easter
 .RE
 .RE
 Note that the task distribution contains example holiday files that can be
 included like this:
 .RS
 .RS
 .br
 include /usr/local/share/doc/task/rc/holidays-US.rc
 .RE
 .RE
 .TP
 .B monthsperline=3
 Determines how many months the "task calendar" command renders across the
 screen.  Defaults to however many will fit.  If more months than will fit are
 specified, task will only show as many that will fit.
 .SS COLOR CONTROLS
 .TP
 .B color=on
 May be "on" or "off". Determines whether task uses color. When "off", task will
 use dashes (-----) to underline column headings.
 .TP
 .B fontunderline=on
 Determines if font underlines or ASCII dashes should be used to underline
 headers, even when color is enabled.
 .RE
 Task has a number of coloration rules.  They correspond to a particular
 attribute of a task, such as it being due, or being active, and specifies the
 automatic coloring of that task.  A list of valid colors, depending on your
 terminal, can be obtained by running the command:
 .RS
 .B task color
 .RE
 .RS
 The coloration rules and their defaults are:
 .RE
 .RS
 .B color.overdue=bold red
 The color for overdue tasks.
 .br
 .B color.due.today=bold magenta
 The color of tasks due today.
 .br
 .B color.due=bold yellow
 The color of due tasks.
 .br
 .B color.pri.H=bold
 The color of priority:H tasks.
 .br
 .B color.pri.M=on yellow
 The color of priority:M tasks.  No default value.
 .br
 .B color.pri.L=on green
 The color of priority:L tasks.  No default value.
 .br
 .B color.pri.none=white on blue
 The color of priority: tasks.  No default value.
 .br
 .B color.active=bold cyan
 The color of active tasks.
 .br
 .B color.tagged=yellow
 The color of tagged tasks.
 .br
 .B color.recurring=on red
 The color for recurring tasks.
 .RE
 .RE
 .RS
 To disable a coloration rule for which there is a default, set the value to
 nothing, for example:
 .RS
 .B color.tagged=
 .RE
 .RE
 See the task-color(5) man pages for color details.
 .RE
 Certain attributes like tags, projects and keywords can have their own
 coloration rules.
 .RE
 .TP
 .B color.tag.X=yellow
 Colors any task that has the tag X.
 .RE
 .TP
 .B color.project.X=on green
 Colors any task assigned to project X.
 .RE
 .TP
 .B color.keyword.X=on blue
 Colors any task where the description or any annotation contains X.
 .RE
 .TP
 .B color.header=green
 Colors any of the messages printed prior to the report output.
 .RE
 .TP
 .B color.footnote=green
 Colors any of the messages printed last.
 .RE
 .TP
 .B color.summary.bar=on green
 Colors the summary progress bar.  Should consist of a background color.
 .RE
 .TP
 .B color.summary.background=on black
 Colors the summary progress bar.  Should consist of a background color.
 .RE
 .TP
 .B color.calendar.today=black on cyan
 Color of today in calendar.
 .RE
 .TP
 .B color.calendar.due=black on green
 Color of days with due tasks in calendar.
 .RE
 .TP
 .B color.calendar.due.today=black on magenta
 Color of today with due tasks in calendar.
 .RE
 .TP
 .B color.calendar.overdue=black on red
 Color of days with overdue tasks in calendar.
 .RE
 .TP
 .B color.calendar.weekend=bright white on black
 Color of weekend days in calendar.
 .RE
 .TP
 .B color.calendar.holiday=black on bright yellow
 Color of holidays in calendar.
 .RE
 .TP
 .B color.calendar.weeknumber=black on white
 Color of weeknumbers in calendar.
 .RE
 .TP
 .B color.alternate=on rgb253
 Color of alternate tasks.
 This is to apply a specific color to every other task in a report,
 which can make it easier to visually separate tasks.  This is especially
 useful when tasks are displayed over multiple lines due to long descriptions
 or annotations.
 .RE
 .TP
 .B color.history.add=on red
 .RE
 .br
 .B color.history.done=on green
 .RE
 .br
 .B color.history.delete=on yellow
 .RS
 Colors the bars on the ghistory report graphs.  Defaults to red, green and
 yellow bars.
 .RE
 .TP
 .B color.undo.before=red
 .RE
 .br
 .B color.undo.after=green
 .RS
 Colors used by the undo command, to indicate the values both before and after
 a change that is to be reverted.
 .RE
 .SS SHADOW FILE
 .TP
 .B
 shadow.file=$HOME/.task/shadow.txt
 If specified, designates a file path that will be automatically written to by
 task, whenever the task database changes.  In other words, it is automatically
 kept up to date.  The shadow.command configuration variable is used to determine
 which report is written to the shadow file.  There is no color used in the
 shadow file. This feature can be useful in maintaining a current file for use by
 programs like GeekTool, Conky or Samurize.
 .TP
 .B
 shadow.command=list
 This is the command that is run to maintain the shadow file, determined by the
 .I shadow.file
 configuration variable. The format is identical to that of
 .I default.command
 \&. Please see the corresponding documentation for that command.
 .TP
 .B
 shadow.notify=on
 When this value is set to "on", task will display a message whenever the shadow
 file is updated by some task command.
 .SS DEFAULTS
 .TP
 .B
 default.project=foo
 Provides a default project name for the
 .I task add
 command, if you don't specify one.  The default is blank.
 .TP
 .B
 default.priority=M
 Provides a default priority for the
 .I task add
 command, if you don't specify one.  The default is blank.
 .TP
 .B
 default.command=list
 Provides a default command that is run every time task is invoked with no
 arguments.  For example, if set to:
 .RS
 .RS
 default.command=list project:foo
 .RE
 .RE
 .RS
 then task will run the "list project:foo" command if no command is specified.
 This means that by merely typing
 .RE
 .RS
 .RS
 $ task
 .br
 [task list project:foo]
 .br
 \&
 .br
 ID Project Pri Description
 1 foo     H   Design foo
 2 foo         Build foo
 .RE
 .RE
 .SS REPORTS
 The reports can be customized by using the following configuration variables.
 The output columns, their labels and the sort order can be set using the
 corresponding variables for each report. Each report name is used as a
 "command" name. For example
 .TP
 .B task overdue
 .TP
 .B report.X.description
 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, project, priority, entry, start, due, recur, recur_indicator, age,
 age_compact, active, tags, tag_indicator, description, description_only,
 countdown, countdown_compact.
 The IDs are separated by commas.
 .TP
 .B report.X.labels
 The labels for each column that will be used when generating report X. The
 labels are a comma separated list.
 .TP
 .B report.X.sort
 The sort order of the tasks in the generated report X. The sort order is
 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
 .TP
 .B report.X.filter
 This adds a filter to the report X so that only tasks matching the filter
 criteria are displayed in the generated report.
 .TP
 .B report.X.dateformat
 This adds a dateformat to the report X that will be used by the "due date"
 column. If it is not set then reportdateformat and dateformat will be used in
 this order. See the
 .B DATES
 section for details on the sequence placeholders.
 .TP
 .B report.X.annotations
 This adds the possibility to control the output of annotations for a task in a
 report. See the
 .B annotations
 variable for details on the possible values.
 .TP
 .B report.X.limit
 An optional value to a report limiting the number of displayed tasks in the
 generated report.
 .TP
 Task comes with a number of predefined reports in its default configuration
 file. These reports are:
 .TP
 .B long
 Lists all task, all data, matching the specified criteria.
 .TP
 .B list
 Lists all tasks matching the specified criteria.
 .TP
 .B ls
 Short listing of all tasks matching the specified criteria.
 .TP
 .B minimal
 Minimal listing of all tasks matching the specified criteria.
 .TP
 .B newest
 Shows the newest tasks.
 .TP
 .B oldest
 Shows the oldest tasks.
 .TP
 .B overdue
 Lists overdue tasks matching the specified criteria.
 .TP
 .B active
 Lists active tasks matching the specified criteria.
 .TP
 .B completed
 Lists completed tasks matching the specified criteria.
 .TP
 .B recurring
 Lists recurring tasks matching the specified criteria.
 .TP
 .B waiting
 Lists all waiting tasks matching the specified criteria.
 .TP
 .B all
 Lists all tasks matching the specified criteria.
 .TP
 .B next
 Lists all tasks with upcoming due dates matching the specified criteria.
 .SH "CREDITS & COPYRIGHTS"
 task was written by P. Beckingham <paul@beckingham.net>.
 .br
 Copyright (C) 2006 \- 2010 P. Beckingham
 This man page was originally written by Federico Hernandez.
 task is distributed under the GNU General Public License.  See
 http://www.gnu.org/licenses/gpl-2.0.txt for more information.
 .SH SEE ALSO
 .BR task(1),
 .BR task-tutorial(5),
 .BR task-faq(5)
 .BR task-color(5)
 For more information regarding task, the following may be referenced:
 .TP
 The official site at
 <http://taskwarrior.org>
 .TP
 The official code repository at
 <git://tasktools.org/task.git/>
 .TP
 You can contact the project by writing an email to
 <support@taskwarrior.org>
 .SH REPORTING BUGS
 .TP
 Bugs in task may be reported to the issue-tracker at
 <http://taskwarrior.org>
--- a/doc/man/taskrc.5.in
+++ b/doc/man/taskrc.5.in
--- a/doc/misc/grammar.bnf
+++ b/doc/misc/grammar.bnf
@@ -1,40 +0,0 @@
 # This is a full BNF grammar for the task command line.  It is intended that a
 # future release of task will incorporate a complete lexer/parser implementing
 # this grammar, which will allow for more sophisticated command lines, for
 # example:
 #
 #    task delete 1 2 4-7
 #    task add pri:H pro:X -- pro pri 1 ///
 #
 command     ::= simple_command
              | filter_command filter?
              | id_command
              | "export" file
              | <id>
              | <id> <substitution> ;
 simple_command ::= "version" | "help" | "projects" | "tags" | "next" | "stats"
                 | "color" ;
 filter_command ::= "summary" | "history" | "calendar" | "active" | "overdue"
                 | "oldest" | "newest" | "add" | "list" | "long" | "ls"
                 | "completed" ;
 id_command ::= "delete" | "undelete" | "info" | "start" | "end" | "done"
             | "undo" ;
 filter      ::= filter_part+ ;
 filter_part ::= tag_add | tag_remove | attribute | word ;
 tag_add     ::= "+" word ;
 tag_remove  ::= "-" word ;
 attribute   ::= word ":" word ;
 word        ::=
 file        ::=
 id          ::= digit+ ;
 digit       ::= "0" | "1" | "2" | "3" | "4" | "5" | "6" | "7" | "8" | "9" ;
 substitution ::= "/" word+ "/" word* "/" "g"? ;
--- a/doc/misc/script-color.txt
+++ b/doc/misc/script-color.txt
@@ -1,34 +0,0 @@
                                         Hello.  This is a demonstration of the
                                         task program color capabilities coming
                                         in version 1.9.
 task color                               The color command shows the various
                                         supported colors.  For this you will
                                         need an xterm with 256-color support,
                                         or an equivalent.
                                         This demo uses iTerm running on Snow
                                         Leopard.
 task add Prepare 1.9 for release         Let's create a few tasks, to illustrate
 task add Update the various docs         the features.  Five should be enough.
 task add Run the regression tests
 task add Make the packages
 task add Upload to distributions
 --- NOTES
 16-color mode
 upgrade
 blending
 alternate lines
 --- NOTES
 task ls                                  Okay, let's color any tasks that
                                         mention tests a nice medium blue.
 echo 'color.keyword.test=color23' >> ~/.taskrc
--- a/doc/misc/script-hooks-2.txt
+++ b/doc/misc/script-hooks-2.txt
@@ -1,40 +0,0 @@
 $ # Q: What is a formatting hook?
 $ # A: Lua code that modifies task output at run time.
 $
 $ cat > hooks.lua
 -- Make ID not show up
 function id (name, value)
  return "(shhh - it's a secret)", 0, nil
 end
 -- Decorate the UUID
 function uuid (name, value)
  return '<<<' .. value .. '>>>', 0, nil
 end
 ^D
 $ # Q: What is a command hook?
 $ # A: Lua code that changes the way commands work.
 $
 $ cat >> hooks.lua
 -- Disable tags
 function notags ()
  return 1, 'Tags have been disabled'
 end
 ^D
 $
 $ task config -- hook.format-id ~/demo/hooks.lua:id
 $ task config -- hook.format-uuid ~/demo/hooks.lua:uuid
 $ task config -- hook.pre-tag ~/demo/hooks.lua:notags
 $ task list
 $ task add Demonstrate formatting hooks
 $ task 1 info
 $ task config hooks on
 $ task 1 info
 $ task 1 +try_to_tag
--- a/doc/misc/script-hooks.txt
+++ b/doc/misc/script-hooks.txt
@@ -1,33 +0,0 @@
 $
 $ # Task now has Lua 5.1.4 built in.
 $
 $ task version
 $ cat > hooks.lua
 function foo ()
  print ("Hello from Lua")
  return 0, nil
 end
 ^D
 $
 $ # Task can call into Lua at many points during execution.
 $ # This one is called immediately before task quits.
 $
 $ task rc.hook.pre-exit=~/hooks.lua:foo version
 $
 $ # While task is calling Lua code, the Lua can also call
 $ # back into a task API, for information.
 $
 $ cat > hooks.lua
 function foo ()
  print "Lua version is " .. task_lua_version ())
  print "Task version is " .. task_version ())
  return 0, nil
 end
 ^D
 $
 $ cat >> .taskrc
 hook.pre-exit=~/hooks.lua:foo
 ^D
 $
 $ task version
--- a/doc/misc/script.txt
+++ b/doc/misc/script.txt
@@ -1,109 +0,0 @@
                                         Hello, and welcome to this quick demo of the task program.
 task add do laundry                      Let's add some tasks
                                         I need to do laundry
 task add project:garage order dumpster   Oh yeah, I need to order the dumpster
 task add +phone tell mom i loveher       Must call Mom  (that "phone" there is a tag - they can
                                           be useful for searching and categorizing)
 task add +phone pro:garage schedule
  goodwill pickup
 task ad +email pro:garage ask Tom if     Notice I can abbreviate commands
  he wants that old bkie
 task ls                                  Let's see what we've got
                                         Oh, I spelled bike wrong
 task 5 /bkie/bike/
 task ls                                  That's better
 task 1 pro:home                          Let's assign projects
 task 3 pro:home tell mom I love her
 task ls pro:garage
 task long pro:garage                     Let's see all the columns
 task list pro:garage                     There are different ways to list
 task lis +phone                          By tag
 task li pro:garage +phone                By project and tag
 task l mom                               By word
 task 1 priority:H                        Priorities can be High, Medium or Low
 task pri:H 3
 task 1 pri:M
 task li                                  The list is sorted by priority.
 task 2 pri:L
 task li
 task done 3                              Suppose task 3 is done
 task li                                  ...and it's gone
 task 2 +phone +mistake                   Lets add tags
 # Oops!
 task 2 -mistake                          or remove tags
 task tags                                or look at all the tags
 task info 2                              or all the details
 task projects                            or all the projects
 task 3 fg:bold                           Let's make it colorful
 task 4 fg:bold_green
 task li
 task 3 fg:bold_underline_white
 task li
 task 4 bg:on_bright_red fg:bold_yellow
 task li                                  Oh that's just nasty - let's get rid of that.
 task 4 bg:
 task li
 task 4 fg:
 task 3 fg:
 task colors                              There are many combinations to choose from
 (Slashes!!!)
 task 1 due:6/8/2008                      Let's add a due date
 date
 task li
 task calendar                            Notice the due task is in yellow, today is marked cyan
 task 1 due:5/20/2008                     This is now an overdue task
 task li                                  and it shows up red
 task overdue
 task cal
 task export file.csv                     You can export the tasks to a spreadsheet
 cat file.csv
 task start 1                             Started tasks can be used as reminders
                                           of what you are supposed to be doing
 task active                              They show up as active
 task done 1                              Let's clear out a couple
 task li
 task done 3
 task active
 task summary                             Summary shows progress on all projects
 task history                             History shows general activity - how many added,
                                           completed etc, by month
 task ghistory                            This report shows a histogram of tasks that were
                                           added (in red), completed (in green) and deleted
                                           (in yellow), all by month.
                                         And that's it.  There are more commands than this
                                         covered in the online documentation, but this should give
                                         the basic idea.
                                         Thank you for watching.
--- a/doc/misc/themes/README
+++ b/doc/misc/themes/README
@@ -0,0 +1,16 @@
 Themes
 To generate samples of themes, first execute the 'run' script to generate the
 sample data.  Note that this data may need to be tweaked to include qualities
 that need to be illustrated in theme sample.
 Then edit the 'rc' file to include the desired theme file.
 Then run 'per' once per theme, and capture the display.
 Note that this will require that the terminal window be switched between a black
 and white background to properly show the light and dark themes.
 Note that for the solarized themes, the terminal color palette needs to be set
 to specific colors.
--- a/doc/misc/themes/per
+++ b/doc/misc/themes/per
@@ -0,0 +1,8 @@
 echo '$ task list'
 task rc:rc list | grep -v alternate
 echo '$ task summary'
 task rc:rc summary | grep -v alternate
 echo '$ task ghistory'
 task rc:rc ghistory | grep -v alternate
 echo '$ task calendar'
 task rc:rc calendar | grep -v alternate
--- a/doc/misc/themes/run
+++ b/doc/misc/themes/run
@@ -0,0 +1,47 @@
 rm pending.data completed.data undo.data rc
 cat <<EOF >>rc
 data.location=.
 confirmation=off
 _forcecolor=on
 #include ~/task-2.0.0.git/doc/rc/light-16.theme
 #include ~/task-2.0.0.git/doc/rc/dark-16.theme
 #include ~/task-2.0.0.git/doc/rc/light-256.theme
 #include ~/task-2.0.0.git/doc/rc/dark-256.theme
 #include ~/task-2.0.0.git/doc/rc/dark-gray-256.theme
 #include ~/task-2.0.0.git/doc/rc/dark-red-256.theme
 #include ~/task-2.0.0.git/doc/rc/dark-green-256.theme
 #include ~/task-2.0.0.git/doc/rc/dark-blue-256.theme
 include ~/task-2.0.0.git/doc/rc/dark-violets-256.theme
 #include ~/task-2.0.0.git/doc/rc/dark-yellow-green.theme
 #include ~/task-2.0.0.git/doc/rc/solarized-dark-256.theme
 #include ~/task-2.0.0.git/doc/rc/solarized-light-256.theme
 EOF
 task rc:rc add Ordinary task
 task rc:rc add Started task
 task rc:rc 2 start
 task rc:rc add High priority task pri:H
 task rc:rc add Medium priority task pri:M
 task rc:rc add Low priority task pri:L
 task rc:rc add Household task project:Home
 task rc:rc add Outdoor task project:Garden
 task rc:rc add Overdue task due:yesterday
 task rc:rc add Due task due:tomorrow
 task rc:rc add Not yet due tasks due:2/14/2012
 task rc:rc add Recurring task due:eom recur:monthly
 task rc:rc add Tagged task +tag1
 task rc:rc add Blocking task
 task rc:rc add Dependent task
 task rc:rc log Completed_1 project:Garden
 task rc:rc log Completed_2 project:Garden
 task rc:rc log Completed_3 project:Home
 task rc:rc add Deleted_1
 task rc:rc 14 mod depends:13
 task rc:rc 15 delete
--- a/doc/rc/dark-16.theme
+++ b/doc/rc/dark-16.theme
@@ -1,17 +1,52 @@
-# Sample task 1.9 (or later) dark 16-color theme
+################################################################################
 # Sample taskwarrior 1.9 (or later) dark 16-color theme
 #
 # taskwarrior - a command line task list manager.
 #
 # Copyright 2006-2012, Paul Beckingham, Federico Hernandez.
 #
 # Permission is hereby granted, free of charge, to any person obtaining a copy
 # of this software and associated documentation files (the "Software"), to deal
 # in the Software without restriction, including without limitation the rights
 # to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
 # copies of the Software, and to permit persons to whom the Software is
 # furnished to do so, subject to the following conditions:
 #
 # The above copyright notice and this permission notice shall be included
 # in all copies or substantial portions of the Software.
 #
 # THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
 # OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
 # FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
 # THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
 # LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
 # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 # SOFTWARE.
 #
 # http://www.opensource.org/licenses/mit-license.php
 #
 ###############################################################################
 color=on
 color.header=yellow
 color.footnote=yellow
 color.debug=yellow
-color.summary.bar=on green
+color.summary.bar=black on green
-color.summary.background=on black
+color.summary.background=white on black
 color.history.add=black on red
 color.history.done=black on green
 color.history.delete=black on yellow
 color.burndown.pending=on red
 color.burndown.started=on yellow
 color.burndown.done=on green
 color.sync.added=green
 color.sync.changed=yellow
 color.sync.rejected=red
 color.undo.before=red
 color.undo.after=green
@@ -33,5 +68,8 @@ color.pri.H=bold white
 color.pri.M=white
 color.pri.L=
 color.tagged=green
 color.blocked=black on white
 color.project.none=
 color.tag.none=
 color.alternate=
--- a/doc/rc/dark-256.theme
+++ b/doc/rc/dark-256.theme
@@ -1,17 +1,52 @@
-# Sample task 1.9 (or later) dark 256-color theme
+###############################################################################
 # Sample taskwarrior 1.9 (or later) dark 256-color theme
 #
 # taskwarrior - a command line task list manager.
 #
 # Copyright 2006-2012, Paul Beckingham, Federico Hernandez.
 #
 # Permission is hereby granted, free of charge, to any person obtaining a copy
 # of this software and associated documentation files (the "Software"), to deal
 # in the Software without restriction, including without limitation the rights
 # to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
 # copies of the Software, and to permit persons to whom the Software is
 # furnished to do so, subject to the following conditions:
 #
 # The above copyright notice and this permission notice shall be included
 # in all copies or substantial portions of the Software.
 #
 # THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
 # OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
 # FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
 # THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
 # LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
 # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 # SOFTWARE.
 #
 # http://www.opensource.org/licenses/mit-license.php
 #
 ###############################################################################
 color=on
 color.header=color3
 color.footnote=color3
 color.debug=color3
-color.summary.bar=on rgb141
+color.summary.bar=black on rgb141
-color.summary.background=on color0
+color.summary.background=white on color0
 color.history.add=color0 on rgb500
 color.history.done=color0 on rgb050
 color.history.delete=color0 on rgb550
 color.burndown.pending=on color9
 color.burndown.started=on color11
 color.burndown.done=on rgb010
 color.sync.added=rgb010
 color.sync.changed=color11
 color.sync.rejected=color9
 color.undo.before=color1
 color.undo.after=color2
@@ -33,5 +68,8 @@ color.pri.H=color255
 color.pri.M=color250
 color.pri.L=color245
 color.tagged=rgb031
 color.blocked=white on color8
 color.project.none=
 color.tag.none=
 color.alternate=on color233
--- a/doc/rc/dark-blue-256.theme
+++ b/doc/rc/dark-blue-256.theme
@@ -1,17 +1,52 @@
-# Sample task 1.9 (or later) dark 256-color theme, featuring blue.
+###############################################################################
 # Sample taskwarrior 1.9 (or later) dark 256-color theme, featuring blue.
 #
 # taskwarrior - a command line task list manager.
 #
 # Copyright 2006-2012, Paul Beckingham, Federico Hernandez.
 #
 # Permission is hereby granted, free of charge, to any person obtaining a copy
 # of this software and associated documentation files (the "Software"), to deal
 # in the Software without restriction, including without limitation the rights
 # to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
 # copies of the Software, and to permit persons to whom the Software is
 # furnished to do so, subject to the following conditions:
 #
 # The above copyright notice and this permission notice shall be included
 # in all copies or substantial portions of the Software.
 #
 # THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
 # OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
 # FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
 # THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
 # LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
 # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 # SOFTWARE.
 #
 # http://www.opensource.org/licenses/mit-license.php
 #
 ###############################################################################
 color=on
 color.header=rgb013
 color.footnote=rgb013
 color.debug=rgb013
-color.summary.bar=on rgb003
+color.summary.bar=white on rgb003
-color.summary.background=on color0
+color.summary.background=white on color0
 color.history.add=color0 on rgb015
 color.history.done=color0 on rgb025
 color.history.delete=color0 on rgb035
 color.burndown.pending=on rgb004
 color.burndown.started=on rgb015
 color.burndown.done=on gray4
 color.sync.added=gray4
 color.sync.changed=rgb015
 color.sync.rejected=rgb004
 color.undo.before=rgb013
 color.undo.after=rgb035
@@ -33,5 +68,8 @@ color.pri.H=rgb035
 color.pri.M=rgb025
 color.pri.L=rgb015
 color.tagged=color246
 color.blocked=white on rgb001
 color.project.none=
 color.tag.none=
 color.alternate=on color233
--- a/doc/rc/dark-gray-256.theme
+++ b/doc/rc/dark-gray-256.theme
@@ -0,0 +1,75 @@
 ###############################################################################
 # Sample taskwarrior 1.9 (or later) dark gray 256-color theme
 #
 # taskwarrior - a command line task list manager.
 #
 # Copyright 2006-2012, Paul Beckingham, Federico Hernandez.
 #
 # Permission is hereby granted, free of charge, to any person obtaining a copy
 # of this software and associated documentation files (the "Software"), to deal
 # in the Software without restriction, including without limitation the rights
 # to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
 # copies of the Software, and to permit persons to whom the Software is
 # furnished to do so, subject to the following conditions:
 #
 # The above copyright notice and this permission notice shall be included
 # in all copies or substantial portions of the Software.
 #
 # THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
 # OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
 # FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
 # THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
 # LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
 # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 # SOFTWARE.
 #
 # http://www.opensource.org/licenses/mit-license.php
 #
 ###############################################################################
 color=on
 color.header=color8
 color.footnote=color8
 color.debug=color8
 color.summary.bar=black on gray12
 color.summary.background=white on gray3
 color.history.add=color0 on gray6
 color.history.done=color0 on gray15
 color.history.delete=color0 on gray10
 color.burndown.pending=on gray6
 color.burndown.started=on gray15
 color.burndown.done=on gray10
 color.sync.added=gray10
 color.sync.changed=gray15
 color.sync.rejected=gray6
 color.undo.before=gray6
 color.undo.after=gray15
 color.calendar.today=color8 on color15
 color.calendar.due=color7 on color8
 color.calendar.due.today=color15 on color8
 color.calendar.overdue=underline color0 on color7
 color.calendar.weekend=on color235
 color.calendar.holiday=color7 on color15
 color.calendar.weeknumber=gray4
 color.recurring=gray8
 color.overdue=color0 on color15
 color.due.today=underline color0 on color7
 color.due=color7
 color.active=color7 on color8
 color.pri.none=
 color.pri.H=color15
 color.pri.M=color7
 color.pri.L=color8
 color.tagged=gray12
 color.blocked=color15 on color8
 color.project.none=
 color.tag.none=
 color.alternate=on gray2
--- a/doc/rc/dark-green-256.theme
+++ b/doc/rc/dark-green-256.theme
@@ -1,17 +1,52 @@
-# Sample task 1.9 (or later) dark 256-color theme, featuring green.
+###############################################################################
 # Sample taskwarrior 1.9 (or later) dark 256-color theme, featuring green.
 #
 # taskwarrior - a command line task list manager.
 #
 # Copyright 2006-2012, Paul Beckingham, Federico Hernandez.
 #
 # Permission is hereby granted, free of charge, to any person obtaining a copy
 # of this software and associated documentation files (the "Software"), to deal
 # in the Software without restriction, including without limitation the rights
 # to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
 # copies of the Software, and to permit persons to whom the Software is
 # furnished to do so, subject to the following conditions:
 #
 # The above copyright notice and this permission notice shall be included
 # in all copies or substantial portions of the Software.
 #
 # THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
 # OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
 # FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
 # THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
 # LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
 # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 # SOFTWARE.
 #
 # http://www.opensource.org/licenses/mit-license.php
 #
 ###############################################################################
 color=on
 color.header=rgb031
 color.footnote=rgb031
 color.debug=rgb031
-color.summary.bar=on rgb030
+color.summary.bar=white on rgb030
-color.summary.background=on color0
+color.summary.background=white on color0
 color.history.add=color0 on rgb010
 color.history.done=color0 on rgb030
 color.history.delete=color0 on rgb050
 color.burndown.pending=on rgb010
 color.burndown.started=on rgb030
 color.burndown.done=on gray4
 color.sync.added=gray4
 color.sync.changed=rgb030
 color.sync.rejected=rgb010
 color.undo.before=rgb031
 color.undo.after=rgb053
@@ -33,5 +68,8 @@ color.pri.H=rgb050
 color.pri.M=rgb030
 color.pri.L=rgb010
 color.tagged=color246
 color.blocked=white on rgb010
 color.project.none=
 color.tag.none=
 color.alternate=on color233
--- a/doc/rc/dark-red-256.theme
+++ b/doc/rc/dark-red-256.theme
@@ -1,17 +1,52 @@
-# Sample task 1.9 (or later) dark 256-color theme, featuring red.
+###############################################################################
 # Sample taskwarrior 1.9 (or later) dark 256-color theme, featuring red.
 #
 # taskwarrior - a command line task list manager.
 #
 # Copyright 2006-2012, Paul Beckingham, Federico Hernandez.
 #
 # Permission is hereby granted, free of charge, to any person obtaining a copy
 # of this software and associated documentation files (the "Software"), to deal
 # in the Software without restriction, including without limitation the rights
 # to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
 # copies of the Software, and to permit persons to whom the Software is
 # furnished to do so, subject to the following conditions:
 #
 # The above copyright notice and this permission notice shall be included
 # in all copies or substantial portions of the Software.
 #
 # THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
 # OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
 # FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
 # THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
 # LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
 # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 # SOFTWARE.
 #
 # http://www.opensource.org/licenses/mit-license.php
 #
 ###############################################################################
 color=on
 color.header=rgb100
 color.footnote=rgb100
 color.debug=rgb100
-color.summary.bar=on rgb300
+color.summary.bar=white on rgb300
-color.summary.background=on color0
+color.summary.background=white on color0
 color.history.add=color0 on rgb100
 color.history.done=color0 on rgb300
 color.history.delete=color0 on rgb500
 color.burndown.pending=on rgb200
 color.burndown.started=on rgb411
 color.burndown.done=on gray4
 color.sync.added=gray4
 color.sync.changed=rgb411
 color.sync.rejected=rgb200
 color.undo.before=rgb301
 color.undo.after=rgb503
@@ -33,5 +68,8 @@ color.pri.H=rgb500
 color.pri.M=rgb400
 color.pri.L=rgb300
 color.tagged=color246
 color.blocked=white on rgb100
 color.project.none=
 color.tag.none=
 color.alternate=on color233
--- a/doc/rc/dark-violets-256.theme
+++ b/doc/rc/dark-violets-256.theme
@@ -0,0 +1,75 @@
 ################################################################################
 # Sample taskwarrior 1.9 (or later) dark violet 256-color theme
 #
 # taskwarrior - a command line task list manager.
 #
 # Copyright 2006-2012, Paul Beckingham, Federico Hernandez.
 #
 # Permission is hereby granted, free of charge, to any person obtaining a copy
 # of this software and associated documentation files (the "Software"), to deal
 # in the Software without restriction, including without limitation the rights
 # to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
 # copies of the Software, and to permit persons to whom the Software is
 # furnished to do so, subject to the following conditions:
 #
 # The above copyright notice and this permission notice shall be included
 # in all copies or substantial portions of the Software.
 #
 # THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
 # OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
 # FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
 # THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
 # LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
 # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 # SOFTWARE.
 #
 # http://www.opensource.org/licenses/mit-license.php
 #
 ###############################################################################
 color=on
 color.header=rgb013
 color.footnote=rgb013
 color.debug=rgb013
 color.summary.bar=white on rgb103
 color.summary.background=white on color0
 color.history.add=color0 on rgb105
 color.history.done=color0 on rgb205
 color.history.delete=color0 on rgb305
 color.burndown.pending=on rgb103
 color.burndown.started=on rgb214
 color.burndown.done=on gray4
 color.sync.added=gray4
 color.sync.changed=rgb214
 color.sync.rejected=rgb103
 color.undo.before=rgb103
 color.undo.after=rgb305
 color.calendar.today=color15 on rgb103
 color.calendar.due=color0 on rgb325
 color.calendar.due.today=color0 on rgb404
 color.calendar.overdue=color0 on color9
 color.calendar.weekend=gray12 on gray3
 color.calendar.holiday=color15 on rgb022
 color.calendar.weeknumber=rgb104
 color.recurring=rgb115
 color.overdue=color9
 color.due.today=rgb533
 color.due=rgb055
 color.active=rgb445 on rgb213
 color.pri.none=
 color.pri.H=rgb404
 color.pri.M=rgb304
 color.pri.L=rgb325
 color.tagged=rgb334
 color.blocked=white on rgb101
 color.project.none=
 color.tag.none=
 color.alternate=on gray2
--- a/doc/rc/dark-yellow-green.theme
+++ b/doc/rc/dark-yellow-green.theme
@@ -0,0 +1,75 @@
 ################################################################################
 # Sample taskwarrior 1.9 (or later) dark-yellow-green 256-color theme
 #
 # taskwarrior - a command line task list manager.
 #
 # Copyright 2006-2012, Paul Beckingham, Federico Hernandez.
 #
 # Permission is hereby granted, free of charge, to any person obtaining a copy
 # of this software and associated documentation files (the "Software"), to deal
 # in the Software without restriction, including without limitation the rights
 # to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
 # copies of the Software, and to permit persons to whom the Software is
 # furnished to do so, subject to the following conditions:
 #
 # The above copyright notice and this permission notice shall be included
 # in all copies or substantial portions of the Software.
 #
 # THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
 # OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
 # FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
 # THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
 # LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
 # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 # SOFTWARE.
 #
 # http://www.opensource.org/licenses/mit-license.php
 #
 ###############################################################################
 color=on
 color.header=rgb031
 color.footnote=rgb031
 color.debug=rgb031
 color.summary.bar=white on rgb030
 color.summary.background=white on color0
 color.history.add=color0 on rgb010
 color.history.done=color0 on rgb030
 color.history.delete=color0 on rgb050
 color.burndown.pending=on rgb110
 color.burndown.started=on rgb430
 color.burndown.done=on gray4
 color.sync.added=gray4
 color.sync.changed=rgb430
 color.sync.rejected=rgb110
 color.undo.before=rgb031
 color.undo.after=rgb053
 color.calendar.today=color15 on rgb110
 color.calendar.due=color0 on rgb430
 color.calendar.due.today=color0 on rgb410
 color.calendar.overdue=color0 on rgb400
 color.calendar.weekend=on color235
 color.calendar.holiday=rgb151 on rgb020
 color.calendar.weeknumber=rgb110
 color.recurring=rgb343
 color.overdue=rgb400
 color.due.today=rgb410
 color.due=rgb420
 color.active=rgb451 on rgb310
 color.pri.none=
 color.pri.H=rgb450
 color.pri.M=rgb030
 color.pri.L=rgb010
 color.tagged=rgb342
 color.blocked=white on rgb110
 color.project.none=
 color.tag.none=
 color.alternate=on gray0
--- a/doc/rc/holidays-SE.rc
+++ b/doc/rc/holidays-SE.rc
@@ -1,36 +0,0 @@
 calendar.holidays=sparse
 holiday.nyårsdagen.name=Nyårsdagen
 holiday.nyårsdagen.date=20100101
 holiday.trettondedagjul.name=Trettondedag jul
 holiday.trettondedagjul.date=20100106
 holiday.långfredagen.name=Långfredagen
 holiday.långfredagen.date=20100402
 holiday.påskdagen.name=Påskdagen
 holiday.påskdagen.date=20100404
 holiday.annandagpåsk.name=Annandag påsk
 holiday.annandagpåsk.date=20100405
 holiday.valborgmässoafton.name=Valborgmässoafton
 holiday.valborgmässoafton.date=20100430
 holiday.förstamaj.name=Första maj
 holiday.förstamaj.date=20100501
 holiday.kristihimmelfärdsdag.name=Kristi Himmelsfärdsdag
 holiday.kristihimmelfärdsdag.date=20100513
 holiday.pingstdagen.name=Pingstdagen
 holiday.pingstdagen.date=20100523
 holiday.nationaldagen.name=Nationaldagen
 holiday.nationaldagen.date=20100606
 holiday.midsommarafton.name=Midsommarafton
 holiday.midsommarafton.date=20100625
 holiday.midsommardagen.name=Midsommardagen
 holiday.midsommardagen.date=20100626
 holiday.allahelgonsdag.name=Alla Helgons Dag
 holiday.allahelgonsdag.date=20101106
 holiday.julafton.name=Julafton
 holiday.julafton.date=20101224
 holiday.juldagen.name=Juldagen
 holiday.juldagen.date=20101225
 holiday.annandagjul.name=Annandag jul
 holiday.annandagjul.date=20101226
 holiday.nyårsafton.name=Nyårsafton
 holiday.nyårsafton.date=20101231
--- a/doc/rc/holidays-US.rc
+++ b/doc/rc/holidays-US.rc
@@ -1,28 +0,0 @@
 calendar.holidays=sparse
 holiday.newyearsday.name=New Years Day
 holiday.newyearsday.date=20100101
 holiday.martinlutherkingday.name=Martin Luther King Day
 holiday.martinlutherkingday.date=20100118
 holiday.presidentsday.name=Presidents Day
 holiday.presidentsday.date=20100215
 holiday.patriotsday.name=Patriots Day
 holiday.patriotsday.date=20100419
 holiday.memorialday.name=Memorial Day
 holiday.memorialday.date=20100531
 holiday.independenceday.name=Independence Day
 holiday.independenceday.date=20100704
 holiday.independenceday2.name=Independence Day observed
 holiday.independenceday2.date=20100705
 holiday.laborday.name=Labor Day
 holiday.laborday.date=20100906
 holiday.columbusday.name=Columbus Day
 holiday.columbusday.date=20101011
 holiday.veteransdays.name=Veterans Day
 holiday.veteransdays.date=20101111
 holiday.thanksgiving.name=Thanksgiving Day
 holiday.thanksgiving.date=20101125
 holiday.christmasday.name=Christmas Day
 holiday.christmasday.date=20101225
 holiday.newyearseve.name=New Years Eve
 holiday.newyearseve.date=20101231
--- a/doc/rc/holidays.be-BY.rc
+++ b/doc/rc/holidays.be-BY.rc
@@ -0,0 +1,69 @@
 ###############################################################################
 # International Holiday Data provided by Holidata.net
 # http://holidata.net/be-BY/2012.json
 # http://holidata.net/be-BY/2013.json
 #
 # Copyright 2006-2012, Paul Beckingham, Federico Hernandez.
 #
 # Permission is hereby granted, free of charge, to any person obtaining a copy
 # of this software and associated documentation files (the "Software"), to deal
 # in the Software without restriction, including without limitation the rights
 # to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
 # copies of the Software, and to permit persons to whom the Software is
 # furnished to do so, subject to the following conditions:
 #
 # The above copyright notice and this permission notice shall be included
 # in all copies or substantial portions of the Software.
 #
 # THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
 # OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
 # FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
 # THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
 # LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
 # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 # SOFTWARE.
 #
 # http://www.opensource.org/licenses/mit-license.php
 #
 ###############################################################################
 holiday.be-BY1.name=Новы Год
 holiday.be-BY1.date=20120101
 holiday.be-BY2.name=Раство Хрыстова(праваслаўнае)
 holiday.be-BY2.date=20120107
 holiday.be-BY3.name=Міжнародны жаночы дзень
 holiday.be-BY3.date=20120803
 holiday.be-BY4.name=Пасха(праваслаўная)
 holiday.be-BY4.date=20120415
 holiday.be-BY5.name=Радуніца
 holiday.be-BY5.date=20120424
 holiday.be-BY6.name=Свята працы
 holiday.be-BY6.date=20120501
 holiday.be-BY7.name=Дзень Перамогі
 holiday.be-BY7.date=20120509
 holiday.be-BY8.name=Дзень незалежнаці
 holiday.be-BY8.date=20120703
 holiday.be-BY9.name=Дзень Кастрычніцкай рэвалюцыі
 holiday.be-BY9.date=20121107
 holiday.be-BY10.name=Раство Хрыстова(у заходніх хрысціян)
 holiday.be-BY10.date=20121225
 holiday.be-BY11.name=Новы Год
 holiday.be-BY11.date=20130101
 holiday.be-BY12.name=Раство Хрыстова(праваслаўнае)
 holiday.be-BY12.date=20130107
 holiday.be-BY13.name=Міжнародны жаночы дзень
 holiday.be-BY13.date=20130803
 holiday.be-BY14.name=Пасха(праваслаўная)
 holiday.be-BY14.date=20130505
 holiday.be-BY15.name=Радуніца
 holiday.be-BY15.date=20130514
 holiday.be-BY16.name=Свята працы
 holiday.be-BY16.date=20130501
 holiday.be-BY17.name=Дзень Перамогі
 holiday.be-BY17.date=20130509
 holiday.be-BY18.name=Дзень незалежнаці
 holiday.be-BY18.date=20130703
 holiday.be-BY19.name=Дзень Кастрычніцкай рэвалюцыі
 holiday.be-BY19.date=20131107
 holiday.be-BY20.name=Раство Хрыстова(у заходніх хрысціян)
 holiday.be-BY20.date=20131225
--- a/doc/rc/holidays.cs-CZ.rc
+++ b/doc/rc/holidays.cs-CZ.rc
@@ -0,0 +1,81 @@
 ###############################################################################
 # International Holiday Data provided by Holidata.net
 # http://holidata.net/cs-CZ/2012.json
 # http://holidata.net/cs-CZ/2013.json
 #
 # Copyright 2006-2012, Paul Beckingham, Federico Hernandez.
 #
 # Permission is hereby granted, free of charge, to any person obtaining a copy
 # of this software and associated documentation files (the "Software"), to deal
 # in the Software without restriction, including without limitation the rights
 # to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
 # copies of the Software, and to permit persons to whom the Software is
 # furnished to do so, subject to the following conditions:
 #
 # The above copyright notice and this permission notice shall be included
 # in all copies or substantial portions of the Software.
 #
 # THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
 # OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
 # FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
 # THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
 # LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
 # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 # SOFTWARE.
 #
 # http://www.opensource.org/licenses/mit-license.php
 #
 ###############################################################################
 holiday.cs-CZ1.name=Nový rok
 holiday.cs-CZ1.date=20120101
 holiday.cs-CZ2.name=Den obnovy samostatnosti českého státu
 holiday.cs-CZ2.date=20120101
 holiday.cs-CZ3.name=Velikonoční pondělí
 holiday.cs-CZ3.date=20120409
 holiday.cs-CZ4.name=Svátek práce
 holiday.cs-CZ4.date=20120501
 holiday.cs-CZ5.name=Den vítězství
 holiday.cs-CZ5.date=20120508
 holiday.cs-CZ6.name=Den slovanských věrozvěstů
 holiday.cs-CZ6.date=20120705
 holiday.cs-CZ7.name=Den upálení mistra Jana Husa
 holiday.cs-CZ7.date=20120706
 holiday.cs-CZ8.name=Den české státnosti
 holiday.cs-CZ8.date=20120928
 holiday.cs-CZ9.name=Den vzniku samostatného československého státu
 holiday.cs-CZ9.date=20121028
 holiday.cs-CZ10.name=Den boje za svobodu a demokracii
 holiday.cs-CZ10.date=20121117
 holiday.cs-CZ11.name=Štědrý den
 holiday.cs-CZ11.date=20121224
 holiday.cs-CZ12.name=1. svátek vánoční
 holiday.cs-CZ12.date=20121225
 holiday.cs-CZ13.name=2. svátek vánoční
 holiday.cs-CZ13.date=20121226
 holiday.cs-CZ14.name=Nový rok
 holiday.cs-CZ14.date=20130101
 holiday.cs-CZ15.name=Den obnovy samostatnosti českého státu
 holiday.cs-CZ15.date=20130101
 holiday.cs-CZ16.name=Velikonoční pondělí
 holiday.cs-CZ16.date=20130401
 holiday.cs-CZ17.name=Svátek práce
 holiday.cs-CZ17.date=20130501
 holiday.cs-CZ18.name=Den vítězství
 holiday.cs-CZ18.date=20130508
 holiday.cs-CZ19.name=Den slovanských věrozvěstů
 holiday.cs-CZ19.date=20130705
 holiday.cs-CZ20.name=Den upálení mistra Jana Husa
 holiday.cs-CZ20.date=20130706
 holiday.cs-CZ21.name=Den české státnosti
 holiday.cs-CZ21.date=20130928
 holiday.cs-CZ22.name=Den vzniku samostatného československého státu
 holiday.cs-CZ22.date=20131028
 holiday.cs-CZ23.name=Den boje za svobodu a demokracii
 holiday.cs-CZ23.date=20131117
 holiday.cs-CZ24.name=Štědrý den
 holiday.cs-CZ24.date=20131224
 holiday.cs-CZ25.name=1. svátek vánoční
 holiday.cs-CZ25.date=20131225
 holiday.cs-CZ26.name=2. svátek vánoční
 holiday.cs-CZ26.date=20131226
--- a/doc/rc/holidays.da-DK.rc
+++ b/doc/rc/holidays.da-DK.rc
@@ -0,0 +1,77 @@
 ###############################################################################
 # International Holiday Data provided by Holidata.net
 # http://holidata.net/da-DK/2012.json
 # http://holidata.net/da-DK/2013.json
 #
 # Copyright 2006-2012, Paul Beckingham, Federico Hernandez.
 #
 # Permission is hereby granted, free of charge, to any person obtaining a copy
 # of this software and associated documentation files (the "Software"), to deal
 # in the Software without restriction, including without limitation the rights
 # to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
 # copies of the Software, and to permit persons to whom the Software is
 # furnished to do so, subject to the following conditions:
 #
 # The above copyright notice and this permission notice shall be included
 # in all copies or substantial portions of the Software.
 #
 # THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
 # OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
 # FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
 # THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
 # LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
 # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 # SOFTWARE.
 #
 # http://www.opensource.org/licenses/mit-license.php
 #
 ###############################################################################
 holiday.da-DK1.name=Nytårsdag
 holiday.da-DK1.date=20120101
 holiday.da-DK2.name=Palmesøndag
 holiday.da-DK2.date=20120401
 holiday.da-DK3.name=Skærtorsdag
 holiday.da-DK3.date=20120405
 holiday.da-DK4.name=Langfredag
 holiday.da-DK4.date=20120406
 holiday.da-DK5.name=Påskedag
 holiday.da-DK5.date=20120408
 holiday.da-DK6.name=Anden påskedag
 holiday.da-DK6.date=20120409
 holiday.da-DK7.name=Store bededag
 holiday.da-DK7.date=20120504
 holiday.da-DK8.name=Kristi himmelfartsdag
 holiday.da-DK8.date=20120517
 holiday.da-DK9.name=Pinsedag
 holiday.da-DK9.date=20120527
 holiday.da-DK10.name=Anden pinsedag
 holiday.da-DK10.date=20120528
 holiday.da-DK11.name=Juledag
 holiday.da-DK11.date=20121225
 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
--- a/doc/rc/holidays.de-AT.rc
+++ b/doc/rc/holidays.de-AT.rc
@@ -0,0 +1,121 @@
 ###############################################################################
 # International Holiday Data provided by Holidata.net
 # http://holidata.net/de-AT/2012.json
 # http://holidata.net/de-AT/2013.json
 #
 # Copyright 2006-2012, Paul Beckingham, Federico Hernandez.
 #
 # Permission is hereby granted, free of charge, to any person obtaining a copy
 # of this software and associated documentation files (the "Software"), to deal
 # in the Software without restriction, including without limitation the rights
 # to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
 # copies of the Software, and to permit persons to whom the Software is
 # furnished to do so, subject to the following conditions:
 #
 # The above copyright notice and this permission notice shall be included
 # in all copies or substantial portions of the Software.
 #
 # THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
 # OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
 # FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
 # THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
 # LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
 # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 # SOFTWARE.
 #
 # http://www.opensource.org/licenses/mit-license.php
 #
 ###############################################################################
 holiday.de-AT1.name=Neujahr
 holiday.de-AT1.date=20120101
 holiday.de-AT2.name=Heilige drei KÃ¶nige
 holiday.de-AT2.date=20120106
 holiday.de-AT3.name=Josef (K, St, T, V)
 holiday.de-AT3.date=20120319
 holiday.de-AT4.name=Karfreitag
 holiday.de-AT4.date=20120406
 holiday.de-AT5.name=Ostersonntag
 holiday.de-AT5.date=20120408
 holiday.de-AT6.name=Ostermontag
 holiday.de-AT6.date=20120409
 holiday.de-AT7.name=Staatsfeiertag
 holiday.de-AT7.date=20120501
 holiday.de-AT8.name=Florian (O)
 holiday.de-AT8.date=20120504
 holiday.de-AT9.name=Christi Himmelfahrt
 holiday.de-AT9.date=20120517
 holiday.de-AT10.name=Pfingstsonntag
 holiday.de-AT10.date=20120527
 holiday.de-AT11.name=Pfingstmontag
 holiday.de-AT11.date=20120528
 holiday.de-AT12.name=Fronleichnam
 holiday.de-AT12.date=20120607
 holiday.de-AT13.name=Mariä Himmelfahrt
 holiday.de-AT13.date=20120815
 holiday.de-AT14.name=Rupert (S)
 holiday.de-AT14.date=20120924
 holiday.de-AT15.name=Tag der Volksabstimmung (K)
 holiday.de-AT15.date=20121010
 holiday.de-AT16.name=Allerheiligen
 holiday.de-AT16.date=20121101
 holiday.de-AT17.name=Martin (B)
 holiday.de-AT17.date=20121111
 holiday.de-AT18.name=Leopold (W, N)
 holiday.de-AT18.date=20121115
 holiday.de-AT19.name=Mariä Empfängnis
 holiday.de-AT19.date=20121208
 holiday.de-AT20.name=Heiliger Abend
 holiday.de-AT20.date=20121224
 holiday.de-AT21.name=Christtag
 holiday.de-AT21.date=20121225
 holiday.de-AT22.name=Stefanitag
 holiday.de-AT22.date=20121226
 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
--- a/doc/rc/holidays.de-DE.rc
+++ b/doc/rc/holidays.de-DE.rc
@@ -0,0 +1,165 @@
 ###############################################################################
 # International Holiday Data provided by Holidata.net
 # http://holidata.net/de-DE/2012.json
 # http://holidata.net/de-DE/2013.json
 #
 # Copyright 2006-2012, Paul Beckingham, Federico Hernandez.
 #
 # Permission is hereby granted, free of charge, to any person obtaining a copy
 # of this software and associated documentation files (the "Software"), to deal
 # in the Software without restriction, including without limitation the rights
 # to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
 # copies of the Software, and to permit persons to whom the Software is
 # furnished to do so, subject to the following conditions:
 #
 # The above copyright notice and this permission notice shall be included
 # in all copies or substantial portions of the Software.
 #
 # THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
 # OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
 # FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
 # THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
 # LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
 # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 # SOFTWARE.
 #
 # http://www.opensource.org/licenses/mit-license.php
 #
 ###############################################################################
 holiday.de-DE1.name=Neujahr
 holiday.de-DE1.date=20120101
 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
--- a/doc/rc/holidays.en-CA.rc
+++ b/doc/rc/holidays.en-CA.rc
@@ -0,0 +1,85 @@
 ###############################################################################
 # International Holiday Data provided by Holidata.net
 # http://holidata.net/en-CA/2012.json
 # http://holidata.net/en-CA/2013.json
 #
 # Copyright 2006-2012, Paul Beckingham, Federico Hernandez.
 #
 # Permission is hereby granted, free of charge, to any person obtaining a copy
 # of this software and associated documentation files (the "Software"), to deal
 # in the Software without restriction, including without limitation the rights
 # to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
 # copies of the Software, and to permit persons to whom the Software is
 # furnished to do so, subject to the following conditions:
 #
 # The above copyright notice and this permission notice shall be included
 # in all copies or substantial portions of the Software.
 #
 # THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
 # OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
 # FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
 # THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
 # LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
 # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 # SOFTWARE.
 #
 # http://www.opensource.org/licenses/mit-license.php
 #
 ###############################################################################
 holiday.en-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
--- a/doc/rc/holidays.en-GB.rc
+++ b/doc/rc/holidays.en-GB.rc
@@ -0,0 +1,65 @@
 ###############################################################################
 # International Holiday Data provided by Holidata.net
 # http://holidata.net/en-GB/2012.json
 # http://holidata.net/en-GB/2013.json
 #
 # Copyright 2006-2012, Paul Beckingham, Federico Hernandez.
 #
 # Permission is hereby granted, free of charge, to any person obtaining a copy
 # of this software and associated documentation files (the "Software"), to deal
 # in the Software without restriction, including without limitation the rights
 # to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
 # copies of the Software, and to permit persons to whom the Software is
 # furnished to do so, subject to the following conditions:
 #
 # The above copyright notice and this permission notice shall be included
 # in all copies or substantial portions of the Software.
 #
 # THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
 # OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
 # FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
 # THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
 # LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
 # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 # SOFTWARE.
 #
 # http://www.opensource.org/licenses/mit-license.php
 #
 ###############################################################################
 holiday.en-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
--- a/doc/rc/holidays.en-NZ.rc
+++ b/doc/rc/holidays.en-NZ.rc
@@ -0,0 +1,69 @@
 ###############################################################################
 # International Holiday Data provided by Holidata.net
 # http://holidata.net/en-NZ/2012.json
 # http://holidata.net/en-NZ/2013.json
 #
 # Copyright 2006-2012, Paul Beckingham, Federico Hernandez.
 #
 # Permission is hereby granted, free of charge, to any person obtaining a copy
 # of this software and associated documentation files (the "Software"), to deal
 # in the Software without restriction, including without limitation the rights
 # to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
 # copies of the Software, and to permit persons to whom the Software is
 # furnished to do so, subject to the following conditions:
 #
 # The above copyright notice and this permission notice shall be included
 # in all copies or substantial portions of the Software.
 #
 # THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
 # OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
 # FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
 # THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
 # LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
 # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 # SOFTWARE.
 #
 # http://www.opensource.org/licenses/mit-license.php
 #
 ###############################################################################
 holiday.en-NZ1.name=New Year's Day
 holiday.en-NZ1.date=20120101
 holiday.en-NZ2.name=Day after New Years Day
 holiday.en-NZ2.date=20120102
 holiday.en-NZ3.name=Waitangi Day
 holiday.en-NZ3.date=20120206
 holiday.en-NZ4.name=Good Friday
 holiday.en-NZ4.date=20120406
 holiday.en-NZ5.name=Easter Monday
 holiday.en-NZ5.date=20120409
 holiday.en-NZ6.name=ANZAC Day
 holiday.en-NZ6.date=20120425
 holiday.en-NZ7.name=Queen's Birthday
 holiday.en-NZ7.date=20120604
 holiday.en-NZ8.name=Labour Day
 holiday.en-NZ8.date=20121022
 holiday.en-NZ9.name=Christmas Day
 holiday.en-NZ9.date=20121225
 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
--- a/doc/rc/holidays.en-US.rc
+++ b/doc/rc/holidays.en-US.rc
@@ -0,0 +1,79 @@
 ###############################################################################
 # International Holiday Data provided by Holidata.net
 # http://holidata.net/en-US/2012.json
 # http://holidata.net/en-US/2013.json
 #
 # Copyright 2006-2012, Paul Beckingham, Federico Hernandez.
 #
 # Permission is hereby granted, free of charge, to any person obtaining a copy
 # of this software and associated documentation files (the "Software"), to deal
 # in the Software without restriction, including without limitation the rights
 # to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
 # copies of the Software, and to permit persons to whom the Software is
 # furnished to do so, subject to the following conditions:
 #
 # The above copyright notice and this permission notice shall be included
 # in all copies or substantial portions of the Software.
 #
 # THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
 # OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
 # FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
 # THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
 # LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
 # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 # SOFTWARE.
 #
 # http://www.opensource.org/licenses/mit-license.php
 #
 ###############################################################################
 holiday.en-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-US6.name=Patriots' Day
 holiday.en-US6.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-US17.name=Patriots' Day
 holiday.en-US17.date=20130415
 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
--- a/doc/rc/holidays.es-ES.rc
+++ b/doc/rc/holidays.es-ES.rc
@@ -0,0 +1,79 @@
 ###############################################################################
 # International Holiday Data provided by Holidata.net
 # http://holidata.net/es-ES/2012.json
 # http://holidata.net/es-ES/2013.json
 #
 # Copyright 2006-2012, Paul Beckingham, Federico Hernandez.
 #
 # Permission is hereby granted, free of charge, to any person obtaining a copy
 # of this software and associated documentation files (the "Software"), to deal
 # in the Software without restriction, including without limitation the rights
 # to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
 # copies of the Software, and to permit persons to whom the Software is
 # furnished to do so, subject to the following conditions:
 #
 # The above copyright notice and this permission notice shall be included
 # in all copies or substantial portions of the Software.
 #
 # THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
 # OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
 # FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
 # THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
 # LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
 # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 # SOFTWARE.
 #
 # http://www.opensource.org/licenses/mit-license.php
 #
 ###############################################################################
 holiday.es-ES1.name=Año Nuevo
 holiday.es-ES1.date=20120101
 holiday.es-ES2.name=Día de los Reyes
 holiday.es-ES2.date=20120106
 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
--- a/doc/rc/holidays.fr-FR.rc
+++ b/doc/rc/holidays.fr-FR.rc
@@ -0,0 +1,73 @@
 ###############################################################################
 # International Holiday Data provided by Holidata.net
 # http://holidata.net/fr-FR/2012.json
 # http://holidata.net/fr-FR/2013.json
 #
 # Copyright 2006-2012, Paul Beckingham, Federico Hernandez.
 #
 # Permission is hereby granted, free of charge, to any person obtaining a copy
 # of this software and associated documentation files (the "Software"), to deal
 # in the Software without restriction, including without limitation the rights
 # to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
 # copies of the Software, and to permit persons to whom the Software is
 # furnished to do so, subject to the following conditions:
 #
 # The above copyright notice and this permission notice shall be included
 # in all copies or substantial portions of the Software.
 #
 # THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
 # OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
 # FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
 # THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
 # LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
 # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 # SOFTWARE.
 #
 # http://www.opensource.org/licenses/mit-license.php
 #
 ###############################################################################
 holiday.fr-FR1.name=Jour de l'an
 holiday.fr-FR1.date=20120101
 holiday.fr-FR2.name=Lundi de Pâques
 holiday.fr-FR2.date=20120409
 holiday.fr-FR3.name=Fête du premier mai
 holiday.fr-FR3.date=20120501
 holiday.fr-FR4.name=Armistice 1945
 holiday.fr-FR4.date=20120508
 holiday.fr-FR5.name=Ascencion
 holiday.fr-FR5.date=20120517
 holiday.fr-FR6.name=Pentecôte
 holiday.fr-FR6.date=20120528
 holiday.fr-FR7.name=Fête nationale
 holiday.fr-FR7.date=20120714
 holiday.fr-FR8.name=Assomption
 holiday.fr-FR8.date=20120815
 holiday.fr-FR9.name=Toussaint
 holiday.fr-FR9.date=20121101
 holiday.fr-FR10.name=Armistice 1918
 holiday.fr-FR10.date=20121111
 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
--- a/doc/rc/holidays.it-IT.rc
+++ b/doc/rc/holidays.it-IT.rc
@@ -0,0 +1,77 @@
 ###############################################################################
 # International Holiday Data provided by Holidata.net
 # http://holidata.net/it-IT/2012.json
 # http://holidata.net/it-IT/2013.json
 #
 # Copyright 2006-2012, Paul Beckingham, Federico Hernandez.
 #
 # Permission is hereby granted, free of charge, to any person obtaining a copy
 # of this software and associated documentation files (the "Software"), to deal
 # in the Software without restriction, including without limitation the rights
 # to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
 # copies of the Software, and to permit persons to whom the Software is
 # furnished to do so, subject to the following conditions:
 #
 # The above copyright notice and this permission notice shall be included
 # in all copies or substantial portions of the Software.
 #
 # THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
 # OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
 # FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
 # THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
 # LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
 # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 # SOFTWARE.
 #
 # http://www.opensource.org/licenses/mit-license.php
 #
 ###############################################################################
 holiday.it-IT1.name=Capodanno
 holiday.it-IT1.date=20120101
 holiday.it-IT2.name=Epifania
 holiday.it-IT2.date=20120106
 holiday.it-IT3.name=Carnevale
 holiday.it-IT3.date=20120308
 holiday.it-IT4.name=Pasqua
 holiday.it-IT4.date=20120409
 holiday.it-IT5.name=Festa della liberazione
 holiday.it-IT5.date=20120425
 holiday.it-IT6.name=Festa del lavoro
 holiday.it-IT6.date=20120501
 holiday.it-IT7.name=Festa della repubblica
 holiday.it-IT7.date=20120602
 holiday.it-IT8.name=Assunzione (ferragosto)
 holiday.it-IT8.date=20120815
 holiday.it-IT9.name=Ognissanti
 holiday.it-IT9.date=20121101
 holiday.it-IT10.name=Immacolata concezione
 holiday.it-IT10.date=20121208
 holiday.it-IT11.name=Natale
 holiday.it-IT11.date=20121225
 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
--- a/doc/rc/holidays.jp-JP.rc
+++ b/doc/rc/holidays.jp-JP.rc
@@ -0,0 +1,99 @@
 ###############################################################################
 # International Holiday Data provided by Holidata.net
 # http://holidata.net/jp-JP/2012.json
 # http://holidata.net/jp-JP/2013.json
 #
 # Copyright 2006-2012, Paul Beckingham, Federico Hernandez.
 #
 # Permission is hereby granted, free of charge, to any person obtaining a copy
 # of this software and associated documentation files (the "Software"), to deal
 # in the Software without restriction, including without limitation the rights
 # to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
 # copies of the Software, and to permit persons to whom the Software is
 # furnished to do so, subject to the following conditions:
 #
 # The above copyright notice and this permission notice shall be included
 # in all copies or substantial portions of the Software.
 #
 # THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
 # OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
 # FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
 # THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
 # LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
 # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 # SOFTWARE.
 #
 # http://www.opensource.org/licenses/mit-license.php
 #
 ###############################################################################
 holiday.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-JP16.name=勤労感謝の日
 holiday.jp-JP16.date=20121123
 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
--- a/doc/rc/holidays.nb-NO.rc
+++ b/doc/rc/holidays.nb-NO.rc
@@ -0,0 +1,97 @@
 ###############################################################################
 # International Holiday Data provided by Holidata.net
 # http://holidata.net/nb-NO/2012.json
 # http://holidata.net/nb-NO/2013.json
 #
 # Copyright 2006-2012, Paul Beckingham, Federico Hernandez.
 #
 # Permission is hereby granted, free of charge, to any person obtaining a copy
 # of this software and associated documentation files (the "Software"), to deal
 # in the Software without restriction, including without limitation the rights
 # to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
 # copies of the Software, and to permit persons to whom the Software is
 # furnished to do so, subject to the following conditions:
 #
 # The above copyright notice and this permission notice shall be included
 # in all copies or substantial portions of the Software.
 #
 # THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
 # OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
 # FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
 # THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
 # LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
 # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 # SOFTWARE.
 #
 # http://www.opensource.org/licenses/mit-license.php
 #
 ###############################################################################
 holiday.nb-NO1.name=Nyttårsdag
 holiday.nb-NO1.date=20120101
 holiday.nb-NO2.name=Fastelavn
 holiday.nb-NO2.date=20120219
 holiday.nb-NO3.name=Palmesøndag
 holiday.nb-NO3.date=20120401
 holiday.nb-NO4.name=Skjærtorsdag
 holiday.nb-NO4.date=20120405
 holiday.nb-NO5.name=Langfredag
 holiday.nb-NO5.date=20120406
 holiday.nb-NO6.name=Påskedag
 holiday.nb-NO6.date=20120408
 holiday.nb-NO7.name=Påskedag
 holiday.nb-NO7.date=20120409
 holiday.nb-NO8.name=Offentlig Høytidsdag
 holiday.nb-NO8.date=20120501
 holiday.nb-NO9.name=Frigjøringsdag 1945
 holiday.nb-NO9.date=20120508
 holiday.nb-NO10.name=Grunnlovsdag
 holiday.nb-NO10.date=20120517
 holiday.nb-NO11.name=Kristi Himmelfartsdag
 holiday.nb-NO11.date=20120517
 holiday.nb-NO12.name=Pinsedag
 holiday.nb-NO12.date=20120527
 holiday.nb-NO13.name=Pinsedag
 holiday.nb-NO13.date=20120528
 holiday.nb-NO14.name=Julaften
 holiday.nb-NO14.date=20121224
 holiday.nb-NO15.name=Juledag
 holiday.nb-NO15.date=20121225
 holiday.nb-NO16.name=Juledag
 holiday.nb-NO16.date=20121226
 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
--- a/doc/rc/holidays.nl-NL.rc
+++ b/doc/rc/holidays.nl-NL.rc
@@ -0,0 +1,85 @@
 ###############################################################################
 # International Holiday Data provided by Holidata.net
 # http://holidata.net/nl-NL/2012.json
 # http://holidata.net/nl-NL/2013.json
 #
 # Copyright 2006-2012, Paul Beckingham, Federico Hernandez.
 #
 # Permission is hereby granted, free of charge, to any person obtaining a copy
 # of this software and associated documentation files (the "Software"), to deal
 # in the Software without restriction, including without limitation the rights
 # to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
 # copies of the Software, and to permit persons to whom the Software is
 # furnished to do so, subject to the following conditions:
 #
 # The above copyright notice and this permission notice shall be included
 # in all copies or substantial portions of the Software.
 #
 # THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
 # OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
 # FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
 # THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
 # LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
 # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 # SOFTWARE.
 #
 # http://www.opensource.org/licenses/mit-license.php
 #
 ###############################################################################
 holiday.nl-NL1.name=Nieuwjaar
 holiday.nl-NL1.date=20120101
 holiday.nl-NL2.name=Goede Vrijdag
 holiday.nl-NL2.date=20120406
 holiday.nl-NL3.name=Pasen
 holiday.nl-NL3.date=20120408
 holiday.nl-NL4.name=Tweede Pasdag
 holiday.nl-NL4.date=20120409
 holiday.nl-NL5.name=Koninginnedag
 holiday.nl-NL5.date=20120430
 holiday.nl-NL6.name=Dodenherdenking
 holiday.nl-NL6.date=20120504
 holiday.nl-NL7.name=Bevrijdingsdag
 holiday.nl-NL7.date=20120505
 holiday.nl-NL8.name=Hemelvaartsdag
 holiday.nl-NL8.date=20120517
 holiday.nl-NL9.name=Pinksteren
 holiday.nl-NL9.date=20120527
 holiday.nl-NL10.name=Tweede Pinksterdag
 holiday.nl-NL10.date=20120528
 holiday.nl-NL11.name=Sinterklaas
 holiday.nl-NL11.date=20121205
 holiday.nl-NL12.name=Koninkrijksdag
 holiday.nl-NL12.date=20121215
 holiday.nl-NL13.name=Kerstmis
 holiday.nl-NL13.date=20121225
 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
--- a/doc/rc/holidays.sv-SE.rc
+++ b/doc/rc/holidays.sv-SE.rc
@@ -0,0 +1,97 @@
 ###############################################################################
 # International Holiday Data provided by Holidata.net
 # http://holidata.net/sv-SE/2012.json
 # http://holidata.net/sv-SE/2013.json
 #
 # Copyright 2006-2012, Paul Beckingham, Federico Hernandez.
 #
 # Permission is hereby granted, free of charge, to any person obtaining a copy
 # of this software and associated documentation files (the "Software"), to deal
 # in the Software without restriction, including without limitation the rights
 # to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
 # copies of the Software, and to permit persons to whom the Software is
 # furnished to do so, subject to the following conditions:
 #
 # The above copyright notice and this permission notice shall be included
 # in all copies or substantial portions of the Software.
 #
 # THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
 # OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
 # FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
 # THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
 # LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
 # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 # SOFTWARE.
 #
 # http://www.opensource.org/licenses/mit-license.php
 #
 ###############################################################################
 holiday.sv-SE1.name=Nyårsdagen
 holiday.sv-SE1.date=20120101
 holiday.sv-SE2.name=Trettondedag jul
 holiday.sv-SE2.date=20120106
 holiday.sv-SE3.name=Långfredagen
 holiday.sv-SE3.date=20120406
 holiday.sv-SE4.name=Påskdagen
 holiday.sv-SE4.date=20120408
 holiday.sv-SE5.name=Annandag påsk
 holiday.sv-SE5.date=20120409
 holiday.sv-SE6.name=Valborgmässoafton
 holiday.sv-SE6.date=20120430
 holiday.sv-SE7.name=Första maj
 holiday.sv-SE7.date=20120501
 holiday.sv-SE8.name=Kristi Himmelsfärdsdag
 holiday.sv-SE8.date=20120517
 holiday.sv-SE9.name=Pingstdagen
 holiday.sv-SE9.date=20120527
 holiday.sv-SE10.name=Nationaldagen
 holiday.sv-SE10.date=20120606
 holiday.sv-SE11.name=Midsommarafton
 holiday.sv-SE11.date=20120622
 holiday.sv-SE12.name=Midsommardagen
 holiday.sv-SE12.date=20120623
 holiday.sv-SE13.name=Alla Helgons Dag
 holiday.sv-SE13.date=20121103
 holiday.sv-SE14.name=Julafton
 holiday.sv-SE14.date=20121224
 holiday.sv-SE15.name=Juldagen
 holiday.sv-SE15.date=20121225
 holiday.sv-SE16.name=Annandag jul
 holiday.sv-SE16.date=20121226
 holiday.sv-SE17.name=Nyårsafton
 holiday.sv-SE17.date=20121231
 holiday.sv-SE18.name=Nyårsdagen
 holiday.sv-SE18.date=20130101
 holiday.sv-SE19.name=Trettondedag jul
 holiday.sv-SE19.date=20130106
 holiday.sv-SE20.name=Långfredagen
 holiday.sv-SE20.date=20130329
 holiday.sv-SE21.name=Påskdagen
 holiday.sv-SE21.date=20130331
 holiday.sv-SE22.name=Annandag påsk
 holiday.sv-SE22.date=20130401
 holiday.sv-SE23.name=Valborgmässoafton
 holiday.sv-SE23.date=20130430
 holiday.sv-SE24.name=Första maj
 holiday.sv-SE24.date=20130501
 holiday.sv-SE25.name=Kristi Himmelsfärdsdag
 holiday.sv-SE25.date=20130509
 holiday.sv-SE26.name=Pingstdagen
 holiday.sv-SE26.date=20130519
 holiday.sv-SE27.name=Nationaldagen
 holiday.sv-SE27.date=20130606
 holiday.sv-SE28.name=Midsommarafton
 holiday.sv-SE28.date=20130621
 holiday.sv-SE29.name=Midsommardagen
 holiday.sv-SE29.date=20130622
 holiday.sv-SE30.name=Alla Helgons Dag
 holiday.sv-SE30.date=20131102
 holiday.sv-SE31.name=Julafton
 holiday.sv-SE31.date=20131224
 holiday.sv-SE32.name=Juldagen
 holiday.sv-SE32.date=20131225
 holiday.sv-SE33.name=Annandag jul
 holiday.sv-SE33.date=20131226
 holiday.sv-SE34.name=Nyårsafton
 holiday.sv-SE34.date=20131231
--- a/doc/rc/light-16.theme
+++ b/doc/rc/light-16.theme
@@ -1,17 +1,52 @@
-# Sample task 1.9 (or later) light 16-color theme
+###############################################################################
 # Sample taskwarrior 1.9 (or later) light 16-color theme
 #
 # taskwarrior - a command line task list manager.
 #
 # Copyright 2006-2012, Paul Beckingham, Federico Hernandez.
 #
 # Permission is hereby granted, free of charge, to any person obtaining a copy
 # of this software and associated documentation files (the "Software"), to deal
 # in the Software without restriction, including without limitation the rights
 # to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
 # copies of the Software, and to permit persons to whom the Software is
 # furnished to do so, subject to the following conditions:
 #
 # The above copyright notice and this permission notice shall be included
 # in all copies or substantial portions of the Software.
 #
 # THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
 # OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
 # FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
 # THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
 # LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
 # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 # SOFTWARE.
 #
 # http://www.opensource.org/licenses/mit-license.php
 #
 ###############################################################################
 color=on
 color.header=blue
 color.footnote=blue
 color.debug=blue
-color.summary.bar=on green
+color.summary.bar=black on green
-color.summary.background=on black
+color.summary.background=white on black
 color.history.add=black on red
 color.history.done=black on green
 color.history.delete=black on yellow
 color.burndown.pending=on red
 color.burndown.started=on yellow
 color.burndown.done=on green
 color.sync.added=green
 color.sync.changed=yellow
 color.sync.rejected=red
 color.undo.before=red
 color.undo.after=green
@@ -33,5 +68,8 @@ color.pri.H=bold black
 color.pri.M=black
 color.pri.L=
 color.tagged=green
 color.blocked=white on black
 color.project.none=
 color.tag.none=
 color.alternate=
--- a/doc/rc/light-256.theme
+++ b/doc/rc/light-256.theme
@@ -1,17 +1,52 @@
-# Sample task 1.9 (or later) light 256-color theme
+###############################################################################
 # Sample taskwarrior 1.9 (or later) light 256-color theme
 #
 # taskwarrior - a command line task list manager.
 #
 # Copyright 2006-2012, Paul Beckingham, Federico Hernandez.
 #
 # Permission is hereby granted, free of charge, to any person obtaining a copy
 # of this software and associated documentation files (the "Software"), to deal
 # in the Software without restriction, including without limitation the rights
 # to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
 # copies of the Software, and to permit persons to whom the Software is
 # furnished to do so, subject to the following conditions:
 #
 # The above copyright notice and this permission notice shall be included
 # in all copies or substantial portions of the Software.
 #
 # THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
 # OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
 # FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
 # THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
 # LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
 # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 # SOFTWARE.
 #
 # http://www.opensource.org/licenses/mit-license.php
 #
 ###############################################################################
 color=on
 color.header=color4
 color.footnote=color4
 color.debug=color4
-color.summary.bar=on rgb141
+color.summary.bar=black on rgb141
-color.summary.background=on color0
+color.summary.background=white on color0
 color.history.add=color0 on rgb500
 color.history.done=color0 on rgb050
 color.history.delete=color0 on rgb550
 color.burndown.pending=on rgb200
 color.burndown.started=on rgb520
 color.burndown.done=on rgb011
 color.sync.added=rgb011
 color.sync.changed=rgb520
 color.sync.rejected=rgb200
 color.undo.before=color1
 color.undo.after=color2
@@ -33,5 +68,8 @@ color.pri.H=color232
 color.pri.M=color237
 color.pri.L=color242
 color.tagged=rgb020
 color.blocked=gray12 on gray4
 color.project.none=
 color.tag.none=
 color.alternate=on color254
--- a/doc/rc/refresh
+++ b/doc/rc/refresh
@@ -0,0 +1,9 @@
 #! /bin/bash
 for i in holidays*rc
 do
  locale=${i:9:5}
  echo $locale
  ../../scripts/add-ons/update-holidays.pl --locale $locale --file holidays.${locale}.rc
 done
--- a/doc/rc/solarized-dark-256.theme
+++ b/doc/rc/solarized-dark-256.theme
@@ -0,0 +1,93 @@
 ################################################################################
 # Taskwarrior solarized-dark-256 theme created by Stefan A. Keel.
 #
 # taskwarrior - a command line task list manager.
 #
 # Copyright 2006-2012, Paul Beckingham, Federico Hernandez.
 # 
 # Colors used are based on the Solarized palette created by Ethan Schoonover 
 # <http://ethanschoonover.com/solarized>
 #
 # This theme was designed to work with a terminal application that is using
 # a Solarized "Dark" color theme, otherwise colors will look odd. 
 # Solarized includes themes for iTerm2, OSX Terminal.app, and Xresources.
 # Others are also available, i.e.:
 # Gnome Terminal <https://github.com/sigurdga/gnome-terminal-colors-solarized>
 #
 # Colors 0 through 15 in this theme are based on the 16 color positions defined
 # in the Xresources file distributed with the Solarized color palette.  Some 
 # of the colors used are "named" in order to use the bold feature.  The color
 # "name" is based on the color's original name as the terminal understands it.
 #
 # Permission is hereby granted, free of charge, to any person obtaining a copy
 # of this software and associated documentation files (the "Software"), to deal
 # in the Software without restriction, including without limitation the rights
 # to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
 # copies of the Software, and to permit persons to whom the Software is
 # furnished to do so, subject to the following conditions:
 #
 # The above copyright notice and this permission notice shall be included
 # in all copies or substantial portions of the Software.
 #
 # THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
 # OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
 # FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
 # THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
 # LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
 # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 # SOFTWARE.
 #
 # http://www.opensource.org/licenses/mit-license.php
 #
 ################################################################################
 color=on
 color.active=bold red
 color.alternate=on black #color0
 color.blocked=color0 on color10
 color.burndown.done=color0 on color4
 color.burndown.pending=color0 on color1
 color.burndown.started=color0 on color9
 color.calendar.due=color0 on color9
 color.calendar.due.today=color0 on color1
 color.calendar.holiday=color0 on color3
 color.calendar.overdue=color0 on color5
 color.calendar.today=color0 on color4
 color.calendar.weekend=on color0
 color.calendar.weeknumber=color4
 color.debug=color6
 color.due=color9
 color.due.today=color1
 color.overdue=color5
 color.footnote=color6
 color.header=color4
 color.history.add=color0 on color1
 color.history.delete=color0 on color3
 color.history.done=color0 on color10
 color.pri.H=bold blue #color14
 color.pri.M=bold yellow #color12
 color.pri.L=bold green #color11
 color.pri.none=
 color.project.none=
 color.recurring=color4
 color.summary.background=on color0
 color.summary.bar=color0 on color6
 color.sync.added=color14
 color.sync.changed=color9
 color.sync.rejected=color13
 color.tag.none=
 color.tagged=color10
 color.undo.after=color2
 color.undo.before=color1
--- a/doc/rc/solarized-light-256.theme
+++ b/doc/rc/solarized-light-256.theme
@@ -0,0 +1,93 @@
 ################################################################################
 # Taskwarrior solarized-dark-256 theme created by Stefan A. Keel.
 #
 # taskwarrior - a command line task list manager.
 #
 # Copyright 2006-2012, Paul Beckingham, Federico Hernandez.
 # 
 # Colors used are based on the Solarized palette created by Ethan Schoonover 
 # <http://ethanschoonover.com/solarized>
 #
 # This theme was designed to work with a terminal application that is using
 # a Solarized "Light" color theme, otherwise colors will look odd. 
 # Solarized includes themes for iTerm2, OSX Terminal.app, and Xresources.
 # Others are also available, i.e.:
 # Gnome Terminal <https://github.com/sigurdga/gnome-terminal-colors-solarized>
 #
 # Colors 0 through 15 in this theme are based on the 16 color positions defined
 # in the Xresources file distributed with the Solarized color palette.  Some 
 # of the colors used are "named" in order to use the bold feature.  The color
 # "name" is based on the color's original name as the terminal understands it.
 #
 # Permission is hereby granted, free of charge, to any person obtaining a copy
 # of this software and associated documentation files (the "Software"), to deal
 # in the Software without restriction, including without limitation the rights
 # to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
 # copies of the Software, and to permit persons to whom the Software is
 # furnished to do so, subject to the following conditions:
 #
 # The above copyright notice and this permission notice shall be included
 # in all copies or substantial portions of the Software.
 #
 # THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
 # OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
 # FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
 # THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
 # LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
 # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 # SOFTWARE.
 #
 # http://www.opensource.org/licenses/mit-license.php
 #
 ################################################################################
 color=on
 color.active=bold red #color9
 color.alternate=on white #color7 (allows bold for alternate rows)
 color.blocked=on color14
 color.burndown.done=color0 on color4
 color.burndown.pending=color0 on color1
 color.burndown.started=color0 on color9
 color.calendar.due=color7 on color9
 color.calendar.due.today=color7 on color1
 color.calendar.holiday=color7 on color3
 color.calendar.overdue=color7 on color5
 color.calendar.today=color7 on color4
 color.calendar.weekend=on color7
 color.calendar.weeknumber=color14
 color.debug=color3
 color.due=color9
 color.due.today=color1
 color.overdue=color5
 color.footnote=color2
 color.header=color2
 color.history.add=color0 on color1
 color.history.delete=color0 on color3
 color.history.done=color14 on color0
 color.pri.H=bold black #color0
 color.pri.M=bold yellow #color11
 color.pri.L=bold cyan #color14
 color.pri.none=
 color.project.none=
 color.recurring=color4
 color.summary.background=on color7
 color.summary.bar=color0 on color6
 color.sync.added=color10
 color.sync.changed=color9
 color.sync.rejected=color13
 color.tag.none=
 color.tagged=color14
 color.undo.after=color2
 color.undo.before=color1
--- a/doc/ref/task-ref.pages
+++ b/doc/ref/task-ref.pages
--- a/doc/ref/task-ref.pdf
+++ b/doc/ref/task-ref.pdf
--- a/i18n/CMakeLists.txt
+++ b/i18n/CMakeLists.txt
@@ -0,0 +1,4 @@
 cmake_minimum_required (VERSION 2.8)
 install (DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/ DESTINATION ${TASK_DOCDIR}/i18n
                                                FILES_MATCHING REGEX "tips.*"
                                                               PATTERN "CMakeFiles" EXCLUDE)
--- a/i18n/strings.de-DE
+++ b/i18n/strings.de-DE
@@ -1,157 +0,0 @@
 # This is an example strings.en-US file.
 #
 # The task program has a built-in set of default strings, which are UTF8 encoded
 # for the en-US locale.  A file such as this is used to override those defaults.
 # This means that a strings file is merely a delta applied to the built-in
 # strings, so an empty string file means you get en-US.
 #
 # To use another string file, add the following entry to your .taskrc file:
 #
 #   locale=sv-SE    # Swedish string set
 # 1xx task shell
 100 Unbekannter Fehler #Unknown Error.
 101 Konnte nicht Datenverzeichnis HOME aus passwd Datei lesen #Could not read home directory from the passwd file.
 102 (j/n) #(y/n)
 103 Ungültige ID in Sequenz #Invalid ID in sequence
 104 Ungültige ID in Bereich #Invalid ID in range
 105 Invertierter Sequenzbereich hoch-niedrig #Inverted sequence range high-low
 106 ID Bereich zu gross #ID Range too large
 107 Keine Sequenz #Not a sequence.
 108 Task interaktiv nur möglich mit vorhandenem ncurses #Interactive task is only available when built with ncurses support.
 109 Leerer Eintrag in der Eingabe #Empty record in input
 110 Unbekanntes Zeichen am Zeilenende #Unrecognized characters at end of line
 111 Datensatz nicht als Format 4 erkannt #Record not recognized as format 4
 112 Kann leere Zeichenkette nicht ersetzen #Cannot substitute an empty string
 113 Nicht erkanntes Zeichen am Ende der Ersetzung #Unrecognized character(s) at end of substitution
 114 Fehlformulierte Ersetzung #Malformed substitution
 115 Etiketten dürfen keine Kommas enthalten #Tags are not permitted to contain commas
 # 2xx Commands - must be sequential
 200 aktiv #active
 201 hinzufen #add
 202 beizufügen  #append
 203 anmerkung #annotate
 204 kalender #calendar
 205 farben #colors
 206 fertiggestellt #completed
 207 löschen #delete
 208 erledigt #done
 209 duplizieren #duplicate
 210 editieren #edit
 211 export #export
 212 hilfe #help
 213 geschichte #history
 214 ggeschichte #ghistory
 215 import #import
 216 info #info
 218 überfällig #overdue
 219 projekte #projects
 220 start #start
 221 statistik #stats
 222 stop #stop
 223 zusammenfassung #summary
 224 etikett #tags
 225 zeitdatenblatt#timesheet
 227 rücksetzen #undo
 228 version #version
 # 3xx Attributes - must be sequential
 300 projekt #project
 301 priorität #priority
 302 vordergrund #fg
 303 hintergrund #bg
 304 fällig #due
 305 eintrag #entry
 306 start #start
 307 stop #end
 308 wiederkehrend #recur
 309 bis #until
 310 mask #mask
 311 imask #imask
 # 35x Attribute modifiers - must be sequential
 350 davor #before
 351 danach #after
 352 nict #not
 353 kein #none
 354 beliebig #any
 355 synth #synth
 356 unter #under
 357 über #over
 358 erstes #first
 359 letztes #last
 360 dieses #this
 361 nächste #next
 362 ist #is
 363 istnicht #isnt
 364 hat #has
 365 hatnicht #hasnt
 366 beginntmit #startswith
 367 endetmit #endswith
 # 4xx Columns
 # 5xx Colors
 500 fett #bold
 501 unterstrichen #underline
 502 fett_unterstrichen #bold_underline
 503 schwarz #black
 504 rot #red
 505 grün #green
 506 gelb #yellow
 507 blau #blue
 508 magenta #magenta
 509 cyan #cyan
 510 weiss #white
 511 fett_schwarz #bold_black
 512 fett_rot #bold_red
 513 fett_grün #bold_green
 514 fett_gelb #bold_yellow
 515 fett_blau #bold_blue
 516 fett_magenta #bold_magenta
 517 fett_cyan #bold_cyan
 518 fett_weiss #bold_white
 519 unterstrichen_schwarz #underline_black
 520 unterstrichen_rot #underline_red
 521 unterstrichen_grün #underline_green
 522 unterstrichen_gelb #underline_yellow
 523 unterstrichen_blau #underline_blue
 524 unterstrichen_magenta #underline_magenta
 525 unterstrichen_cyan #underline_cyan
 526 unterstrichen_weiss #underline_white
 527 fett_unterstrichen_schwarz #bold_underline_black
 528 fett_unterstrichen_rot #bold_underline_red
 529 fett_unterstrichen_grün #bold_underline_green
 530 fett_unterstrichen_gelb #bold_underline_yellow
 531 fett_unterstrichen_blau #bold_underline_blue
 532 fett_unterstrichen_magenta #bold_underline_magenta
 533 fett_unterstrichen_cyan #bold_underline_cyan
 534 fett_unterstrichen_weiss #bold_underline_white
 535 auf_schwarz #on_black
 536 auf_rot #on_red
 537 auf_grün #on_green
 538 auf_gelb #on_yellow
 539 auf_blau #on_blue
 540 auf_magenta #on_magenta
 541 auf_cyan #on_cyan
 542 auf_weiss #on_white
 543 auf_signal_schwarz #on_bright_black
 544 auf_signal_rot #on_bright_red
 545 auf_signal_grün #on_bright_green
 546 auf_signal_gelb #on_bright_yellow
 547 auf_signal_blau #on_bright_blue
 548 auf_signal_magenta #on_bright_magenta
 549 auf_signal_cyan #on_bright_cyan
 550 auf_signal_weiss #on_bright_white
 551 aus #off
 552 Unbekannte Farbe #Unknown color name
 # 6xx Config
 # 7xx TDB
 # 8xx Reports
--- a/i18n/strings.en-US
+++ b/i18n/strings.en-US
@@ -1,123 +0,0 @@
 # This is an example strings.en-US file.
 #
 # The task program has a built-in set of default strings, which are UTF8 encoded
 # for the en-US locale.  A file such as this is used to override those defaults.
 # This means that a strings file is merely a delta applied to the built-in
 # strings, so an empty string file means you get en-US.
 #
 # To use another string file, add the following entry to your .taskrc file:
 #
 #   locale=sv-SE    # Swedish string set
 # 1xx task shell
 100 Unknown Error.
 101 Could not read home directory from the passwd file.
 102 (y/n)
 103 Invalid ID in sequence
 104 Invalid ID in range
 105 Inverted sequence range high-low
 106 ID Range too large
 107 Not a sequence.
 108 Interactive task is only available when built with ncurses support.
 109 Empty record in input
 110 Unrecognized characters at end of line
 111 Record not recognized as format 4
 112 Cannot substitute an empty string
 113 Unrecognized character(s) at end of substitution
 114 Malformed substitution
 115 Tags are not permitted to contain commas
 116 You must specify a command, or a task ID to modify
 # 2xx Commands - must be sequential
 200 active
 201 add
 202 append
 203 annotate
 204 calendar
 205 colors
 206 completed
 207 delete
 208 done
 209 duplicate
 210 edit
 212 help
 215 import
 216 info
 217 prepend
 218 overdue
 219 projects
 220 start
 221 stats
 222 stop
 223 summary
 224 tags
 225 timesheet
 226 log
 227 undo
 228 version
 229 shell
 230 config
 231 show
 # 3xx Attributes - must be sequential
 300 project
 301 priority
 302 fg
 303 bg
 304 due
 305 entry
 306 start
 307 end
 308 recur
 309 until
 310 mask
 311 imask
 # 35x Attribute modifiers - must be sequential
 350 before
 351 after
 352 not
 353 none
 354 any
 355 synth
 356 under
 357 over
 358 first
 359 last
 360 this
 361 next
 362 is
 363 isnt
 364 has
 365 hasnt
 366 startswith
 367 endswith
 # 4xx Columns
 # 5xx Colors
 500 bold
 501 underline
 502 on
 503 bright
 504 black
 505 red
 506 green
 507 yellow
 508 blue
 509 magenta
 510 cyan
 511 white
 520 off
 521 Unknown color name
 # 6xx Config
 # 7xx TDB
 # 8xx Reports
--- a/i18n/strings.es-ES
+++ b/i18n/strings.es-ES
@@ -1,11 +0,0 @@
 # 1xx task shell
 100 Error desconocido.
 # 2xx Commands
 # 3xx Attributes
 # 4xx Columns
 # 5xx Colors
 # 6xx Config
 # 7xx TDB
 # 8xx Reports
--- a/i18n/strings.fr-FR
+++ b/i18n/strings.fr-FR
@@ -1,11 +0,0 @@
 # 1xx task shell
 100 Erreur inconnue.
 # 2xx Commands
 # 3xx Attributes
 # 4xx Columns
 # 5xx Colors
 # 6xx Config
 # 7xx TDB
 # 8xx Reports
--- a/i18n/strings.nl-NL
+++ b/i18n/strings.nl-NL
@@ -1,11 +0,0 @@
 # 1xx task shell
 100 Onbekende fout.
 # 2xx Commands
 # 3xx Attributes
 # 4xx Columns
 # 5xx Colors
 # 6xx Config
 # 7xx TDB
 # 8xx Reports
--- a/i18n/strings.sv-SE
+++ b/i18n/strings.sv-SE
@@ -1,157 +0,0 @@
 # This is an example strings.en-US file.
 #
 # The task program has a built-in set of default strings, which are UTF8 encoded
 # for the en-US locale.  A file such as this is used to override those defaults.
 # This means that a strings file is merely a delta applied to the built-in
 # strings, so an empty string file means you get en-US.
 #
 # To use another string file, add the following entry to your .taskrc file:
 #
 #   locale=sv-SE    # Swedish string set
 # 1xx task shell
 100 Okänt fel. #Unknown Error.
 101 Kunde inte läsa hemkatalogen från passwd filen. #Could not read home directory from the passwd file.
 102 (j/n) #(y/n)
 103 Ogiltig ID i sekvens #Invalid ID in sequence
 104 Ogiltig ID i spännvidd #Invalid ID in range
 105 Inverterad sekvens spännvidd hög-låg #Inverted sequence range high-low
 106 ID spännvidd för stor #ID Range too large
 107 Ingen sekvens. #Not a sequence.
 108 Interaktiv task är bara tillgänglig när den kompilerades med support för ncurses. #Interactive task is only available when built with ncurses support.
 109 Tom post i ingångsdata #Empty record in input
 110 Okänt tecknen på slutet av raden. #Unrecognized characters at end of line
 111 Post inte indentifierad som format 4 #Record not recognized as format 4
 112 Substitution av tom teckensträng är inte möjligt #Cannot substitute an empty string
 113 Pkänt tecken vid slutet av substitution #Unrecognized character(s) at end of substitution
 114 Ogiltig substitution #Malformed substitution
 115 Taggar får inte innehåller komman #Tags are not permitted to contain commas
 # 2xx Commands - must be sequential
 200 aktivt #active
 201 tillägg #add
 202 bifoga #append
 203 kommentera #annotate
 204 kalender #calendar
 205 färger #colors
 206 avslutad #completed
 207 stryk #delete
 208 färdig #done
 209 kopiera #duplicate
 210 redigera #edit
 211 exportera #export
 212 hjälp #help
 213 historia #history
 214 ghistoria #ghistory
 215 importera #import
 216 info #info
 218 försenad #overdue
 219 projekten #projects
 220 start #start
 221 statistik #stats
 222 stop #stop
 223 sammanfattning #summary
 224 taggar #tags
 225 tidsrapport #timesheet
 227 ångra #undo
 228 version #version
 # 3xx Attributes - must be sequential
 300 projekt #project
 301 prioritet #priority
 302 förgrund #fg
 303 bakgrund #bg
 304 väntad #due
 305 post #entry
 306 start #start
 307 slut #end
 308 periodirskt #recur
 309 innan #until
 310 mask #mask
 311 imask #imask
 # 35x Attribute modifiers - must be sequential
 350 före #before
 351 efter #after
 352 inte #not
 353 ingen #none
 354 några #any
 355 synth #synth
 356 under #under
 357 över #over
 358 första #first
 359 sista #last
 360 detta #this
 361 nästa #next
 362 är #is
 363 ärinte #isnt
 364 har #has
 365 harinte #hasnt
 366 börjarmed #startswith
 367 slutarmed #endswith
 # 4xx Columns
 # 5xx Colors
 500 fet #bold
 501 understrykt #underline
 502 fet_understrykt #bold_underline
 503 svart #black
 504 röd #red
 505 grön #green
 506 gul #yellow
 507 blå #blue
 508 magenta #magenta
 509 cyan #cyan
 510 vit #white
 511 fet_svart #bold_black
 512 fet_röd #bold_red
 513 fet_grön #bold_green
 514 fet_gul #bold_yellow
 515 fet_blå #bold_blue
 516 fet_magenta #bold_magenta
 517 fet_cyan #bold_cyan
 518 fet_vit #bold_white
 519 understrykt_svart #underline_black
 520 understrykt_röd #underline_red
 521 understrykt_grön #underline_green
 522 understrykt_gul #underline_yellow
 523 understrykt_blå #underline_blue
 524 understrykt_magenta #underline_magenta
 525 understrykt_cyan #underline_cyan
 526 understrykt_vit #underline_white
 527 fet_understrykt_svart #bold_underline_black
 528 fet_understrykt_röd #bold_underline_red
 529 fet_understrykt_grön #bold_underline_green
 530 fet_understrykt_gul #bold_underline_yellow
 531 fet_understrykt_blå #bold_underline_blue
 532 fet_understrykt_magenta #bold_underline_magenta
 533 fet_understrykt_cyan #bold_underline_cyan
 534 fet_understrykt_vit #bold_underline_white
 535 på_svart #on_black
 536 på_röd #on_red
 537 på_grön #on_green
 538 på_gul #on_yellow
 539 på_blå #on_blue
 540 på_magenta #on_magenta
 541 på_cyan #on_cyan
 542 på_vit #on_white
 543 på_ljust_svart #on_bright_black
 544 på_ljust_röd #on_bright_red
 545 på_ljust_grön #on_bright_green
 546 på_ljust_gul #on_bright_yellow
 547 på_ljust_blå #on_bright_blue
 548 på_ljust_magenta #on_bright_magenta
 549 på_ljust_cyan #on_bright_cyan
 550 på_ljust_vit #on_bright_white
 551 av #off
 552 Okänt färg namn #Unknown color name
 # 6xx Config
 # 7xx TDB
 # 8xx Reports
--- a/i18n/tips.en-US
+++ b/i18n/tips.en-US
@@ -1,5 +1,69 @@
 %
-first tip
+For bash users, try 'alias t=task' to save some keystrokes.
 %
-second tip
+Have you tried 'task edit 1' 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
 month?  You can then see all waiting tasks with 'task waiting'.
 %
 Did you know that 'task 1 wait:' will restore a waiting task to pending status?
 %
 If you put 'default.command=list project:home' in your .taskrc file, then just
 running 'task' will automatically run 'task list project:home' for you.  Save
 some keystrokes!
 %
 If you edit your pending.data file, make sure that your text editor doesn't
 strip the trailing \n characters from the end of the file.
 %
 If you must edit your pending.data file, make sure that your text editor doesn't
 convert from a Unix to a DOS file encoding.
 %
 Do you have the latest version of task installed?  Check http://taskwarrior.org
 periodically for news of updates.  That feature you wanted might be ready...
 %
 Don't forget the online docs at http://taskwarrior.org/wiki/taskwarrior, and if
 you find errors, please let us know.  Then again, it is a wiki, so feel free to
 correct them yourself.
 %
 Don't forget the online docs at http://taskwarrior.org/wiki/taskwarrior, but if
 you cannot find documentation on a particular topic, either create a ticket
 requesting it, email support@taskwarrior.org asking for it, or start it
 yourself.
 %
 Did you know there are man pages for task?  Try 'man task', 'man taskrc',
 'man task-tutorial', 'man task-color' and 'man task-faq'.
 %
 Did you know there are several 256-color themes available for task?
 %
 Did you know that running 'task show' will perform various checks on your
 .taskrc file, looking for errors?
 %
 Are you making the most of color?  Try 'task color' to see what colors your
 system supports.
 %
 Are you using projects?  If you do, taskwarrior will keep track of the project
 completion percentage and report it to you whenever it changes.
 %
 Did you know you can list tasks that have priorities like 'task list
 priority.above:L'?
 %
 The http://tasktools.org/latest URL can tell you which is the latest version.
 %
 To make your task list clear and actionable, always describe it starting with a
 verb, like "call" or "clean" or "get".
 %
 Don't like the name of a command?  Create an alias.
 %
 You can choose whether your searches are case sensitive or not, by running
 'task config search.case.sensitive yes'
 %
 Back up your data files by making copies of the ~/.taskrc file and ~/.task
 directory.
 %
 Accidentally changed a task? The undo command makes it a breeze to recover from
 any inadvertent change -- even a deletion!
 %
 Want to see a list of all changes you have made to a task?  The info report will
 display a complete change history.
 %
--- a/i18n/tips.it-IT
+++ b/i18n/tips.it-IT
@@ -0,0 +1,59 @@
 %
 Se usi bash, puoi digitare qualche carattere in meno con 'alias t=task'.
 %
 Hai provato 'task edit 1' per modificare tutti gli aspetti del task 1 con il tuo
 editor preferito!
 %
 Lo sapevi che con 'task 1 wait:eom' puoi nascondere il task 1 fino alla fine del
 mese? Per listare tutti i task in attesa, usa 'task waiting'.
 %
 Lo sapevi che con 'task 1 wait:' puoi togliere un task dallo stato di attesa?
 %
 Se aggiungi la linea 'default.command=list project:home' al tuo file .taskrc,
 invocando 'task' invocherà automaticamente 'task list project:home' per te.
 Digita qualche carattere in meno!
 %
 Se editi il tuo file pending.data manualmente, assicurati che il tuo editor non
 rimuova il carattere \n alla fine del file.
 %
 Sei sicuro che la versione di task installata sia la più recente? Controlla
 periodicamente http://taskwarrior.org per novità e aggiornamenti: la
 funzionalità che aspettavi potrebbe essere pronta!
 %
 Non dimenticarti della documentazione online su
 http://taskwarrior.org/wiki/taskwarrior. Se trovi degli errori, puoi
 comunicarcelo o correggerli da te: è una wiki!
 %
 Lo sapevi che esistono le pagine del manuale di task? Prova con 'man task', 'man
 taskrc', 'man task-tutorial', 'man task-color' e 'man task-faq'.
 %
 Lo sapevi che ci sono svariati temi a 256 colori disponibili per task?
 %
 Lo sapevi che invocando 'task show' vengono eseguiti svariati controlli sul tuo
 file .taskrc e che alla fine viene presentato un report con gli errori?
 %
 Stai sfruttando al massimo i colori a tua disposizione? Prova ad invocare 'task
 color' per vedere i colori supportati dal tuo sistema.
 %
 Usi la funzionalità di task legata ai progetti? Se sì, taskwarrior tiene traccia
 del livello di completamento dei tuoi progetti e te lo notifica quando cambia.
 %
 Lo sapevi che puoi listare i tasks prioritari con un comando come 'task list
 priority.above:L'?
 %
 Hai la versione più aggiornata? Controllalo su http://tasktools.org/latest!
 %
 In una lista di task chiara e concisa le azioni iniziano sempre con un verbo,
 come "chiama", "pulisci", o "compera".
 %
 Non ti piace il nome di un comando? Crea un alias!
 %
 Puoi scegliere se le tue ricerche devono essere portate a termine in modo
 case-sensitive o meno, invocando 'task config search.case.sensitive [yes|no]'
 %
 Per fare un backup completo dei tuoi task è sufficiente fare una copia del file
 ~/.taskrc e della directory ~/.task.
 %
 Hai modificato accidentalmente un task? Con il comando 'undo' è facile
 ripristinare un task -- anche dopo una cancellazione!
 %
--- a/i18n/tips.ja-JP
+++ b/i18n/tips.ja-JP
@@ -0,0 +1,70 @@
 %
 bashユーザーなら、'alias t=task'としてキー入力を減らしてみてください。
 %
 'task edit 1'とすると、タスク1のあらゆる要素をテキストエディタで編集
 できます。試してみましたか？
 %
 'task 1 wait:eom'とすると、月末までタスク1を隠す（待機させる）ことが
 できます。「待機」させたタスクは、'task waiting'で表示できます。
 %
 'task 1 wait:'で、待機状態のタスクを pending ステータスに変更できます。
 %
 設定ファイル .taskrc に 'default.command=list project:home' と書くと、
 単に 'task' を実行するだけで、自動的に 'task list project:home' した
 のと同じことになります。これでキー入力数を減らせますね！
 %
 もしpending.dataファイルを編集するなら、テキストエディタにファイル
 末尾にある、連続した \n 文字を勝手に削除させないようにしてください。
 %
 もしpending.dataファイルを編集するなら、テキストエディタが改行
 文字を勝手にUnixスタイルからDOSスタイルに変更しないように設定
 してください。
 %
 お使いのtaskは最新版ですか？　 http://taskwarrior.org/を定期的に
 確認し、アップデート情報を確認してください。この機能はいずれ実装
 されるかもしれません……。
 %
 オンラインにあるドキュメント http://taskwarrior.org/wiki/taskwarrior
 をお忘れなく。もし間違いを見つけたらお知らせください。ただ、これは
 wikiなので、ご自身で直して頂くことも可能です。
 %
 オンラインにあるドキュメント http://taskwarrior.org/wiki/taskwarrior
 をお忘れなく。ただ、必要な情報が見つからないかもしれません。そうした
 場合は、チケットでリクエストするか、support@taskwarrior.org にeメール
 で相談してください。
 %
 taskにはmanページがあります。'man task'、'man taskrc'、
 'man task-turorial'、'man task-color'、'man task-faq' が利用できます。
 %
 taskでは256色の色表示が可能です。ご存じでしたか？
 %
 'task show'を使っていますか？　これを使うことで、お使いの .taskrc
 ファイルに問題がないかを、様々な形でチェックできます。
 %
 もっと多くの色を利用したいですか？　'task color'を試してください。
 システム上でサポートされている各種カラー指定を表示します。
 %
 プロジェクト機能を使っていますか？　これを使えば、taskwarriorによる
 進捗率管理や、レポートを随時確認することができます。
 %
 一定の優先度のタスクのみ表示する場合、次のようにしてください。
 'task list priority.above:L'?
 %
 http://tasktools.org/latest というURLに、最新版が準備されています。
 %
 タスクリストを明確かつ「するべきこと」が分かるようにするために、
 動詞から書き出しましょう。「電話をかける：どこどこへ」「整理する」
 「調べる」といった形で。
 %
 コマンドの名前が気に入らない？　エイリアスを設定しましょう。
 %
 検索時、大文字小文字を区別するかどうかは任意に指定できます。
 'task config search.case.sensitive yes'で区別できます。
 %
 データファイルのバックアップを行う場合、~/.taskrcファイルと、
 ~/.task ディレクトリを対象にしてください。
 %
 間違えてタスクを変更してしまったら？　undoコマンドを使うことで、
 あらゆる操作を一つ前に戻すことができます。もちろん削除もです！
 %
--- a/i18n/tips.sv-SE
+++ b/i18n/tips.sv-SE
@@ -1,5 +1,14 @@
 %
-första tips
+För bash användare, med 'alias t=task' kan du spara på nedslagningar på tangentbordet.
 %
-andra tips
+Har du försökt att använda 'task edit 1' för att ändra alla aspekter av task 1 i din texteditor?
 %
 Med 'task 1 wait:eom' kan du göma task 1 fram till slutet av månaden. För att se
 alla task som väntar kan du använda 'task waiting'.
 %
 Visste du att 'task 1 wait:' återställa en väntande task till "peding" igen?
 %
 Skriv 'default.command=list project:home' i din .taskrc fil. När du sen använder
 'task' körs det en 'task list project:home' istäälet för dig. Spara på nedslagningar
 på tangetbordet.
 %
--- a/507
+++ b/507
@@ -1,507 +0,0 @@
 #!/bin/sh
 # install - install a program, script, or datafile
 scriptversion=2006-10-14.15
 # This originates from X11R5 (mit/util/scripts/install.sh), which was
 # later released in X11R6 (xc/config/util/install.sh) with the
 # following copyright and license.
 #
 # Copyright (C) 1994 X Consortium
 #
 # Permission is hereby granted, free of charge, to any person obtaining a copy
 # of this software and associated documentation files (the "Software"), to
 # deal in the Software without restriction, including without limitation the
 # rights to use, copy, modify, merge, publish, distribute, sublicense, and/or
 # sell copies of the Software, and to permit persons to whom the Software is
 # furnished to do so, subject to the following conditions:
 #
 # The above copyright notice and this permission notice shall be included in
 # all copies or substantial portions of the Software.
 #
 # THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
 # IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
 # FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL THE
 # X CONSORTIUM BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
 # AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNEC-
 # TION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 #
 # Except as contained in this notice, the name of the X Consortium shall not
 # be used in advertising or otherwise to promote the sale, use or other deal-
 # ings in this Software without prior written authorization from the X Consor-
 # tium.
 #
 #
 # FSF changes to this file are in the public domain.
 #
 # Calling this script install-sh is preferred over install.sh, to prevent
 # `make' implicit rules from creating a file called install from it
 # when there is no Makefile.
 #
 # This script is compatible with the BSD install script, but was written
 # from scratch.
 nl='
 '
 IFS=" ""	$nl"
 # set DOITPROG to echo to test this script
 # Don't use :- since 4.3BSD and earlier shells don't like it.
 doit="${DOITPROG-}"
 if test -z "$doit"; then
  doit_exec=exec
 else
  doit_exec=$doit
 fi
 # Put in absolute file names if you don't have them in your path;
 # or use environment vars.
 mvprog="${MVPROG-mv}"
 cpprog="${CPPROG-cp}"
 chmodprog="${CHMODPROG-chmod}"
 chownprog="${CHOWNPROG-chown}"
 chgrpprog="${CHGRPPROG-chgrp}"
 stripprog="${STRIPPROG-strip}"
 rmprog="${RMPROG-rm}"
 mkdirprog="${MKDIRPROG-mkdir}"
 posix_glob=
 posix_mkdir=
 # Desired mode of installed file.
 mode=0755
 chmodcmd=$chmodprog
 chowncmd=
 chgrpcmd=
 stripcmd=
 rmcmd="$rmprog -f"
 mvcmd="$mvprog"
 src=
 dst=
 dir_arg=
 dstarg=
 no_target_directory=
 usage="Usage: $0 [OPTION]... [-T] SRCFILE DSTFILE
   or: $0 [OPTION]... SRCFILES... DIRECTORY
   or: $0 [OPTION]... -t DIRECTORY SRCFILES...
   or: $0 [OPTION]... -d DIRECTORIES...
 In the 1st form, copy SRCFILE to DSTFILE.
 In the 2nd and 3rd, copy all SRCFILES to DIRECTORY.
 In the 4th, create DIRECTORIES.
 Options:
 -c         (ignored)
 -d         create directories instead of installing files.
 -g GROUP   $chgrpprog installed files to GROUP.
 -m MODE    $chmodprog installed files to MODE.
 -o USER    $chownprog installed files to USER.
 -s         $stripprog installed files.
 -t DIRECTORY  install into DIRECTORY.
 -T         report an error if DSTFILE is a directory.
 --help     display this help and exit.
 --version  display version info and exit.
 Environment variables override the default commands:
  CHGRPPROG CHMODPROG CHOWNPROG CPPROG MKDIRPROG MVPROG RMPROG STRIPPROG
 "
 while test $# -ne 0; do
  case $1 in
    -c) shift
        continue;;
    -d) dir_arg=true
        shift
        continue;;
    -g) chgrpcmd="$chgrpprog $2"
        shift
        shift
        continue;;
    --help) echo "$usage"; exit $?;;
    -m) mode=$2
        shift
        shift
 	case $mode in
 	  *' '* | *'	'* | *'
 '*	  | *'*'* | *'?'* | *'['*)
 	    echo "$0: invalid mode: $mode" >&2
 	    exit 1;;
 	esac
        continue;;
    -o) chowncmd="$chownprog $2"
        shift
        shift
        continue;;
    -s) stripcmd=$stripprog
        shift
        continue;;
    -t) dstarg=$2
 	shift
 	shift
 	continue;;
    -T) no_target_directory=true
 	shift
 	continue;;
    --version) echo "$0 $scriptversion"; exit $?;;
    --)	shift
 	break;;
    -*)	echo "$0: invalid option: $1" >&2
 	exit 1;;
    *)  break;;
  esac
 done
 if test $# -ne 0 && test -z "$dir_arg$dstarg"; then
  # When -d is used, all remaining arguments are directories to create.
  # When -t is used, the destination is already specified.
  # Otherwise, the last argument is the destination.  Remove it from $@.
  for arg
  do
    if test -n "$dstarg"; then
      # $@ is not empty: it contains at least $arg.
      set fnord "$@" "$dstarg"
      shift # fnord
    fi
    shift # arg
    dstarg=$arg
  done
 fi
 if test $# -eq 0; then
  if test -z "$dir_arg"; then
    echo "$0: no input file specified." >&2
    exit 1
  fi
  # It's OK to call `install-sh -d' without argument.
  # This can happen when creating conditional directories.
  exit 0
 fi
 if test -z "$dir_arg"; then
  trap '(exit $?); exit' 1 2 13 15
  # Set umask so as not to create temps with too-generous modes.
  # However, 'strip' requires both read and write access to temps.
  case $mode in
    # Optimize common cases.
    *644) cp_umask=133;;
    *755) cp_umask=22;;
    *[0-7])
      if test -z "$stripcmd"; then
 	u_plus_rw=
      else
 	u_plus_rw='% 200'
      fi
      cp_umask=`expr '(' 777 - $mode % 1000 ')' $u_plus_rw`;;
    *)
      if test -z "$stripcmd"; then
 	u_plus_rw=
      else
 	u_plus_rw=,u+rw
      fi
      cp_umask=$mode$u_plus_rw;;
  esac
 fi
 for src
 do
  # Protect names starting with `-'.
  case $src in
    -*) src=./$src ;;
  esac
  if test -n "$dir_arg"; then
    dst=$src
    dstdir=$dst
    test -d "$dstdir"
    dstdir_status=$?
  else
    # Waiting for this to be detected by the "$cpprog $src $dsttmp" command
    # might cause directories to be created, which would be especially bad
    # if $src (and thus $dsttmp) contains '*'.
    if test ! -f "$src" && test ! -d "$src"; then
      echo "$0: $src does not exist." >&2
      exit 1
    fi
    if test -z "$dstarg"; then
      echo "$0: no destination specified." >&2
      exit 1
    fi
    dst=$dstarg
    # Protect names starting with `-'.
    case $dst in
      -*) dst=./$dst ;;
    esac
    # If destination is a directory, append the input filename; won't work
    # if double slashes aren't ignored.
    if test -d "$dst"; then
      if test -n "$no_target_directory"; then
 	echo "$0: $dstarg: Is a directory" >&2
 	exit 1
      fi
      dstdir=$dst
      dst=$dstdir/`basename "$src"`
      dstdir_status=0
    else
      # Prefer dirname, but fall back on a substitute if dirname fails.
      dstdir=`
 	(dirname "$dst") 2>/dev/null ||
 	expr X"$dst" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
 	     X"$dst" : 'X\(//\)[^/]' \| \
 	     X"$dst" : 'X\(//\)$' \| \
 	     X"$dst" : 'X\(/\)' \| . 2>/dev/null ||
 	echo X"$dst" |
 	    sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
 		   s//\1/
 		   q
 		 }
 		 /^X\(\/\/\)[^/].*/{
 		   s//\1/
 		   q
 		 }
 		 /^X\(\/\/\)$/{
 		   s//\1/
 		   q
 		 }
 		 /^X\(\/\).*/{
 		   s//\1/
 		   q
 		 }
 		 s/.*/./; q'
      `
      test -d "$dstdir"
      dstdir_status=$?
    fi
  fi
  obsolete_mkdir_used=false
  if test $dstdir_status != 0; then
    case $posix_mkdir in
      '')
 	# Create intermediate dirs using mode 755 as modified by the umask.
 	# This is like FreeBSD 'install' as of 1997-10-28.
 	umask=`umask`
 	case $stripcmd.$umask in
 	  # Optimize common cases.
 	  *[2367][2367]) mkdir_umask=$umask;;
 	  .*0[02][02] | .[02][02] | .[02]) mkdir_umask=22;;
 	  *[0-7])
 	    mkdir_umask=`expr $umask + 22 \
 	      - $umask % 100 % 40 + $umask % 20 \
 	      - $umask % 10 % 4 + $umask % 2
 	    `;;
 	  *) mkdir_umask=$umask,go-w;;
 	esac
 	# With -d, create the new directory with the user-specified mode.
 	# Otherwise, rely on $mkdir_umask.
 	if test -n "$dir_arg"; then
 	  mkdir_mode=-m$mode
 	else
 	  mkdir_mode=
 	fi
 	posix_mkdir=false
 	case $umask in
 	  *[123567][0-7][0-7])
 	    # POSIX mkdir -p sets u+wx bits regardless of umask, which
 	    # is incompatible with FreeBSD 'install' when (umask & 300) != 0.
 	    ;;
 	  *)
 	    tmpdir=${TMPDIR-/tmp}/ins$RANDOM-$$
 	    trap 'ret=$?; rmdir "$tmpdir/d" "$tmpdir" 2>/dev/null; exit $ret' 0
 	    if (umask $mkdir_umask &&
 		exec $mkdirprog $mkdir_mode -p -- "$tmpdir/d") >/dev/null 2>&1
 	    then
 	      if test -z "$dir_arg" || {
 		   # Check for POSIX incompatibilities with -m.
 		   # HP-UX 11.23 and IRIX 6.5 mkdir -m -p sets group- or
 		   # other-writeable bit of parent directory when it shouldn't.
 		   # FreeBSD 6.1 mkdir -m -p sets mode of existing directory.
 		   ls_ld_tmpdir=`ls -ld "$tmpdir"`
 		   case $ls_ld_tmpdir in
 		     d????-?r-*) different_mode=700;;
 		     d????-?--*) different_mode=755;;
 		     *) false;;
 		   esac &&
 		   $mkdirprog -m$different_mode -p -- "$tmpdir" && {
 		     ls_ld_tmpdir_1=`ls -ld "$tmpdir"`
 		     test "$ls_ld_tmpdir" = "$ls_ld_tmpdir_1"
 		   }
 		 }
 	      then posix_mkdir=:
 	      fi
 	      rmdir "$tmpdir/d" "$tmpdir"
 	    else
 	      # Remove any dirs left behind by ancient mkdir implementations.
 	      rmdir ./$mkdir_mode ./-p ./-- 2>/dev/null
 	    fi
 	    trap '' 0;;
 	esac;;
    esac
    if
      $posix_mkdir && (
 	umask $mkdir_umask &&
 	$doit_exec $mkdirprog $mkdir_mode -p -- "$dstdir"
      )
    then :
    else
      # The umask is ridiculous, or mkdir does not conform to POSIX,
      # or it failed possibly due to a race condition.  Create the
      # directory the slow way, step by step, checking for races as we go.
      case $dstdir in
 	/*) prefix=/ ;;
 	-*) prefix=./ ;;
 	*)  prefix= ;;
      esac
      case $posix_glob in
        '')
 	  if (set -f) 2>/dev/null; then
 	    posix_glob=true
 	  else
 	    posix_glob=false
 	  fi ;;
      esac
      oIFS=$IFS
      IFS=/
      $posix_glob && set -f
      set fnord $dstdir
      shift
      $posix_glob && set +f
      IFS=$oIFS
      prefixes=
      for d
      do
 	test -z "$d" && continue
 	prefix=$prefix$d
 	if test -d "$prefix"; then
 	  prefixes=
 	else
 	  if $posix_mkdir; then
 	    (umask=$mkdir_umask &&
 	     $doit_exec $mkdirprog $mkdir_mode -p -- "$dstdir") && break
 	    # Don't fail if two instances are running concurrently.
 	    test -d "$prefix" || exit 1
 	  else
 	    case $prefix in
 	      *\'*) qprefix=`echo "$prefix" | sed "s/'/'\\\\\\\\''/g"`;;
 	      *) qprefix=$prefix;;
 	    esac
 	    prefixes="$prefixes '$qprefix'"
 	  fi
 	fi
 	prefix=$prefix/
      done
      if test -n "$prefixes"; then
 	# Don't fail if two instances are running concurrently.
 	(umask $mkdir_umask &&
 	 eval "\$doit_exec \$mkdirprog $prefixes") ||
 	  test -d "$dstdir" || exit 1
 	obsolete_mkdir_used=true
      fi
    fi
  fi
  if test -n "$dir_arg"; then
    { test -z "$chowncmd" || $doit $chowncmd "$dst"; } &&
    { test -z "$chgrpcmd" || $doit $chgrpcmd "$dst"; } &&
    { test "$obsolete_mkdir_used$chowncmd$chgrpcmd" = false ||
      test -z "$chmodcmd" || $doit $chmodcmd $mode "$dst"; } || exit 1
  else
    # Make a couple of temp file names in the proper directory.
    dsttmp=$dstdir/_inst.$$_
    rmtmp=$dstdir/_rm.$$_
    # Trap to clean up those temp files at exit.
    trap 'ret=$?; rm -f "$dsttmp" "$rmtmp" && exit $ret' 0
    # Copy the file name to the temp name.
    (umask $cp_umask && $doit_exec $cpprog "$src" "$dsttmp") &&
    # and set any options; do chmod last to preserve setuid bits.
    #
    # If any of these fail, we abort the whole thing.  If we want to
    # ignore errors from any of these, just make sure not to ignore
    # errors from the above "$doit $cpprog $src $dsttmp" command.
    #
    { test -z "$chowncmd" || $doit $chowncmd "$dsttmp"; } \
      && { test -z "$chgrpcmd" || $doit $chgrpcmd "$dsttmp"; } \
      && { test -z "$stripcmd" || $doit $stripcmd "$dsttmp"; } \
      && { test -z "$chmodcmd" || $doit $chmodcmd $mode "$dsttmp"; } &&
    # Now rename the file to the real destination.
    { $doit $mvcmd -f "$dsttmp" "$dst" 2>/dev/null \
      || {
 	   # The rename failed, perhaps because mv can't rename something else
 	   # to itself, or perhaps because mv is so ancient that it does not
 	   # support -f.
 	   # Now remove or move aside any old file at destination location.
 	   # We try this two ways since rm can't unlink itself on some
 	   # systems and the destination file might be busy for other
 	   # reasons.  In this case, the final cleanup might fail but the new
 	   # file should still install successfully.
 	   {
 	     if test -f "$dst"; then
 	       $doit $rmcmd -f "$dst" 2>/dev/null \
 	       || { $doit $mvcmd -f "$dst" "$rmtmp" 2>/dev/null \
 		     && { $doit $rmcmd -f "$rmtmp" 2>/dev/null; :; }; }\
 	       || {
 		 echo "$0: cannot unlink or rename $dst" >&2
 		 (exit 1); exit 1
 	       }
 	     else
 	       :
 	     fi
 	   } &&
 	   # Now rename the file to the real destination.
 	   $doit $mvcmd "$dsttmp" "$dst"
 	 }
    } || exit 1
    trap '' 0
  fi
 done
 # Local variables:
 # eval: (add-hook 'write-file-hooks 'time-stamp)
 # time-stamp-start: "scriptversion="
 # time-stamp-format: "%:y-%02m-%02d.%02H"
 # time-stamp-end: "$"
 # End:
--- a/367
+++ b/367
@@ -1,367 +0,0 @@
 #! /bin/sh
 # Common stub for a few missing GNU programs while installing.
 scriptversion=2006-05-10.23
 # Copyright (C) 1996, 1997, 1999, 2000, 2002, 2003, 2004, 2005, 2006
 #   Free Software Foundation, Inc.
 # Originally by Fran,cois Pinard <pinard@iro.umontreal.ca>, 1996.
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
 # the Free Software Foundation; either version 2, or (at your option)
 # any later version.
 # This program is distributed in the hope that it will be useful,
 # but WITHOUT ANY WARRANTY; without even the implied warranty of
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 # GNU General Public License for more details.
 # You should have received a copy of the GNU General Public License
 # along with this program; if not, write to the Free Software
 # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
 # 02110-1301, USA.
 # As a special exception to the GNU General Public License, if you
 # distribute this file as part of a program that contains a
 # configuration script generated by Autoconf, you may include it under
 # the same distribution terms that you use for the rest of that program.
 if test $# -eq 0; then
  echo 1>&2 "Try \`$0 --help' for more information"
  exit 1
 fi
 run=:
 sed_output='s/.* --output[ =]\([^ ]*\).*/\1/p'
 sed_minuso='s/.* -o \([^ ]*\).*/\1/p'
 # In the cases where this matters, `missing' is being run in the
 # srcdir already.
 if test -f configure.ac; then
  configure_ac=configure.ac
 else
  configure_ac=configure.in
 fi
 msg="missing on your system"
 case $1 in
 --run)
  # Try to run requested program, and just exit if it succeeds.
  run=
  shift
  "$@" && exit 0
  # Exit code 63 means version mismatch.  This often happens
  # when the user try to use an ancient version of a tool on
  # a file that requires a minimum version.  In this case we
  # we should proceed has if the program had been absent, or
  # if --run hadn't been passed.
  if test $? = 63; then
    run=:
    msg="probably too old"
  fi
  ;;
  -h|--h|--he|--hel|--help)
    echo "\
 $0 [OPTION]... PROGRAM [ARGUMENT]...
 Handle \`PROGRAM [ARGUMENT]...' for when PROGRAM is missing, or return an
 error status if there is no known handling for PROGRAM.
 Options:
  -h, --help      display this help and exit
  -v, --version   output version information and exit
  --run           try to run the given command, and emulate it if it fails
 Supported PROGRAM values:
  aclocal      touch file \`aclocal.m4'
  autoconf     touch file \`configure'
  autoheader   touch file \`config.h.in'
  autom4te     touch the output file, or create a stub one
  automake     touch all \`Makefile.in' files
  bison        create \`y.tab.[ch]', if possible, from existing .[ch]
  flex         create \`lex.yy.c', if possible, from existing .c
  help2man     touch the output file
  lex          create \`lex.yy.c', if possible, from existing .c
  makeinfo     touch the output file
  tar          try tar, gnutar, gtar, then tar without non-portable flags
  yacc         create \`y.tab.[ch]', if possible, from existing .[ch]
 Send bug reports to <bug-automake@gnu.org>."
    exit $?
    ;;
  -v|--v|--ve|--ver|--vers|--versi|--versio|--version)
    echo "missing $scriptversion (GNU Automake)"
    exit $?
    ;;
  -*)
    echo 1>&2 "$0: Unknown \`$1' option"
    echo 1>&2 "Try \`$0 --help' for more information"
    exit 1
    ;;
 esac
 # Now exit if we have it, but it failed.  Also exit now if we
 # don't have it and --version was passed (most likely to detect
 # the program).
 case $1 in
  lex|yacc)
    # Not GNU programs, they don't have --version.
    ;;
  tar)
    if test -n "$run"; then
       echo 1>&2 "ERROR: \`tar' requires --run"
       exit 1
    elif test "x$2" = "x--version" || test "x$2" = "x--help"; then
       exit 1
    fi
    ;;
  *)
    if test -z "$run" && ($1 --version) > /dev/null 2>&1; then
       # We have it, but it failed.
       exit 1
    elif test "x$2" = "x--version" || test "x$2" = "x--help"; then
       # Could not run --version or --help.  This is probably someone
       # running `$TOOL --version' or `$TOOL --help' to check whether
       # $TOOL exists and not knowing $TOOL uses missing.
       exit 1
    fi
    ;;
 esac
 # If it does not exist, or fails to run (possibly an outdated version),
 # try to emulate it.
 case $1 in
  aclocal*)
    echo 1>&2 "\
 WARNING: \`$1' is $msg.  You should only need it if
         you modified \`acinclude.m4' or \`${configure_ac}'.  You might want
         to install the \`Automake' and \`Perl' packages.  Grab them from
         any GNU archive site."
    touch aclocal.m4
    ;;
  autoconf)
    echo 1>&2 "\
 WARNING: \`$1' is $msg.  You should only need it if
         you modified \`${configure_ac}'.  You might want to install the
         \`Autoconf' and \`GNU m4' packages.  Grab them from any GNU
         archive site."
    touch configure
    ;;
  autoheader)
    echo 1>&2 "\
 WARNING: \`$1' is $msg.  You should only need it if
         you modified \`acconfig.h' or \`${configure_ac}'.  You might want
         to install the \`Autoconf' and \`GNU m4' packages.  Grab them
         from any GNU archive site."
    files=`sed -n 's/^[ ]*A[CM]_CONFIG_HEADER(\([^)]*\)).*/\1/p' ${configure_ac}`
    test -z "$files" && files="config.h"
    touch_files=
    for f in $files; do
      case $f in
      *:*) touch_files="$touch_files "`echo "$f" |
 				       sed -e 's/^[^:]*://' -e 's/:.*//'`;;
      *) touch_files="$touch_files $f.in";;
      esac
    done
    touch $touch_files
    ;;
  automake*)
    echo 1>&2 "\
 WARNING: \`$1' is $msg.  You should only need it if
         you modified \`Makefile.am', \`acinclude.m4' or \`${configure_ac}'.
         You might want to install the \`Automake' and \`Perl' packages.
         Grab them from any GNU archive site."
    find . -type f -name Makefile.am -print |
 	   sed 's/\.am$/.in/' |
 	   while read f; do touch "$f"; done
    ;;
  autom4te)
    echo 1>&2 "\
 WARNING: \`$1' is needed, but is $msg.
         You might have modified some files without having the
         proper tools for further handling them.
         You can get \`$1' as part of \`Autoconf' from any GNU
         archive site."
    file=`echo "$*" | sed -n "$sed_output"`
    test -z "$file" && file=`echo "$*" | sed -n "$sed_minuso"`
    if test -f "$file"; then
 	touch $file
    else
 	test -z "$file" || exec >$file
 	echo "#! /bin/sh"
 	echo "# Created by GNU Automake missing as a replacement of"
 	echo "#  $ $@"
 	echo "exit 0"
 	chmod +x $file
 	exit 1
    fi
    ;;
  bison|yacc)
    echo 1>&2 "\
 WARNING: \`$1' $msg.  You should only need it if
         you modified a \`.y' file.  You may need the \`Bison' package
         in order for those modifications to take effect.  You can get
         \`Bison' from any GNU archive site."
    rm -f y.tab.c y.tab.h
    if test $# -ne 1; then
        eval LASTARG="\${$#}"
 	case $LASTARG in
 	*.y)
 	    SRCFILE=`echo "$LASTARG" | sed 's/y$/c/'`
 	    if test -f "$SRCFILE"; then
 	         cp "$SRCFILE" y.tab.c
 	    fi
 	    SRCFILE=`echo "$LASTARG" | sed 's/y$/h/'`
 	    if test -f "$SRCFILE"; then
 	         cp "$SRCFILE" y.tab.h
 	    fi
 	  ;;
 	esac
    fi
    if test ! -f y.tab.h; then
 	echo >y.tab.h
    fi
    if test ! -f y.tab.c; then
 	echo 'main() { return 0; }' >y.tab.c
    fi
    ;;
  lex|flex)
    echo 1>&2 "\
 WARNING: \`$1' is $msg.  You should only need it if
         you modified a \`.l' file.  You may need the \`Flex' package
         in order for those modifications to take effect.  You can get
         \`Flex' from any GNU archive site."
    rm -f lex.yy.c
    if test $# -ne 1; then
        eval LASTARG="\${$#}"
 	case $LASTARG in
 	*.l)
 	    SRCFILE=`echo "$LASTARG" | sed 's/l$/c/'`
 	    if test -f "$SRCFILE"; then
 	         cp "$SRCFILE" lex.yy.c
 	    fi
 	  ;;
 	esac
    fi
    if test ! -f lex.yy.c; then
 	echo 'main() { return 0; }' >lex.yy.c
    fi
    ;;
  help2man)
    echo 1>&2 "\
 WARNING: \`$1' is $msg.  You should only need it if
 	 you modified a dependency of a manual page.  You may need the
 	 \`Help2man' package in order for those modifications to take
 	 effect.  You can get \`Help2man' from any GNU archive site."
    file=`echo "$*" | sed -n "$sed_output"`
    test -z "$file" && file=`echo "$*" | sed -n "$sed_minuso"`
    if test -f "$file"; then
 	touch $file
    else
 	test -z "$file" || exec >$file
 	echo ".ab help2man is required to generate this page"
 	exit 1
    fi
    ;;
  makeinfo)
    echo 1>&2 "\
 WARNING: \`$1' is $msg.  You should only need it if
         you modified a \`.texi' or \`.texinfo' file, or any other file
         indirectly affecting the aspect of the manual.  The spurious
         call might also be the consequence of using a buggy \`make' (AIX,
         DU, IRIX).  You might want to install the \`Texinfo' package or
         the \`GNU make' package.  Grab either from any GNU archive site."
    # The file to touch is that specified with -o ...
    file=`echo "$*" | sed -n "$sed_output"`
    test -z "$file" && file=`echo "$*" | sed -n "$sed_minuso"`
    if test -z "$file"; then
      # ... or it is the one specified with @setfilename ...
      infile=`echo "$*" | sed 's/.* \([^ ]*\) *$/\1/'`
      file=`sed -n '
 	/^@setfilename/{
 	  s/.* \([^ ]*\) *$/\1/
 	  p
 	  q
 	}' $infile`
      # ... or it is derived from the source name (dir/f.texi becomes f.info)
      test -z "$file" && file=`echo "$infile" | sed 's,.*/,,;s,.[^.]*$,,'`.info
    fi
    # If the file does not exist, the user really needs makeinfo;
    # let's fail without touching anything.
    test -f $file || exit 1
    touch $file
    ;;
  tar)
    shift
    # We have already tried tar in the generic part.
    # Look for gnutar/gtar before invocation to avoid ugly error
    # messages.
    if (gnutar --version > /dev/null 2>&1); then
       gnutar "$@" && exit 0
    fi
    if (gtar --version > /dev/null 2>&1); then
       gtar "$@" && exit 0
    fi
    firstarg="$1"
    if shift; then
 	case $firstarg in
 	*o*)
 	    firstarg=`echo "$firstarg" | sed s/o//`
 	    tar "$firstarg" "$@" && exit 0
 	    ;;
 	esac
 	case $firstarg in
 	*h*)
 	    firstarg=`echo "$firstarg" | sed s/h//`
 	    tar "$firstarg" "$@" && exit 0
 	    ;;
 	esac
    fi
    echo 1>&2 "\
 WARNING: I can't seem to be able to run \`tar' with the given arguments.
         You may want to install GNU tar or Free paxutils, or check the
         command line arguments."
    exit 1
    ;;
  *)
    echo 1>&2 "\
 WARNING: \`$1' is needed, and is $msg.
         You might have modified some files without having the
         proper tools for further handling them.  Check the \`README' file,
         it often tells you about the needed prerequisites for installing
         this package.  You may also peek at any GNU archive site, in case
         some other package would contain this missing \`$1' program."
    exit 1
    ;;
 esac
 exit 0
 # Local variables:
 # eval: (add-hook 'write-file-hooks 'time-stamp)
 # time-stamp-start: "scriptversion="
 # time-stamp-format: "%:y-%02m-%02d.%02H"
 # time-stamp-end: "$"
 # End:
--- a/package-config/osx/OSX-packaging.pdf
+++ b/package-config/osx/OSX-packaging.pdf
--- a/package-config/osx/README
+++ b/package-config/osx/README
@@ -31,9 +31,10 @@ Note: This is being written from the OSX 10.6 perspective, and may therefore
    $ cd ~/task-package.git
  2.2 Making sure you have the right version of the code.  This assumes you are
-    building task 1.9.2, but any version number is interchangeable.  Check out
+    building taskwarrior 1.9.2, but any version number is interchangeable.
-    the correct branch, and make sure it is sitting at the correct commit, via
+    Check out the correct branch, and make sure it is sitting at the correct
-    a tag.  Note that while 1.9.2 is a branch name, v1.9.2 is a tag name.
+    commit, via a tag.  Note that while 1.9.2 is a branch name, v1.9.2 is a tag
    name.
    $ git checkout 1.9.2
    $ git reset --hard v1.9.2
@@ -41,7 +42,7 @@ Note: This is being written from the OSX 10.6 perspective, and may therefore
    If there is an error in this step, stop, capture the output, and report the
    errors.
-3. Build task
+3. Build taskwarrior
  3.1 First build the task binary.  Note the "-j 2" tells make to use both cores
    in your dual-core Intel CPU, which means faster compiles.  If you own a quad
@@ -61,9 +62,9 @@ Note: This is being written from the OSX 10.6 perspective, and may therefore
 4. Build the test suite
-  4.1 The test suite exists to prove that we do not break task features from one
+  4.1 The test suite exists to prove that we do not break taskwarrior features
-    release to the next.  While this is not a perfect solution, it has saved us
+    from one release to the next.  While this is not a perfect solution, it has
-    many times from releasing code that is inferior.
+    saved us many times from releasing code that is inferior.
    The first step is to modify the test suite Makefile to remove the Lua line.
    This is because we do not yet have dynamic detection of the Lua library for
@@ -74,11 +75,11 @@ Note: This is being written from the OSX 10.6 perspective, and may therefore
    Any text editor will do, but look for this line (line 5):
-      LFLAGS  = -L/usr/local/lib -lncurses -llua
+      LFLAGS  = -L/usr/local/lib -llua
    and change it to:
-      LFLAGS  = -L/usr/local/lib -lncurses
+      LFLAGS  = -L/usr/local/lib
    Now build the unit tests:
@@ -111,7 +112,7 @@ Note: This is being written from the OSX 10.6 perspective, and may therefore
  6.1 Launch the package manager.
-    $ open -a /Developer/Applications/Utilies/PackageManager.app   
+    $ open -a /Developer/Applications/Utilities/PackageManager.app   
  6.2 Close the 'Untitled' window that opens - we will be using a different
    file.  Note that PackageManager is still running - it just has no windows.
@@ -123,13 +124,13 @@ Note: This is being written from the OSX 10.6 perspective, and may therefore
    <figure 1>
    This is the file from the last time a package was created.  It needs some
-    adjustments.  Start by clicking on the "Task x.x.x Distribution" with a
+    adjustments.  Start by clicking on the "Taskwarrior x.x.x Distribution" with
-    package icon in the top left part of the window.
+    a package icon in the top left part of the window.
  6.4 Click on the "Configuration" button/tab.
-    - Change the "Title" to "Task 1.9.2"
+    - Change the "Title" to "Taskwarrior 1.9.2"
-    - Change the "Description" to "Task 1.9.2 install for Snow Leopard"
+    - Change the "Description" to "Taskwarrior 1.9.2 install for Snow Leopard"
    <figure 2>
@@ -203,7 +204,7 @@ Note: This is being written from the OSX 10.6 perspective, and may therefore
      one
    - Make sure "Restart Action" is "None"
    - Make sure "Require admin authentication" is checked
-    - Make sure "PAckage Location" is "Self-Contained"
+    - Make sure "Package Location" is "Self-Contained"
    <figure 12>
@@ -238,8 +239,8 @@ Note: This is being written from the OSX 10.6 perspective, and may therefore
 8. Test the package
-  8.1 Double-click on the package you just created, and install task.  You
+  8.1 Double-click on the package you just created, and install taskwarrior.
-    should see the README file in the UI, and the COPYING file on another
+    You should see the README file in the UI, and the COPYING file on another
    page.  It should succeed.
  <figure 14>
@@ -255,21 +256,22 @@ Note: This is being written from the OSX 10.6 perspective, and may therefore
  $ /usr/local/bin/task version
-  task 1.9.2 built for darwin-ncurses
+  task 2.0.0 built for darwin
-  Copyright (C) 2006 - 2010 P. Beckingham, F. Hernandez.
+  Copyright (C) 2006 - 2012 P. Beckingham, F. Hernandez.
-  Task may be copied only under the terms of the GNU General Public License,
+  Taskwarrior may be copied only under the terms of the GNU General Public
-  which may be found in the task source kit.
+  License, which may be found in the taskwarrior source kit.
-  Documentation for task can be found using 'man task', 'man taskrc', 'man
+  Documentation for taskwarrior can be found using 'man task', 'man taskrc',
-  task-tutorial', 'man task-color', 'man task-faq' or at http://taskwarrior.org
+  'man task-tutorial', 'man task-color', 'man task-faq' or at
  http://taskwarrior.org
  $ man task
  ...
  ...
-  task 1.9.2             2010-05-22                task 1.9.2
+  task 2.0.0             2012-01-10                task 2.0.0
-  The man page should list 1.9.2 as the version number, but the date will be
+  The man page should list 2.0.0 as the version number, but the date will be
  different.
 9. Email the package to Fredde.
--- a/package-config/osx/task.pmdoc/01local-contents.xml
+++ b/package-config/osx/task.pmdoc/01local-contents.xml
@@ -1 +1 @@
-<pkg-contents spec="1.12"><f n="local" o="root" g="wheel" p="16877" pt="/Users/paul/task-1.9.1.git/package-config/osx/local" m="false" t="file"><f n="bin" o="root" g="wheel" p="16877"><f n="task" o="root" g="wheel" p="33261"/></f><f n="share" o="root" g="wheel" p="16877"><f n="doc" o="root" g="wheel" p="16877"><f n="task" o="root" g="wheel" p="16877"><f n="AUTHORS" o="root" g="wheel" p="33188"/><f n="ChangeLog" o="root" g="wheel" p="33188"/><f n="COPYING" o="root" g="wheel" p="33188"/><f n="NEWS" o="root" g="wheel" p="33188"/><f n="README" o="root" g="wheel" p="33188"/><f n="scripts" o="root" g="wheel" p="16877"><f n="bash" o="root" g="wheel" p="16877"><f n="task_completion.sh" o="root" g="wheel" p="33188"/></f><f n="vim" o="root" g="wheel" p="16877"><f n="ftdetect" o="root" g="wheel" p="16877"><f n="task.vim" o="root" g="wheel" p="33188"/></f><f n="README" o="root" g="wheel" p="33188"/><f n="syntax" o="root" g="wheel" p="16877"><f n="taskdata.vim" o="root" g="wheel" p="33188"/><f n="taskedit.vim" o="root" g="wheel" p="33188"/><f n="taskrc.vim" o="root" g="wheel" p="33188"/></f></f><f n="zsh" o="root" g="wheel" p="16877"><f n="_task" o="root" g="wheel" p="33188"/></f></f></f></f><f n="man" o="root" g="wheel" p="17917"><f n="man1" o="root" g="wheel" p="17901"><f n="task.1" o="root" g="wheel" p="33188"/><mod>group</mod><mod>owner</mod></f><f n="man5" o="root" g="wheel" p="17901"><f n="task-color.5" o="root" g="wheel" p="33188"/><f n="task-faq.5" o="root" g="wheel" p="33188"/><f n="task-tutorial.5" o="root" g="wheel" p="33188"/><f n="taskrc.5" o="root" g="wheel" p="33188"/><mod>group</mod><mod>owner</mod></f><mod>group</mod><mod>owner</mod></f></f><mod>group</mod><mod>owner</mod></f></pkg-contents>
+<pkg-contents spec="1.12"><f n="local" o="paul" g="staff" p="16877" pt="/Users/paul/task-1.9.4.git/package-config/osx/local" m="false" t="file"><f n="bin" o="root" g="wheel" p="16877"><f n="task" o="root" g="wheel" p="33261"/></f><f n="share" o="root" g="wheel" p="16877"><f n="doc" o="root" g="wheel" p="16877"><f n="task" o="root" g="wheel" p="16877"><f n="AUTHORS" o="root" g="wheel" p="33188"/><f n="ChangeLog" o="root" g="wheel" p="33188"/><f n="COPYING" o="root" g="wheel" p="33188"/><f n="NEWS" o="root" g="wheel" p="33188"/><f n="rc" o="root" g="wheel" p="16877"><f n="dark-16.theme" o="root" g="wheel" p="33188"/><f n="dark-256.theme" o="root" g="wheel" p="33188"/><f n="dark-blue-256.theme" o="root" g="wheel" p="33188"/><f n="dark-gray-256.theme" o="root" g="wheel" p="33188"/><f n="dark-green-256.theme" o="root" g="wheel" p="33188"/><f n="dark-red-256.theme" o="root" g="wheel" p="33188"/><f n="dark-violets-256.theme" o="root" g="wheel" p="33188"/><f n="dark-yellow-green.theme" o="root" g="wheel" p="33188"/><f n="holidays-AT.rc" o="root" g="wheel" p="33188"/><f n="holidays-CA.rc" o="root" g="wheel" p="33188"/><f n="holidays-DE.rc" o="root" g="wheel" p="33188"/><f n="holidays-DK.rc" o="root" g="wheel" p="33188"/><f n="holidays-ES.rc" o="root" g="wheel" p="33188"/><f n="holidays-FR.rc" o="root" g="wheel" p="33188"/><f n="holidays-IT.rc" o="root" g="wheel" p="33188"/><f n="holidays-NL.rc" o="root" g="wheel" p="33188"/><f n="holidays-NO.rc" o="root" g="wheel" p="33188"/><f n="holidays-NZ.rc" o="root" g="wheel" p="33188"/><f n="holidays-SE.rc" o="root" g="wheel" p="33188"/><f n="holidays-UK.rc" o="root" g="wheel" p="33188"/><f n="holidays-US.rc" o="root" g="wheel" p="33188"/><f n="light-16.theme" o="root" g="wheel" p="33188"/><f n="light-256.theme" o="root" g="wheel" p="33188"/></f><f n="README" o="root" g="wheel" p="33188"/><f n="scripts" o="root" g="wheel" p="16877"><f n="add-ons" o="root" g="wheel" p="16877"><f n="export-csv.pl" o="root" g="wheel" p="33188"/><f n="export-ical.pl" o="root" g="wheel" p="33188"/><f n="export-xml.pl" o="root" g="wheel" p="33188"/><f n="export-xml.py" o="root" g="wheel" p="33188"/><f n="export-xml.rb" o="root" g="wheel" p="33188"/><f n="export-yaml.pl" o="root" g="wheel" p="33188"/></f><f n="bash" o="root" g="wheel" p="16877"><f n="task_completion.sh" o="root" g="wheel" p="33188"/></f><f n="fish" o="root" g="wheel" p="16877"><f n="task.fish" o="root" g="wheel" p="33188"/></f><f n="vim" o="root" g="wheel" p="16877"><f n="ftdetect" o="root" g="wheel" p="16877"><f n="task.vim" o="root" g="wheel" p="33188"/></f><f n="README" o="root" g="wheel" p="33188"/><f n="syntax" o="root" g="wheel" p="16877"><f n="taskdata.vim" o="root" g="wheel" p="33188"/><f n="taskedit.vim" o="root" g="wheel" p="33188"/><f n="taskrc.vim" o="root" g="wheel" p="33188"/></f></f><f n="zsh" o="root" g="wheel" p="16877"><f n="_task" o="root" g="wheel" p="33188"/></f></f></f></f><f n="man" o="642" g="642" p="17917"><f n="man1" o="642" g="642" p="16877"><f n="task.1" o="root" g="642" p="33188"/></f><f n="man5" o="642" g="642" p="16877"><f n="task-color.5" o="root" g="642" p="33188"/><f n="task-faq.5" o="root" g="642" p="33188"/><f n="task-sync.5" o="root" g="642" p="33188"/><f n="task-tutorial.5" o="root" g="642" p="33188"/><f n="taskrc.5" o="root" g="642" p="33188"/></f></f></f></f></pkg-contents>
--- a/package-config/osx/task.pmdoc/01local.xml
+++ b/package-config/osx/task.pmdoc/01local.xml
@@ -1 +1 @@
-<pkgref spec="1.12" uuid="B93940C5-2C4F-47D6-8038-3D24062FBC85"><config><identifier>com.beckingham.task191.local.pkg</identifier><version>1.0</version><description/><post-install type="none"/><requireAuthorization/><installFrom>/Users/paul/task-1.9.1.git/package-config/osx/local</installFrom><installTo mod="true" relocatable="true">/usr/local</installTo><flags><followSymbolicLinks/></flags><packageStore type="internal"/><mod>installTo.path</mod><mod>identifier</mod><mod>parent</mod><mod>installTo</mod><mod>relocatable</mod></config><contents><file-list>01local-contents.xml</file-list><filter>/CVS$</filter><filter>/\.svn$</filter><filter>/\.cvsignore$</filter><filter>/\.cvspass$</filter><filter>/\.DS_Store$</filter></contents></pkgref>
+<pkgref spec="1.12" uuid="B93940C5-2C4F-47D6-8038-3D24062FBC85"><config><identifier>com.gbf.task194.local.pkg</identifier><version>1.0</version><description></description><post-install type="none"/><requireAuthorization/><installFrom mod="true">/Users/paul/task-1.9.4.git/package-config/osx/local</installFrom><installTo mod="true" relocatable="true">/usr/local</installTo><flags><followSymbolicLinks/></flags><packageStore type="internal"></packageStore><mod>installTo.path</mod><mod>relocatable</mod><mod>installFrom.path</mod><mod>parent</mod><mod>identifier</mod><mod>installTo</mod></config><contents><file-list>01local-contents.xml</file-list><filter>/CVS$</filter><filter>/\.svn$</filter><filter>/\.cvsignore$</filter><filter>/\.cvspass$</filter><filter>/\.DS_Store$</filter></contents></pkgref>
--- a/package-config/osx/task.pmdoc/index.xml
+++ b/package-config/osx/task.pmdoc/index.xml
@@ -1 +1 @@
-<pkmkdoc spec="1.12"><properties><title>Task 1.9.1</title><build>/Users/paul/Desktop/task-1.9.1-sl.pkg</build><organization>com.beckingham</organization><userSees ui="both"/><min-target os="3"/><domain anywhere="true" system="true"/></properties><distribution><versions min-spec="1.000000"/><scripts></scripts></distribution><description>Task 1.9.1 install for Snow Leopard.</description><contents><choice title="local" id="choice37" starts_selected="true" starts_enabled="true" starts_hidden="false"><pkgref id="com.beckingham.task191.local.pkg"/></choice></contents><resources bg-scale="proportional" bg-align="center"><locale lang="en"><resource mod="true" type="license">/Users/paul/task-1.9.1.git/package-config/osx/COPYING.txt</resource><resource mod="true" type="readme">/Users/paul/task-1.9.1.git/package-config/osx/README.txt</resource></locale></resources><requirements><requirement id="tosv" operator="ge" value="'10.6.0'"><message>Task requires Mac OSX 10.6.0 (Snow Leopard) or later.</message></requirement></requirements><flags/><item type="file">01local.xml</item><mod>properties.title</mod><mod>properties.customizeOption</mod><mod>description</mod><mod>properties.anywhereDomain</mod><mod>properties.systemDomain</mod></pkmkdoc>
+<pkmkdoc spec="1.12"><properties><title>Task 1.9.4</title><build>/Users/paul/Desktop/task-1.9.4-sl.pkg</build><organization>com.beckingham</organization><userSees ui="both"/><min-target os="3"/><domain anywhere="true" system="true"/></properties><distribution><versions min-spec="1.000000"/><scripts></scripts></distribution><description>Task 1.9.4 install for Snow Leopard.</description><contents><choice title="local" id="choice37" starts_selected="true" starts_enabled="true" starts_hidden="false"><pkgref id="com.gbf.task194.local.pkg"/></choice></contents><resources bg-scale="proportional" bg-align="center"><locale lang="en"><resource mod="true" type="license">/Users/paul/task-1.9.4.git/package-config/osx/COPYING.txt</resource><resource mod="true" type="readme">/Users/paul/task-1.9.4.git/package-config/osx/README.txt</resource></locale></resources><requirements><requirement id="tosv" operator="ge" value="'10.6.0'"><message>Task requires Mac OSX 10.6.0 (Snow Leopard) or later.</message></requirement></requirements><flags/><item type="file">01local.xml</item><mod>properties.title</mod><mod>properties.customizeOption</mod><mod>description</mod><mod>properties.anywhereDomain</mod><mod>properties.systemDomain</mod></pkmkdoc>
--- a/package-config/osx/update
+++ b/package-config/osx/update
@@ -5,6 +5,8 @@ mkdir -p local/share/doc/task/scripts/bash
 mkdir -p local/share/doc/task/scripts/vim/ftdetect
 mkdir -p local/share/doc/task/scripts/vim/syntax
 mkdir -p local/share/doc/task/scripts/zsh
 mkdir -p local/share/doc/task/scripts/fish
 mkdir -p local/share/doc/task/scripts/add-ons
 mkdir -p local/share/doc/task/rc
 mkdir -p local/share/man/man1
 mkdir -p local/share/man/man5
@@ -25,6 +27,8 @@ cp ../../scripts/vim/README     local/share/doc/task/scripts/vim
 cp ../../scripts/vim/ftdetect/* local/share/doc/task/scripts/vim/ftdetect
 cp ../../scripts/vim/syntax/*   local/share/doc/task/scripts/vim/syntax
 cp ../../scripts/zsh/*          local/share/doc/task/scripts/zsh
 cp ../../scripts/fish/*         local/share/doc/task/scripts/fish
 cp ../../scripts/add-ons/*      local/share/doc/task/scripts/add-ons
 cp ../../doc/rc/*.theme         local/share/doc/task/rc
 cp ../../doc/rc/holidays*       local/share/doc/task/rc
--- a/package-config/ubuntu/debian/copyright
+++ b/package-config/ubuntu/debian/copyright
@@ -32,10 +32,10 @@ Upstream Authors:
 Copyright:
-    Copyright 2006 - 2010, Paul Beckingham
+    Copyright 2006 - 2012, Paul Beckingham
-    Copyright 2009 - 2010  Federico Hernandez
+    Copyright 2009 - 2012  Federico Hernandez
-    Copyright 2006 - 2010, Paul Beckingham, Federico Hernandez
+    Copyright 2006 - 2012, Paul Beckingham, Federico Hernandez
-    Copyright 2009 - 2010  John Florian
+    Copyright 2009 - 2012  John Florian
    Copyright 2009 P.C. Shyamshankar
    Copyright © 1994–2008 Lua.org, PUC-Rio
@@ -60,6 +60,6 @@ Public License can be found in `/usr/share/common-licenses/GPL-2'.
 The Debian packaging is:
-    Copyright (C) 2009 - 2010, Federico Hernandez <ultrafredde@gmail.com>
+    Copyright (C) 2009 - 2012, Federico Hernandez <ultrafredde@gmail.com>
 and is licensed under the GPL, see above.
--- a/scripts/CMakeLists.txt
+++ b/scripts/CMakeLists.txt
@@ -0,0 +1,2 @@
 cmake_minimum_required (VERSION 2.8)
 install (DIRECTORY bash fish vim zsh add-ons extensions DESTINATION ${TASK_DOCDIR}/scripts)
--- a/scripts/add-ons/export-csv.pl
+++ b/scripts/add-ons/export-csv.pl
@@ -0,0 +1,82 @@
 #! /usr/bin/perl
 ################################################################################
 ## taskwarrior - a command line task list manager.
 ##
 ## Copyright 2006-2012, Paul Beckingham, Federico Hernandez.
 ##
 ## Permission is hereby granted, free of charge, to any person obtaining a copy
 ## of this software and associated documentation files (the "Software"), to deal
 ## in the Software without restriction, including without limitation the rights
 ## to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
 ## copies of the Software, and to permit persons to whom the Software is
 ## furnished to do so, subject to the following conditions:
 ##
 ## The above copyright notice and this permission notice shall be included
 ## in all copies or substantial portions of the Software.
 ##
 ## THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
 ## OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
 ## FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
 ## THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
 ## LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
 ## OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 ## SOFTWARE.
 ##
 ## http://www.opensource.org/licenses/mit-license.php
 ##
 ################################################################################
 use strict;
 use warnings;
 # Give a nice error if the (non-standard) JSON module is not installed.
 eval "use JSON";
 if ($@)
 {
  print "Error: You need to install the JSON Perl module.\n";
  exit 1;
 }
 # Use the taskwarrior 2.0+ export command to filter and return JSON
 my $command = join (' ', ("env PATH=$ENV{PATH} task export", @ARGV));
 if ($command =~ /No matches/)
 {
  printf STDERR $command;
  exit 1;
 }
 # Generate output.
 print "'uuid','status','tags','entry','start','due','recur','end','project',",
      "'priority','fg','bg','description'\n";
 for my $task (split /,$/ms, qx{$command})
 {
  my $data = from_json ($task);
  print "'$data->{'uuid'}',",
        "'$data->{'status'}',",
        "'", (exists $data->{'tags'} ? join (' ', @{$data->{'tags'}}) : ''), "',",
        "'$data->{'entry'}',",
        "'", ($data->{'start'}    || ''), "',",
        "'", ($data->{'due'}      || ''), "',",
        "'", ($data->{'recur'}    || ''), "',",
        "'", ($data->{'end'}      || ''), "',",
        "'", ($data->{'project'}  || ''), "',",
        "'", ($data->{'priority'} || ''), "',",
        "'", ($data->{'fg'}       || ''), "',",
        "'", ($data->{'bg'}       || ''), "',",
        "'$data->{'description'}'",
        "\n";
  # Note that this format ignores:
  #   wait
  #   until
  #   annotations
  #   mask
  #   imask
 }
 exit 0;
 ################################################################################
--- a/scripts/add-ons/export-html.pl
+++ b/scripts/add-ons/export-html.pl
@@ -0,0 +1,91 @@
 #! /usr/bin/perl
 ################################################################################
 ## taskwarrior - a command line task list manager.
 ##
 ## Copyright 2006-2012, Paul Beckingham, Federico Hernandez.
 ##
 ## Permission is hereby granted, free of charge, to any person obtaining a copy
 ## of this software and associated documentation files (the "Software"), to deal
 ## in the Software without restriction, including without limitation the rights
 ## to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
 ## copies of the Software, and to permit persons to whom the Software is
 ## furnished to do so, subject to the following conditions:
 ##
 ## The above copyright notice and this permission notice shall be included
 ## in all copies or substantial portions of the Software.
 ##
 ## THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
 ## OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
 ## FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
 ## THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
 ## LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
 ## OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 ## SOFTWARE.
 ##
 ## http://www.opensource.org/licenses/mit-license.php
 ##
 ################################################################################
 use strict;
 use warnings;
 # Give a nice error if the (non-standard) JSON module is not installed.
 eval "use JSON";
 if ($@)
 {
  print "Error: You need to install the JSON Perl module.\n";
  exit 1;
 }
 # Use the taskwarrior 2.0+ export command to filter and return JSON
 my $command = join (' ', ("env PATH='$ENV{PATH}' task export", @ARGV));
 if ($command =~ /No matches/)
 {
  printf STDERR $command;
  exit 1;
 }
 # Generate output.
 print "<html>\n",
      "  <body>\n",
      "    <table>\n",
      "      <thead>\n",
      "        <tr>\n",
      "          <td>ID</td>\n",
      "          <td>Pri</td>\n",
      "          <td>Description</td>\n",
      "          <td>Project</td>\n",
      "          <td>Due</td>\n",
      "        </tr>\n",
      "      </thead>\n",
      "      <tbody>\n";
 my $count = 0;
 for my $task (split /,$/ms, qx{$command})
 {
  ++$count;
  my $data = from_json ($task);
  print "        <tr>\n",
        "          <td>", ($data->{'id'}          || ''), "</td>\n",
        "          <td>", ($data->{'priority'}    || ''), "</td>\n",
        "          <td>", ($data->{'description'} || ''), "</td>\n",
        "          <td>", ($data->{'project'}     || ''), "</td>\n",
        "          <td>", ($data->{'due'}         || ''), "</td>\n",
        "        </tr>\n";
 }
 print "      </tbody>\n",
      "      <tfooter>\n",
      "        <tr>\n",
      "          <td>", $count, " matching tasks</td>\n",
      "        </tr>\n",
      "      </tfooter>\n",
      "    </table>\n",
      "  </body>\n",
      "</html>\n";
 exit 0;
 ################################################################################
--- a/scripts/add-ons/export-ical.pl
+++ b/scripts/add-ons/export-ical.pl
@@ -0,0 +1,103 @@
 #! /usr/bin/perl
 ################################################################################
 ## taskwarrior - a command line task list manager.
 ##
 ## Copyright 2006-2012, Paul Beckingham, Federico Hernandez.
 ##
 ## Permission is hereby granted, free of charge, to any person obtaining a copy
 ## of this software and associated documentation files (the "Software"), to deal
 ## in the Software without restriction, including without limitation the rights
 ## to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
 ## copies of the Software, and to permit persons to whom the Software is
 ## furnished to do so, subject to the following conditions:
 ##
 ## The above copyright notice and this permission notice shall be included
 ## in all copies or substantial portions of the Software.
 ##
 ## THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
 ## OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
 ## FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
 ## THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
 ## LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
 ## OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 ## SOFTWARE.
 ##
 ## http://www.opensource.org/licenses/mit-license.php
 ##
 ################################################################################
 use strict;
 use warnings;
 # Give a nice error if the (non-standard) JSON module is not installed.
 eval "use JSON";
 if ($@)
 {
  print "Error: You need to install the JSON Perl module.\n";
  exit 1;
 }
 # Use the taskwarrior 2.0+ export command to filter and return JSON
 my $command = join (' ', ("env PATH=$ENV{PATH} task export", @ARGV));
 if ($command =~ /No matches/)
 {
  printf STDERR $command;
  exit 1;
 }
 # Generate output.
 print "BEGIN:VCALENDAR\n",
      "VERSION:2.0\n",
      "PRODID:=//GBF/taskwarrior 1.9.4//EN\n";
 for my $task (split /,$/ms, qx{$command})
 {
  my $data = from_json ($task);
  print "BEGIN:VTODO\n";
  print "UID:$data->{'uuid'}\n";
  print "DTSTAMP:$data->{'entry'}\n";
  print "DTSTART:$data->{'start'}\n" if exists $data->{'start'};
  print "DUE:$data->{'due'}\n"       if exists $data->{'due'};
  print "COMPLETED:$data->{'end'}\n" if exists $data->{'end'};
  print "SUMMARY:$data->{'description'}\n";
  print "CLASS:PRIVATE\n";
  print "CATEGORIES:", join (',', @{$data->{'tags'}}), "\n" if exists $data->{'tags'};
  # Priorities map to a 1-9 scale.
  if (exists $data->{'priority'})
  {
    print "PRIORITY:", ($data->{'priority'} eq 'H' ? '1' :
                        $data->{'priority'} eq 'M' ? '5' :
                                                     '9'), "\n";
  }
  # Status maps differently.
  my $status = $data->{'status'};
  if ($status eq 'pending' || $status eq 'waiting')
  {
    print "STATUS:", (exists $data->{'start'} ? 'IN-PROCESS' : 'NEEDS-ACTION'), "\n";
  }
  elsif ($status eq 'completed')
  {
    print "STATUS:COMPLETED\n";
  }
  elsif ($status eq 'deleted')
  {
    print "STATUS:CANCELLED\n";
  }
  # Annotations become comments.
  if (exists $data->{'annotations'})
  {
    print "COMMENT:$_->{'description'}\n" for @{$data->{'annotations'}};
  }
  print "END:VTODO\n";
 }
 print "END:VCALENDAR\n";
 exit 0;
 ################################################################################
--- a/scripts/add-ons/export-sql.py
+++ b/scripts/add-ons/export-sql.py
@@ -0,0 +1,171 @@
 #! /usr/bin/python
 ###############################################################################
 # taskwarrior - a command line task list manager.
 #
 # Copyright 2006-2012, Paul Beckingham, Federico Hernandez.
 #
 # Permission is hereby granted, free of charge, to any person obtaining a copy
 # of this software and associated documentation files (the "Software"), to deal
 # in the Software without restriction, including without limitation the rights
 # to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
 # copies of the Software, and to permit persons to whom the Software is
 # furnished to do so, subject to the following conditions:
 #
 # The above copyright notice and this permission notice shall be included
 # in all copies or substantial portions of the Software.
 #
 # THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
 # OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
 # FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
 # THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
 # LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
 # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 # SOFTWARE.
 #
 # http://www.opensource.org/licenses/mit-license.php
 #
 ###############################################################################
 """
 export-sql.py -- Export the taskwarrior database as a series of SQL commands.
 Example usage::
    $ ./export-sql.py | sqlite3 mytasks.db
    $ /usr/bin/sqlite3 mytasks.db "select * from annotations;"
 This script has only been tested with sqlite3, but in theory, it could be
 easily modified to supported mysql, postgres or whatever you choose.
 Author:  Ralph Bean
 """
 import sys
 import commands
 import json
 from datetime import datetime
 # Note that you may want to modify the field sizes to suit your usage.
 table_definitions = """
 CREATE TABLE tasks (
    uuid VARCHAR(255) NOT NULL,
    description VARCHAR(255) NOT NULL,
    entry DATETIME NOT NULL,
    end DATETIME,
    priority VARCHAR(32),
    project VARCHAR(32),
    status VARCHAR(32),
    PRIMARY KEY (uuid)
 );
 CREATE TABLE annotations (
    uuid VARCHAR(255) NOT NULL,
    description VARCHAR(255) NOT NULL,
    entry DATETIME NOT NULL,
    FOREIGN KEY(uuid) REFERENCES tasks(uuid)
 );
 """
 replacements = {
    '"': '&dquot;',
    "'": '&quot;',
    '[': '&open;',
    ']': '&close;',
    '/': '\\/',
 }
 def escape(s):
    """ Escape a string in the taskwarrior style """
    for unsafe, safe in replacements.iteritems():
        s = s.replace(unsafe, safe)
    return s
 # A lookup table for how to convert various values by type to SQL
 conversion_lookup = {
    # Tack on an extra set of quotes
    unicode: lambda v: "'%s'" % escape(v),
    # Do the same as for unicode
    str: lambda v: convert(unicode(v)),
    # Convert to ISO format and do the same as for unicode
    datetime: lambda v: convert(v.isoformat(' ')),
    # Replace python None with SQL NULL
    type(None): lambda v: 'NULL',
 }
 # Compose a value with its corresponding function in conversion_lookup
 convert = lambda v: conversion_lookup.get(type(v), lambda v: v)(v)
 def parse_datetime(task):
    """ Parse the datetime strings given to us by `task export` """
    for key in ['entry', 'end']:
        if key in task:
            task[key] = datetime.strptime(task[key], "%Y%m%dT%H%M%SZ")
    return task
 def to_sql(task):
    """ Create a list of SQL INSERT statements out of a task python dict """
    def make_annotation(annot):
        """ Create a list of SQL INSERT statements for an annotation """
        annot['uuid'] = task['uuid']
        template = "{uuid}, {description}, {entry}"
        annot = dict(zip(annot.keys(), map(convert, annot.values())))
        values = template.format(**annot)
        return "INSERT INTO \"annotations\" VALUES(%s)" % values
    template = "{uuid}, {description}, {entry}, {end}, " + \
           "{priority}, {project}, {status}"
    nullables = ['end', 'priority', 'project', 'status']
    defaults = dict([(key, None) for key in nullables])
    defaults['annotations'] = []
    defaults.update(task)
    defaults = dict(zip(defaults.keys(), map(convert, defaults.values())))
    values = template.format(**defaults)
    annotations = map(make_annotation, defaults['annotations'])
    return ["INSERT INTO \"tasks\" VALUES(%s)" % values] + annotations
 def main():
    """ Return a list of SQL statements. """
    # Use the taskwarrior 2.0+ export command to filter and return JSON
    command = "task export " + " ".join(sys.argv[1:])
    # Load each task from json to a python dict
    tasks = map(json.loads, commands.getoutput(command).split(",\n"))
    # Mangle datetime strings into python datetime objects
    tasks = map(parse_datetime, tasks)
    # Produce formatted SQL statements for each task
    inserts = sum(map(to_sql, tasks), [])
    return inserts
 if __name__ == '__main__':
    # Get the INSERT statements
    lines = main()
    # Combine them with semicolons
    sql = table_definitions + ";\n".join(lines) + ';'
    # Print them out, decorated with sqlite3 trappings
    print """
 BEGIN TRANSACTION;
 {sql}
 COMMIT;""".format(sql=sql)
 ###############################################################################
--- a/scripts/add-ons/export-xml.pl
+++ b/scripts/add-ons/export-xml.pl
@@ -0,0 +1,86 @@
 #! /usr/bin/perl
 ################################################################################
 ## taskwarrior - a command line task list manager.
 ##
 ## Copyright 2006-2012, Paul Beckingham, Federico Hernandez.
 ##
 ## Permission is hereby granted, free of charge, to any person obtaining a copy
 ## of this software and associated documentation files (the "Software"), to deal
 ## in the Software without restriction, including without limitation the rights
 ## to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
 ## copies of the Software, and to permit persons to whom the Software is
 ## furnished to do so, subject to the following conditions:
 ##
 ## The above copyright notice and this permission notice shall be included
 ## in all copies or substantial portions of the Software.
 ##
 ## THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
 ## OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
 ## FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
 ## THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
 ## LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
 ## OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 ## SOFTWARE.
 ##
 ## http://www.opensource.org/licenses/mit-license.php
 ##
 ################################################################################
 use strict;
 use warnings;
 # Give a nice error if the (non-standard) JSON module is not installed.
 eval "use JSON";
 if ($@)
 {
  print "Error: You need to install the JSON Perl module.\n";
  exit 1;
 }
 # Use the taskwarrior 2.0+ export command to filter and return JSON
 my $command = join (' ', ("env PATH=$ENV{PATH} task export", @ARGV));
 if ($command =~ /No matches/)
 {
  printf STDERR $command;
  exit 1;
 }
 # Generate output.
 print "<tasks>\n";
 for my $task (split /,$/ms, qx{$command})
 {
  my $data = from_json ($task);
  print "  <task>\n";
  for my $key (keys %$data)
  {
    if ($key eq 'annotations')
    {
      print "    <annotations>\n";
      for my $anno (@{$data->{$key}})
      {
        print "      <annotation>\n";
        print "        <$_>$anno->{$_}</$_>\n" for keys %$anno;
        print "      </annotation>\n";
      }
      print "    </annotations>\n";
    }
    elsif ($key eq 'tags')
    {
      print "    <tags>\n";
      print "      <tag>$_</tag>\n" for @{$data->{'tags'}};
      print "    </tags>\n";
    }
    else
    {
      print "    <$key>$data->{$key}</$key>\n";
    }
  }
  print "  </task>\n";
 }
 print "</tasks>\n";
 exit 0;
 ################################################################################
--- a/scripts/add-ons/export-xml.py
+++ b/scripts/add-ons/export-xml.py
@@ -0,0 +1,62 @@
 #! /usr/bin/python
 ################################################################################
 ## taskwarrior - a command line task list manager.
 ##
 ## Copyright 2006-2012, Paul Beckingham, Federico Hernandez.
 ##
 ## Permission is hereby granted, free of charge, to any person obtaining a copy
 ## of this software and associated documentation files (the "Software"), to deal
 ## in the Software without restriction, including without limitation the rights
 ## to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
 ## copies of the Software, and to permit persons to whom the Software is
 ## furnished to do so, subject to the following conditions:
 ##
 ## The above copyright notice and this permission notice shall be included
 ## in all copies or substantial portions of the Software.
 ##
 ## THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
 ## OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
 ## FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
 ## THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
 ## LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
 ## OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 ## SOFTWARE.
 ##
 ## http://www.opensource.org/licenses/mit-license.php
 ##
 ################################################################################
 import sys
 import commands
 import json
 # Use the taskwarrior 2.0+ export command to filter and return JSON
 command = "/usr/local/bin/task export " + " ".join (sys.argv[1:])
 # Generate output.
 print "<tasks>"
 for task in commands.getoutput (command).split (",\n"):
    data = json.loads (task)
    print "  <task>"
    for name,value in data.items ():
        if name == "annotations":
            print "    <annotations>"
            for anno in value:
                print "      <annotation>"
                for name,value in anno.items ():
                    print "        <{0}>{1}</{0}>".format (name, value)
                    print "      </annotation>"
                    print "    </annotations>"
        elif name == "tags":
            print "    <tags>"
            for tag in value:
                print "      <tag>{0}</tag>".format (tag)
                print "    </tags>"
        else:
            print "    <{0}>{1}</{0}>".format (name, value)
    print "  </task>"
 print "</tasks>"
 sys.exit (0)
 ################################################################################
--- a/scripts/add-ons/export-xml.rb
+++ b/scripts/add-ons/export-xml.rb
@@ -0,0 +1,67 @@
 #! /usr/bin/ruby
 ################################################################################
 ## taskwarrior - a command line task list manager.
 ##
 ## Copyright 2006-2012, Paul Beckingham, Federico Hernandez.
 ##
 ## Permission is hereby granted, free of charge, to any person obtaining a copy
 ## of this software and associated documentation files (the "Software"), to deal
 ## in the Software without restriction, including without limitation the rights
 ## to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
 ## copies of the Software, and to permit persons to whom the Software is
 ## furnished to do so, subject to the following conditions:
 ##
 ## The above copyright notice and this permission notice shall be included
 ## in all copies or substantial portions of the Software.
 ##
 ## THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
 ## OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
 ## FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
 ## THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
 ## LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
 ## OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 ## SOFTWARE.
 ##
 ## http://www.opensource.org/licenses/mit-license.php
 ##
 ################################################################################
 require 'rubygems'
 require 'json'
 # Use the taskwarrior 2.0+ export command to filter and return JSON
 lines = IO.popen("/usr/local/bin/task export " + ARGV.join(" ")).readlines
 # Generate output.
 print "<tasks>\n"
 lines.each do |line|
  data = JSON.parse(line)
  print "  <task>\n"
  data.each do |key,value|
    if key == "annotations"
      print "    <annotations>\n"
      value.each do |anno|
        print "      <annotation>\n"
        anno.each do |key,value|
          print "        <#{key}>#{value}</#{key}>\n"
        end
        print "      </annotation>\n"
      end
      print "    </annotations>\n"
    elsif key == "tags"
      print "    <tags>\n"
      value.each do |tag|
        print "      <tag>#{tag}</tag>\n"
      end
      print "    </tags>\n"
    else
      print "    <#{key}>#{value}</#{key}>\n"
    end
  end
  print "  </task>\n"
 end
 print "</tasks>\n"
 exit 0
 ################################################################################
--- a/scripts/add-ons/export-yad.pl
+++ b/scripts/add-ons/export-yad.pl
@@ -0,0 +1,82 @@
 #! /usr/bin/perl
 ################################################################################
 ## taskwarrior - a command line task list manager.
 ##
 ## Copyright 2006-2012, Paul Beckingham, Federico Hernandez.
 ##
 ## Permission is hereby granted, free of charge, to any person obtaining a copy
 ## of this software and associated documentation files (the "Software"), to deal
 ## in the Software without restriction, including without limitation the rights
 ## to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
 ## copies of the Software, and to permit persons to whom the Software is
 ## furnished to do so, subject to the following conditions:
 ##
 ## The above copyright notice and this permission notice shall be included
 ## in all copies or substantial portions of the Software.
 ##
 ## THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
 ## OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
 ## FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
 ## THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
 ## LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
 ## OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 ## SOFTWARE.
 ##
 ## http://www.opensource.org/licenses/mit-license.php
 ##
 ################################################################################
 use strict;
 use warnings;
 # Give a nice error if the (non-standard) JSON module is not installed.
 eval "use JSON";
 if ($@)
 {
  print "Error: You need to install the JSON Perl module.\n";
  exit 1;
 }
 # Use the taskwarrior 2.0+ export command to filter and return JSON
 my $command = join (' ', ("env PATH=$ENV{PATH} task export", @ARGV));
 if ($command =~ /No matches/)
 {
  printf STDERR $command;
  exit 1;
 }
 # Generate output.
 print "'uuid','status','tags','entry','start','due','recur','end','project',",
      "'priority','fg','bg','description'\n";
 for my $task (split /,$/ms, qx{$command})
 {
  my $data = from_json ($task);
  print "'$data->{'uuid'}',",
        "'$data->{'status'}',",
        "'", (exists $data->{'tags'} ? join (' ', @{$data->{'tags'}}) : ''), "',",
        "'$data->{'entry'}',",
        "'", ($data->{'start'}    || ''), "',",
        "'", ($data->{'due'}      || ''), "',",
        "'", ($data->{'recur'}    || ''), "',",
        "'", ($data->{'end'}      || ''), "',",
        "'", ($data->{'project'}  || ''), "',",
        "'", ($data->{'priority'} || ''), "',",
        "'", ($data->{'fg'}       || ''), "',",
        "'", ($data->{'bg'}       || ''), "',",
        "'$data->{'description'}'",
        "\n";
  # Note that this format ignores:
  #   wait
  #   until
  #   annotations
  #   mask
  #   imask
 }
 exit 0;
 ################################################################################
--- a/scripts/add-ons/export-yaml.pl
+++ b/scripts/add-ons/export-yaml.pl
@@ -0,0 +1,80 @@
 #! /usr/bin/perl
 ################################################################################
 ## taskwarrior - a command line task list manager.
 ##
 ## Copyright 2006-2012, Paul Beckingham, Federico Hernandez.
 ##
 ## Permission is hereby granted, free of charge, to any person obtaining a copy
 ## of this software and associated documentation files (the "Software"), to deal
 ## in the Software without restriction, including without limitation the rights
 ## to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
 ## copies of the Software, and to permit persons to whom the Software is
 ## furnished to do so, subject to the following conditions:
 ##
 ## The above copyright notice and this permission notice shall be included
 ## in all copies or substantial portions of the Software.
 ##
 ## THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
 ## OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
 ## FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
 ## THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
 ## LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
 ## OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 ## SOFTWARE.
 ##
 ## http://www.opensource.org/licenses/mit-license.php
 ##
 ################################################################################
 use strict;
 use warnings;
 # Give a nice error if the (non-standard) JSON module is not installed.
 eval "use JSON";
 if ($@)
 {
  print "Error: You need to install the JSON Perl module.\n";
  exit 1;
 }
 # Generate output.
 print "%YAML 1.1\n",
      "---\n";
 while (my $json = <>)
 {
  $json =~ s/^\[//;
  $json =~ s/\]$//;
  $json =~ s/,$//;
  next if $json eq '';
  my $data = from_json ($json);
  print "  task:\n";
  for my $key (sort keys %$data)
  {
    if ($key eq 'annotations')
    {
      print "    annotations:\n";
      for my $anno (@{$data->{$key}})
      {
        print "      annotation:\n";
        print "        $_: $anno->{$_}\n" for keys %$anno;
      }
    }
    elsif ($key eq 'tags')
    {
      print "    tags: ", join (',', @{$data->{'tags'}}), "\n";
    }
    else
    {
      print "    $key: $data->{$key}\n";
    }
  }
 }
 print "...\n";
 exit 0;
 ################################################################################
--- a/Show More
+++ b/Show More
		`@@ -1 +1 @@`
			<pkg-contents spec="1.12"><f n="local" o="root" g="wheel" p="16877" pt="/Users/paul/task-1.9.1.git/package-config/osx/local" m="false" t="file"><f n="bin" o="root" g="wheel" p="16877"><f n="task" o="root" g="wheel" p="33261"/></f><f n="share" o="root" g="wheel" p="16877"><f n="doc" o="root" g="wheel" p="16877"><f n="task" o="root" g="wheel" p="16877"><f n="AUTHORS" o="root" g="wheel" p="33188"/><f n="ChangeLog" o="root" g="wheel" p="33188"/><f n="COPYING" o="root" g="wheel" p="33188"/><f n="NEWS" o="root" g="wheel" p="33188"/><f n="README" o="root" g="wheel" p="33188"/><f n="scripts" o="root" g="wheel" p="16877"><f n="bash" o="root" g="wheel" p="16877"><f n="task_completion.sh" o="root" g="wheel" p="33188"/></f><f n="vim" o="root" g="wheel" p="16877"><f n="ftdetect" o="root" g="wheel" p="16877"><f n="task.vim" o="root" g="wheel" p="33188"/></f><f n="README" o="root" g="wheel" p="33188"/><f n="syntax" o="root" g="wheel" p="16877"><f n="taskdata.vim" o="root" g="wheel" p="33188"/><f n="taskedit.vim" o="root" g="wheel" p="33188"/><f n="taskrc.vim" o="root" g="wheel" p="33188"/></f></f><f n="zsh" o="root" g="wheel" p="16877"><f n="_task" o="root" g="wheel" p="33188"/></f></f></f></f><f n="man" o="root" g="wheel" p="17917"><f n="man1" o="root" g="wheel" p="17901"><f n="task.1" o="root" g="wheel" p="33188"/><mod>group</mod><mod>owner</mod></f><f n="man5" o="root" g="wheel" p="17901"><f n="task-color.5" o="root" g="wheel" p="33188"/><f n="task-faq.5" o="root" g="wheel" p="33188"/><f n="task-tutorial.5" o="root" g="wheel" p="33188"/><f n="taskrc.5" o="root" g="wheel" p="33188"/><mod>group</mod><mod>owner</mod></f><mod>group</mod><mod>owner</mod></f></f><mod>group</mod><mod>owner</mod></f></pkg-contents>				<pkg-contents spec="1.12"><f n="local" o="paul" g="staff" p="16877" pt="/Users/paul/task-1.9.4.git/package-config/osx/local" m="false" t="file"><f n="bin" o="root" g="wheel" p="16877"><f n="task" o="root" g="wheel" p="33261"/></f><f n="share" o="root" g="wheel" p="16877"><f n="doc" o="root" g="wheel" p="16877"><f n="task" o="root" g="wheel" p="16877"><f n="AUTHORS" o="root" g="wheel" p="33188"/><f n="ChangeLog" o="root" g="wheel" p="33188"/><f n="COPYING" o="root" g="wheel" p="33188"/><f n="NEWS" o="root" g="wheel" p="33188"/><f n="rc" o="root" g="wheel" p="16877"><f n="dark-16.theme" o="root" g="wheel" p="33188"/><f n="dark-256.theme" o="root" g="wheel" p="33188"/><f n="dark-blue-256.theme" o="root" g="wheel" p="33188"/><f n="dark-gray-256.theme" o="root" g="wheel" p="33188"/><f n="dark-green-256.theme" o="root" g="wheel" p="33188"/><f n="dark-red-256.theme" o="root" g="wheel" p="33188"/><f n="dark-violets-256.theme" o="root" g="wheel" p="33188"/><f n="dark-yellow-green.theme" o="root" g="wheel" p="33188"/><f n="holidays-AT.rc" o="root" g="wheel" p="33188"/><f n="holidays-CA.rc" o="root" g="wheel" p="33188"/><f n="holidays-DE.rc" o="root" g="wheel" p="33188"/><f n="holidays-DK.rc" o="root" g="wheel" p="33188"/><f n="holidays-ES.rc" o="root" g="wheel" p="33188"/><f n="holidays-FR.rc" o="root" g="wheel" p="33188"/><f n="holidays-IT.rc" o="root" g="wheel" p="33188"/><f n="holidays-NL.rc" o="root" g="wheel" p="33188"/><f n="holidays-NO.rc" o="root" g="wheel" p="33188"/><f n="holidays-NZ.rc" o="root" g="wheel" p="33188"/><f n="holidays-SE.rc" o="root" g="wheel" p="33188"/><f n="holidays-UK.rc" o="root" g="wheel" p="33188"/><f n="holidays-US.rc" o="root" g="wheel" p="33188"/><f n="light-16.theme" o="root" g="wheel" p="33188"/><f n="light-256.theme" o="root" g="wheel" p="33188"/></f><f n="README" o="root" g="wheel" p="33188"/><f n="scripts" o="root" g="wheel" p="16877"><f n="add-ons" o="root" g="wheel" p="16877"><f n="export-csv.pl" o="root" g="wheel" p="33188"/><f n="export-ical.pl" o="root" g="wheel" p="33188"/><f n="export-xml.pl" o="root" g="wheel" p="33188"/><f n="export-xml.py" o="root" g="wheel" p="33188"/><f n="export-xml.rb" o="root" g="wheel" p="33188"/><f n="export-yaml.pl" o="root" g="wheel" p="33188"/></f><f n="bash" o="root" g="wheel" p="16877"><f n="task_completion.sh" o="root" g="wheel" p="33188"/></f><f n="fish" o="root" g="wheel" p="16877"><f n="task.fish" o="root" g="wheel" p="33188"/></f><f n="vim" o="root" g="wheel" p="16877"><f n="ftdetect" o="root" g="wheel" p="16877"><f n="task.vim" o="root" g="wheel" p="33188"/></f><f n="README" o="root" g="wheel" p="33188"/><f n="syntax" o="root" g="wheel" p="16877"><f n="taskdata.vim" o="root" g="wheel" p="33188"/><f n="taskedit.vim" o="root" g="wheel" p="33188"/><f n="taskrc.vim" o="root" g="wheel" p="33188"/></f></f><f n="zsh" o="root" g="wheel" p="16877"><f n="_task" o="root" g="wheel" p="33188"/></f></f></f></f><f n="man" o="642" g="642" p="17917"><f n="man1" o="642" g="642" p="16877"><f n="task.1" o="root" g="642" p="33188"/></f><f n="man5" o="642" g="642" p="16877"><f n="task-color.5" o="root" g="642" p="33188"/><f n="task-faq.5" o="root" g="642" p="33188"/><f n="task-sync.5" o="root" g="642" p="33188"/><f n="task-tutorial.5" o="root" g="642" p="33188"/><f n="taskrc.5" o="root" g="642" p="33188"/></f></f></f></f></pkg-contents>
		`@@ -1 +1 @@`
			<pkgref spec="1.12" uuid="B93940C5-2C4F-47D6-8038-3D24062FBC85"><config><identifier>com.beckingham.task191.local.pkg</identifier><version>1.0</version><description/><post-install type="none"/><requireAuthorization/><installFrom>/Users/paul/task-1.9.1.git/package-config/osx/local</installFrom><installTo mod="true" relocatable="true">/usr/local</installTo><flags><followSymbolicLinks/></flags><packageStore type="internal"/><mod>installTo.path</mod><mod>identifier</mod><mod>parent</mod><mod>installTo</mod><mod>relocatable</mod></config><contents><file-list>01local-contents.xml</file-list><filter>/CVS$</filter><filter>/\.svn$</filter><filter>/\.cvsignore$</filter><filter>/\.cvspass$</filter><filter>/\.DS_Store$</filter></contents></pkgref>				<pkgref spec="1.12" uuid="B93940C5-2C4F-47D6-8038-3D24062FBC85"><config><identifier>com.gbf.task194.local.pkg</identifier><version>1.0</version><description></description><post-install type="none"/><requireAuthorization/><installFrom mod="true">/Users/paul/task-1.9.4.git/package-config/osx/local</installFrom><installTo mod="true" relocatable="true">/usr/local</installTo><flags><followSymbolicLinks/></flags><packageStore type="internal"></packageStore><mod>installTo.path</mod><mod>relocatable</mod><mod>installFrom.path</mod><mod>parent</mod><mod>identifier</mod><mod>installTo</mod></config><contents><file-list>01local-contents.xml</file-list><filter>/CVS$</filter><filter>/\.svn$</filter><filter>/\.cvsignore$</filter><filter>/\.cvspass$</filter><filter>/\.DS_Store$</filter></contents></pkgref>
		`@@ -1 +1 @@`
			<pkmkdoc spec="1.12"><properties><title>Task 1.9.1</title><build>/Users/paul/Desktop/task-1.9.1-sl.pkg</build><organization>com.beckingham</organization><userSees ui="both"/><min-target os="3"/><domain anywhere="true" system="true"/></properties><distribution><versions min-spec="1.000000"/><scripts></scripts></distribution><description>Task 1.9.1 install for Snow Leopard.</description><contents><choice title="local" id="choice37" starts_selected="true" starts_enabled="true" starts_hidden="false"><pkgref id="com.beckingham.task191.local.pkg"/></choice></contents><resources bg-scale="proportional" bg-align="center"><locale lang="en"><resource mod="true" type="license">/Users/paul/task-1.9.1.git/package-config/osx/COPYING.txt</resource><resource mod="true" type="readme">/Users/paul/task-1.9.1.git/package-config/osx/README.txt</resource></locale></resources><requirements><requirement id="tosv" operator="ge" value="'10.6.0'"><message>Task requires Mac OSX 10.6.0 (Snow Leopard) or later.</message></requirement></requirements><flags/><item type="file">01local.xml</item><mod>properties.title</mod><mod>properties.customizeOption</mod><mod>description</mod><mod>properties.anywhereDomain</mod><mod>properties.systemDomain</mod></pkmkdoc>				<pkmkdoc spec="1.12"><properties><title>Task 1.9.4</title><build>/Users/paul/Desktop/task-1.9.4-sl.pkg</build><organization>com.beckingham</organization><userSees ui="both"/><min-target os="3"/><domain anywhere="true" system="true"/></properties><distribution><versions min-spec="1.000000"/><scripts></scripts></distribution><description>Task 1.9.4 install for Snow Leopard.</description><contents><choice title="local" id="choice37" starts_selected="true" starts_enabled="true" starts_hidden="false"><pkgref id="com.gbf.task194.local.pkg"/></choice></contents><resources bg-scale="proportional" bg-align="center"><locale lang="en"><resource mod="true" type="license">/Users/paul/task-1.9.4.git/package-config/osx/COPYING.txt</resource><resource mod="true" type="readme">/Users/paul/task-1.9.4.git/package-config/osx/README.txt</resource></locale></resources><requirements><requirement id="tosv" operator="ge" value="'10.6.0'"><message>Task requires Mac OSX 10.6.0 (Snow Leopard) or later.</message></requirement></requirements><flags/><item type="file">01local.xml</item><mod>properties.title</mod><mod>properties.customizeOption</mod><mod>description</mod><mod>properties.anywhereDomain</mod><mod>properties.systemDomain</mod></pkmkdoc>
		`@@ -0,0 +1,2 @@`
							`cmake_minimum_required (VERSION 2.8)`
							`install (DIRECTORY bash fish vim zsh add-ons extensions DESTINATION ${TASK_DOCDIR}/scripts)`