Documentation Update

- Fixed typo in copyright.
- Added new feature to NEWS file.
- Added 'merge.autopush' as a valid configuration variable.
This commit is contained in:
Paul Beckingham 2010-09-01 22:39:37 -04:00
parent 4d46be0767
commit 04ddf74a07
4 changed files with 11 additions and 4 deletions

View file

@ -1,7 +1,7 @@
////////////////////////////////////////////////////////////////////////////////
// taskwarrior - a command line task list manager.
//
// Copyright 2006 - 2010, Paul Beckingham, Johannes Schlatow.
// Copyright 2010, Johannes Schlatow.
// All rights reserved.
//
// This program is free software; you can redistribute it and/or modify it under

View file

@ -1,7 +1,7 @@
////////////////////////////////////////////////////////////////////////////////
// taskwarrior - a command line task list manager.
//
// Copyright 2006 - 2010, Paul Beckingham, Johannes Schlatow.
// Copyright 2010, Johannes Schlatow.
// All rights reserved.
//
// This program is free software; you can redistribute it and/or modify it under

View file

@ -204,9 +204,13 @@ int shortUsage (std::string &outs)
table.addCell (row, 2, "Lists all tasks in CSV format. Alias to export.csv");
row = table.addRow ();
table.addCell (row, 1, "task merge FILE");
table.addCell (row, 1, "task merge URL");
table.addCell (row, 2, "Merges the specified undo.data file with the local data files.");
row = table.addRow ();
table.addCell (row, 1, "task push URL");
table.addCell (row, 2, "Pushes the local undo.data files to the URL.");
row = table.addRow ();
table.addCell (row, 1, "task export.ical");
table.addCell (row, 2, "Lists all tasks in iCalendar format.");