Product Name Change

- Converted all (appropriate) uses of 'task' to 'taskwarrior'.

AUTHORS

@@ -1,4 +1,6 @@
-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)
@@ -7,6 +9,7 @@ The development of task was made possible by the significant contributions of th
   Johannes Schlatow  (Contributing Author)
 
 The following submitted code, packages or analysis, and deserve special thanks:
+
   Damian Glenny
   Andy Lester
   H. İbrahim Güngör
@@ -27,7 +30,9 @@ The following submitted code, packages or analysis, and deserve special thanks:
   Kevin Owens
   Mick Koch
 
-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

ChangeLog

@@ -65,6 +65,8 @@
  + 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.
+ + Clarified the documentation regarding the project name (taskwarrior) and
+   the program name (task).
 
 ------ old releases ------------------------------
 

NEWS

@@ -1,5 +1,5 @@
 
-New Features in task 1.9.3
+New Features in taskwarrior 1.9.3
 
   - Start and stop times for a task can now be recorded as annotations.
   - Special tags 'nocolor', 'nocal' and 'nonag'.
@@ -18,16 +18,16 @@ New Features in task 1.9.3
   Please refer to the ChangeLog file for full details.  There are too many to
   list here.
 
-New commands in task 1.9.3
+New commands in taskwarrior 1.9.3
 
   - New 'task color legend' command will show samples of all the defined colors
     and color rules from your .taskrc and theme.
   - New 'task export.yaml' command will export YAML 1.1, which can then be
     imported via 'task import <file>'.
   - New 'task merge <file>' command that can merge the local and an undo.data
-    file from another task user, to sync across machines, for example.
+    file from another taskwarrior user, to sync across machines, for example.
 
-New configuration options in task 1.9.3
+New configuration options in taskwarrior 1.9.3
 
   - journal.time, journal.time.start.annotation, journal.time.stop.annotation
   - 'sow', 'som' and 'soy' are now accepted in dates
@@ -35,17 +35,17 @@ New configuration options in task 1.9.3
     'socw' and 'eocw' refer to the calendar week (starting Sunday/Monday and
     ending Saturday/Sunday)
 
-Newly deprecated features in task 1.9.3
+Newly deprecated features in taskwarrior 1.9.3
 
   - entry_time, start_time and end_time are now synonyms for the entry, start
     and end fields.  Recent enhancements to date formatting render these fields
     obsolete.  The 'task show' command warns of the use of these deprecated
-    fields.  The synonyms will be removed in a future version of task.
+    fields.  The synonyms will be removed in a future version of taskwarrior.
 
 
 ---
 
-Task has been built and tested on the following configurations:
+Taskwarrior has been built and tested on the following configurations:
 
   * OS X 10.6 Snow Leopard and 10.5 Leopard
   * Fedora 13 Goddard, 12 Constantine
@@ -64,8 +64,8 @@ Task has been built and tested on the following configurations:
 
 ---
 
-While Task has undergone testing, bugs are sure to remain.  If you encounter a
+While Taskwarrior has undergone testing, bugs are sure to remain.  If you
-bug, please enter a new issue at:
+encounter a bug, please enter a new issue at:
 
   http://taskwarrior.org/projects/taskwarrior/issues/new
 

README

@@ -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,6 @@ 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.
 
 ---

README.build

@@ -1,14 +1,14 @@
 
-Task Build Notes
+Taskwarrior Build Notes
 ----------------
 
-Task 1.9 has dependencies that are detected by the configure program in almost
+Taskwarrior 1.9 has dependencies that are detected by the configure program in
-all cases, but there are situations and operating systems that mean you will
+almost all cases, but there are situations and operating systems that mean you
-need to offer configure a little help.
+will need to offer configure a little help.
 
-If task will not build on your system, first take a look at the Operating System
+If taskwarrior will not build on your system, first take a look at the Operating
-notes below.  If this doesn't help, then go to the Troubleshooting section,
+System notes below.  If this doesn't help, then go to the Troubleshooting
-which includes instructions on how to contact us for help.
+section, which includes instructions on how to contact us for help.
 
 
 
@@ -16,7 +16,7 @@ Operating System Notes
 ----------------------
 
 Cygwin 1.7
-  Building task on Cygwin 1.7 requires a configure option:
+  Building taskwarrior on Cygwin 1.7 requires a configure option:
 
     ./configure --with-ncurses-inc=/usr/include/ncurses
 
@@ -25,7 +25,7 @@ Cygwin 1.7
 
 
 Haiku Alpha/R1
-  Task must be built with gcc version 4.x, so make sure you run:
+  Taskwarrior must be built with gcc version 4.x, so make sure you run:
 
     $ setgcc gcc4
 
@@ -84,15 +84,15 @@ locate and use the ncurses library.  They are:
 
   --without-ncurses
 
-    This disables ncurses support in task, and should really be used as a last
+    This disables ncurses support in taskwarrior, and should really be used as a
-    resort.  We know of no systems where this is needed.
+    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
+If configure runs, but taskwarrior does not build, when ideally you would send
-contents of config.log, and a transcript from the build, which is not written to
+both the contents of config.log, and a transcript from the build, which is not
-a file, and must be captured from the terminal.
+written to a file, and must be captured from the terminal.
 
 ---

doc/man/task-color.5

@@ -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,25 +28,25 @@ 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 '
     color                        off
 
 it always returns 'off', no matter what the setting.
 
-The reason is that the task output gets piped into grep, and the color is
+The reason is that the taskwarrior output gets piped into grep, and the color is
 disabled.  If you wanted those color codes, you can override this behavior by
 setting the _forcecolor variable to on, like this:
 
@@ -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,8 @@ 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:
+Taskwarrior has a command that helps you visualize these color combinations.
+Try this:
 
     $ task color underline bright red on black
 
@@ -187,15 +188,15 @@ 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.
 
 Note also that there is no bold or bright attributes when dealing with 256
 colors, but there is still underline available.
 
 .SH LEGEND
-Task will show examples of all defined colors used in your .taskrc, or theme,
+Taskwarrior will show examples of all defined colors used in your .taskrc, or
-if you run this command:
+theme, if you run this command:
 
     $ task color legend
 
@@ -203,9 +204,9 @@ 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's add a few tasks:
 
     $ task add project:Home priority:H pay the bills               (1)
     $ task add project:Home            clean the rug               (2)
@@ -236,7 +237,7 @@ those colors can be made subtle, and complementary, but without care, this can
 be a visual mess.  Beware!
 
 .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.
 
@@ -247,7 +248,7 @@ your .taskrc file:
 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
@@ -269,13 +270,13 @@ 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>.
+Taskwarrior was written by P. Beckingham <paul@beckingham.net>.
 .br
 Copyright (C) 2006 \- 2010 P. Beckingham
 
 This man page was originally written by Paul Beckingham.
 
-task is distributed under the GNU General Public License. See
+Taskwarrior is distributed under the GNU General Public License. See
 http://www.gnu.org/licenses/gpl-2.0.txt for more information.
 
 .SH SEE ALSO
@@ -284,7 +285,7 @@ http://www.gnu.org/licenses/gpl-2.0.txt for more information.
 .BR task-faq(5)
 .BR task-tutorial(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
@@ -300,5 +301,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>

doc/man/task-faq.5

@@ -4,26 +4,26 @@
 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
+Taskwarrior is a command line TODO list manager. It maintains a list of tasks
-want to do, allowing you to add/remove, and otherwise manipulate them.  Task
+that you want to do, allowing you to add/remove, and otherwise manipulate them.
-has a rich list of commands that allow you to do various things with it.
+Taskwarrior 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
+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 of task to a file, I lose all the colors.  How do I fix this?
+.B Q: When I redirect the output 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
+A: Taskwarrior knows (or thinks it knows) when the output is not going directly
-terminal, and strips out all the color control characters.  This is based on
+to a terminal, and strips out all the color control characters.  This is based
-the assumption that the color control codes are not wanted in the file.  Prevent
+on the assumption that the color control codes are not wanted in the file.
-this with the following entry in your .taskrc 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?
+.B Q: How do I backup my taskwarrior data files? Where are they?
-A: Task writes all pending tasks to the file
+A: Taskwarrior writes all pending tasks to the file
 
     ~/.task/pending.data
 
@@ -33,8 +33,8 @@ and all completed and deleted tasks to
 
 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
+taskwarrior configuration data.  To be sure, and to future-proof your backup,
-backing up all the files in the ~/.task directory.
+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?
@@ -50,39 +50,39 @@ 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?
+.B Q: Can I revert to a previous version of taskwarrior? 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
+Note that it is possible that the taskwarrior file format will change. For
-format changed between versions 1.5.0 and 1.6.0. Task will automatically upgrade
+example, the format changed between versions 1.5.0 and 1.6.0. Taskwarrior will
-the file but if you need to revert to a previous version of task, there is the
+automatically upgrade the file but if you need to revert to a previous version
-file format to consider. This is yet another good reason to back up your task
+of taskwarrior, there is the file format to consider. This is yet another good
-data files!
+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?
+.B Q: I'm using Ubuntu 9.04, and I want 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
+Then you need to rebuild taskwarrior 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,
+The result should be a taskwarrior program that knows the width of the terminal
-and wraps accordingly.
+window, and wraps accordingly.
 
-Note that there are binary packages that all include this capability.
+Note that all the binary packages include this capability.
 
 .TP
-.B Q: How do I build task under Cygwin?
+.B Q: How do I build taskwarrior under Cygwin?
 A: Take a look at the README.build file, where the latest information on build
-issues is kept.  Task is built the same way everywhere. But under Cygwin, you'll
+issues is kept.  Taskwarrior is built the same way everywhere. But under Cygwin,
-need to make sure you have the following packages available first:
+you'll need to make sure you have the following packages available first:
 
     gcc
     make
@@ -90,8 +90,8 @@ need to make sure you have the following packages available first:
     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
+required, but the ncurses packages are optional. Ncurses will allow taskwarrior
-determine the width of the window, and therefore use the whole width and wrap
+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.
@@ -106,35 +106,37 @@ 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.
+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.
+Note that if you install the 'mintty' shell in Cygwin, then you can use 256
+colors.
 
 See the 'man task-color' for more details on which colors can be used.
 
 .TP
-.B Q: Where does task store the data?
+.B Q: Where does taskwarrior store the data?
-By default, task creates a .taskrc file in your home directory and populates it
+By default, taskwarrior creates a .taskrc file in your home directory and
-with defaults.  Task also creates a .task directory in your home directory and
+populates it with defaults.  Taskwarrior also creates a .task directory in your
-puts data files there.
+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
+to edit it.  But taskwarrior provides a rich command set to do that manipulation
-you, so it is probably best to leave those files alone.
+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
+If you delete (or rename) your .taskrc file, taskwarrior will offer to create a
-one for you.  Another way to do this is with the command:
+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.  There will not be
+Taskwarrior will create 'new-file' if it doesn't already exist.  There will not
-much in it though - task relies heavily on default values, which can be seen
+be much in it though - taskwarrior relies heavily on default values, which can
-with this command:
+be seen with this command:
 
     $ task show
 
@@ -142,18 +144,18 @@ which lists all the currently known settings.  If you have just created
 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 of task.
+particularly if your .taskrc file was created by an older version.
 
 .TP
-.B Q: Do I need to back up my task data?
+.B Q: Do I need to back up my taskwarrior 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
+synching tool.  Simply configure taskwarrior to store it's data in a dropbox
-modifying the:
+folder, by modifying the:
 
     data.location=...
 
@@ -161,21 +163,21 @@ configuration variable.  Check out DropBox at http://www.dropbox.com.
 
 .TP
 .B Q: I don't like dropbox. Is there another way to synchronize my tasks?
-Of course. Especially if you want to modify tasks offline on both machines and 
+Of course. Especially if you want to modify tasks offline on both machines and
-synchronize them later on. For this purpose task provides a 'merge' command which
+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 
+is able to insert the modifications you made to one of your task databases into
-second database.
+a second database.
 
 Here is a basic example of the procedure:
-    
+
     $ rsync myremotehost:.task/undo.data /tmp/undo_remote.data
     $ task merge /tmp/undo_remote.data
     $ rsync ${HOME}/.task/*.data myremotehost:.task/
 
-First you need to get the undo.data file from the remote system with a network
+First you need to get the undo.data file from the remote system, or removable
-protocol of your choice or a removable medium as well. When task finished the merge
+media.  When the merge command completes, you should copy all the local .data
-command you should copy all the local .data files to the remote system. This way you
+files to the remote system. This way you ensure that both systems are fully
-ensure that both systems are fully synchronized.
+synchronized.
 
 .TP
 .B Q: The undo.data file gets very large - do I need it?
@@ -183,14 +185,14 @@ 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 task, because task never reads it until you want to
+that it does not slow down taskwarrior, because it is never read until you want
-undo.  Otherwise task only appends to the file.
+to undo.  Otherwise taskwarrior 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
+otherwise the easiest way is to just try it!  With version 1.9 or later, you
-run
+simply run
 
     $ task color
 
@@ -204,11 +206,10 @@ See the task-color(5) man page for more details.
 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 task color
+See the task-color(5) man page for an in-depth explanation of the color rules.
-rules.
 
 .TP
-.B Q: How can I make task put the command in the terminal window title?
+.B Q: How can I make taskwarrior 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:
 
@@ -227,7 +228,7 @@ function that does the same thing:
     }
 
 .TP
-.B Q: Task searches in a case-sensitive fashion - can I change that?
+.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
@@ -236,24 +237,24 @@ This will affect searching for keywords:
 
     $ task list Document
 
-task will perform a caseless search in the description and any annotations for
+taskwarrior will perform a caseless search in the description and any
-the keyword 'Document'.  It also affects description and annotation
+annotations for the keyword 'Document'.  It also affects description and
-substitutions:
+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?
+.B Q: Why do the ID numbers change?
-Task does this to always show you the smallest numbers it can.  The idea is that
+Taskwarrior does this to always show you the smallest numbers it can.  The idea
-if your tasks are numbered 1 - 33, for example, those are easy to type in.  If
+is that if your tasks are numbered 1 - 33, for example, those are easy to type
-instead task kept a rolling sequence number, after a while your tasks might be
+in.  If instead task kept a rolling sequence number, after a while your tasks
-numbered 481 - 513, which makes it more likely to enter one incorrectly, because
+might be numbered 481 - 513, which makes it more likely to enter one
-there are more digits.
+incorrectly, because there are more digits.
 
-When you run a report (such as "list"), task assigns the numbers before it
+When you run a report (such as "list"), the numbers are assigned before display.
-displays them.  For example, you can do this:
+For example, you can do this:
 
     $ task list
     $ task do 12
@@ -261,17 +262,18 @@ displays them.  For example, you can do this:
     $ 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
+taskwarrior performs a garbage-collect operation on the pending tasks file when
-report is run, which moves the deleted and completed tasks from the pending.data
+a report is run, which moves the deleted and completed tasks from the
-file to the completed.data file.  This keeps the pending tasks file small, and
+pending.data file to the completed.data file.  This keeps the pending tasks file
-therefore keeps task fast.  The completed data file is the one that grows
+small, and therefore keeps taskwarrior fast.  The completed data file is the one
-unbounded with use, but that one isn't accessed as much, so it doesn't matter as
+that grows unbounded with use, but that one isn't accessed as much, so it
-much.  So in all, the ID number resequencing is about efficiency.
+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
+Taskwarriors filters are all combined with and implicit logical AND operator, so
-you were to try this:
+if you were to try this:
 
     $ task list priority:H priority:M
 
@@ -292,8 +294,8 @@ 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
+Taskwarrior now has a 'denotate' command to remove annotations.  Here is an
-example task:
+example:
 
     $ task add Original task
     $ task 1 annotate foo
@@ -327,13 +329,13 @@ There are lots of ways.  Here are some:
  - Fix bugs
 
 .SH "CREDITS & COPYRIGHTS"
-task was written by P. Beckingham <paul@beckingham.net>.
+Taskwarrior 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
+Taskwarrior is distributed under the GNU General Public License.  See
 http://www.gnu.org/licenses/gpl-2.0.txt for more information.
 
 .SH SEE ALSO
@@ -358,5 +360,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>

doc/man/task.1

@@ -7,17 +7,17 @@ task \- A command line todo manager.
 .B task [subcommand] [args]
 
 .SH DESCRIPTION
-Task is a command line todo list manager. It maintains a list of tasks that you
+Taskwarrior is a command line todo list manager. It maintains a list of tasks
-want to do, allowing you to add/remove, and otherwise manipulate them.  Task
+that you want to do, allowing you to add/remove, and otherwise manipulate them.
-has a rich list of subcommands that allow you to do various things with it.
+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
+At the core, taskwarrior is a list processing program. You add text and
-related parameters and task redisplays the information in a nice way.  It turns
+additional related parameters and redisplay the information in a nice way.  It
-into a todo list program when you add due dates and recurrence. It turns into an
+turns into a todo list program when you add due dates and recurrence. It turns
-organized todo list program when you add priorities, tags (one word descriptors),
+into an organized todo list program when you add priorities, tags (one word
-project groups, etc.  Task turns into an organized to do list program when you
+descriptors), project groups, etc.  Taskwarrior turns into an organized to do
-modify the configuration file to have the output displayed the way you want to
+list program when you modify the configuration file to have the output displayed
-see it.
+the way you want to see it.
 
 .SH SUBCOMMANDS
 
@@ -45,7 +45,7 @@ Shows all data and metadata for the specified task.
 
 .TP
 .B ID
-With an ID but no specific command, task runs the "info" command.
+With an ID but no specific command, taskwarrior runs the "info" command.
 
 .TP
 .B undo
@@ -154,7 +154,7 @@ currently defined colors.
 
 .TP
 .B version
-Shows the task version number
+Shows the taskwarrior version number
 
 .TP
 .B help
@@ -162,12 +162,13 @@ Shows the long usage text.
 
 .TP 
 .B show [all | substring]"
-Shows all the current settings in the task configuration file. If a substring
+Shows all the current settings in the taskwarrior configuration file. If a
-is specified just the settings containing that substring will be displayed.
+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.
+Add, modify and remove settings directly in the taskwarrior configuration.
 This command either modifies the 'name' setting with a new value of 'value',
 or adds a new entry that is equivalent to 'name=value':
 
@@ -212,8 +213,9 @@ 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 currently predefined in taskwarrior. The output and sort behavior of
-reports can be configured in the configuration file. See also the man page taskrc(5).
+these reports can be configured in the configuration file. See also the man page
+taskrc(5).
 
 .TP
 .B active [tags] [attrs] [description]
@@ -372,11 +374,11 @@ task list due.before:eom priority.not:L
 .SH SPECIFYING DATES AND FREQUENCIES
 
 .SS DATES
-Task reads dates from the command line and displays dates in the
+Taskwarrior reads dates from the command line and displays dates in the
 reports.  The expected and desired date format is determined by the
 configuration variable
 .I dateformat
-in the task configuration file.
+in the taskwarrior configuration file.
 
 .RS
 .TP
@@ -433,7 +435,7 @@ task ... due:fri
 .RE
 
 .SS FREQUENCIES
-Recurrence periods. Task supports several ways of specifying the
+Recurrence periods. Taskwarrior supports several ways of specifying the
 .I frequency
 of recurring tasks.
 
@@ -473,7 +475,7 @@ Every two years.
 
 
 .SH COMMAND ABBREVIATION
-All task commands may be abbreviated as long as a unique prefix is used. E.g.
+All taskwarrior commands may be abbreviated as long as a unique prefix is used. E.g.
 
 .RS
 $ task li
@@ -505,7 +507,7 @@ $ task add "quoted ' quote"
 $ task add escaped \\' quote
 .RE
 
-The argument \-\- (a double dash) tells task to treat all other args
+The argument \-\- (a double dash) tells taskwarrior to treat all other args
 as description:
 
 .RS
@@ -513,7 +515,7 @@ $ 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:
+Taskwarrior stores its configuration in a file in the user's home directory:
 ~/.taskrc . The default configuration file can be overridden with
 
 .TP
@@ -557,7 +559,7 @@ can be configured in the configuration file.
 ~/.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>.
+Taskwarrior was written by P. Beckingham <paul@beckingham.net>.
 .br
 Copyright (C) 2006 \- 2010 P. Beckingham
 
@@ -566,7 +568,7 @@ and supplemented by Federico Hernandez.
 
 Thank also to T. Charles Yun.
 
-task is distributed under the GNU General Public License.  See
+Taskwarrior is distributed under the GNU General Public License.  See
 http://www.gnu.org/licenses/gpl-2.0.txt for more information.
 
 .SH SEE ALSO
@@ -575,7 +577,7 @@ http://www.gnu.org/licenses/gpl-2.0.txt for more information.
 .BR task-faq(5)
 .BR task-color(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
@@ -591,5 +593,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>

doc/man/taskrc.5

@@ -9,7 +9,7 @@ taskrc \- Configuration file for the task(1) command
 .B task rc:<directory-path>/.taskrc
 
 .SH DESCRIPTION
-.B task
+.B taskwarrior
 obtains its configuration data from a file called
 .I .taskrc
 \&. This file is normally located in the user's home directory:
@@ -35,14 +35,14 @@ $ task rc.<name>:<value> ...
 .RE
 
 If
-.B task
+.B taskwarrior
 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 taskwarrior configuration file consists of a series of "assignments" in each
-The "assignments" have the syntax:
+line.  The "assignments" have the syntax:
 
 .RS
 <name-of-configuration-variable>=<value-to-be-set>
@@ -66,9 +66,9 @@ 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.
+Note that taskwarrior is flexible about the values used to represent Boolean
-You can use "on", "yes", "y", "1", "true", "t", "+", "enabled".  Anything else
+items.  You can use "on", "yes", "y", "1", "true", "t", "+", "enabled".
-means "off".
+Anything else means "off".
 
 .SH EDITING
 You can edit your .taskrc file by hand if you wish, or you can use the 'config'
@@ -84,14 +84,14 @@ To delete an entry, use this command:
 $ task config nag
 .RE
 
-Task will then use the default value.  To explicitly set a value to blank, and
+Taskwarrior will then use the default value.  To explicitly set a value to
-therefore avoid using the default value, use this command:
+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:
+Taskwarrior will also display all your settings with this command:
 
 .RS
 $ task config
@@ -120,8 +120,8 @@ include /usr/local/share/doc/task/rc/holidays-US.rc
 include /usr/local/share/doc/task/rc/dark-16.theme
 .RE
 
-This includes two standard files that are distributed with task, which define a
+This includes two standard files that are distributed with taskwarrior, which
-set of US holidays, and set up a 16-color theme for task to use, to color the
+define a set of US holidays, and set up a 16-color theme to use, to color the
 reports and calendar.
 
 .SH CONFIGURATION VARIABLES
@@ -131,8 +131,8 @@ Valid variable names and their default values are:
 
 .TP
 .B data.location=$HOME/.task
-This is a path to the directory containing all the task files. By default, it is
+This is a path to the directory containing all the taskwarrior files. By
-set up to be ~/.task, for example: /home/paul/.task
+default, it is set up to be ~/.task, for example: /home/paul/.task
 
 Note that you can use the
 .B ~
@@ -140,8 +140,8 @@ shell meta character, which will be properly expanded.
 
 .TP
 .B locking=on
-Determines whether task uses file locking when accessing the pending.data and
+Determines whether to use file locking when accessing the pending.data and
-completed.data files.  Defaults to "on". Solaris users who store the task data
+completed.data files.  Defaults to "on". Solaris users who store the 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.
@@ -149,7 +149,7 @@ 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
+Determines whether to use ncurses to establish the size of the window you are
 using, for text wrapping.
 
 .TP
@@ -160,31 +160,32 @@ The width of tables used when ncurses support is not available. Defaults to 80.
 .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,
+command is used. Taskwarrior will first look for this configuration variable. If
-it is used.  Otherwise task will look for the $VISUAL or $EDITOR environment
+found, it is used.  Otherwise it will look for the $VISUAL or $EDITOR
-variables, before it defaults to using "vi".
+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
+code.  If not specified, will assume en-US.  If specified, taskwarrior will
-the correct file of localized strings and proceed.  It is an error to specify a
+locate the correct file of localized strings and proceed.  It is an error to
-locale for which there is no strings file.
+specify a locale for which there is no strings file.
 
 .TP
 .B verbose=yes
-Controls some of the verbosity of task.
+Controls some of the verbosity of taskwarrior.
 
 .TP
 .B confirmation=yes
-May be "yes" or "no", and determines whether task will ask for confirmation
+May be "yes" or "no", and determines whether taskwarrior will ask for
-before deleting a task or doing bulk changes.  The default value is "yes".
+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
+May be "yes" or "no", and causes the display of the ID and description of any
 task when you run the start, stop, do, undo or delete commands. The default
 value is "yes".
 
@@ -254,8 +255,8 @@ 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
+Taskwarrior shuts off color automatically when the output is not sent directly
-a TTY.  For example, this command:
+to a TTY.  For example, this command:
 
 .RS
 .RS
@@ -271,7 +272,8 @@ $ task rc._forcecolor=yes list > file
 
 .TP
 .B blanklines=yes
-Turning this value off causes task to generate a more vertically compact output.
+Turning this value off causes taskwarrior to generate a more vertically compact
+output.
 
 .TP
 .B shell.prompt=task>
@@ -299,24 +301,25 @@ 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
+When the 'undo' command is run, taskwarrior presents a before and after
-data.  This can be in either the 'side' style, which compares values side-by-side
+comparison of the data.  This can be in either the 'side' style, which compares
-in a table, or 'diff' style, which uses a format similar to the 'diff' command.
+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
+Taskwarrior has a debug mode that causes diagnostic output to be displayed.
-this is not something anyone would want, but when reporting a bug, debug output
+Typically this is not something anyone would want, but when reporting a bug,
-can be useful.  It can also help explain how the command line is being parsed,
+debug output can be useful.  It can also help explain how the command line is
-but the information is displayed in a developer-friendly, not a user-friendly
+being parsed, but the information is displayed in a developer-friendly, not a
-way.
+user-friendly way.
 
 .TP
 .B alias.rm=delete
-Task supports command aliases.  This alias provides an alternate name (rm) for
+Taskwarrior supports command aliases.  This alias provides an alternate name
-the delete command.  You can use aliases to provide alternate names for any of
+(rm) for the delete command.  You can use aliases to provide alternate names for
-task's commands.  Several commands you may use are actually aliases - 'history',
+any of the commands.  Several commands you may use are actually aliases -
-for example, or 'export'.
+the 'history' report, for example, or 'export'.
 
 .SS DATES
 
@@ -330,8 +333,8 @@ for example, or 'export'.
 .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
+This is a string of characters that define how taskwarrior formats date values.
-precedence order for the configuration variable is report.X.dateformat then
+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
@@ -495,8 +498,8 @@ holiday.eastersunday.date=easter
 .RE
 .RE
 
-Note that the task distribution contains example holiday files that can be
+Note that the taskwarrior distribution contains example holiday files that can
-included like this:
+be included like this:
 
 .RS
 .RS
@@ -509,14 +512,14 @@ include /usr/local/share/doc/task/rc/holidays-US.rc
 .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.
+specified, taskwarrior 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
+May be "on" or "off". Determines whether taskwarrior uses color. When "off",
-use dashes (-----) to underline column headings.
+will use dashes (-----) to underline column headings.
 
 .TP
 .B fontunderline=on
@@ -524,7 +527,7 @@ 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
+Taskwarrior 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:
@@ -693,11 +696,11 @@ a change that is to be reverted.
 .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
+taskwarrior, whenever the task database changes.  In other words, it is
-kept up to date.  The shadow.command configuration variable is used to determine
+automatically kept up to date.  The shadow.command configuration variable is
-which report is written to the shadow file.  There is no color used in the
+used to determine which report is written to the shadow file.  There is no color
-shadow file. This feature can be useful in maintaining a current file for use by
+used in the shadow file. This feature can be useful in maintaining a current
-programs like GeekTool, Conky or Samurize.
+file for use by programs like GeekTool, Conky or Samurize.
 
 .TP
 .B
@@ -711,8 +714,8 @@ configuration variable. The format is identical to that of
 .TP
 .B
 shadow.notify=on
-When this value is set to "on", task will display a message whenever the shadow
+When this value is set to "on", taskwarrior will display a message whenever the
-file is updated by some task command.
+shadow file is updated by some task command.
 
 .SS DEFAULTS
 
@@ -733,7 +736,7 @@ 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
+Provides a default command that is run every time taskwarrior is invoked with no
 arguments.  For example, if set to:
 
 .RS
@@ -743,8 +746,8 @@ default.command=list project:foo
 .RE
 
 .RS
-then task will run the "list project:foo" command if no command is specified.
+then taskwarrior will run the "list project:foo" command if no command is
-This means that by merely typing
+specified.  This means that by merely typing
 .RE
 
 .RS
@@ -823,8 +826,8 @@ 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
+Taskwarrior comes with a number of predefined reports in its default
-file. These reports are:
+configuration file. These reports are:
 
 .TP
 .B long
@@ -879,13 +882,13 @@ Lists all tasks matching the specified criteria.
 Lists all tasks with upcoming due dates matching the specified criteria.
 
 .SH "CREDITS & COPYRIGHTS"
-task was written by P. Beckingham <paul@beckingham.net>.
+Taskwarrior 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
+Taskwarrior is distributed under the GNU General Public License.  See
 http://www.gnu.org/licenses/gpl-2.0.txt for more information.
 
 .SH SEE ALSO
@@ -894,7 +897,7 @@ http://www.gnu.org/licenses/gpl-2.0.txt for more information.
 .BR task-faq(5)
 .BR task-color(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
@@ -910,5 +913,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>

doc/misc/grammar.bnf

@@ -1,8 +1,8 @@
 
-# This is a full BNF grammar for the task command line.  It is intended that a
+# This is a full BNF grammar for the taskwarrior command line.  It is intended
-# future release of task will incorporate a complete lexer/parser implementing
+# that a future release of taskwarrior will incorporate a complete lexer/parser
-# this grammar, which will allow for more sophisticated command lines, for
+# implementing this grammar, which will allow for more sophisticated command
-# example:
+# lines, for example:
 #
 #    task delete 1 2 4-7
 #    task add pri:H pro:X -- pro pri 1 ///

doc/misc/script-193.txt

@@ -11,10 +11,10 @@ task-tutorial.5 man page.
 
 ---------------------------------------- Intro -----------------------------------------------------
 
-http://taskwarrior.org                   Hello, and welcome to this task version 1.9.3 demo.
+http://taskwarrior.org                   Hello, and welcome to this taskwarrior version 1.9.3 demo.
                                          I'm going to show you over 100 features, so don't blink, or
-                                         you'll miss some.  Even experienced task users are going to
+                                         you'll miss some.  Even experienced users are going to learn
-                                         learn *something*.
+                                         *something*.
 
                                          I will start off with basic usage, and proceed to more
                                          sophisticated commands as we go along.
@@ -46,10 +46,10 @@ task 3 done                              That looks good - but now I think of it
 task list                                guest list, so I can mark that one as done.
 
                                          And that's basic usage, and you already know enough to be
-                                         productive using task.  If you stopped here, you would be
+                                         productive using taskwarrior.  If you stopped here, you
-                                         perfectly able to manage your task list.
+                                         would be perfectly able to manage your task list.
 
-                                         But if you want to see what task can really do, keep watching...
+                                         But if you want to see what it can really do, keep watching...
 
 ---------------------------------------- Projects --------------------------------------------------
 
@@ -63,9 +63,9 @@ task 7 project:home                      We can now use projects to separate hom
                                          project.
 
 task 1-6 project:party                   And we will put those first six tasks in the 'party'
-                                         project.  See how we specify a range of tasks?  Task will
+                                         project.  See how we specify a range of tasks?  Taskwarrior
-                                         want to confirm bulk changes like this, but we'll accept
+                                         will want to confirm bulk changes like this, but we'll
-                                         all changes here.
+                                         accept all changes here.
 
 task projects                            Now that we have multiple projects, as shown here, we can
 task list project:home                   use project as a filter for the list report.  You can see
@@ -76,8 +76,8 @@ task li pro:par                          again that we can abbreviate 'list' and
 ---------------------------------------- Priorities ------------------------------------------------
 
 task 1-3,5 priority:H                    Priorities are another way to organize tasks.  You can use
-task list                                priority values of high, medium and low, and task knows
+task list                                priority values of high, medium and low, and taskwarrior
-                                         these as H, M or L.
+                                         knows these as H, M or L.
 
 task 3 pri:                              You can remove priorities by specifying a blank value.
 
@@ -116,26 +116,27 @@ task add Hire a band?    <---            Sometimes the command will confuse the
 task add Hire a band\?   <---            escape the wildcard...
 task add "Hire a band?"  <---            or quote the whole description...
 
-task add -- Hire a band\? +dj            You can also use the minus minus operator which tells task
+task add -- Hire a band\? +dj            You can also use the minus minus operator which tells
-                                         to stop being clever and interpret the rest of the arguments
+                                         taskwarrior to stop being clever and interpret the rest
-                                         as a task description.  Otherwise, that +dj would be
+                                         of the arguments as a task description.  Otherwise, that
-                                         interpreted as a tag.
+                                         +dj would be interpreted as a tag.
 
 task undo                                We don't need a band, so the easiest way to get rid of that
-                                         task is to undo the last change.  Task has a complete undo
+                                         task is to undo the last change.  Taskwarrior has a
-                                         stack, so you can undo all the way back to the beginning.
+                                         complete undo stack, so you can undo all the way back to
+                                         the beginning.
 task 1 delete                            The undo operation gets rid of the task completely, but I
 task undo                                could also have just deleted the task, then the deletion
                                          itself would be tracked, and also undoable.
 
 ---------------------------------------- Info ------------------------------------------------------
 
-task 1 info                              During that undo operation, task displayed metadata that
+task 1 info                              During that undo operation, taskwarrior displayed metadata
-task 1                                   is associated with the task.  You can display this with the
+task 1                                   that is associated with the task.  You can display this
-                                         info command, and its shortcut.
+                                         with the info command, and its shortcut.
 
-task stats                               There are also statistics that task gathers, which I can
+task stats                               There are also statistics that taskwarrior gathers, which
-                                         display.
+                                         I can display.
 
 ---------------------------------------- Annotations -----------------------------------------------
 
@@ -151,7 +152,7 @@ task list
 
 ---------------------------------------- Configuration ---------------------------------------------
 
-task show                                Task has a 'show' command, that is used to display the
+task show                                There is a 'show' command, that is used to display the
                                          active configuration.  There are hundreds of settings that
                                          can be changed, and every one has a sensible default.
 
@@ -163,7 +164,7 @@ task config answer 42                    The 'config' command is used to modify
                                          value of 42.
 
 task show answer                         The 'show' command indicates that the value was changed,
-task config answer                       and also that the variable is meaningless to task.  The show
+task config answer                       and also that the variable is unrecognized.  The show
                                          command performs a detailed check on your configuration, and
                                          alerts you to several kinds of problem.  The config command
                                          can also remove a value.
@@ -175,9 +176,9 @@ task rc.report.list.sort=description+ list
 
 ---------------------------------------- Defaults --------------------------------------------------
 
-task config default.command list         Task has a default command, which can be set to anything,
+task config default.command list         There is a default command, which can be set to anything,
 task                                     in this case it is set to the 'list' report.  Then running
-                                         task with no command name runs the default command.
+                                         taskwarrior with no command name runs the default command.
 
 task config default.priority H           I can also specify a default priority and project, which
 task config default.project Work         means that any tasks added will use them, unless an
@@ -190,7 +191,7 @@ task config default.project
 
 ---------------------------------------- Aliases ---------------------------------------------------
 
-task config alias.zzz list               You can create aliases to effectively rename task commands.
+task config alias.zzz list               You can create aliases to effectively rename commands.
 task zzz
 
 task z                                   You can abbreviate those, too.
@@ -209,10 +210,10 @@ task list                                rules where a specific task is given a
 task 1 bg:                               Note that the quotes are necessary, otherwise the shell
                                          will consider "bg:on" and "red" to be separate arugments.
 
-task color                               Task supports 256 colors on certain terminal emulators,
+task color                               Taskwarrior supports 256 colors on certain terminal
-                                         and this shows the range of colors available.
+                                         emulators, and this shows the range of colors available.
 
-task color white on red                  Task can also show a sample of a color.
+task color white on red                  This is how to show a color sample.
 
 task color legend                        Or samples of all the active color settings.
 
@@ -280,8 +281,8 @@ task calendar                            When tasks have due dates, you can see
 vi ~/.taskrc
 # include /usr/local/share/doc/task/rc/holidays-US.rc
 task calendar
-                                         Task comes with sample holiday files.  You can create your
+                                         Taskwarrior provides sample holiday files.  You can create
-                                         own, or use one of the samples to show holidays on the
+                                         your own, or use one of the samples to show holidays on the
                                          calendar.
 
 task cal 2010                            You can see the whole year.
@@ -328,9 +329,9 @@ task rc:x list                           have effects on individual tasks.  The
 
 task rc:x tags                           Special tags are highlighted by the 'tags' command.
 
-task rc:x 6 -nocolor                     There are others - the 'nonag' special tag prevents task
+task rc:x 6 -nocolor                     There are others - the 'nonag' special tag prevents the
-                                         from generating nag messages when you work on low priority
+                                         generation of nag messages when you work on low priority
-                                         tasks when there are higher priority tasks.
+                                         tasks when there are more important ones.
 
                                          The 'nocal' special tag will prevent a task from appearing
                                          on the calendar.
@@ -360,7 +361,7 @@ task 11 rc.confirmation:no delete        And now it's deleted.
 
 ---------------------------------------- Reports ---------------------------------------------------
 
-task minimal                             Task has a good many reports.  There is the bare minimum.
+task minimal                             Taskwarrior has a good many reports.  There is the bare minimum.
 task ls                                  The simple.
 task list                                The standard.
 task long                                The kitchen sink.
@@ -457,22 +458,22 @@ task export.csv venue                    Let's just export one task in CSV forma
 task export.vcalendar venue              Or in VCalendar format...
 task export.yaml venue                   Or YAML.
 
-cat file.text                            Task can also import.  Here I am importing simple lines
+cat file.text                            I can also import.  Here I am importing simple lines of
-task import file.text                    of text.  Task recognizes the format and confirms.
+task import file.text                    text.  Taskwarrior recognizes the format and confirms.
 
-cat file.yaml                            Here is a YAML example.  Task can read several formats,
+cat file.yaml                            Here is a YAML example.  Taskwarrior can read several
-task import file.yaml                    including old versions task data.  Using YAML, you can
+task import file.yaml                    formats, including old versions task data.  Using YAML,
-                                         round-trip the data without loss.
+                                         you can round-trip the data without loss.
 
 task new limit:2                         Here are the imported tasks.
 
 ---------------------------------------- Help ------------------------------------------------------
 
-task help                                You'll find a quick reference page built into task itself,
+task help                                You'll find a quick reference page built in, with the 'help'
-man task                                 or perhaps you'll want to take a look at the several man
+man task                                 command, or perhaps you'll want to take a look at the several
-man taskrc                               pages installed with task.  This demo has superficially
+man taskrc                               man pages installed.  This demo has superficially shown
-man task-color                           shown many features which have more capability and depth
+man task-color                           many features which have more capability and depth which you
-                                         which you can find in the man pages, and online.
+                                         can find in the man pages, and online.
 
 man task-tutorial                        This screencast is actually just a recording of me going
                                          through the tutorial.

doc/misc/script-color.txt

@@ -1,5 +1,5 @@
                                          Hello.  This is a demonstration of the
-                                         task program color capabilities coming
+                                         taskwarrior color capabilities coming
                                          in version 1.9.
 
 task color                               The color command shows the various

doc/misc/script-hooks-2.txt

@@ -1,5 +1,5 @@
 $ # Q: What is a formatting hook?
-$ # A: Lua code that modifies task output at run time.
+$ # A: Lua code that modifies taskwarrior output at run time.
 $
 $ cat > hooks.lua
 

doc/misc/script-hooks.txt

@@ -1,5 +1,5 @@
 $
-$ # Task now has Lua 5.1.4 built in.
+$ # Taskwarrior now has Lua 5.1.4 built in.
 $
 $ task version
 $ cat > hooks.lua
@@ -9,18 +9,18 @@ function foo ()
 end
 ^D
 $
-$ # Task can call into Lua at many points during execution.
+$ # Taskwarrior can call into Lua at many points during execution.
-$ # This one is called immediately before task quits.
+$ # This one is called immediately before taskwarrior quits.
 $
 $ task rc.hook.pre-exit=~/hooks.lua:foo version
 $
-$ # While task is calling Lua code, the Lua can also call
+$ # While taskwarrior is calling Lua code, the Lua can also call
-$ # back into a task API, for information.
+$ # back into a taskwarrior API, for information.
 $
 $ cat > hooks.lua
 function foo ()
   print "Lua version is " .. task_lua_version ())
-  print "Task version is " .. task_version ())
+  print "Taskwarrior version is " .. task_version ())
   return 0, nil
 end
 ^D

doc/misc/script.txt

@@ -1,4 +1,5 @@
-                                         Hello, and welcome to this quick demo of the task program.
+                                         Hello, and welcome to this quick demo of the
+                                         taskwarrior program.
 
 task add do laundry                      Let's add some tasks
                                          I need to do laundry

doc/rc/dark-16.theme

@@ -1,7 +1,7 @@
 ################################################################################
-# Sample task 1.9 (or later) dark 16-color theme
+# Sample taskwarrior 1.9 (or later) dark 16-color theme
 #
-# task - a command line task list manager.
+# taskwarrior - a command line task list manager.
 #
 # Copyright 2006 - 2010, Paul Beckingham.
 # All rights reserved.

doc/rc/dark-256.theme

@@ -1,7 +1,7 @@
 ###############################################################################
-# Sample task 1.9 (or later) dark 256-color theme
+# Sample taskwarrior 1.9 (or later) dark 256-color theme
 #
-# task - a command line task list manager.
+# taskwarrior - a command line task list manager.
 #
 # Copyright 2006 - 2010, Paul Beckingham.
 # All rights reserved.

doc/rc/dark-blue-256.theme

@@ -1,7 +1,7 @@
 ###############################################################################
-# Sample task 1.9 (or later) dark 256-color theme, featuring blue.
+# Sample taskwarrior 1.9 (or later) dark 256-color theme, featuring blue.
 #
-# task - a command line task list manager.
+# taskwarrior - a command line task list manager.
 #
 # Copyright 2006 - 2010, Paul Beckingham.
 # All rights reserved.

doc/rc/dark-green-256.theme

@@ -1,7 +1,7 @@
 ###############################################################################
-# Sample task 1.9 (or later) dark 256-color theme, featuring green.
+# Sample taskwarrior 1.9 (or later) dark 256-color theme, featuring green.
 #
-# task - a command line task list manager.
+# taskwarrior - a command line task list manager.
 #
 # Copyright 2006 - 2010, Paul Beckingham.
 # All rights reserved.

doc/rc/dark-red-256.theme

@@ -1,7 +1,7 @@
 ###############################################################################
-# Sample task 1.9 (or later) dark 256-color theme, featuring red.
+# Sample taskwarrior 1.9 (or later) dark 256-color theme, featuring red.
 #
-# task - a command line task list manager.
+# taskwarrior - a command line task list manager.
 #
 # Copyright 2006 - 2010, Paul Beckingham.
 # All rights reserved.

doc/rc/holidays-SE.rc

@@ -1,7 +1,7 @@
 ################################################################################
 # Sample calendar for Sweden
 #
-# task - a command line task list manager.
+# taskwarrior - a command line task list manager.
 #
 # Copyright 2010, Federico Hernandez.
 # All rights reserved.

doc/rc/holidays-US.rc

@@ -1,7 +1,7 @@
 ################################################################################
 # Sample calendar for the US
 #
-# task - a command line task list manager.
+# taskwarrior - a command line task list manager.
 #
 # Copyright 2010, Federico Hernandez.
 # All rights reserved.

doc/rc/light-16.theme

@@ -1,7 +1,7 @@
 ###############################################################################
-# Sample task 1.9 (or later) light 16-color theme
+# Sample taskwarrior 1.9 (or later) light 16-color theme
 #
-# task - a command line task list manager.
+# taskwarrior - a command line task list manager.
 #
 # Copyright 2006 - 2010, Paul Beckingham.
 # All rights reserved.

doc/rc/light-256.theme

@@ -1,7 +1,7 @@
 ###############################################################################
-# Sample task 1.9 (or later) light 256-color theme
+# Sample taskwarrior 1.9 (or later) light 256-color theme
 #
-# task - a command line task list manager.
+# taskwarrior - a command line task list manager.
 #
 # Copyright 2006 - 2010, Paul Beckingham.
 # All rights reserved.

i18n/strings.en-US

@@ -1,9 +1,9 @@
 # This is an example strings.en-US file.
 #
-# The task program has a built-in set of default strings, which are UTF8 encoded
+# The taskwarrior program has a built-in set of default strings, which are UTF8
-# for the en-US locale.  A file such as this is used to override those defaults.
+# encoded for the en-US locale.  A file such as this is used to override those
-# This means that a strings file is merely a delta applied to the built-in
+# defaults.  This means that a strings file is merely a delta applied to the
-# strings, so an empty string file means you get en-US.
+# 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:
 #
@@ -18,7 +18,7 @@
 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.
+108 Interactive mode 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

i18n/strings.sv-SE

@@ -1,9 +1,9 @@
 # This is an example strings.en-US file.
 #
-# The task program has a built-in set of default strings, which are UTF8 encoded
+# The taskwarrior program has a built-in set of default strings, which are UTF8
-# for the en-US locale.  A file such as this is used to override those defaults.
+# encoded for the en-US locale.  A file such as this is used to override those
-# This means that a strings file is merely a delta applied to the built-in
+# default.  This means that a strings file is merely a delta applied to the
-# strings, so an empty string file means you get en-US.
+# 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:
 #

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
@@ -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>
@@ -257,12 +258,13 @@ Note: This is being written from the OSX 10.6 perspective, and may therefore
 
   task 1.9.2 built for darwin-ncurses
   Copyright (C) 2006 - 2010 P. Beckingham, F. Hernandez.
-                                                                                                                     
-  Task may be copied only under the terms of the GNU General Public License,
-  which may be found in the task source kit.
 
-  Documentation for task can be found using 'man task', 'man taskrc', 'man
+  Taskwarrior may be copied only under the terms of the GNU General Public
-  task-tutorial', 'man task-color', 'man task-faq' or at http://taskwarrior.org
+  License, which may be found in the taskwarrior source kit.
+
+  Documentation for taskwarrior can be found using 'man task', 'man taskrc',
+  'man task-tutorial', 'man task-color', 'man task-faq' or at
+  http://taskwarrior.org
 
   $ man task
   ...

scripts/bash/task_completion.sh

@@ -1,9 +1,9 @@
-# bash completion support for task
+# bash completion support for taskwarrior
 #
 # Copyright 2009-2010 Federico Hernandez
 # All rights reserved.
 #
-# This script is part of the task project.
+# This script is part of the taskwarrior project.
 #
 # 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

scripts/fish/task.fish

@@ -1,4 +1,4 @@
-# Task <http://taskwarrior.org> tab completions for the Fish shell
+# Taskwarrior <http://taskwarrior.org> tab completions for the Fish shell
 # <http://fishshell.org>.
 #
 # Copy this script to ~/.config/fish/completions/task.fish, open a new shell,

scripts/vim/README

@@ -1,5 +1,5 @@
 
-              Configure VIM for Syntax Highlighting of Task Data
+          Configure VIM for Syntax Highlighting of Taskwarrior Data
 
 
 The task data files (pending.data, completed.data and undo.data),
@@ -24,12 +24,12 @@ You may prefer instead to read the help online at:
     http://vimdoc.sourceforge.net/htmldoc/syntax.html#syntax
 
 
-                   Configuring VIM to Understand Task Data
+              Configuring VIM to Understand Taskwarrior Data
 
 Once you have VIM's syntax highlighting enabled and working with other file
-types properly, configuring it for use with task is simple.  You simply need
+types properly, configuring it for use with taskwarrior is simple.  You simply
-to copy some files that came with task into your home directory so that you
+need to copy some files that came with taskwarrior into your home directory so
-have:
+that you have:
 
     ~/.vim/ftdetect/task.vim
     ~/.vim/syntax/taskdata.vim

scripts/vim/ftdetect/task.vim

@@ -1,4 +1,4 @@
-" Vim support file to detect Task Warrior data and configuration files and 
+" Vim support file to detect Taskwarrior data and configuration files and 
 " single task edits
 "
 " Maintainer:   John Florian <jflorian@doubledog.org>
@@ -10,13 +10,13 @@
 " For the full text of this license, see COPYING.
 
 
-" Task Warrior data files
+" Taskwarrior data files
 au BufRead,BufNewFile {pending,completed,undo}.data	set filetype=taskdata
 
-" Task Warrior configuration file
+" Taskwarrior configuration file
 au BufRead,BufNewFile .taskrc				set filetype=taskrc
 
-" Task Warrior handling of 'task 42 edit'
+" Taskwarrior handling of 'task 42 edit'
 au BufRead,BufNewFile *.task				set filetype=taskedit
 
 " vim:noexpandtab

scripts/vim/syntax/taskdata.vim

@@ -1,5 +1,5 @@
 " Vim syntax file
-" Language:	task data
+" Language:	taskwarrior data
 " Maintainer:	John Florian <jflorian@doubledog.org>
 " Updated:	Wed Jul  8 19:46:20 EDT 2009
 "

scripts/vim/syntax/taskrc.vim

@@ -1,5 +1,5 @@
 " Vim syntax file
-" Language:	support for editing task configuration file
+" Language:	support for editing taskwarrior configuration file
 " Maintainer:	John Florian <jflorian@doubledog.org>
 " Updated:	Sat Feb 20 14:14:44 EST 2010
 "

scripts/zsh/_task

@@ -1,17 +1,17 @@
 #compdef task
 #
 # This script is currently unmaintained and was released for an earlier version
-# of task. We welcome any zsh user that wants to contribute to task to take a
+# of taskwarrior.  We welcome any zsh user that wants to contribute to
-# look at this script and either confirm its working status or improve it.
+# taskwarrior to take a look at this script and either confirm its working
-# Please contact us at support@taskwarrior.org if you have further questions on
+# status or improve it.  Please contact us at support@taskwarrior.org if you
-# how to contribute to task.
+# have further questions on how to contribute to taskwarrior.
 #
-# zsh completion for task
+# zsh completion for taskwarrior
 #
 # Copyright 2009 P.C. Shyamshankar
 # All rights reserved.
 #
-# This script is part of the task project.
+# This script is part of the taskwarrior project.
 #
 # 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

src/API.cpp

@@ -1,5 +1,5 @@
 ////////////////////////////////////////////////////////////////////////////////
-// Task Lua API
+// Taskwarrior Lua API
 //
 // Copyright 2006 - 2010, Paul Beckingham.
 // All rights reserved.
@@ -57,7 +57,8 @@ Task* the_task = NULL;
 #ifdef HAVE_LIBLUA
 
 ////////////////////////////////////////////////////////////////////////////////
-// Returns a string representing the task version number, such as '1.9.0'.
+// Returns a string representing the taskwarrior version number, such as
+// '1.9.0'.
 static int api_task_version (lua_State* L)
 {
   lua_pushstring (L, PACKAGE_VERSION);

src/API.h

@@ -1,5 +1,5 @@
 ////////////////////////////////////////////////////////////////////////////////
-// task - a command line task list manager.
+// taskwarrior - a command line task list manager.
 //
 // Copyright 2006 - 2010, Paul Beckingham.
 // All rights reserved.

src/Att.cpp

@@ -1,5 +1,5 @@
 ////////////////////////////////////////////////////////////////////////////////
-// task - a command line task list manager.
+// taskwarrior - a command line task list manager.
 //
 // Copyright 2006 - 2010, Paul Beckingham.
 // All rights reserved.

src/Att.h

@@ -1,5 +1,5 @@
 ////////////////////////////////////////////////////////////////////////////////
-// task - a command line task list manager.
+// taskwarrior - a command line task list manager.
 //
 // Copyright 2006 - 2010, Paul Beckingham.
 // All rights reserved.

src/Cmd.cpp

@@ -1,5 +1,5 @@
 ////////////////////////////////////////////////////////////////////////////////
-// task - a command line task list manager.
+// taskwarrior - a command line task list manager.
 //
 // Copyright 2006 - 2010, Paul Beckingham.
 // All rights reserved.

src/Cmd.h

@@ -1,5 +1,5 @@
 ////////////////////////////////////////////////////////////////////////////////
-// task - a command line task list manager.
+// taskwarrior - a command line task list manager.
 //
 // Copyright 2006 - 2010, Paul Beckingham.
 // All rights reserved.

src/Color.cpp

@@ -1,5 +1,5 @@
 ////////////////////////////////////////////////////////////////////////////////
-// task - a command line task list manager.
+// taskwarrior - a command line task list manager.
 //
 // Copyright 2006 - 2010, Paul Beckingham.
 // All rights reserved.

src/Color.h

@@ -1,5 +1,5 @@
 ////////////////////////////////////////////////////////////////////////////////
-// task - a command line task list manager.
+// taskwarrior - a command line task list manager.
 //
 // Copyright 2006 - 2010, Paul Beckingham.
 // All rights reserved.

src/Column.cpp

@@ -1,5 +1,5 @@
 ////////////////////////////////////////////////////////////////////////////////
-// task - a command line task list manager.
+// taskwarrior - a command line task list manager.
 //
 // Copyright 2006 - 2010, Paul Beckingham, Federico Hernandez.
 // All rights reserved.

src/Column.h

@@ -1,5 +1,5 @@
 ////////////////////////////////////////////////////////////////////////////////
-// task - a command line task list manager.
+// taskwarrior - a command line task list manager.
 //
 // Copyright 2006 - 2010, Paul Beckingham, Federico Hernandez.
 // All rights reserved.

src/Config.cpp

@@ -1,5 +1,5 @@
 ///////////////////////////////////////////////////////////////////////////////
-// task - a command line task list manager.
+// taskwarrior - a command line task list manager.
 //
 // Copyright 2006 - 2010, Paul Beckingham.
 // All rights reserved.
@@ -46,7 +46,7 @@
 // 1) It is used to create a new .taskrc file, by copying it directly to disk.
 // 2) It is parsed and used as default values for all Config.get calls.
 std::string Config::defaults =
-  "# Task program configuration file.\n"
+  "# Taskwarrior program configuration file.\n"
   "# For more documentation, see http://taskwarrior.org or try 'man task', 'man task-faq',\n"
   "# 'man task-tutorial', 'man task-color' or 'man taskrc'\n"
   "\n"

src/Config.h

@@ -1,5 +1,5 @@
 ////////////////////////////////////////////////////////////////////////////////
-// task - a command line task list manager.
+// taskwarrior - a command line task list manager.
 //
 // Copyright 2006 - 2010, Paul Beckingham.
 // All rights reserved.

src/Context.cpp

@@ -1,5 +1,5 @@
 ////////////////////////////////////////////////////////////////////////////////
-// task - a command line task list manager.
+// taskwarrior - a command line task list manager.
 //
 // Copyright 2006 - 2010, Paul Beckingham.
 // All rights reserved.
@@ -479,7 +479,7 @@ void Context::loadCorrectConfigFile ()
                 + "\n\n"
                 + "Would you like a sample "
                 + rc.data
-                + " created, so task can proceed?"))
+                + " created, so taskwarrior can proceed?"))
       throw std::string ("Cannot proceed without rc file.");
 
     config.createDefaultRC (rc, data);

src/Context.h

@@ -1,5 +1,5 @@
 ////////////////////////////////////////////////////////////////////////////////
-// task - a command line task list manager.
+// taskwarrior - a command line task list manager.
 //
 // Copyright 2006 - 2010, Paul Beckingham.
 // All rights reserved.

src/Date.cpp

@@ -1,5 +1,5 @@
 ////////////////////////////////////////////////////////////////////////////////
-// task - a command line task list manager.
+// taskwarrior - a command line task list manager.
 //
 // Copyright 2006 - 2010, Paul Beckingham, Federico Hernandez.
 // All rights reserved.

src/Date.h

@@ -1,5 +1,5 @@
 ////////////////////////////////////////////////////////////////////////////////
-// task - a command line task list manager.
+// taskwarrior - a command line task list manager.
 //
 // Copyright 2006 - 2010, Paul Beckingham, Federico Hernandez.
 // All rights reserved.

src/Directory.cpp

@@ -1,5 +1,5 @@
 ////////////////////////////////////////////////////////////////////////////////
-// task - a command line task list manager.
+// taskwarrior - a command line task list manager.
 //
 // Copyright 2006 - 2009, Paul Beckingham.
 // All rights reserved.

src/Directory.h

@@ -1,5 +1,5 @@
 ////////////////////////////////////////////////////////////////////////////////
-// task - a command line task list manager.
+// taskwarrior - a command line task list manager.
 //
 // Copyright 2006 - 2009, Paul Beckingham.
 // All rights reserved.

src/Duration.cpp

@@ -1,5 +1,5 @@
 ////////////////////////////////////////////////////////////////////////////////
-// task - a command line task list manager.
+// taskwarrior - a command line task list manager.
 //
 // Copyright 2006 - 2010, Paul Beckingham.
 // All rights reserved.

src/Duration.h

@@ -1,5 +1,5 @@
 ////////////////////////////////////////////////////////////////////////////////
-// task - a command line task list manager.
+// taskwarrior - a command line task list manager.
 //
 // Copyright 2006 - 2010, Paul Beckingham.
 // All rights reserved.

src/File.cpp

@@ -1,5 +1,5 @@
 ////////////////////////////////////////////////////////////////////////////////
-// task - a command line task list manager.
+// taskwarrior - a command line task list manager.
 //
 // Copyright 2006 - 2009, Paul Beckingham.
 // All rights reserved.

src/File.h

@@ -1,5 +1,5 @@
 ////////////////////////////////////////////////////////////////////////////////
-// task - a command line task list manager.
+// taskwarrior - a command line task list manager.
 //
 // Copyright 2006 - 2009, Paul Beckingham.
 // All rights reserved.

src/Filter.cpp

@@ -1,5 +1,5 @@
 ////////////////////////////////////////////////////////////////////////////////
-// task - a command line task list manager.
+// taskwarrior - a command line task list manager.
 //
 // Copyright 2006 - 2010, Paul Beckingham.
 // All rights reserved.

src/Filter.h

@@ -1,5 +1,5 @@
 ////////////////////////////////////////////////////////////////////////////////
-// task - a command line task list manager.
+// taskwarrior - a command line task list manager.
 //
 // Copyright 2006 - 2010, Paul Beckingham.
 // All rights reserved.

src/Grid.cpp

@@ -1,5 +1,5 @@
 ////////////////////////////////////////////////////////////////////////////////
-// task - a command line task list manager.
+// taskwarrior - a command line task list manager.
 //
 // Copyright 2006 - 2010, Paul Beckingham.
 // All rights reserved.

src/Grid.h

@@ -1,5 +1,5 @@
 ////////////////////////////////////////////////////////////////////////////////
-// task - a command line task list manager.
+// taskwarrior - a command line task list manager.
 //
 // Copyright 2006 - 2010, Paul Beckingham.
 // All rights reserved.

src/Hooks.cpp

@@ -1,5 +1,5 @@
 ////////////////////////////////////////////////////////////////////////////////
-// task - a command line task list manager.
+// taskwarrior - a command line task list manager.
 //
 // Copyright 2006 - 2010, Paul Beckingham.
 // All rights reserved.

src/Hooks.h

@@ -1,5 +1,5 @@
 ////////////////////////////////////////////////////////////////////////////////
-// task - a command line task list manager.
+// taskwarrior - a command line task list manager.
 //
 // Copyright 2006 - 2010, Paul Beckingham.
 // All rights reserved.

src/Keymap.cpp

@@ -1,5 +1,5 @@
 ////////////////////////////////////////////////////////////////////////////////
-// task - a command line task list manager.
+// taskwarrior - a command line task list manager.
 //
 // Copyright 2006 - 2010, Paul Beckingham.
 // All rights reserved.

src/Keymap.h

@@ -1,5 +1,5 @@
 ////////////////////////////////////////////////////////////////////////////////
-// task - a command line task list manager.
+// taskwarrior - a command line task list manager.
 //
 // Copyright 2006 - 2010, Paul Beckingham.
 // All rights reserved.

src/Location.cpp

@@ -1,5 +1,5 @@
 ////////////////////////////////////////////////////////////////////////////////
-// task - a command line task list manager.
+// taskwarrior - a command line task list manager.
 //
 // Copyright 2006 - 2010, Paul Beckingham.
 // All rights reserved.

src/Location.h

@@ -1,5 +1,5 @@
 ////////////////////////////////////////////////////////////////////////////////
-// task - a command line task list manager.
+// taskwarrior - a command line task list manager.
 //
 // Copyright 2006 - 2010, Paul Beckingham.
 // All rights reserved.

src/Nibbler.cpp

@@ -1,5 +1,5 @@
 ////////////////////////////////////////////////////////////////////////////////
-// task - a command line task list manager.
+// taskwarrior - a command line task list manager.
 //
 // Copyright 2006 - 2010, Paul Beckingham, Federico Hernandez.
 // All rights reserved.

src/Nibbler.h

@@ -1,5 +1,5 @@
 ////////////////////////////////////////////////////////////////////////////////
-// task - a command line task list manager.
+// taskwarrior - a command line task list manager.
 //
 // Copyright 2006 - 2010, Paul Beckingham, Federico Hernandez.
 // All rights reserved.

src/Path.cpp

@@ -1,5 +1,5 @@
 ////////////////////////////////////////////////////////////////////////////////
-// task - a command line task list manager.
+// taskwarrior - a command line task list manager.
 //
 // Copyright 2006 - 2009, Paul Beckingham.
 // All rights reserved.

src/Path.h

@@ -1,5 +1,5 @@
 ////////////////////////////////////////////////////////////////////////////////
-// task - a command line task list manager.
+// taskwarrior - a command line task list manager.
 //
 // Copyright 2006 - 2009, Paul Beckingham.
 // All rights reserved.

src/Permission.cpp

@@ -1,5 +1,5 @@
 ////////////////////////////////////////////////////////////////////////////////
-// task - a command line task list manager.
+// taskwarrior - a command line task list manager.
 //
 // Copyright 2006 - 2010, Paul Beckingham.
 // All rights reserved.

src/Permission.h

@@ -1,5 +1,5 @@
 ////////////////////////////////////////////////////////////////////////////////
-// task - a command line task list manager.
+// taskwarrior - a command line task list manager.
 //
 // Copyright 2006 - 2010, Paul Beckingham.
 // All rights reserved.

src/Record.cpp

@@ -1,5 +1,5 @@
 ////////////////////////////////////////////////////////////////////////////////
-// task - a command line task list manager.
+// taskwarrior - a command line task list manager.
 //
 // Copyright 2006 - 2010, Paul Beckingham.
 // All rights reserved.

src/Record.h

@@ -1,5 +1,5 @@
 ////////////////////////////////////////////////////////////////////////////////
-// task - a command line task list manager.
+// taskwarrior - a command line task list manager.
 //
 // Copyright 2006 - 2010, Paul Beckingham.
 // All rights reserved.

src/Sequence.cpp

@@ -1,5 +1,5 @@
 ////////////////////////////////////////////////////////////////////////////////
-// task - a command line task list manager.
+// taskwarrior - a command line task list manager.
 //
 // Copyright 2006 - 2010, Paul Beckingham.
 // All rights reserved.

src/Sequence.h

@@ -1,5 +1,5 @@
 ////////////////////////////////////////////////////////////////////////////////
-// task - a command line task list manager.
+// taskwarrior - a command line task list manager.
 //
 // Copyright 2006 - 2010, Paul Beckingham.
 // All rights reserved.

src/StringTable.cpp

@@ -1,5 +1,5 @@
 ////////////////////////////////////////////////////////////////////////////////
-// task - a command line task list manager.
+// taskwarrior - a command line task list manager.
 //
 // Copyright 2006 - 2010, Paul Beckingham.
 // All rights reserved.

src/StringTable.h

@@ -1,5 +1,5 @@
 ////////////////////////////////////////////////////////////////////////////////
-// task - a command line task list manager.
+// taskwarrior - a command line task list manager.
 //
 // Copyright 2006 - 2010, Paul Beckingham.
 // All rights reserved.

src/Subst.cpp

@@ -1,5 +1,5 @@
 ////////////////////////////////////////////////////////////////////////////////
-// task - a command line task list manager.
+// taskwarrior - a command line task list manager.
 //
 // Copyright 2006 - 2010, Paul Beckingham.
 // All rights reserved.

src/Subst.h

@@ -1,5 +1,5 @@
 ////////////////////////////////////////////////////////////////////////////////
-// task - a command line task list manager.
+// taskwarrior - a command line task list manager.
 //
 // Copyright 2006 - 2010, Paul Beckingham.
 // All rights reserved.

src/TDB.cpp

@@ -1,5 +1,5 @@
 ////////////////////////////////////////////////////////////////////////////////
-// task - a command line task list manager.
+// taskwarrior - a command line task list manager.
 //
 // Copyright 2006 - 2010, Paul Beckingham.
 // All rights reserved.
@@ -1261,7 +1261,7 @@ void TDB::merge (const std::string& mergeFile)
               DEBUG_STR ("    scanning right side");
               if (tmod_r > tmod_l)
                 mods.push_front (tmod_r);
-              
+
               std::list<Taskmod>::iterator tmp_it = rmod_rit.base ();
               rmods.erase (--tmp_it);
               rmod_rit--;

src/TDB.h

@@ -1,5 +1,5 @@
 ////////////////////////////////////////////////////////////////////////////////
-// task - a command line task list manager.
+// taskwarrior - a command line task list manager.
 //
 // Copyright 2006 - 2010, Paul Beckingham.
 // All rights reserved.

src/Table.cpp

@@ -1,5 +1,5 @@
 ////////////////////////////////////////////////////////////////////////////////
-// task - a command line task list manager.
+// taskwarrior - a command line task list manager.
 //
 // Copyright 2006 - 2010, Paul Beckingham.
 // All rights reserved.

src/Table.h

@@ -1,5 +1,5 @@
 ////////////////////////////////////////////////////////////////////////////////
-// task - a command line task list manager.
+// taskwarrior - a command line task list manager.
 //
 // Copyright 2006 - 2010, Paul Beckingham.
 // All rights reserved.

src/Task.cpp

@@ -1,5 +1,5 @@
 ////////////////////////////////////////////////////////////////////////////////
-// task - a command line task list manager.
+// taskwarrior - a command line task list manager.
 //
 // Copyright 2006 - 2010, Paul Beckingham, Federico Hernandez.
 // All rights reserved.
@@ -164,7 +164,7 @@ void Task::legacyParse (const std::string& line)
   {
   // File format version 1, from 2006.11.27 - 2007.12.31
   case 1:
-    throw std::string ("Task no longer supports file format 1, originally used "
+    throw std::string ("Taskwarrior no longer supports file format 1, originally used "
                        "between 27 November 2006 and 31 December 2007.");  // TODO i18n
     break;
 
@@ -328,7 +328,7 @@ void Task::legacyParse (const std::string& line)
     break;
 
   default:
-    throw std::string ("Unrecognized task file format."); // TODO i18n
+    throw std::string ("Unrecognized taskwarrior file format."); // TODO i18n
     break;
   }
 }

src/Task.h

@@ -1,5 +1,5 @@
 ////////////////////////////////////////////////////////////////////////////////
-// task - a command line task list manager.
+// taskwarrior - a command line task list manager.
 //
 // Copyright 2006 - 2010, Paul Beckingham, Federico Hernandez.
 // All rights reserved.

src/Taskmod.cpp

@@ -1,5 +1,5 @@
 ////////////////////////////////////////////////////////////////////////////////
-// task - a command line task list manager.
+// taskwarrior - a command line task list manager.
 //
 // Copyright 2006 - 2010, Paul Beckingham, Johannes Schlatow.
 // All rights reserved.

src/Taskmod.h

@@ -1,5 +1,5 @@
 ////////////////////////////////////////////////////////////////////////////////
-// task - a command line task list manager.
+// taskwarrior - a command line task list manager.
 //
 // Copyright 2006 - 2010, Paul Beckingham, Johannes Schlatow.
 // All rights reserved.

src/Timer.cpp

@@ -1,5 +1,5 @@
 ////////////////////////////////////////////////////////////////////////////////
-// task - a command line task list manager.
+// taskwarrior - a command line task list manager.
 //
 // Copyright 2006 - 2010, Paul Beckingham.
 // All rights reserved.

src/Timer.h

@@ -1,5 +1,5 @@
 ////////////////////////////////////////////////////////////////////////////////
-// task - a command line task list manager.
+// taskwarrior - a command line task list manager.
 //
 // Copyright 2006 - 2010, Paul Beckingham.
 // All rights reserved.

src/command.cpp

@@ -1,5 +1,5 @@
 ////////////////////////////////////////////////////////////////////////////////
-// task - a command line task list manager.
+// taskwarrior - a command line task list manager.
 //
 // Copyright 2006 - 2010, Paul Beckingham, Federico Hernandez.
 // All rights reserved.
@@ -626,8 +626,8 @@ int handleVersion (std::string &outs)
     disclaimer.setColumnWidth (0, Table::flexible);
     disclaimer.setColumnJustification (0, Table::left);
     disclaimer.addCell (disclaimer.addRow (), 0,
-        "Task may be copied only under the terms of the GNU General Public "
+        "Taskwarrior may be copied only under the terms of the GNU General Public "
-        "License, which may be found in the task source kit.");
+        "License, which may be found in the taskwarrior source kit.");
 
     // Create a table for the URL.
     Table link;
@@ -636,7 +636,7 @@ int handleVersion (std::string &outs)
     link.setColumnWidth (0, Table::flexible);
     link.setColumnJustification (0, Table::left);
     link.addCell (link.addRow (), 0,
-      "Documentation for task can be found using 'man task', 'man taskrc', "
+      "Documentation for taskwarrior can be found using 'man task', 'man taskrc', "
       "'man task-tutorial', 'man task-color', 'man task-faq' or at "
       "http://taskwarrior.org");
 

src/custom.cpp

@@ -1,5 +1,5 @@
 ////////////////////////////////////////////////////////////////////////////////
-// task - a command line task list manager.
+// taskwarrior - a command line task list manager.
 //
 // Copyright 2006 - 2010, Paul Beckingham.
 // All rights reserved.

src/dependency.cpp

@@ -1,5 +1,5 @@
 ////////////////////////////////////////////////////////////////////////////////
-// task - a command line task list manager.
+// taskwarrior - a command line task list manager.
 //
 // Copyright 2006 - 2010, Paul Beckingham, Federico Hernandez.
 // All rights reserved.

src/edit.cpp

@@ -1,5 +1,5 @@
 ////////////////////////////////////////////////////////////////////////////////
-// task - a command line task list manager.
+// taskwarrior - a command line task list manager.
 //
 // Copyright 2006 - 2010, Paul Beckingham.
 // All rights reserved.
@@ -115,17 +115,17 @@ static std::string formatTask (Task task)
   before << "# The 'task edit <id>' command allows you to modify all aspects of a task" << std::endl
          << "# using a text editor.  What is shown below is a representation of the"    << std::endl
          << "# task in all it's detail.  Modify what you wish, and if you save and"     << std::endl
-         << "# quit your editor, task will read this file and try to make sense of"     << std::endl
+         << "# quit your editor, taskwarrior will read this file and try to make sense" << std::endl
-         << "# what changed, and apply those changes.  If you quit your editor without" << std::endl
+         << "# of what changed, and apply those changes.  If you quit your editor"      << std::endl
-         << "# saving or making any modifications, task will do nothing."               << std::endl
+         << "# without saving or making any modifications, taskwarrior will do nothing."<< std::endl
          << "#"                                                                         << std::endl
          << "# Lines that begin with # represent data you cannot change, like ID."      << std::endl
-         << "# If you get too 'creative' with your editing, task will dump you back "   << std::endl
+         << "# If you get too 'creative' with your editing, taskwarrior will dump you"  << std::endl
-         << "# into the editor to try again."                                           << std::endl
+         << "# back into the editor to try again."                                      << std::endl
          << "#"                                                                         << std::endl
          << "# Should you find yourself in an endless Groundhog Day loop, editing and"  << std::endl
          << "# editing the same file, just quit the editor without making any changes." << std::endl
-         << "# Task will notice this and stop the editing."                             << std::endl
+         << "# Taskwarrior will notice this and stop the editing."                      << std::endl
          << "#"                                                                         << std::endl
          << "# Name               Editable details"                                     << std::endl
          << "# -----------------  ----------------------------------------------------" << std::endl
@@ -590,7 +590,7 @@ ARE_THESE_REALLY_HARMFUL:
       before = after;
       File::write (file.str (), before);
 
-      if (confirm ("Task couldn't handle your edits.  Would you like to try again?"))
+      if (confirm ("Taskwarrior couldn't handle your edits.  Would you like to try again?"))
         goto ARE_THESE_REALLY_HARMFUL;
     }
   }

src/export.cpp

@@ -1,5 +1,5 @@
 ////////////////////////////////////////////////////////////////////////////////
-// task - a command line task list manager.
+// taskwarrior - a command line task list manager.
 //
 // Copyright 2006 - 2010, Paul Beckingham, Federico Hernandez.
 // All rights reserved.

src/i18n.h

@@ -1,5 +1,5 @@
 ////////////////////////////////////////////////////////////////////////////////
-// task - a command line task list manager.
+// taskwarrior - a command line task list manager.
 //
 // Copyright 2006 - 2010, Paul Beckingham.
 // All rights reserved.

src/import.cpp

@@ -1,5 +1,5 @@
 ////////////////////////////////////////////////////////////////////////////////
-// task - a command line task list manager.
+// taskwarrior - a command line task list manager.
 //
 // Copyright 2006 - 2010, Paul Beckingham.
 // All rights reserved.
@@ -1289,23 +1289,23 @@ int handleImport (std::string &outs)
       std::string identifier;
       switch (type)
       {
-      case task_1_4_3:    identifier = "This looks like an older task export file.";              break;
+      case task_1_4_3:    identifier = "This looks like an older taskwarrior export file.";              break;
-      case task_1_5_0:    identifier = "This looks like a recent task export file.";              break;
+      case task_1_5_0:    identifier = "This looks like a recent taskwarrior export file.";              break;
-      case task_1_6_0:    identifier = "This looks like a current task export file.";             break;
+      case task_1_6_0:    identifier = "This looks like a current taskwarrior export file.";             break;
-      case task_cmd_line: identifier = "This looks like task command line arguments.";            break;
+      case task_cmd_line: identifier = "This looks like taskwarrior command line arguments.";            break;
-      case todo_sh_2_0:   identifier = "This looks like a todo.sh 2.x file.";                     break;
+      case todo_sh_2_0:   identifier = "This looks like a todo.sh 2.x file.";                            break;
-      case csv:           identifier = "This looks like a CSV file, but not a task export file."; break;
+      case csv:           identifier = "This looks like a CSV file, but not a taskwarrior export file."; break;
-      case yaml:          identifier = "This looks like a YAML file.";                            break;
+      case yaml:          identifier = "This looks like a YAML file.";                                   break;
-      case text:          identifier = "This looks like a text file with one task per line.";     break;
+      case text:          identifier = "This looks like a text file with one task per line.";            break;
       case not_a_clue:
-        throw std::string ("Task cannot determine which type of file this is, "
+        throw std::string ("Taskwarrior cannot determine which type of file "
-                           "and cannot proceed.");
+                           "this is, and cannot proceed.");
       }
 
       // For tty users, confirm the import, as it is destructive.
       if (isatty (fileno (stdout)))
         if (! confirm (identifier + "  Okay to proceed?"))
-          throw std::string ("Task will not import any data.");
+          throw std::string ("Taskwarrior will not import any data.");
 
       // Determine which type it might be, then attempt an import.
       switch (type)

src/interactive.cpp

@@ -1,5 +1,5 @@
 ////////////////////////////////////////////////////////////////////////////////
-// task - a command line task list manager.
+// taskwarrior - a command line task list manager.
 //
 // Copyright 2006 - 2010, Paul Beckingham.
 // All rights reserved.
@@ -82,7 +82,7 @@ int Context::interactive ()
   while (command != "quit")
   {
     // Render title.
-    std::string title = "task 2.0.0";
+    std::string title = "taskwarrior 3.0.0";
     while ((int) title.length () < width)
       title += " ";
 
@@ -91,8 +91,8 @@ int Context::interactive ()
 
     bkgdset (COLOR_PAIR (2));
     int line = height / 2;
-    mvprintw (line,     width / 2 - 16, " I n t e r a c t i v e   t a s k ");
+    mvprintw (line,     width / 2 - 24, " I n t e r a c t i v e   t a s k w a r r i o r ");
-    mvprintw (line + 1, width / 2 - 16, "     Coming in version 2.0.0     ");
+    mvprintw (line + 1, width / 2 - 24, "            Coming in version 3.0.0            ");
 
     std::string footer = "Press 'q' to quit.";
     while ((int) footer.length () < width)
@@ -127,8 +127,8 @@ int Context::interactive ()
 #else
 
   throw stringtable.get (INTERACTIVE_NO_NCURSES,
-                         "Interactive task is only available when built with ncurses "
+                         "Interactive taskwarrior is only available when built "
-                         "support.");
+                         "with ncurses support.");
 
 #endif
 }

src/main.cpp

@@ -1,5 +1,5 @@
 ////////////////////////////////////////////////////////////////////////////////
-// task - a command line task list manager.
+// taskwarrior - a command line task list manager.
 //
 // Copyright 2006 - 2010, Paul Beckingham.
 // All rights reserved.