man: xinclude --host/--machine

As usual, those common options are pushed to the end.

10 files changed, 45 insertions, 171 deletions

diff --git a/man/busctl.xml b/man/busctl.xml
index 7947c8d2c8..9865b17d54 100644
--- a/man/busctl.xml
+++ b/man/busctl.xml
@@ -71,26 +71,6 @@ along with systemd; If not, see <http://www.gnu.org/licenses/>.
 
     <variablelist>
       <varlistentry>
-        <term><option>-H</option></term>
-        <term><option>--host</option></term>
-
-        <listitem>
-          <para>Execute the operation remotely. Specify a hostname, or
-          username and hostname separated by <literal>@</literal>, to
-          connect to. This will use SSH to talk to the remote systemd
-          instance.</para>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry>
-          <term><option>-M</option></term>
-          <term><option>--machine=</option></term>
-
-          <listitem><para>Execute the operation on a local container.
-          Specify a container name to connect to.</para></listitem>
-      </varlistentry>
-
-      <varlistentry>
           <term><option>--address=<replaceable>ADDRESS</replaceable></option></term>
 
           <listitem><para>Connect to the bus specified by
@@ -155,6 +135,8 @@ along with systemd; If not, see <http://www.gnu.org/licenses/>.
 
       <xi:include href="user-system-options.xml" xpointer="user" />
       <xi:include href="user-system-options.xml" xpointer="system" />
+      <xi:include href="user-system-options.xml" xpointer="host" />
+      <xi:include href="user-system-options.xml" xpointer="machine" />
 
       <xi:include href="standard-options.xml" xpointer="help" />
       <xi:include href="standard-options.xml" xpointer="version" />
diff --git a/man/hostnamectl.xml b/man/hostnamectl.xml
index d6d0005398..6746a7042f 100644
--- a/man/hostnamectl.xml
+++ b/man/hostnamectl.xml
@@ -112,18 +112,6 @@
                         </varlistentry>
 
                         <varlistentry>
-                                <term><option>-H</option></term>
-                                <term><option>--host</option></term>
-
-                                <listitem><para>Execute the operation
-                                remotely. Specify a hostname, or
-                                username and hostname separated by <literal>@</literal>,
-                                to connect to. This will use SSH to
-                                talk to the remote
-                                system.</para></listitem>
-                        </varlistentry>
-
-                        <varlistentry>
                                 <term><option>--static</option></term>
                                 <term><option>--transient</option></term>
                                 <term><option>--pretty</option></term>
@@ -145,6 +133,8 @@
                                 </para></listitem>
                         </varlistentry>
 
+                        <xi:include href="user-system-options.xml" xpointer="host" />
+
                         <xi:include href="standard-options.xml" xpointer="help" />
                         <xi:include href="standard-options.xml" xpointer="version" />
                 </variablelist>
diff --git a/man/localectl.xml b/man/localectl.xml
index bef3edb441..c2e79a2d71 100644
--- a/man/localectl.xml
+++ b/man/localectl.xml
@@ -98,18 +98,6 @@
                         </varlistentry>
 
                         <varlistentry>
-                                <term><option>-H</option></term>
-                                <term><option>--host</option></term>
-
-                                <listitem><para>Execute the operation
-                                remotely. Specify a hostname, or
-                                username and hostname separated by <literal>@</literal>,
-                                to connect to. This will use SSH to
-                                talk to the remote
-                                system.</para></listitem>
-                        </varlistentry>
-
-                        <varlistentry>
                                 <term><option>--no-convert</option></term>
 
                                 <listitem><para>If
@@ -121,6 +109,8 @@
                                 respectively.</para></listitem>
                         </varlistentry>
 
+                        <xi:include href="user-system-options.xml" xpointer="host" />
+
                         <xi:include href="standard-options.xml" xpointer="help" />
                         <xi:include href="standard-options.xml" xpointer="version" />
                         <xi:include href="standard-options.xml" xpointer="no-pager" />
diff --git a/man/loginctl.xml b/man/loginctl.xml
index 25eae3159f..749db92ed1 100644
--- a/man/loginctl.xml
+++ b/man/loginctl.xml
@@ -91,27 +91,6 @@
                         </varlistentry>
 
                         <varlistentry>
-                                <term><option>-H</option></term>
-                                <term><option>--host</option></term>
-
-                                <listitem><para>Execute the operation
-                                remotely. Specify a hostname, or
-                                username and hostname separated by <literal>@</literal>,
-                                to connect to. This will use SSH to
-                                talk to the remote login manager
-                                instance.</para></listitem>
-                        </varlistentry>
-
-                        <varlistentry>
-                                <term><option>-M</option></term>
-                                <term><option>--machine=</option></term>
-
-                                <listitem><para>Execute the operation on a
-                                local container. Specify a container
-                                name to connect to.</para></listitem>
-                        </varlistentry>
-
-                        <varlistentry>
                                 <term><option>-p</option></term>
                                 <term><option>--property=</option></term>
 
@@ -178,6 +157,9 @@
                                 <constant>SIGTERM</constant>.</para></listitem>
                         </varlistentry>
 
+                        <xi:include href="user-system-options.xml" xpointer="host" />
+                        <xi:include href="user-system-options.xml" xpointer="machine" />
+
                         <xi:include href="standard-options.xml" xpointer="help" />
                         <xi:include href="standard-options.xml" xpointer="version" />
                         <xi:include href="standard-options.xml" xpointer="no-pager" />
diff --git a/man/machinectl.xml b/man/machinectl.xml
index da539ed087..89dca9cf89 100644
--- a/man/machinectl.xml
+++ b/man/machinectl.xml
@@ -73,27 +73,6 @@
 
                 <variablelist>
                         <varlistentry>
-                                <term><option>-H</option></term>
-                                <term><option>--host=</option></term>
-
-                                <listitem><para>Execute the operation
-                                remotely. Specify a hostname, or
-                                username and hostname separated by <literal>@</literal>,
-                                to connect to. This will use SSH to
-                                talk to the remote machine manager
-                                instance.</para></listitem>
-                        </varlistentry>
-
-                        <varlistentry>
-                                <term><option>-M</option></term>
-                                <term><option>--machine=</option></term>
-
-                                <listitem><para>Execute the operation on a
-                                local container. Specify a container
-                                name to connect to.</para></listitem>
-                        </varlistentry>
-
-                        <varlistentry>
                                 <term><option>-p</option></term>
                                 <term><option>--property=</option></term>
 
@@ -167,6 +146,9 @@
                                         footer.</para></listitem>
                         </varlistentry>
 
+                        <xi:include href="user-system-options.xml" xpointer="host" />
+                        <xi:include href="user-system-options.xml" xpointer="machine" />
+
                         <xi:include href="standard-options.xml" xpointer="help" />
                         <xi:include href="standard-options.xml" xpointer="version" />
                         <xi:include href="standard-options.xml" xpointer="no-pager" />
diff --git a/man/systemctl.xml b/man/systemctl.xml
index 379bf263e0..355cd11bba 100644
--- a/man/systemctl.xml
+++ b/man/systemctl.xml
@@ -423,27 +423,6 @@ along with systemd; If not, see <http://www.gnu.org/licenses/>.
       </varlistentry>
 
       <varlistentry>
-        <term><option>-H</option></term>
-        <term><option>--host</option></term>
-
-        <listitem>
-          <para>Execute the operation remotely. Specify a hostname, or
-          username and hostname separated by <literal>@</literal>, to
-          connect to. This will use SSH to talk to the remote systemd
-          instance.</para>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry>
-          <term><option>-M</option></term>
-          <term><option>--machine=</option></term>
-
-          <listitem><para>Execute the operation on a local
-          container. Specify a container name to connect
-          to.</para></listitem>
-      </varlistentry>
-
-      <varlistentry>
         <term><option>-n</option></term>
         <term><option>--lines=</option></term>
 
@@ -477,6 +456,9 @@ along with systemd; If not, see <http://www.gnu.org/licenses/>.
         </listitem>
       </varlistentry>
 
+      <xi:include href="user-system-options.xml" xpointer="host" />
+      <xi:include href="user-system-options.xml" xpointer="machine" />
+
       <xi:include href="standard-options.xml" xpointer="help" />
       <xi:include href="standard-options.xml" xpointer="version" />
       <xi:include href="standard-options.xml" xpointer="no-pager" />
diff --git a/man/systemd-analyze.xml b/man/systemd-analyze.xml
index 7556ef7bce..c7a25985ca 100644
--- a/man/systemd-analyze.xml
+++ b/man/systemd-analyze.xml
@@ -199,28 +199,6 @@
                         </varlistentry>
 
                         <varlistentry>
-                                <term><option>-H</option></term>
-                                <term><option>--host=</option></term>
-
-                                <listitem><para>Execute the operation
-                                remotely. Specify a hostname, or
-                                username and hostname separated by
-                                <literal>@</literal>, to connect
-                                to. This will use SSH to talk to the
-                                remote machine manager
-                                instance.</para></listitem>
-                        </varlistentry>
-
-                        <varlistentry>
-                                <term><option>-M</option></term>
-                                <term><option>--machine=</option></term>
-
-                                <listitem><para>Execute the operation on a
-                                local container. Specify a container
-                                name to connect to.</para></listitem>
-                        </varlistentry>
-
-                        <varlistentry>
                                 <term><option>--order</option></term>
                                 <term><option>--require</option></term>
 
@@ -279,6 +257,9 @@
                                 e.g. "50ms".</para></listitem>
                         </varlistentry>
 
+                        <xi:include href="user-system-options.xml" xpointer="host" />
+                        <xi:include href="user-system-options.xml" xpointer="machine" />
+
                         <xi:include href="standard-options.xml" xpointer="help" />
                         <xi:include href="standard-options.xml" xpointer="version" />
                         <xi:include href="standard-options.xml" xpointer="no-pager" />
diff --git a/man/systemd-run.xml b/man/systemd-run.xml
index fc2131eb2f..064195a989 100644
--- a/man/systemd-run.xml
+++ b/man/systemd-run.xml
@@ -90,27 +90,6 @@ along with systemd; If not, see <http://www.gnu.org/licenses/>.
 
     <variablelist>
       <varlistentry>
-              <term><option>-H</option></term>
-              <term><option>--host=</option></term>
-
-              <listitem><para>Execute the operation
-              remotely. Specify a hostname, or
-              username and hostname separated by <literal>@</literal>,
-              to connect to. This will use SSH to
-              talk to the remote machine manager
-              instance.</para></listitem>
-      </varlistentry>
-
-      <varlistentry>
-              <term><option>-M</option></term>
-              <term><option>--machine=</option></term>
-
-              <listitem><para>Execute the operation on a
-              local container. Specify a container
-              name to connect to.</para></listitem>
-      </varlistentry>
-
-      <varlistentry>
         <term><option>--scope</option></term>
 
         <listitem>
@@ -173,6 +152,8 @@ along with systemd; If not, see <http://www.gnu.org/licenses/>.
 
       <xi:include href="user-system-options.xml" xpointer="user" />
       <xi:include href="user-system-options.xml" xpointer="system" />
+      <xi:include href="user-system-options.xml" xpointer="host" />
+      <xi:include href="user-system-options.xml" xpointer="machine" />
 
       <xi:include href="standard-options.xml" xpointer="help" />
       <xi:include href="standard-options.xml" xpointer="version" />
diff --git a/man/timedatectl.xml b/man/timedatectl.xml
index 7ac19e6be4..ee75d423d7 100644
--- a/man/timedatectl.xml
+++ b/man/timedatectl.xml
@@ -77,27 +77,6 @@
                         </varlistentry>
 
                         <varlistentry>
-                                <term><option>-H</option></term>
-                                <term><option>--host=</option></term>
-
-                                <listitem><para>Execute the operation
-                                remotely. Specify a hostname, or
-                                username and hostname separated by <literal>@</literal>,
-                                to connect to. This will use SSH to
-                                talk to the remote machine manager
-                                instance.</para></listitem>
-                        </varlistentry>
-
-                        <varlistentry>
-                                <term><option>-M</option></term>
-                                <term><option>--machine=</option></term>
-
-                                <listitem><para>Execute operation on a
-                                local container. Specify a container
-                                name to connect to.</para></listitem>
-                        </varlistentry>
-
-                        <varlistentry>
                                 <term><option>--adjust-system-clock</option></term>
 
                                 <listitem><para>If
@@ -110,6 +89,9 @@
                                 clock.</para></listitem>
                         </varlistentry>
 
+                        <xi:include href="user-system-options.xml" xpointer="host" />
+                        <xi:include href="user-system-options.xml" xpointer="machine" />
+
                         <xi:include href="standard-options.xml" xpointer="help" />
                         <xi:include href="standard-options.xml" xpointer="version" />
                         <xi:include href="standard-options.xml" xpointer="no-pager" />
diff --git a/man/user-system-options.xml b/man/user-system-options.xml
index 0863960214..cca5c79a7a 100644
--- a/man/user-system-options.xml
+++ b/man/user-system-options.xml
@@ -20,4 +20,26 @@
       implied default.</para>
     </listitem>
   </varlistentry>
+
+  <varlistentry id='host'>
+    <term><option>-H</option></term>
+    <term><option>--host=</option></term>
+
+    <listitem id='host-text'>
+      <para>Execute the operation remotely. Specify a hostname, or
+      username and hostname separated by <literal>@</literal>, to
+      connect to. This will use SSH to talk to the remote machine
+      manager instance.</para>
+    </listitem>
+  </varlistentry>
+
+  <varlistentry id='machine'>
+    <term><option>-M</option></term>
+    <term><option>--machine=</option></term>
+
+    <listitem id='machine-text'>
+      <para>Execute operation on a local container. Specify a
+      container name to connect to.</para>
+    </listitem>
+  </varlistentry>
 </variablelist>