diff --git a/examples/src/java/org/pantsbuild/example/from_maven.md b/examples/src/java/org/pantsbuild/example/from_maven.md
index e75a03684ed..76d4665f815 100644
--- a/examples/src/java/org/pantsbuild/example/from_maven.md
+++ b/examples/src/java/org/pantsbuild/example/from_maven.md
@@ -53,11 +53,10 @@ Pants Equivalents
 `run`
 
 `-Xdebug` run a binary in the debugger<br>
-`run.jvm --debug`
+`run.jvm --jvm-debug`
 
 `-Dtest=com.foo.BarSpec -Dmaven.surefire.debug=true test` run one test in the debugger<br>
-`test.junit --debug --test=com.foo.BarSpec` or
-`test.specs --debug --test=com.foo.BarSpec`
+`test.junit --jvm-debug --test=com.foo.BarSpec`
 
 Depending on Source, not Jars
 -----------------------------
diff --git a/examples/src/scala/org/pantsbuild/example/JvmRunExample.scala b/examples/src/scala/org/pantsbuild/example/JvmRunExample.scala
index ef85304a0ce..636607bf964 100644
--- a/examples/src/scala/org/pantsbuild/example/JvmRunExample.scala
+++ b/examples/src/scala/org/pantsbuild/example/JvmRunExample.scala
@@ -4,7 +4,7 @@
 package org.pantsbuild.example
 
 // A simple jvm binary to test the jvm_run task on. Try, e.g.,
-// ./pants -ldebug run --run-jvm-jvm-options='-Dfoo=bar' --run-jvm-args="Foo Bar" \\
+// ./pants -ldebug run --jvm-run-jvm-options='-Dfoo=bar' --jvm-run-jvm-program-args="Foo Bar" \\
 //   examples/src/scala/org/pantsbuild/example:jvm-run-example
 
 
diff --git a/src/docs/first_tutorial.md b/src/docs/first_tutorial.md
index a148f1dee54..885ca1a5827 100644
--- a/src/docs/first_tutorial.md
+++ b/src/docs/first_tutorial.md
@@ -171,32 +171,36 @@ command-line options for that goal. E.g.,
     :::bash
     $ ./pants test -h
 
-    test: Test compiled code.
-
-    test.specs
-      -h, --help              show this help message and exit
-      --jvm-options <option>...
-                              Run the jvm with these extra jvm options. (default: [])
-      --args <arg>...         Run the jvm with these extra program args. (default: [])
-      --[no-]debug            Run the jvm under a debugger. (default: None)
-      --confs _TEST.SPECS_CONFS__
-                              Use only these Ivy configurations of external deps.
-                              (default: [u'default'])
+    cache.test options:
 
+    --[no-]cache-test-read (default: True)
+        Read build artifacts from cache, if available.
+    --[no-]cache-test-write (default: True)
+        Write build artifacts to cache, if available.
+
+    test.go options:
+    Runs `go test` on Go packages.
+
+    --[no-]test-go-remote (default: False)
+        Enables running tests found in go_remote_libraries.
+    --test-go-build-and-test-flags=<str> (default: )
+        Flags to pass in to `go test` tool.
     ...more test options...
 
-    test.pytest
-      -h, --help              show this help message and exit
-      --timeout _TEST.PYTEST_TIMEOUT__
-                              Number of seconds to wait for http connections.
-                              (default: 0)
+    test.junit options:
 
+    --test-junit-confs="['str1','str2',...]" (--test-junit-confs="['str1','str2',...]") ... (default: ['default'])
+        Use only these Ivy configurations of external deps.
+    --[no-]test-junit-skip (default: False)
+        Skip running junit.
+    --[no-]test-junit-fail-fast (default: False)
+        Fail fast on the first test failure in a suite.
 
     ...many more test options...
 
-The `test` goal is made up of parts, or *tasks*: `test.junit`, `test.pytest`, and `test.specs`.
+The `test` goal is made up of parts, or *tasks* such as `test.junit` and `test.pytest`.
 Command-line options apply to those tasks. The goal's help groups options by task. E.g., here, it
-shows the `test.spec` ` --jvm-options` option with `test.specs`.
+shows the `test.go` ` --test-go-build-and-test-flags` option with `test.go`.
 
 For a list of available goals, `./pants goals`.
 
@@ -207,7 +211,7 @@ For help with things that aren't goals (global options, other kinds of help), us
 
 If you want help diagnosing some strange Pants behavior, you might want verbose output.
 To get this, instead of just invoking `./pants`, set some environment variables and request
-more logging: `PEX_VERBOSE=1 PANTS_VERBOSE=1 PYTHON_VERBOSE=1 ./pants -debug`.
+more logging: `PEX_VERBOSE=1 PANTS_VERBOSE=1 ./pants -ldebug`.
 
 BUILD Files
 -----------
diff --git a/src/docs/tshoot.md b/src/docs/tshoot.md
index 9632f675cf5..5c84035d8e4 100644
--- a/src/docs/tshoot.md
+++ b/src/docs/tshoot.md
@@ -52,7 +52,7 @@ stdout, you can set some environment variables and pass the `-ldebug`
 flag (along with the parameters you meant to pass):
 
     :::bash
-    $ PEX_VERBOSE=1 PANTS_VERBOSE=1 PYTHON_VERBOSE=1 ./pants -ldebug ...
+    $ PEX_VERBOSE=1 PANTS_VERBOSE=1 ./pants -ldebug ...
 
 This can be especially useful if you're trying to figure out what Pants
 was "looking at" when it crashed.
diff --git a/testprojects/src/scala/org/pantsbuild/testproject/publish/JvmRunExample.scala b/testprojects/src/scala/org/pantsbuild/testproject/publish/JvmRunExample.scala
index 28c09e4c22a..cb3ed40a699 100644
--- a/testprojects/src/scala/org/pantsbuild/testproject/publish/JvmRunExample.scala
+++ b/testprojects/src/scala/org/pantsbuild/testproject/publish/JvmRunExample.scala
@@ -4,7 +4,7 @@
 package org.pantsbuild.testproject.publish
 
 // A simple jvm binary to test the jvm_run task on. Try, e.g.,
-// ./pants -ldebug run --run-jvm-jvm-options='-Dfoo=bar' --run-jvm-args="Foo Bar" \\
+// ./pants -ldebug run --jvm-run-jvm-options='-Dfoo=bar' --jvm-run-jvm-program-args="Foo Bar" \\
 //   testprojects/src/scala/org/pantsbuild/testproject/publish:jvm-run-example-lib
 
 object JvmRunExample {