merge: branch 'main'

update DocBook DTD version to latest stable 4.5

https://gitlab.freedesktop.org/NetworkManager/NetworkManager/-/merge_requests/1900

19 files changed, 37 insertions, 37 deletions

diff --git a/docs/api/network-manager-docs.xml b/docs/api/network-manager-docs.xml
index faee87992e..a7cf24610a 100644
--- a/docs/api/network-manager-docs.xml
+++ b/docs/api/network-manager-docs.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0"?>
-<!DOCTYPE book PUBLIC "-//OASIS//DTD DocBook XML V4.1.2//EN"
-               "http://www.oasis-open.org/docbook/xml/4.1.2/docbookx.dtd" [
+<!DOCTYPE book PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
+               "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
 <!ENTITY version SYSTEM "version.xml">
 ]>
 <book id="index" xmlns:xi="http://www.w3.org/2003/XInclude">
diff --git a/docs/api/settings-spec.xsl b/docs/api/settings-spec.xsl
index 7a4522370e..39d4e357f1 100644
--- a/docs/api/settings-spec.xsl
+++ b/docs/api/settings-spec.xsl
@@ -4,8 +4,8 @@
 
   <xsl:output
       method="xml"
-      doctype-public="-//OASIS//DTD DocBook XML V4.3//EN"
-      doctype-system="http://www.oasis-open.org/docbook/xml/4.3/docbookx.dtd"
+      doctype-public="-//OASIS//DTD DocBook XML V4.5//EN"
+      doctype-system="http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd"
       />
 
   <xsl:template match="nm-setting-docs">
diff --git a/docs/libnm/libnm-docs.xml b/docs/libnm/libnm-docs.xml
index f2b5658cdf..1b37fdd253 100644
--- a/docs/libnm/libnm-docs.xml
+++ b/docs/libnm/libnm-docs.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0"?>
-<!DOCTYPE book PUBLIC "-//OASIS//DTD DocBook XML V4.1.2//EN"
-               "http://www.oasis-open.org/docbook/xml/4.1.2/docbookx.dtd" [
+<!DOCTYPE book PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
+               "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
   <!ENTITY version SYSTEM "version.xml">
 ]>
 
diff --git a/man/NetworkManager-dispatcher.xml b/man/NetworkManager-dispatcher.xml
index f85a495ac7..807e5c4cdd 100644
--- a/man/NetworkManager-dispatcher.xml
+++ b/man/NetworkManager-dispatcher.xml
@@ -1,7 +1,7 @@
 <?xml version='1.0'?>
 <?xml-stylesheet type="text/xsl" href="http://docbook.sourceforge.net/release/xsl/current/xhtml/docbook.xsl"?>
-<!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook XML V4.2//EN"
-"http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd" [
+<!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
+"http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
 <!ENTITY % entities SYSTEM "common.ent" >
 %entities;
 ]>
diff --git a/man/NetworkManager-wait-online.service.xml b/man/NetworkManager-wait-online.service.xml
index 4776002c86..4a8b63bb35 100644
--- a/man/NetworkManager-wait-online.service.xml
+++ b/man/NetworkManager-wait-online.service.xml
@@ -1,7 +1,7 @@
 <?xml version='1.0'?>
 <?xml-stylesheet type="text/xsl" href="http://docbook.sourceforge.net/release/xsl/current/xhtml/docbook.xsl"?>
-<!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook XML V4.2//EN"
-"http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd" [
+<!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
+"http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
 <!ENTITY % entities SYSTEM "common.ent" >
 %entities;
 ]>
diff --git a/man/NetworkManager.conf.xml b/man/NetworkManager.conf.xml
index 3ea511d0b2..fc184ff774 100644
--- a/man/NetworkManager.conf.xml
+++ b/man/NetworkManager.conf.xml
@@ -1,7 +1,7 @@
 <?xml version='1.0'?> <!--*-nxml-*-->
 <?xml-stylesheet type="text/xsl" href="http://docbook.sourceforge.net/release/xsl/current/xhtml/docbook.xsl"?>
-<!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook XML V4.2//EN"
-"http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd" [
+<!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
+"http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
 <!ENTITY % entities SYSTEM "common.ent" >
 %entities;
 ]>
diff --git a/man/NetworkManager.xml b/man/NetworkManager.xml
index ff1635cd29..c2392ad36d 100644
--- a/man/NetworkManager.xml
+++ b/man/NetworkManager.xml
@@ -1,7 +1,7 @@
 <?xml version='1.0'?>
 <?xml-stylesheet type="text/xsl" href="http://docbook.sourceforge.net/release/xsl/current/xhtml/docbook.xsl"?>
-<!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook XML V4.2//EN"
-"http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd" [
+<!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
+"http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
 <!ENTITY % entities SYSTEM "common.ent" >
 %entities;
 ]>
diff --git a/man/nm-cloud-setup.xml b/man/nm-cloud-setup.xml
index d0e14b4fae..7f9a7dbc52 100644
--- a/man/nm-cloud-setup.xml
+++ b/man/nm-cloud-setup.xml
@@ -1,7 +1,7 @@
 <?xml version='1.0'?>
 <?xml-stylesheet type="text/xsl" href="http://docbook.sourceforge.net/release/xsl/current/xhtml/docbook.xsl"?>
-<!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook XML V4.2//EN"
-"http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd" [
+<!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
+"http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
 <!ENTITY % entities SYSTEM "common.ent" >
 %entities;
 ]>
diff --git a/man/nm-initrd-generator.xml b/man/nm-initrd-generator.xml
index 27219fda4c..51015ea8a3 100644
--- a/man/nm-initrd-generator.xml
+++ b/man/nm-initrd-generator.xml
@@ -1,7 +1,7 @@
 <?xml version='1.0'?>
 <?xml-stylesheet type="text/xsl" href="http://docbook.sourceforge.net/release/xsl/current/xhtml/docbook.xsl"?>
-<!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook XML V4.2//EN"
-"http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd" [
+<!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
+"http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
 <!ENTITY % entities SYSTEM "common.ent" >
 %entities;
 ]>
diff --git a/man/nm-online.xml b/man/nm-online.xml
index e9deb83e94..2ed8f3b9b6 100644
--- a/man/nm-online.xml
+++ b/man/nm-online.xml
@@ -1,7 +1,7 @@
 <?xml version='1.0'?>
 <?xml-stylesheet type="text/xsl" href="http://docbook.sourceforge.net/release/xsl/current/xhtml/docbook.xsl"?>
-<!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook XML V4.2//EN"
-"http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd" [
+<!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
+"http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
 <!ENTITY % entities SYSTEM "common.ent" >
 %entities;
 ]>
diff --git a/man/nm-openvswitch.xml b/man/nm-openvswitch.xml
index f0c2ca9462..67b5ea7ce6 100644
--- a/man/nm-openvswitch.xml
+++ b/man/nm-openvswitch.xml
@@ -1,7 +1,7 @@
 <?xml version='1.0'?>
 <?xml-stylesheet type="text/xsl" href="http://docbook.sourceforge.net/release/xsl/current/xhtml/docbook.xsl"?>
-<!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook XML V4.2//EN"
-"http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd" [
+<!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
+"http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
 <!ENTITY % entities SYSTEM "common.ent" >
 %entities;
 ]>
diff --git a/man/nm-settings-dbus.xsl b/man/nm-settings-dbus.xsl
index 665105eea0..c4bd6d8351 100644
--- a/man/nm-settings-dbus.xsl
+++ b/man/nm-settings-dbus.xsl
@@ -8,8 +8,8 @@
 
   <xsl:output
       method="xml"
-      doctype-public="-//OASIS//DTD DocBook XML V4.3//EN"
-      doctype-system="http://www.oasis-open.org/docbook/xml/4.3/docbookx.dtd"
+      doctype-public="-//OASIS//DTD DocBook XML V4.5//EN"
+      doctype-system="http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd"
       />
 
   <xsl:template match="nm-setting-docs">
diff --git a/man/nm-settings-ifcfg-rh.xsl b/man/nm-settings-ifcfg-rh.xsl
index 7b270e9b18..8ad3b10825 100644
--- a/man/nm-settings-ifcfg-rh.xsl
+++ b/man/nm-settings-ifcfg-rh.xsl
@@ -12,8 +12,8 @@
 
   <xsl:output
       method="xml"
-      doctype-public="-//OASIS//DTD DocBook XML V4.3//EN"
-      doctype-system="http://www.oasis-open.org/docbook/xml/4.3/docbookx.dtd"
+      doctype-public="-//OASIS//DTD DocBook XML V4.5//EN"
+      doctype-system="http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd"
       />
 
   <xsl:template match="nm-setting-docs">
diff --git a/man/nm-settings-keyfile.xsl b/man/nm-settings-keyfile.xsl
index 450cc6fdee..d216ee15dd 100644
--- a/man/nm-settings-keyfile.xsl
+++ b/man/nm-settings-keyfile.xsl
@@ -8,8 +8,8 @@
 
   <xsl:output
       method="xml"
-      doctype-public="-//OASIS//DTD DocBook XML V4.3//EN"
-      doctype-system="http://www.oasis-open.org/docbook/xml/4.3/docbookx.dtd"
+      doctype-public="-//OASIS//DTD DocBook XML V4.5//EN"
+      doctype-system="http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd"
       />
 
   <xsl:template match="nm-setting-docs">
diff --git a/man/nm-settings-nmcli.xsl b/man/nm-settings-nmcli.xsl
index 794ee507b1..2f1d035cdf 100644
--- a/man/nm-settings-nmcli.xsl
+++ b/man/nm-settings-nmcli.xsl
@@ -8,8 +8,8 @@
 
   <xsl:output
       method="xml"
-      doctype-public="-//OASIS//DTD DocBook XML V4.3//EN"
-      doctype-system="http://www.oasis-open.org/docbook/xml/4.3/docbookx.dtd"
+      doctype-public="-//OASIS//DTD DocBook XML V4.5//EN"
+      doctype-system="http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd"
       />
 
   <xsl:template match="nm-setting-docs">
diff --git a/man/nmcli-examples.xml b/man/nmcli-examples.xml
index 2c7e16ab79..5249d6ba04 100644
--- a/man/nmcli-examples.xml
+++ b/man/nmcli-examples.xml
@@ -1,7 +1,7 @@
 <?xml version='1.0'?>
 <?xml-stylesheet type="text/xsl" href="http://docbook.sourceforge.net/release/xsl/current/xhtml/docbook.xsl"?>
-<!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook XML V4.2//EN"
-"http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd" [
+<!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
+"http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
 <!ENTITY % entities SYSTEM "common.ent" >
 %entities;
 ]>
diff --git a/man/nmcli.xml b/man/nmcli.xml
index 6b3054c3d7..6299404703 100644
--- a/man/nmcli.xml
+++ b/man/nmcli.xml
@@ -1,7 +1,7 @@
 <?xml version='1.0'?>
 <?xml-stylesheet type="text/xsl" href="http://docbook.sourceforge.net/release/xsl/current/xhtml/docbook.xsl"?>
-<!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook XML V4.2//EN"
-"http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd" [
+<!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
+"http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
 <!ENTITY % entities SYSTEM "common.ent" >
 %entities;
 ]>
diff --git a/man/nmtui.xml b/man/nmtui.xml
index f610be9d08..eac94ab039 100644
--- a/man/nmtui.xml
+++ b/man/nmtui.xml
@@ -1,7 +1,7 @@
 <?xml version='1.0'?>
 <?xml-stylesheet type="text/xsl" href="http://docbook.sourceforge.net/release/xsl/current/xhtml/docbook.xsl"?>
-<!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook XML V4.2//EN"
-"http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd" [
+<!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
+"http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
 <!ENTITY % entities SYSTEM "common.ent" >
 %entities;
 ]>
diff --git a/tools/enums-to-docbook.pl b/tools/enums-to-docbook.pl
index 8439eaee71..d21cafa2b1 100755
--- a/tools/enums-to-docbook.pl
+++ b/tools/enums-to-docbook.pl
@@ -27,7 +27,7 @@ my $nm = shift @ARGV or die "Missing title";
 print <<END;
 <?xml version='1.0'?>
 <?xml-stylesheet type="text/xsl" href="http://docbook.sourceforge.net/release/xsl/current/xhtml/docbook.xsl"?>
-<!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook XML V4.2//EN" "http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd">
+<!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN" "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd">
 
 <refentry id="$id">
   <refmeta>