From e6be9d12db0c1aa2299df795d4dfa38f133e1bf9 Mon Sep 17 00:00:00 2001
From: Mike Yuan <me@yhndnzj.com>
Date: Wed, 25 Jun 2025 13:31:16 +0200
Subject: [PATCH 1/2] man/systemd-run: consistently wrap external command +
 args in a single block

---
 man/systemd-run.xml | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/man/systemd-run.xml b/man/systemd-run.xml
index 4ea9a719a3..0ba002b0eb 100644
--- a/man/systemd-run.xml
+++ b/man/systemd-run.xml
@@ -33,22 +33,25 @@
       <command>systemd-run</command>
       <arg choice="opt" rep="repeat">OPTIONS</arg>
       <arg choice="opt" rep="repeat">PATH OPTIONS</arg>
-      <arg choice="req"><replaceable>COMMAND</replaceable></arg>
+      <arg choice="req"><replaceable>COMMAND</replaceable>
       <arg choice="opt" rep="repeat">ARGS</arg>
+      </arg>
     </cmdsynopsis>
     <cmdsynopsis>
       <command>systemd-run</command>
       <arg choice="opt" rep="repeat">OPTIONS</arg>
       <arg choice="opt" rep="repeat">SOCKET OPTIONS</arg>
-      <arg choice="req"><replaceable>COMMAND</replaceable></arg>
+      <arg choice="req"><replaceable>COMMAND</replaceable>
       <arg choice="opt" rep="repeat">ARGS</arg>
+      </arg>
     </cmdsynopsis>
     <cmdsynopsis>
       <command>systemd-run</command>
       <arg choice="opt" rep="repeat">OPTIONS</arg>
       <arg choice="opt" rep="repeat">TIMER OPTIONS</arg>
-      <arg choice="req"><replaceable>COMMAND</replaceable></arg>
+      <arg choice="req"><replaceable>COMMAND</replaceable>
       <arg choice="opt" rep="repeat">ARGS</arg>
+      </arg>
     </cmdsynopsis>
   </refsynopsisdiv>
 

From 151efb6d1318ad7f2f876547e2a975b766783808 Mon Sep 17 00:00:00 2001
From: Mike Yuan <me@yhndnzj.com>
Date: Wed, 25 Jun 2025 13:32:19 +0200
Subject: [PATCH 2/2] socket-activate: normalize COMMAND notation in help text
 + man

---
 man/systemd-socket-activate.xml       | 5 +++--
 src/socket-activate/socket-activate.c | 2 +-
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/man/systemd-socket-activate.xml b/man/systemd-socket-activate.xml
index 09f0d5cad6..ac9deaf4b7 100644
--- a/man/systemd-socket-activate.xml
+++ b/man/systemd-socket-activate.xml
@@ -25,8 +25,9 @@
     <cmdsynopsis>
       <command>systemd-socket-activate</command>
       <arg choice="opt" rep="repeat">OPTIONS</arg>
-      <arg choice="plain"><replaceable>daemon</replaceable></arg>
-      <arg choice="opt" rep="repeat">OPTIONS</arg>
+      <arg choice="plain"><replaceable>COMMAND</replaceable>
+      <arg choice="opt" rep="repeat">ARGS</arg>
+      </arg>
     </cmdsynopsis>
   </refsynopsisdiv>
 
diff --git a/src/socket-activate/socket-activate.c b/src/socket-activate/socket-activate.c
index a80080b9cd..d4b584e4d3 100644
--- a/src/socket-activate/socket-activate.c
+++ b/src/socket-activate/socket-activate.c
@@ -316,7 +316,7 @@ static int help(void) {
         if (r < 0)
                 return log_oom();
 
-        printf("%s [OPTIONS...]\n"
+        printf("%s [OPTIONS...] COMMAND ...\n"
                "\n%sListen on sockets and launch child on connection.%s\n"
                "\nOptions:\n"
                "  -h --help                  Show this help and exit\n"