From f99200ae83717d9083ff24147539adcbb9078e84 Mon Sep 17 00:00:00 2001
From: Mohit Kumar <52292512+Mohit0233@users.noreply.github.com>
Date: Wed, 20 Nov 2024 14:21:05 +0000
Subject: [PATCH 1/4] backport of commit
 99ca1833057c3abe12b8f608010ed5045654b94d

---
 website/content/docs/api-clients/client-agent.mdx | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/website/content/docs/api-clients/client-agent.mdx b/website/content/docs/api-clients/client-agent.mdx
index 31572a360b..ff9c472e85 100644
--- a/website/content/docs/api-clients/client-agent.mdx
+++ b/website/content/docs/api-clients/client-agent.mdx
@@ -277,6 +277,14 @@ If you want to disable the Boundary Client Agent, you can stop it with the follo
 $ sudo launchctl stop com.hashicorp.boundary.boundary-client-agent
 ```
 
+<Note>
+
+Stopping the Boundary client agent using `launchctl stop` only halts it temporarily, as the `StartInterval` setting causes it to restart automatically after 60 seconds.
+
+**To disable it permanently**, you must unload the service using `launchctl unload`. Unloading not only stops the agent but also removes its configuration from `launchd`. To restart the agent after unloading, you must reload it using `launchctl load`, as the `start` command will not work in this case.
+
+</Note>
+
 </Tab>
 <Tab heading="Windows" group="windows">
 

From a3a3de397d8da20f6e6c5cf28c1090a36778f633 Mon Sep 17 00:00:00 2001
From: Mohit Kumar <52292512+Mohit0233@users.noreply.github.com>
Date: Tue, 26 Nov 2024 05:48:54 +0000
Subject: [PATCH 2/4] backport of commit
 fb397b9a3e4a5b5e3e4b232d51ea83a3d478cefb

---
 website/content/docs/api-clients/client-agent.mdx | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/website/content/docs/api-clients/client-agent.mdx b/website/content/docs/api-clients/client-agent.mdx
index ff9c472e85..d02928bba4 100644
--- a/website/content/docs/api-clients/client-agent.mdx
+++ b/website/content/docs/api-clients/client-agent.mdx
@@ -274,14 +274,12 @@ If you want to disable the Boundary Client Agent, you can stop it with the follo
 <Tab heading="MacOS" group="macos">
 
 ```shell-session
-$ sudo launchctl stop com.hashicorp.boundary.boundary-client-agent
+$ sudo launchctl unload -w /Library/LaunchDaemons/com.hashicorp.boundary.boundary-client-agent.plist
 ```
 
 <Note>
 
-Stopping the Boundary client agent using `launchctl stop` only halts it temporarily, as the `StartInterval` setting causes it to restart automatically after 60 seconds.
-
-**To disable it permanently**, you must unload the service using `launchctl unload`. Unloading not only stops the agent but also removes its configuration from `launchd`. To restart the agent after unloading, you must reload it using `launchctl load`, as the `start` command will not work in this case.
+Unloading the Boundary client agent removes its launch daemon configuration. To restart the agent, use `sudo launchctl load ...`
 
 </Note>
 

From bf15f5bc257e75212152fb6b0acacaa0db596688 Mon Sep 17 00:00:00 2001
From: Mohit Kumar <52292512+Mohit0233@users.noreply.github.com>
Date: Wed, 4 Dec 2024 17:48:37 +0000
Subject: [PATCH 3/4] backport of commit
 30c253fec927108c10ae2406c97ad464db3984e3

---
 website/content/docs/api-clients/client-agent.mdx | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/website/content/docs/api-clients/client-agent.mdx b/website/content/docs/api-clients/client-agent.mdx
index d02928bba4..ea2849147d 100644
--- a/website/content/docs/api-clients/client-agent.mdx
+++ b/website/content/docs/api-clients/client-agent.mdx
@@ -277,11 +277,11 @@ If you want to disable the Boundary Client Agent, you can stop it with the follo
 $ sudo launchctl unload -w /Library/LaunchDaemons/com.hashicorp.boundary.boundary-client-agent.plist
 ```
 
-<Note>
-
-Unloading the Boundary client agent removes its launch daemon configuration. To restart the agent, use `sudo launchctl load ...`
+Unloading the Boundary client agent removes its launch daemon configuration. To restart the agent, use:
 
-</Note>
+```shell-session
+$ sudo launchctl load -w /Library/LaunchDaemons/com.hashicorp.boundary.boundary-client-agent.plist
+```
 
 </Tab>
 <Tab heading="Windows" group="windows">

From 25773d9462d26f9aca19ab7bfeb9452bf41280fe Mon Sep 17 00:00:00 2001
From: Dan Heath <76443935+Dan-Heath@users.noreply.github.com>
Date: Wed, 4 Dec 2024 20:03:48 +0000
Subject: [PATCH 4/4] backport of commit
 cd6ac8ad07e172840df99e7a4ef89c1874b6e356

---
 website/content/docs/api-clients/client-agent.mdx | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/website/content/docs/api-clients/client-agent.mdx b/website/content/docs/api-clients/client-agent.mdx
index ea2849147d..2e75365493 100644
--- a/website/content/docs/api-clients/client-agent.mdx
+++ b/website/content/docs/api-clients/client-agent.mdx
@@ -277,7 +277,7 @@ If you want to disable the Boundary Client Agent, you can stop it with the follo
 $ sudo launchctl unload -w /Library/LaunchDaemons/com.hashicorp.boundary.boundary-client-agent.plist
 ```
 
-Unloading the Boundary client agent removes its launch daemon configuration. To restart the agent, use:
+Unloading the Boundary Client Agent removes its launch daemon configuration. To restart the Client Agent, use:
 
 ```shell-session
 $ sudo launchctl load -w /Library/LaunchDaemons/com.hashicorp.boundary.boundary-client-agent.plist