Merge branch '1.7.1'

Conflicts:
	doc/man5/taskrc.5

ChangeLog

@@ -6,6 +6,8 @@
  + Took the opportunity of a patch release to update the various email
    addresses and URLs in the various documents.
 
+------ old releases ------------------------------
+
 1.7.0 (5/14/2009)
  + Improved the errors when parsing a corrupt or unrecognized pending.data
    or completed.data file (thanks to T. Charles Yun).
@@ -44,8 +46,6 @@
    variable, $VISUAL or $EDITOR environment variable) and allows direct
    editing of all editable task details.
 
------- old releases ------------------------------
-
 1.6.1 (4/24/2009) 1b6faf57c998617024d0348a87b941a5d2ab2249
   + Fixed bug that caused new, first-time .taskrc files to be written without
     including the custom report labels (thanks to P.C. Shyamshankar).

DEVELOPERS

@@ -18,5 +18,5 @@ included.
   color.cpp       Color support functions.
   rules.cpp       Auto-colorization rules.
 
-Please send bugs, patches to task@beckingham.net
+Please send bugs, patches to support@taskwarrior.org
 

Makefile.am

@@ -2,5 +2,5 @@ SUBDIRS = src
 EXTRA_DIST = task_completion.sh doc/man1/task.1 doc/man5/taskrc.5
 man1_MANS = doc/man1/task.1
 man5_MANS = doc/man5/taskrc.5
-otherdir = $(datadir)/doc/task-1.7.0
+otherdir = $(datadir)/doc/task-$(VERSION)
 other_DATA = AUTHORS ChangeLog COPYING INSTALL NEWS README task_completion.sh

doc/man1/task.1

@@ -319,16 +319,14 @@ could be list, ls or long.
 
 .SH EXAMPLES
 
-A small section for examples e.g. some stuff from
+For examples please see the online documentation at
 .br
-http://www.beckingham.net/30second.html
+<http://taskwarrior.org/wiki/taskwarrior/Simple>
-.br
-http://www.beckingham.net/simple.html
 
 .SH FILES
 
 .TP
-~/.taskrc User configuration file.
+~/.taskrc User configuration file - see also taskrc(5).
 
 .TP
 ~/.task The default directory where task stores its data files. The location
@@ -341,7 +339,7 @@ can be configured in the configuration file.
 ~/.task/completed.data The file that contains the completed "done" tasks.
 
 .SH "CREDITS & COPYRIGHTS"
-task was written by P. Beckingham <task@beckingham.net>.
+task was written by P. Beckingham <paul@beckingham.net>.
 .br
 Copyright (C) 2006 \- 2009 P. Beckingham
 
@@ -357,26 +355,18 @@ http://www.gnu.org/licenses/gpl-2.0.txt for more information.
 For more information regarding task, the following may be referenced:
 
 .TP
-<http://www.beckingham.net/task.html>
+The official site at
-The official site.
+<http://taskwarrior.org>
-
-.TP
-<http://groups.google.com/group/taskprogram>
-The official mailing list.
 
 .TP
+The official code repository at
 <http://github.com/pbeckingham/task/>
-The official code repository.
+
+.TP
+You can contact the project by writing an email to
+<support@taskwarrior.org>
 
 .SH REPORTING BUGS
+.TP
 Bugs in task may be reported to the issue-tracker at
-
+<http://taskwarrior.org>
-.RS
-<http://github.com/pbeckingham/task/issues>
-.RE
-
-or to the mailing list at
-
-.RS
-<http://groups.google.com/group/taskprogram>
-.RE

doc/man5/taskrc.5

@@ -294,96 +294,95 @@ The output columns, their labels and the sort order can be set using the corresp
 variables for each report.
 
 .TP
-.B 
+.B
 report.long.description
 Lists all task, all data, matching the specified criteria
 
 .TP
-.B 
+.B
 report.long.labels=ID,Project,Pri,Added,Started,Due,Recur,Age,Tags,Description
 .RE
 .br
-.B 
+.B
 report.long.columns=id,project,priority,entry,start,due,recur,age,tags,description
 .br
-.B 
+.B
 report.long.sort=due+,priority-,project+
 
 .TP
-.B 
+.B
 report.list.description
 Lists all tasks matching the specified criteria
 
 .TP
-.B 
+.B
 report.list.labels=ID,Project,Pri,Due,Active,Age,Description
 .RE
 .br
-.B 
+.B
 report.list.columns=id,project,priority,due,active,age,description
 .br
-.B 
+.B
 report.list.sort=due+,priority-,project+
 
 
 .TP
-.B 
+.B
 report.ls.description
 Minimal listing of all tasks matching the specified criteria
 
 .TP
-.B 
+.B
 report.ls.labels=ID,Project,Pri,Description
 .RE
 .br
-.B 
+.B
 report.ls.columns=id,project,priority,description
 .br
-.B 
+.B
 report.ls.sort=priority-,project+
 
 .TP
-.B 
+.B
 report.newest.description
 Shows the newest tasks
 
 .TP
-.B 
+.B
 report.newest.labels=ID,Project,Pri,Due,Active,Age,Description
 .RE
 .br
-.B 
+.B
 report.newest.columns=id,project,priority,due,active,age,description
 .br
-.B 
+.B
 report.newest.sort=id-
 .br
-.B 
+.B
 report.newest.limit=10
 
 
 .TP
-.B 
+.B
 report.oldest.description
 Shows the oldest tasks
 
 .TP
-.B 
+.B
 report.oldest.labels=ID,Project,Pri,Due,Active,Age,Description
 .RE
 .br
-.B 
+.B
 report.oldest.columns=id,project,priority,due,active,age,description
 .br
-.B 
+.B
 report.oldest.sort=id+
 .br
-.B 
+.B
 report.oldest.limit=10
 
-
 .SH "CREDITS & COPYRIGHTS"
-task was written by P. Beckingham <task@beckingham.net>.
+task was written by P. Beckingham <paul@beckingham.net>.
 .br
 Copyright (C) 2006 \- 2009 P. Beckingham
 
@@ -394,31 +393,23 @@ task is distributed under the GNU General Public License.  See
 http://www.gnu.org/licenses/gpl-2.0.txt for more information.
 
 .SH SEE ALSO
-.BR task (1)
+.BR task(1)
 
 For more information regarding task, the following may be referenced:
 
 .TP
-<http://www.beckingham.net/task.html>
+The official site at
-The official site.
+<http://taskwarrior.org>
-
-.TP
-<http://groups.google.com/group/taskprogram>
-The official mailing list.
 
 .TP
+The official code repository at
 <http://github.com/pbeckingham/task/>
-The official code repository.
+
+.TP
+You can contact the project by writing an email to
+<support@taskwarrior.org>
 
 .SH REPORTING BUGS
+.TP
 Bugs in task may be reported to the issue-tracker at
-
+<http://taskwarrior.org>
-.RS
-<http://github.com/pbeckingham/task/issues>
-.RE
-
-or to the mailing list at
-
-.RS
-<http://groups.google.com/group/taskprogram>
-.RE

src/command.cpp

@@ -290,7 +290,7 @@ std::string handleVersion (Config& conf)
   link.setColumnWidth (0, Table::flexible);
   link.setColumnJustification (0, Table::left);
   link.addCell (link.addRow (), 0,
-    "See http://www.beckingham.net/task.html for the latest releases and a "
+    "See http://taskwarrior.org for the latest releases and a "
     "full tutorial.  New releases containing fixes and enhancements are "
     "made frequently.");
 

src/task.cpp

@@ -224,10 +224,9 @@ static std::string shortUsage (Config& conf)
 
   out << table.render ()
       << std::endl
-      << "See http://www.beckingham.net/task.html for the latest releases and a "
+      << "See http://taskwarrior.org for the latest releases and a "
       << "full tutorial.  New releases containing fixes and enhancements are "
-      << "made frequently.  Join in the discussion of task, present and future, "
+      << "made frequently.  Join in the discussion of task, present and future."
-      << "at http://groups.google.com/group/taskprogram"
       << std::endl
       << std::endl;
 

task_completion.sh

@@ -1,18 +1,39 @@
+# bash completion support for task
 #
-# bash completion support for task 1.7.0-2
+# Copyright 2009 Federico Hernandez
-# Copyright (C) 2009 Federico Hernandez <ultrafredde@gmail.com>
+# All rights reserved.
-# Distributed under the GNU General Public License, version 2.0
+#
+# This script is part of the task 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
+# Foundation; either version 2 of the License, or (at your option) any later
+# version.
+#
+# This program is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+# FOR A PARTICULAR PURPOSE.  See the GNU General Public License for more
+# details.
+#
+# You should have received a copy of the GNU General Public License along with
+# this program; if not, write to the
+#
+#     Free Software Foundation, Inc.,
+#     51 Franklin Street, Fifth Floor,
+#     Boston, MA
+#     02110-1301
+#     USA
 #
 # The routines will do completion of:
 #
 #    *) task subcommands
-#    *) local and remote tag names
+#    *) tag names
 #
 # To use these routines:
 #
-#    1) Copy this file to somewhere (e.g. ~/.task-completion.sh).
+#    1) Copy this file to somewhere (e.g. ~/.bash_completion.d/.task_completion.sh).
 #    2) Added the following line to your .bashrc:
-#        source ~/.task-completion.sh
+#        source ~/.bash_completion.d/task_completion.sh
 #
 #    OR
 #
@@ -21,13 +42,9 @@
 #
 # To submit patches/bug reports:
 #
-#    *) Send them to the mailing list:
+#    *) Go to the projects website at
 #
-#       taskprogram@googlegroups.com
+#       http://taskwarrior.org
-#       
-#    *) CC the all patchesi/bug reports to:
-#
-#       Federico Hernandez <ultrafredde@gmail.com>
 #
 
 _task()