Merge branch '1.7.0' into timesheet

This commit is contained in:
Paul Beckingham
2009-05-07 00:44:12 -04:00
37 changed files with 1037 additions and 663 deletions

View File

@@ -230,7 +230,13 @@ static std::string longUsage (Config& conf)
{
std::stringstream out;
out << shortUsage (conf)
<< "ID is the numeric identifier displayed by the 'task list' command." << "\n"
<< "ID is the numeric identifier displayed by the 'task list' command. "
<< "You can specify multiple IDs for task commands, and multiple tasks "
<< "will be affected. To specify multiple IDs make sure you use one "
<< "of these forms:" << "\n"
<< " task delete 1,2,3" << "\n"
<< " task info 1-3" << "\n"
<< " task pri:H 1,2-5,19" << "\n"
<< "\n"
<< "Tags are arbitrary words, any quantity:" << "\n"
<< " +tag The + means add the tag" << "\n"
@@ -339,7 +345,7 @@ int main (int argc, char** argv)
catch (std::string& error)
{
std::cerr << error << std::endl;
std::cout << error << std::endl;
return -1;
}