Merge branch 'master' into 2.4.0

doc/man/task-color.5.in

@@ -1,4 +1,4 @@
-.TH task-color 5 2013-04-07 "${PACKAGE_STRING}" "User Manuals"
+.TH task-color 5 2014-01-15 "${PACKAGE_STRING}" "User Manuals"
 
 .SH NAME
 task-color \- A color tutorial for the taskwarrior command line todo manager.

doc/man/task-faq.5.in

@@ -1,4 +1,4 @@
-.TH task-faq 5 2013-04-07 "${PACKAGE_STRING}" "User Manuals"
+.TH task-faq 5 2014-01-15 "${PACKAGE_STRING}" "User Manuals"
 
 .SH NAME
 task-faq \- A FAQ for the task(1) command line todo manager.

doc/man/task-sync.5.in

@@ -1,4 +1,4 @@
-.TH task-sync 5 2013-04-07 "${PACKAGE_STRING}" "User Manuals"
+.TH task-sync 5 2014-01-15 "${PACKAGE_STRING}" "User Manuals"
 
 .SH NAME
 task-sync \- A discussion and tutorial for the various task(1) data

doc/man/task-tutorial.5.in

@@ -1,4 +1,4 @@
-.TH task-tutorial 5 2013-04-07 "${PACKAGE_STRING}" "User Manuals"
+.TH task-tutorial 5 2014-01-15 "${PACKAGE_STRING}" "User Manuals"
 
 .SH NAME
 task-tutorial \- A tutorial for the task(1) command line todo manager.

doc/man/task.1.in

@@ -1,4 +1,4 @@
-.TH task 1 2013-04-07 "${PACKAGE_STRING}" "User Manuals"
+.TH task 1 2014-01-15 "${PACKAGE_STRING}" "User Manuals"
 
 .SH NAME
 task \- A command line todo manager.
@@ -214,7 +214,7 @@ Applies the filter then extracts only the task IDs and presents them as
 a range, for example: 1-4,12.  This is useful as input to a task command,
 to achieve this:
 
-	task $(task project:Home ids) modify priority:H
+  task $(task project:Home ids) modify priority:H
 
 This example first gets the IDs for the project:Home filter, then sets
 the priority to H for each of those tasks.  This can also be achieved directly:
@@ -230,7 +230,7 @@ then extracts only the task UUIDs and presents them as
 a comma-separated list.  This is useful as input to a task command, to achieve
 this:
 
-	task $(task project:Home status:completed uuids) modify status:pending
+  task $(task project:Home status:completed uuids) modify status:pending
 
 This example first gets the UUIDs for the project:Home and status:completed
 filters, then makes each of those tasks pending again.
@@ -893,17 +893,17 @@ task ... due:fri
 
 .TP
 Predictable holidays
-task ... due:goodfriday    
+task ... due:goodfriday
 .br
-task ... due:easter    
+task ... due:easter
 .br
-task ... due:eastermonday    
+task ... due:eastermonday
 .br
-task ... due:ascension    
+task ... due:ascension
 .br
-task ... due:pentecost    
+task ... due:pentecost
 .br
-task ... due:midsommar    
+task ... due:midsommar
 .br
 task ... due:midsommarafton
 .RE

doc/man/taskrc.5.in

@@ -1,4 +1,4 @@
-.TH taskrc 5 2013-04-07 "${PACKAGE_STRING}" "User Manuals"
+.TH taskrc 5 2014-01-15 "${PACKAGE_STRING}" "User Manuals"
 
 .SH NAME
 taskrc \- Configuration file for the task(1) command

doc/man/tasksh.1.in

@@ -1,4 +1,4 @@
-.TH tasksh 1 2013-03-09 "${PACKAGE_STRING}" "User Manuals"
+.TH tasksh 1 2014-01-15 "${PACKAGE_STRING}" "User Manuals"
 
 .SH NAME
 tasksh \- Interactive taskwarrior shell

doc/ref/task-ref.pages/Metadata/BuildVersionHistory.plist

@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+<array>
+	<string>pages-trunk-20080703_5</string>
+	<string>pages-trunk-20080829_1</string>
+	<string>pages-trunk-20080921_1</string>
+	<string>local build-Jul  1 2011</string>
+	<string>local build-Nov 15 2011</string>
+	<string>local build-Jul  1 2011</string>
+	<string>local build-Jun 29 2012</string>
+	<string>local build-Oct 16 2012</string>
+	<string>M5.0.1-1478-1</string>
+</array>
+</plist>

doc/ref/task-ref.pages/Metadata/DocumentIdentifier

@@ -0,0 +1 @@
+714E6D35-304F-4CB0-BD91-DD74C9A9979E