From 8537ddbb5aa1fa6a58f7fdebeff4d7b9d6654020 Mon Sep 17 00:00:00 2001
From: Paul Beckingham <paul@beckingham.net>
Date: Tue, 6 Mar 2012 00:36:37 -0500
Subject: [PATCH] Documentation

- Corrected command usages.
- Corrected help command output.
---
 src/commands/CmdCalendar.cpp |  2 +-
 src/commands/CmdMerge.cpp    |  2 +-
 src/commands/CmdPull.cpp     |  2 +-
 src/commands/CmdPush.cpp     |  2 +-
 src/en-US.h                  | 13 +++++++++----
 5 files changed, 13 insertions(+), 8 deletions(-)

diff --git a/src/commands/CmdCalendar.cpp b/src/commands/CmdCalendar.cpp
index bb417fb87..ea8a351a9 100644
--- a/src/commands/CmdCalendar.cpp
+++ b/src/commands/CmdCalendar.cpp
@@ -44,7 +44,7 @@ extern Context context;
 CmdCalendar::CmdCalendar ()
 {
   _keyword     = "calendar";
-  _usage       = "task          calendar [due|month year|year]";
+  _usage       = "task          calendar [due|<month> <year>|<year>] [y]";
   _description = STRING_CMD_CAL_USAGE;
   _read_only   = true;
   _displays_id = true;
diff --git a/src/commands/CmdMerge.cpp b/src/commands/CmdMerge.cpp
index d9ebc9b46..b0722a800 100644
--- a/src/commands/CmdMerge.cpp
+++ b/src/commands/CmdMerge.cpp
@@ -43,7 +43,7 @@ extern Context context;
 CmdMerge::CmdMerge ()
 {
   _keyword     = "merge";
-  _usage       = "task          merge URL";
+  _usage       = "task          merge <URL>";
   _description = STRING_CMD_MERGE_USAGE;
   _read_only   = false;
   _displays_id = false;
diff --git a/src/commands/CmdPull.cpp b/src/commands/CmdPull.cpp
index daebac322..530f48c49 100644
--- a/src/commands/CmdPull.cpp
+++ b/src/commands/CmdPull.cpp
@@ -42,7 +42,7 @@ extern Context context;
 CmdPull::CmdPull ()
 {
   _keyword     = "pull";
-  _usage       = "task          pull URL";
+  _usage       = "task          pull <URL>";
   _description = STRING_CMD_PULL_USAGE;
   _read_only   = true;
   _displays_id = false;
diff --git a/src/commands/CmdPush.cpp b/src/commands/CmdPush.cpp
index 0666335e2..2a9d49567 100644
--- a/src/commands/CmdPush.cpp
+++ b/src/commands/CmdPush.cpp
@@ -42,7 +42,7 @@ extern Context context;
 CmdPush::CmdPush ()
 {
   _keyword     = "push";
-  _usage       = "task          push URL";
+  _usage       = "task          push <URL>";
   _description = STRING_CMD_PUSH_USAGE;
   _read_only   = true;
   _displays_id = false;
diff --git a/src/en-US.h b/src/en-US.h
index 42657132a..bd218c314 100644
--- a/src/en-US.h
+++ b/src/en-US.h
@@ -833,7 +833,7 @@
   "http://taskwarrior.org\n" \
   "\n" \
   "The general form of commands is:\n" \
-  "  task <filter> <command> <mods>\n" \
+  "  task [<filter>] <command> [<mods>]\n" \
   "\n" \
   "The <filter> consists of zero or more restrictions on which tasks to select, " \
   "such as:\n" \
@@ -895,9 +895,6 @@
   "Alternately algebraic expressions support:\n" \
   "  and  or  xor            Logical operators\n" \
   "  <  <=  =  !=  >=  >     Relational operators\n" \
-  "  +  -                    Addition, subtraction\n" \
-  "  !                       Inversion\n" \
-  "  ~  !~                   Match, no match\n" \
   "  (  )                    Precedence\n" \
   "\n" \
   "  task due.before:eom priority.not:L   list\n" \
@@ -927,6 +924,14 @@
   "  $ ! ' \" ( ) ; \\ ` * ? { } [ ] < > | & % # ~\n" \
   "\n"
 
+/*
+  To be included later, before the 'precendence' line.
+ 
+  "  +  -                    Addition, subtraction\n" \
+  "  !                       Inversion\n" \
+  "  ~  !~                   Match, no match\n" \
+*/
+
 // util
 #define STRING_UTIL_CONFIRM_YN       " (yes/no) "
 #define STRING_UTIL_CONFIRM_YES      "yes"