Product Name Change

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

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 "
-        "License, which may be found in the task source kit.");
+        "Taskwarrior may be copied only under the terms of the GNU General Public "
+        "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
-         << "# what changed, and apply those changes.  If you quit your editor without" << std::endl
-         << "# saving or making any modifications, task will do nothing."               << std::endl
+         << "# quit your editor, taskwarrior will read this file and try to make sense" << std::endl
+         << "# of what changed, and apply those changes.  If you quit your editor"      << 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
-         << "# into the editor to try again."                                           << std::endl
+         << "# If you get too 'creative' with your editing, taskwarrior will dump you"  << 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_5_0:    identifier = "This looks like a recent task export file.";              break;
-      case task_1_6_0:    identifier = "This looks like a current task export file.";             break;
-      case task_cmd_line: identifier = "This looks like task command line arguments.";            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 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 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 taskwarrior 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 taskwarrior command line arguments.";            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 taskwarrior export 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 not_a_clue:
-        throw std::string ("Task cannot determine which type of file this is, "
-                           "and cannot proceed.");
+        throw std::string ("Taskwarrior cannot determine which type of file "
+                           "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 + 1, width / 2 - 16, "     Coming in version 2.0.0     ");
+    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 - 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 "
-                         "support.");
+                         "Interactive taskwarrior is only available when built "
+                         "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.

src/main.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/recur.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/report.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.
@@ -250,9 +250,9 @@ int shortUsage (std::string &outs)
   std::stringstream out;
   out << table.render ()
       << std::endl
-      << "Documentation for task can be found using 'man task', 'man taskrc', "
-      << "'man task-tutorial', 'man task-color', 'man task-faq' or at "
-      << "http://taskwarrior.org"
+      << "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"
       << std::endl
       << std::endl;
 
@@ -327,7 +327,7 @@ int longUsage (std::string &outs)
         << "  task add \"quoted ' quote\""                                      << "\n"
         << "  task add escaped \\' quote"                                       << "\n"
         <<                                                                         "\n"
-        << "The argument -- tells task to treat all other args as description." << "\n"
+        << "The argument -- tells taskwarrior to treat all other args as description." << "\n"
         << "  task add -- project:Home needs scheduling"                        << "\n"
         <<                                                                         "\n"
         << "Many characters have special meaning to the shell, including:"      << "\n"

src/rules.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/rx.cpp

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

src/rx.h

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

src/tests/abbreviation.t

@@ -1,6 +1,6 @@
 #! /usr/bin/perl
 ################################################################################
-## task - a command line task list manager.
+## taskwarrior - a command line task list manager.
 ##
 ## Copyright 2006 - 2010, Paul Beckingham.
 ## All rights reserved.
@@ -68,25 +68,25 @@ unlike ($output, qr/\bwithout\b/, 'pri:H without');
 
 # Test the version command abbreviations.
 $output = qx{../task rc:abbrev.rc version};
-like ($output, qr/GNU General Public License/, 'version');
+like ($output, qr/GNU\s+General\s+Public\s+License/, 'version');
 
 $output = qx{../task rc:abbrev.rc versio};
-like ($output, qr/GNU General Public License/, 'versio');
+like ($output, qr/GNU\s+General\s+Public\s+License/, 'versio');
 
 $output = qx{../task rc:abbrev.rc versi};
-like ($output, qr/GNU General Public License/, 'versi');
+like ($output, qr/GNU\s+General\s+Public\s+License/, 'versi');
 
 $output = qx{../task rc:abbrev.rc vers};
-like ($output, qr/GNU General Public License/, 'vers');
+like ($output, qr/GNU\s+General\s+Public\s+License/, 'vers');
 
 $output = qx{../task rc:abbrev.rc ver};
-like ($output, qr/GNU General Public License/, 'ver');
+like ($output, qr/GNU\s+General\s+Public\s+License/, 'ver');
 
 $output = qx{../task rc:abbrev.rc ve};
-like ($output, qr/GNU General Public License/, 've');
+like ($output, qr/GNU\s+General\s+Public\s+License/, 've');
 
 $output = qx{../task rc:abbrev.rc v};
-like ($output, qr/GNU General Public License/, 'v');
+like ($output, qr/GNU\s+General\s+Public\s+License/, 'v');
 
 # Cleanup.
 unlink 'pending.data';

src/tests/add.t

@@ -1,6 +1,6 @@
 #! /usr/bin/perl
 ################################################################################
-## task - a command line task list manager.
+## taskwarrior - a command line task list manager.
 ##
 ## Copyright 2006 - 2010, Paul Beckingham.
 ## All rights reserved.

src/tests/alias.t

@@ -1,6 +1,6 @@
 #! /usr/bin/perl
 ################################################################################
-## task - a command line task list manager.
+## taskwarrior - a command line task list manager.
 ##
 ## Copyright 2006 - 2010, Paul Beckingham.
 ## All rights reserved.

src/tests/annotate.t

@@ -1,6 +1,6 @@
 #! /usr/bin/perl
 ################################################################################
-## task - a command line task list manager.
+## taskwarrior - a command line task list manager.
 ##
 ## Copyright 2006 - 2010, Paul Beckingham.
 ## All rights reserved.

src/tests/append.t

@@ -1,6 +1,6 @@
 #! /usr/bin/perl
 ################################################################################
-## task - a command line task list manager.
+## taskwarrior - a command line task list manager.
 ##
 ## Copyright 2006 - 2010, Paul Beckingham.
 ## All rights reserved.

src/tests/args.t

@@ -1,6 +1,6 @@
 #! /usr/bin/perl
 ################################################################################
-## task - a command line task list manager.
+## taskwarrior - a command line task list manager.
 ##
 ## Copyright 2006 - 2010, Paul Beckingham.
 ## All rights reserved.

src/tests/att.t.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/tests/autocomplete.t.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/tests/basic.t

@@ -1,6 +1,6 @@
 #! /usr/bin/perl
 ################################################################################
-## task - a command line task list manager.
+## taskwarrior - a command line task list manager.
 ##
 ## Copyright 2006 - 2010, Paul Beckingham.
 ## All rights reserved.
@@ -49,7 +49,7 @@ like ($output, qr/You must specify a command, or a task ID to modify/m, 'missing
 # Test the version command.
 $output = qx{../task rc:basic.rc version};
 like ($output, qr/task $version/, 'version - task version number');
-like ($output, qr/GNU General Public License/, 'version - license');
+like ($output, qr/GNU\s+General\s+Public\s+License/, 'version - license');
 like ($output, qr/http:\/\/taskwarrior\.org/, 'version - url');
 
 # Test the _version command.

src/tests/benchmark.t

@@ -1,6 +1,6 @@
 #! /usr/bin/perl
 ################################################################################
-## task - a command line task list manager.
+## taskwarrior - a command line task list manager.
 ##
 ## Copyright 2006 - 2010, Paul Beckingham.
 ## All rights reserved.

src/tests/benchmark2.t

@@ -1,6 +1,6 @@
 #! /usr/bin/perl
 ################################################################################
-## task - a command line task list manager.
+## taskwarrior - a command line task list manager.
 ##
 ## Copyright 2006 - 2010, Paul Beckingham.
 ## All rights reserved.

src/tests/bug.299.t

@@ -1,6 +1,6 @@
 #! /usr/bin/perl
 ################################################################################
-## task - a command line task list manager.
+## taskwarrior - a command line task list manager.
 ##
 ## Copyright 2006 - 2010, Paul Beckingham.
 ## All rights reserved.

src/tests/bug.327.t

@@ -1,6 +1,6 @@
 #! /usr/bin/perl
 ################################################################################
-## task - a command line task list manager.
+## taskwarrior - a command line task list manager.
 ##
 ## Copyright 2006 - 2010, Paul Beckingham.
 ## All rights reserved.

src/tests/bug.360.t

@@ -1,6 +1,6 @@
 #! /usr/bin/perl
 ################################################################################
-## task - a command line task list manager.
+## taskwarrior - a command line task list manager.
 ##
 ## Copyright 2006 - 2010, Paul Beckingham.
 ## All rights reserved.

src/tests/bug.368.t

@@ -1,6 +1,6 @@
 #! /usr/bin/perl
 ################################################################################
-## task - a command line task list manager.
+## taskwarrior - a command line task list manager.
 ##
 ## Copyright 2006 - 2010, Paul Beckingham.
 ## All rights reserved.

src/tests/bug.414.t

@@ -1,6 +1,6 @@
 #! /usr/bin/perl
 ################################################################################
-## task - a command line task list manager.
+## taskwarrior - a command line task list manager.
 ##
 ## Copyright 2006 - 2010, Paul Beckingham.
 ## All rights reserved.

src/tests/bug.417.t

@@ -1,6 +1,6 @@
 #! /usr/bin/perl
 ################################################################################
-## task - a command line task list manager.
+## taskwarrior - a command line task list manager.
 ##
 ## Copyright 2006 - 2010, Paul Beckingham.
 ## All rights reserved.

src/tests/bug.418.t

@@ -1,6 +1,6 @@
 #! /usr/bin/perl
 ################################################################################
-## task - a command line task list manager.
+## taskwarrior - a command line task list manager.
 ##
 ## Copyright 2006 - 2010, Paul Beckingham.
 ## All rights reserved.

src/tests/bug.425.t

@@ -1,6 +1,6 @@
 #! /usr/bin/perl
 ################################################################################
-## task - a command line task list manager.
+## taskwarrior - a command line task list manager.
 ##
 ## Copyright 2006 - 2010, Paul Beckingham.
 ## All rights reserved.

src/tests/bug.434.t

@@ -1,6 +1,6 @@
 #! /usr/bin/perl
 ################################################################################
-## task - a command line task list manager.
+## taskwarrior - a command line task list manager.
 ##
 ## Copyright 2006 - 2010, Paul Beckingham.
 ## All rights reserved.

src/tests/bug.438.t

@@ -1,6 +1,6 @@
 #! /usr/bin/perl
 ################################################################################
-## task - a command line task list manager.
+## taskwarrior - a command line task list manager.
 ##
 ## Copyright 2006 - 2010, Paul Beckingham.
 ## All rights reserved.

src/tests/bug.440.t

@@ -1,6 +1,6 @@
 #! /usr/bin/perl
 ################################################################################
-## task - a command line task list manager.
+## taskwarrior - a command line task list manager.
 ##
 ## Copyright 2006 - 2010, Paul Beckingham.
 ## All rights reserved.

src/tests/bug.441.t

@@ -1,6 +1,6 @@
 #! /usr/bin/perl
 ################################################################################
-## task - a command line task list manager.
+## taskwarrior - a command line task list manager.
 ##
 ## Copyright 2006 - 2010, Paul Beckingham.
 ## All rights reserved.

src/tests/bug.455.t

@@ -1,6 +1,6 @@
 #! /usr/bin/perl
 ################################################################################
-## task - a command line task list manager.
+## taskwarrior - a command line task list manager.
 ##
 ## Copyright 2006 - 2010, Paul Beckingham.
 ## All rights reserved.

src/tests/bug.466.t

@@ -1,6 +1,6 @@
 #! /usr/bin/perl
 ################################################################################
-## task - a command line task list manager.
+## taskwarrior - a command line task list manager.
 ##
 ## Copyright 2006 - 2010, Paul Beckingham.
 ## All rights reserved.

src/tests/bug.annotate.t

@@ -1,6 +1,6 @@
 #! /usr/bin/perl
 ################################################################################
-## task - a command line task list manager.
+## taskwarrior - a command line task list manager.
 ##
 ## Copyright 2006 - 2010, Paul Beckingham.
 ## All rights reserved.

src/tests/bug.annual.t

@@ -1,6 +1,6 @@
 #! /usr/bin/perl
 ################################################################################
-## task - a command line task list manager.
+## taskwarrior - a command line task list manager.
 ##
 ## Copyright 2006 - 2010, Paul Beckingham.
 ## All rights reserved.

src/tests/bug.before.t

@@ -1,6 +1,6 @@
 #! /usr/bin/perl
 ################################################################################
-## task - a command line task list manager.
+## taskwarrior - a command line task list manager.
 ##
 ## Copyright 2006 - 2010, Paul Beckingham.
 ## All rights reserved.

src/tests/bug.bulk.t

@@ -1,6 +1,6 @@
 #! /usr/bin/perl
 ################################################################################
-## task - a command line task list manager.
+## taskwarrior - a command line task list manager.
 ##
 ## Copyright 2006 - 2010, Paul Beckingham.
 ## All rights reserved.