From 984bc8570d38bab903dbff1c002d7c6eb9ac0a85 Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@kitenet.net>
Date: Sat, 20 Apr 2013 20:23:11 -0400
Subject: [PATCH] improve usage messages

---
 Command/Help.hs   | 6 ++++--
 Command/Status.hs | 2 +-
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/Command/Help.hs b/Command/Help.hs
index 5762982269..7852201e8c 100644
--- a/Command/Help.hs
+++ b/Command/Help.hs
@@ -42,7 +42,7 @@ showCommonOptions = putStrLn $ usageInfo "Common options:" options
 
 showGeneralHelp :: IO ()
 showGeneralHelp = putStrLn $ unlines
-	[ "The most commonly used git-annex commands are:"
+	[ "The most frequently used git-annex commands are:"
 	, unlines $ map cmdline $ concat
 		[ Command.Init.def
 		, Command.Add.def
@@ -54,7 +54,9 @@ showGeneralHelp = putStrLn $ unlines
 		, Command.Whereis.def
 		, Command.Fsck.def
 		]
-	, "Run git-annex without any options for a complete command list."
+	, "Run 'git-annex' for a complete command list."
+	, "Run 'git-annex command --help' for help on a specific command."
+	, "Run `git annex help options' for a list of common options."
 	]
   where
 	cmdline c = "\t" ++ cmdname c ++ "\t" ++ cmddesc c
diff --git a/Command/Status.hs b/Command/Status.hs
index 9192202f5a..0009ff0750 100644
--- a/Command/Status.hs
+++ b/Command/Status.hs
@@ -57,7 +57,7 @@ data StatInfo = StatInfo
 type StatState = StateT StatInfo Annex
 
 def :: [Command]
-def = [command "status" (paramOptional paramPaths) seek
+def = [command "status" paramPaths seek
 	SectionQuery "shows status information about the annex"]
 
 seek :: [CommandSeek]