From: Mike Yuan <me@yhndnzj.com>
Date: Sun, 14 Jan 2024 13:18:07 +0000 (+0800)
Subject: man: don't use versioned standard-options
X-Git-Tag: v256-rc1~1132^2~4
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=7fbdd8c323e5f7696dfd86c019754c0791ee9b39;p=thirdparty%2Fsystemd.git

man: don't use versioned standard-options

no-pager-255 was added in #29184, which I reviewed and agreed.
However, as #30887 came up, I reconsidered it a bit, and now
I actually think that this should be removed.

We add new tools that refer to these standard options. During
the process, some options are also promoted to be standard ones.
I think a more sane practice is to generally keep old tools in
the loop, rather than overloading the standard-options with versions.
---

diff --git a/man/standard-options.xml b/man/standard-options.xml
index 28131348286..87058ad657b 100644
--- a/man/standard-options.xml
+++ b/man/standard-options.xml
@@ -3,9 +3,7 @@
   "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd">
 <!-- SPDX-License-Identifier: LGPL-2.1-or-later -->
 
-<variablelist
-    xmlns:xi="http://www.w3.org/2001/XInclude">
-
+<variablelist>
   <varlistentry id='help'>
     <term><option>-h</option></term>
     <term><option>--help</option></term>
@@ -31,16 +29,6 @@
     </listitem>
   </varlistentry>
 
-  <varlistentry id='no-pager-255'>
-    <term><option>--no-pager</option></term>
-
-    <listitem>
-      <para>Do not pipe output into a pager.</para>
-
-      <xi:include href="version-info.xml" xpointer="v255"/>
-    </listitem>
-  </varlistentry>
-
   <varlistentry id='no-ask-password'>
     <term><option>--no-ask-password</option></term>
 
diff --git a/man/systemd-path.xml b/man/systemd-path.xml
index d5a14bc1719..153a9bd0d56 100644
--- a/man/systemd-path.xml
+++ b/man/systemd-path.xml
@@ -59,7 +59,7 @@
         <xi:include href="version-info.xml" xpointer="v215"/></listitem>
       </varlistentry>
 
-      <xi:include href="standard-options.xml" xpointer="no-pager-255"/>
+      <xi:include href="standard-options.xml" xpointer="no-pager"/>
       <xi:include href="standard-options.xml" xpointer="help" />
       <xi:include href="standard-options.xml" xpointer="version" />
     </variablelist>