man: don't duplicate version in History section

diff --git a/man/kernel-command-line.xml b/man/kernel-command-line.xml
index a2a045d209058b2f11c2abbcf1fdecb36f737097..54213d31c6eb7c6118c3c52c9c20c4c7a3fc6016 100644 (file)
--- a/man/kernel-command-line.xml
+++ b/man/kernel-command-line.xml
@@ -802,11 +802,10 @@
       <variablelist>
         <varlistentry>
           <term>systemd 252</term>
+
           <listitem><para>Kernel command-line arguments <varname>systemd.unified_cgroup_hierarchy</varname>
           and <varname>systemd.legacy_systemd_cgroup_controller</varname> were deprecated. Please switch to
-          the unified cgroup hierarchy.</para>
-
-          <xi:include href="version-info.xml" xpointer="v252"/></listitem>
+          the unified cgroup hierarchy.</para></listitem>
         </varlistentry>
       </variablelist>
   </refsect1>

diff --git a/man/systemd-system.conf.xml b/man/systemd-system.conf.xml
index f7b414da5ce05435507f96ecb7a74f8e23f6bc19..b42a49f64360349c567d48ec6f51b80671164dc4 100644 (file)
--- a/man/systemd-system.conf.xml
+++ b/man/systemd-system.conf.xml
@@ -754,10 +754,9 @@
       <variablelist>
         <varlistentry>
           <term>systemd 252</term>
-          <listitem><para>Option <varname>DefaultBlockIOAccounting=</varname> was deprecated. Please switch
-          to the unified cgroup hierarchy.</para>
 
-          <xi:include href="version-info.xml" xpointer="v252"/></listitem>
+          <listitem><para>Option <varname>DefaultBlockIOAccounting=</varname> was deprecated. Please switch
+          to the unified cgroup hierarchy.</para></listitem>
         </varlistentry>
       </variablelist>
   </refsect1>

diff --git a/man/systemd.resource-control.xml b/man/systemd.resource-control.xml
index a2f1bc02baa84a15de95d85fef430c8e53ac4140..aefee94cac577887562fe3fe73f59fb86e06b228 100644 (file)
--- a/man/systemd.resource-control.xml
+++ b/man/systemd.resource-control.xml
@@ -1689,7 +1689,8 @@ DeviceAllow=/dev/loop-control
       <variablelist>
         <varlistentry>
           <term>systemd 252</term>
-          <listitem><para> Options for controlling the Legacy Control Group Hierarchy (<ulink
+
+          <listitem><para>Options for controlling the Legacy Control Group Hierarchy (<ulink
           url="https://docs.kernel.org/admin-guide/cgroup-v1/index.html">Control Groups version 1</ulink>)
           are now fully deprecated:
           <varname>CPUShares=<replaceable>weight</replaceable></varname>,
@@ -1703,9 +1704,7 @@ DeviceAllow=/dev/loop-control
           <varname>BlockIOReadBandwidth=<replaceable>device</replaceable>
           <replaceable>bytes</replaceable></varname>,
           <varname>BlockIOWriteBandwidth=<replaceable>device</replaceable> <replaceable>bytes</replaceable></varname>.
-          Please switch to the unified cgroup hierarchy.</para>
-
- <xi:include href="version-info.xml" xpointer="v252"/></listitem>
+          Please switch to the unified cgroup hierarchy.</para></listitem>
         </varlistentry>
       </variablelist>
   </refsect1>

diff --git a/man/systemd.xml b/man/systemd.xml
index 88dd158021b68e18dfbb5a456d2d8d5ed81b624b..857c942eed10087de9bfc92f45d104edab5e04d4 100644 (file)
--- a/man/systemd.xml
+++ b/man/systemd.xml
@@ -1507,11 +1507,10 @@
       <variablelist>
         <varlistentry>
           <term>systemd 252</term>
+
           <listitem><para>Kernel command-line arguments <varname>systemd.unified_cgroup_hierarchy</varname>
           and <varname>systemd.legacy_systemd_cgroup_controller</varname> were deprecated. Please switch to
-          the unified cgroup hierarchy.</para>
-
-          <xi:include href="version-info.xml" xpointer="v252"/></listitem>
+          the unified cgroup hierarchy.</para></listitem>
         </varlistentry>
       </variablelist>
   </refsect1>

diff --git a/tools/check-version-history.py b/tools/check-version-history.py
index efd7023762e6008e32247cb9d4d00e639ab256f6..dce2b6abd16d4cd6156634f1cb8d31b1cd21a86f 100644 (file)
--- a/tools/check-version-history.py
+++ b/tools/check-version-history.py
@@ -75,9 +75,12 @@ def find_undocumented_commands(pages, ignorelist):
             parent = listitem if listitem is not None else varlistentry
 
             rev = parent.getchildren()[-1]
-            if rev.get("href") != "version-info.xml":
-                if (filename, path) not in ignorelist:
+            if (
+                rev.get("href") != "version-info.xml" and
+                not path.startswith(tuple(entry[1] for entry in ignorelist if entry[0] == filename))
+            ):
                     undocumented.append((filename, path))
+
     return undocumented
 
 

diff --git a/tools/command_ignorelist b/tools/command_ignorelist
index 9408d5a5f95cf4b7ee63b8cd518c12a2485d60ef..0159054b8d42d74d7b5ae7721a4f42962e3fedc6 100644 (file)
--- a/tools/command_ignorelist
+++ b/tools/command_ignorelist
@@ -14,6 +14,7 @@ journald.conf.xml ./refsect1[title="Options"]/variablelist/varlistentry[term="Co
 journald.conf.xml ./refsect1[title="Options"]/variablelist/varlistentry[term="RateLimitIntervalSec="]
 journald.conf.xml ./refsect1[title="Options"]/variablelist/varlistentry[term="SystemMaxUse="]
 journald.conf.xml ./refsect1[title="Options"]/variablelist/varlistentry[term="ForwardToSyslog="]
+kernel-command-line.xml ./refsect1[title="History"]/
 kernel-install.xml ./refsect1[title="Commands"]/variablelist/varlistentry[term="add [[[KERNEL-VERSION] KERNEL-IMAGE] [INITRD-FILE ...]]"]/listitem/variablelist/varlistentry[term="50-depmod.install"]
 kernel-install.xml ./refsect1[title="Commands"]/variablelist/varlistentry[term="add [[[KERNEL-VERSION] KERNEL-IMAGE] [INITRD-FILE ...]]"]/listitem/variablelist/varlistentry[term="90-loaderentry.install"]
 kernel-install.xml ./refsect1[title="Commands"]/variablelist/varlistentry[term="add [[[KERNEL-VERSION] KERNEL-IMAGE] [INITRD-FILE ...]]"]/listitem/variablelist/varlistentry[term="90-uki-copy.install"]
@@ -129,6 +130,7 @@ systemctl.xml ./refsect1[title="Commands"]/refsect2[title="System Commands"]/var
 systemctl.xml ./refsect1[title="Commands"]/refsect2[title="System Commands"]/variablelist/varlistentry[term="suspend"]
 systemctl.xml ./refsect1[title="Commands"]/refsect2[title="System Commands"]/variablelist/varlistentry[term="hibernate"]
 systemctl.xml ./refsect1[title="Commands"]/refsect2[title="System Commands"]/variablelist/varlistentry[term="switch-root ROOT INIT"]
+systemd.xml ./refsect1[title="History"]/
 systemd-ask-password.xml ./refsect1[title="Options"]/variablelist/varlistentry[term="--icon="]
 systemd-ask-password.xml ./refsect1[title="Options"]/variablelist/varlistentry[term="--timeout="]
 systemd-ask-password.xml ./refsect1[title="Options"]/variablelist/varlistentry[term="--no-tty"]
@@ -175,6 +177,7 @@ systemd-nspawn.xml ./refsect1[title="Options"]/refsect2[title="Execution Options
 systemd-nspawn.xml ./refsect1[title="Options"]/refsect2[title="System Identity Options"]/variablelist/varlistentry[term="--uuid="]
 systemd-nspawn.xml ./refsect1[title="Options"]/refsect2[title="Networking Options"]/variablelist/varlistentry[term="--private-network"]
 systemd-nspawn.xml ./refsect1[title="Options"]/refsect2[title="Image Options"]/variablelist/varlistentry[term="--read-only"]
+systemd-system.conf.xml ./refsect1[title="History"]/
 systemd-tmpfiles.xml ./refsect1[title="Commands and options"]/variablelist/varlistentry[term="--create"]
 systemd-tmpfiles.xml ./refsect1[title="Commands and options"]/variablelist/varlistentry[term="--clean"]
 systemd-tmpfiles.xml ./refsect1[title="Commands and options"]/variablelist/varlistentry[term="--remove"]
@@ -249,6 +252,7 @@ systemd.path.xml ./refsect1[title="Options"]/variablelist/varlistentry[term="Pat
 systemd.path.xml ./refsect1[title="Options"]/variablelist/varlistentry[term="Unit="]
 systemd.path.xml ./refsect1[title="Options"]/variablelist/varlistentry[term="MakeDirectory="]
 systemd.path.xml ./refsect1[title="Options"]/variablelist/varlistentry[term="DirectoryMode="]
+systemd.resource-control.xml ./refsect1[title="History"]/
 systemd.service.xml ./refsect1[title="Options"]/variablelist/varlistentry[term="Type="]
 systemd.service.xml ./refsect1[title="Options"]/variablelist/varlistentry[term="RemainAfterExit="]
 systemd.service.xml ./refsect1[title="Options"]/variablelist/varlistentry[term="GuessMainPID="]