diff --git a/x-pack/elastic-agent/docs/run-elastic-agent-standalone.asciidoc b/x-pack/elastic-agent/docs/run-elastic-agent-standalone.asciidoc
index 1038add7d39a..99b39788305f 100644
--- a/x-pack/elastic-agent/docs/run-elastic-agent-standalone.asciidoc
+++ b/x-pack/elastic-agent/docs/run-elastic-agent-standalone.asciidoc
@@ -4,8 +4,6 @@
 
 beta[]
 
-//TODO: Test standalone on RPM and DEB.
-
 Instead of using {fleet} to manage your {agent}s, you can run agents standalone.
 With standalone mode, you manually configure and manage the agents locally on
 the systems where they are installed. 
@@ -44,7 +42,8 @@ NOTE: The policy generated by {fleet} already contains the correct {es} address
 and port for your setup. If you run everything locally, the address is
 `127.0.0.1:9200`. If you use our
 https://www.elastic.co/cloud/elasticsearch-service[hosted {ess}] on {ecloud},
-you can copy the {es} endpoint URL from the overview page of your deployment.
+you can see the {es} endpoint URL by copying it from the overview page of your
+deployment.
 
 . Modify `ES_USERNAME` and `ES_PASSWORD` in the outputs section of
 `elastic-agent.yml` to use your {es} credentials. For example:
diff --git a/x-pack/elastic-agent/docs/tab-widgets/stop-widget.asciidoc b/x-pack/elastic-agent/docs/tab-widgets/stop-widget.asciidoc
index e652680e9d11..5cf15919291c 100644
--- a/x-pack/elastic-agent/docs/tab-widgets/stop-widget.asciidoc
+++ b/x-pack/elastic-agent/docs/tab-widgets/stop-widget.asciidoc
@@ -3,22 +3,8 @@
   <div role="tablist" aria-label="Stop the agent">
     <button role="tab"
             aria-selected="true"
-            aria-controls="deb-tab-stop"
-            id="deb-stop">
-      DEB
-    </button>
-    <button role="tab"
-            aria-selected="false"
-            aria-controls="rpm-tab-stop"
-            id="rpm-stop"
-            tabindex="-1">
-      RPM
-    </button>
-    <button role="tab"
-            aria-selected="false"
             aria-controls="mac-tab-stop"
-            id="mac-stop"
-            tabindex="-1">
+            id="mac-stop">
       MacOS
     </button>
     <button role="tab"
@@ -35,58 +21,72 @@
             tabindex="-1">
       Windows
     </button>
+    <button role="tab"
+            aria-selected="false"
+            aria-controls="deb-tab-stop"
+            id="deb-stop"
+            tabindex="-1">
+      DEB
+    </button>
+    <button role="tab"
+            aria-selected="false"
+            aria-controls="rpm-tab-stop"
+            id="rpm-stop"
+            tabindex="-1">
+      RPM
+    </button>
   </div>
   <div tabindex="0"
        role="tabpanel"
-       id="deb-tab-stop"
-       aria-labelledby="deb-stop">
+       id="mac-tab-stop"
+       aria-labelledby="mac-stop">
 ++++
 
-include::stop.asciidoc[tag=deb]
+include::stop.asciidoc[tag=mac]
 
 ++++
-  </div> 
+  </div>
   <div tabindex="0"
        role="tabpanel"
-       id="rpm-tab-stop"
-       aria-labelledby="rpm-stop"
+       id="linux-tab-stop"
+       aria-labelledby="linux-stop"
        hidden="">
 ++++
 
-include::stop.asciidoc[tag=rpm]
+include::stop.asciidoc[tag=linux]
 
 ++++
   </div>
   <div tabindex="0"
        role="tabpanel"
-       id="mac-tab-stop"
-       aria-labelledby="mac-stop"
+       id="win-tab-stop"
+       aria-labelledby="win-stop"
        hidden="">
 ++++
 
-include::stop.asciidoc[tag=mac]
+include::stop.asciidoc[tag=win]
 
 ++++
   </div>
   <div tabindex="0"
        role="tabpanel"
-       id="linux-tab-stop"
-       aria-labelledby="linux-stop"
+       id="deb-tab-stop"
+       aria-labelledby="deb-stop"
        hidden="">
 ++++
 
-include::stop.asciidoc[tag=linux]
+include::stop.asciidoc[tag=deb]
 
 ++++
-  </div>
+  </div> 
   <div tabindex="0"
        role="tabpanel"
-       id="win-tab-stop"
-       aria-labelledby="win-stop"
+       id="rpm-tab-stop"
+       aria-labelledby="rpm-stop"
        hidden="">
 ++++
 
-include::stop.asciidoc[tag=win]
+include::stop.asciidoc[tag=rpm]
 
 ++++
   </div>
diff --git a/x-pack/elastic-agent/docs/tab-widgets/stop.asciidoc b/x-pack/elastic-agent/docs/tab-widgets/stop.asciidoc
index 7d1f8f97a3f0..5349985d1212 100644
--- a/x-pack/elastic-agent/docs/tab-widgets/stop.asciidoc
+++ b/x-pack/elastic-agent/docs/tab-widgets/stop.asciidoc
@@ -38,8 +38,9 @@ Get the process ID (PID) of the `elastic-agent` process:
 
 [source,shell]
 ----
-ps | grep elastic-agent
+ps | grep elastic-agent <1>
 ----
+<1> Make sure you list processes as the root user.
 
 Then kill the process, replacing the PID in this example with the PID from
 the grep command:
@@ -49,7 +50,7 @@ the grep command:
 kill -9 90682
 ----
 
-NOTE: {agent} will NOT restart automatically if the system is rebooted.
+NOTE: {agent} will restart automatically if the system is rebooted.
 
 // end::kill-process[]
 // end::mac[]
diff --git a/x-pack/elastic-agent/docs/unenroll-elastic-agent.asciidoc b/x-pack/elastic-agent/docs/unenroll-elastic-agent.asciidoc
index 78c7fab9cf9e..378cc1ee364f 100644
--- a/x-pack/elastic-agent/docs/unenroll-elastic-agent.asciidoc
+++ b/x-pack/elastic-agent/docs/unenroll-elastic-agent.asciidoc
@@ -6,10 +6,10 @@ You can unenroll an agent to invalidate the API key used to connect to {es}.
 
 . In {fleet}, select **Agents**.
 
-. Under Agents, choose **Unenroll** from the **Actions** menu next to the agent
-you want to unenroll.
+. Under Agents, choose **Unenroll agent** from the **Actions** menu next to the
+agent you want to unenroll.
 
-. Click **Unenroll**. 
+. Click **Unenroll agent**. 
 +
 The agent will continue to run, but will not be able to send data. It will show
 this error instead: `invalid api key to authenticate with fleet`.
diff --git a/x-pack/elastic-agent/docs/upgrade-elastic-agent.asciidoc b/x-pack/elastic-agent/docs/upgrade-elastic-agent.asciidoc
index e336992cd595..f53fa9e0a37e 100644
--- a/x-pack/elastic-agent/docs/upgrade-elastic-agent.asciidoc
+++ b/x-pack/elastic-agent/docs/upgrade-elastic-agent.asciidoc
@@ -15,8 +15,6 @@ manage upgrades.
 NOTE: The upgrade feature is not supported for upgrading DEB/RPM packages or
 Docker images. 
 
-//REVIEWERS: Are bulk actions supported in Basic or just Gold?
-
 To upgrade {agent} to a new version:
 
 . In {fleet}, select **Agents**.