diff --git a/Library/Homebrew/cmd/--repository.rb b/Library/Homebrew/cmd/--repository.rb
index 2d3f6ba361..3440e25c73 100644
--- a/Library/Homebrew/cmd/--repository.rb
+++ b/Library/Homebrew/cmd/--repository.rb
@@ -8,7 +8,7 @@ module Homebrew
   def __repository_args
     Homebrew::CLI::Parser.new do
       usage_banner <<~EOS
-        `--repository` [<user>`/`<repo>]
+        `--repository`, `--repo` [<user>`/`<repo>]
 
         Display where Homebrew's `.git` directory is located.
 
diff --git a/Library/Homebrew/cmd/analytics.rb b/Library/Homebrew/cmd/analytics.rb
index e34059d4ef..4256e8aca6 100644
--- a/Library/Homebrew/cmd/analytics.rb
+++ b/Library/Homebrew/cmd/analytics.rb
@@ -8,7 +8,7 @@ module Homebrew
   def analytics_args
     Homebrew::CLI::Parser.new do
       usage_banner <<~EOS
-        `analytics` [`on`|`off`|`state`|`regenerate-uuid`]
+        `analytics` [<subcommand>]
 
         If `on` or `off` is passed, turn Homebrew's analytics on or off respectively.
 
diff --git a/Library/Homebrew/cmd/deps.rb b/Library/Homebrew/cmd/deps.rb
index 31190a76ad..19b4cffb32 100644
--- a/Library/Homebrew/cmd/deps.rb
+++ b/Library/Homebrew/cmd/deps.rb
@@ -10,7 +10,7 @@ module Homebrew
   def deps_args
     Homebrew::CLI::Parser.new do
       usage_banner <<~EOS
-        `deps` [<options>] <formula>
+        `deps` [<options>] [<formula>]
 
         Show dependencies for <formula>. Additional options specific to <formula>
         may be appended to the command. When given multiple formula arguments,
diff --git a/Library/Homebrew/cmd/link.rb b/Library/Homebrew/cmd/link.rb
index 5987b74623..0e9890563d 100644
--- a/Library/Homebrew/cmd/link.rb
+++ b/Library/Homebrew/cmd/link.rb
@@ -10,7 +10,7 @@ module Homebrew
   def link_args
     Homebrew::CLI::Parser.new do
       usage_banner <<~EOS
-        `ln`, `link` [<options>] <formula>
+        `link`, `ln` [<options>] <formula>
 
         Symlink all of <formula>'s installed files into the Homebrew prefix. This
         is done automatically when you install formulae but can be useful for DIY
diff --git a/Library/Homebrew/cmd/list.rb b/Library/Homebrew/cmd/list.rb
index 57f4a7cd59..09aa8b3a96 100644
--- a/Library/Homebrew/cmd/list.rb
+++ b/Library/Homebrew/cmd/list.rb
@@ -10,7 +10,7 @@ module Homebrew
   def list_args
     Homebrew::CLI::Parser.new do
       usage_banner <<~EOS
-        `list`, `ls` [<options>]
+        `list`, `ls` [<options>] [<formula>]
 
         List all installed formulae.
       EOS
diff --git a/Library/Homebrew/cmd/log.rb b/Library/Homebrew/cmd/log.rb
index ec315bd1b7..dffa41b083 100644
--- a/Library/Homebrew/cmd/log.rb
+++ b/Library/Homebrew/cmd/log.rb
@@ -9,7 +9,7 @@ module Homebrew
   def log_args
     Homebrew::CLI::Parser.new do
       usage_banner <<~EOS
-        `log` [<options>] <formula>
+        `log` [<options>] [<formula>]
 
         Show the `git log` for the given <formula>.
       EOS
diff --git a/Library/Homebrew/cmd/missing.rb b/Library/Homebrew/cmd/missing.rb
index 217060ec52..6bf68e1434 100644
--- a/Library/Homebrew/cmd/missing.rb
+++ b/Library/Homebrew/cmd/missing.rb
@@ -11,7 +11,7 @@ module Homebrew
   def missing_args
     Homebrew::CLI::Parser.new do
       usage_banner <<~EOS
-        `missing` [<options>] [<formulae>]
+        `missing` [<options>] [<formula>]
 
         Check the given <formula> for missing dependencies. If no <formula> are
         given, check all installed brews.
diff --git a/Library/Homebrew/cmd/options.rb b/Library/Homebrew/cmd/options.rb
index 979e425686..47016cb33b 100644
--- a/Library/Homebrew/cmd/options.rb
+++ b/Library/Homebrew/cmd/options.rb
@@ -10,7 +10,7 @@ module Homebrew
   def options_args
     Homebrew::CLI::Parser.new do
       usage_banner <<~EOS
-        `options` [<options>] <formula>
+        `options` [<options>] [<formula>]
 
         Display install options specific to <formula>.
       EOS
diff --git a/Library/Homebrew/cmd/update-report.rb b/Library/Homebrew/cmd/update-report.rb
index 60c90f9052..725a3ce8ff 100644
--- a/Library/Homebrew/cmd/update-report.rb
+++ b/Library/Homebrew/cmd/update-report.rb
@@ -21,7 +21,7 @@ module Homebrew
   def update_report_args
     Homebrew::CLI::Parser.new do
       usage_banner <<~EOS
-        `update_report` [`--preinstall`]
+        `update-report`
 
         The Ruby implementation of `brew update`. Never called manually.
       EOS
diff --git a/Library/Homebrew/cmd/update.sh b/Library/Homebrew/cmd/update.sh
index daa01c8e95..d855d3ec0e 100644
--- a/Library/Homebrew/cmd/update.sh
+++ b/Library/Homebrew/cmd/update.sh
@@ -1,4 +1,4 @@
-#:  * `update` [<options>]
+#:  * `update`, `up` [<options>]
 #:
 #:  Fetch the newest version of Homebrew and all formulae from GitHub using `git`(1) and perform any necessary migrations.
 #:
diff --git a/Library/Homebrew/cmd/upgrade.rb b/Library/Homebrew/cmd/upgrade.rb
index 1f59c25722..b53cc784bf 100644
--- a/Library/Homebrew/cmd/upgrade.rb
+++ b/Library/Homebrew/cmd/upgrade.rb
@@ -14,7 +14,7 @@ module Homebrew
   def upgrade_args
     Homebrew::CLI::Parser.new do
       usage_banner <<~EOS
-        `upgrade` [<options>] <formula>
+        `upgrade` [<options>] [<formula>]
 
         Upgrade outdated, unpinned formulae (with existing and any appended brew formula options).
 
diff --git a/Library/Homebrew/dev-cmd/audit.rb b/Library/Homebrew/dev-cmd/audit.rb
index f6d99f555a..7729f752a1 100644
--- a/Library/Homebrew/dev-cmd/audit.rb
+++ b/Library/Homebrew/dev-cmd/audit.rb
@@ -18,7 +18,7 @@ module Homebrew
   def audit_args
     Homebrew::CLI::Parser.new do
       usage_banner <<~EOS
-        `audit` [<options>] <formula>
+        `audit` [<options>] [<formula>]
 
         Check <formula> for Homebrew coding style violations. This should be run before
         submitting a new formula. Will exit with a non-zero status if any errors are
diff --git a/Library/Homebrew/dev-cmd/bump-revision.rb b/Library/Homebrew/dev-cmd/bump-revision.rb
index 94f9776ee4..73c0d06655 100644
--- a/Library/Homebrew/dev-cmd/bump-revision.rb
+++ b/Library/Homebrew/dev-cmd/bump-revision.rb
@@ -9,7 +9,7 @@ module Homebrew
   def bump_revision_args
     Homebrew::CLI::Parser.new do
       usage_banner <<~EOS
-        `bump-revision` [<options>] [<formula>]
+        `bump-revision` [<options>] <formula>
 
         Create a commit to increment the revision of <formula>. If no revision is
         present, "revision 1" will be added.
diff --git a/Library/Homebrew/dev-cmd/ruby.rb b/Library/Homebrew/dev-cmd/ruby.rb
index 68a44f7645..532ef3c4bd 100644
--- a/Library/Homebrew/dev-cmd/ruby.rb
+++ b/Library/Homebrew/dev-cmd/ruby.rb
@@ -8,7 +8,7 @@ module Homebrew
   def ruby_args
     Homebrew::CLI::Parser.new do
       usage_banner <<~EOS
-        `ruby` [`-e`]
+        `ruby` (`-e` <text>|<file>)
 
         Run a Ruby instance with Homebrew's libraries loaded, e.g.
         `brew ruby -e "puts :gcc.f.deps"` or `brew ruby script.rb`.