diff --git a/solr/bin/solr b/solr/bin/solr
index e8d3b005248..b1ccb81693d 100755
--- a/solr/bin/solr
+++ b/solr/bin/solr
@@ -631,7 +631,7 @@ if [[ "$SCRIPT_CMD" == "auth" ]]; then
   exit $?
 fi
 
-# at this point all tools that have a custom run process, like "status" and "auth" have been run and exited.
+# At this point all tools that have a custom run process, like "status" and "auth" have been run and exited.
 # Unless a command is one of the ones in the if clause below, we will just run it with the default run_tool function and then exit.
 if [ "$SCRIPT_CMD" != "start" ] && [ "$SCRIPT_CMD" != "stop" ] && [ "$SCRIPT_CMD" != "restart" ]; then
   # hand off the command to the SolrCLI and let it handle the option parsing and validation
diff --git a/solr/core/src/java/org/apache/solr/cli/SolrCLI.java b/solr/core/src/java/org/apache/solr/cli/SolrCLI.java
index e88b0dada7f..470e491cfef 100755
--- a/solr/core/src/java/org/apache/solr/cli/SolrCLI.java
+++ b/solr/core/src/java/org/apache/solr/cli/SolrCLI.java
@@ -411,14 +411,14 @@ private static void printHelp() {
     print(
         "                                zk ls, zk cp, zk rm , zk mv, zk mkroot, zk upconfig, zk downconfig,");
     print(
-        "                                snapshot-create, snapshot-list, snapshot-delete, snapshot-export, snapshot-prepare-export");
+        "                                snapshot-create, snapshot-list, snapshot-delete, snapshot-export");
     print("");
-    print("  Standalone server example (start Solr running in the background on port 8984):");
+    print("  Start Solr on default port 8983:");
     print("");
-    printGreen("    ./solr start -p 8984");
+    printGreen("    ./solr start");
     print("");
     print(
-        "  SolrCloud example (start Solr running in SolrCloud mode using localhost:2181 to connect to Zookeeper, with 1g max heap size and remote Java debug options enabled):");
+        "  Start Solr connecting to external Zookeeper at localhost:2181, with 1g max heap size and remote Java debug options enabled:");
     print("");
     printGreen(
         "    ./solr start -m 1g -z localhost:2181 --jvm-opts \"-Xdebug -Xrunjdwp:transport=dt_socket,server=y,suspend=n,address=1044\"");
@@ -426,6 +426,10 @@ private static void printHelp() {
     print(
         "  Omit '-z localhost:2181' from the above command if you have defined ZK_HOST in solr.in.sh.");
     print("");
+    print("  Start Solr in User Managed (aka Standalone) mode:");
+    print("");
+    printGreen("    ./solr start --user-managed");
+    print("");
     print("Global Options:");
     print("  -v,  --version           Print version information and quit");
     print("       --verbose           Enable verbose mode");