Changeset a53c912 for pst/xml/docbook-xsl.xml

Timestamp:

02/10/2024 11:33:17 AM (3 months ago)

Author:

Pierre Labastie <pierre.labastie@…>

Branches:

12.1, ken/TL2024, lazarus, trunk, xry111/llvm18

Children:

469ab955

Parents:

d9142ec4

Message:

Use both http and https in docbook-xsl catalog

Upstream documentation is not clear whether to use
​https://cdn.docbook.org (in recent docs) or the http form (in older docs
and in the sample xml catalog distributed with the package). So have
both in our catalog file.

File:

• pst/xml/docbook-xsl.xml (modified) (4 diffs)

pst/xml/docbook-xsl.xml

@@ -219 +219 @@
         Create (or append) and populate the XML catalog file using the
         following commands as the <systemitem
-        class="username">root</systemitem> user:
+        class="username">root</systemitem> user (both <emphasis>http</emphasis>
+        and <emphasis>https</emphasis> forms are used because upstream
+        have had both in their documentation):
       </para>
 
@@ -228 +230 @@
 
 xmlcatalog --noout --add "rewriteSystem" \
+           "http://cdn.docbook.org/release/xsl-nons/&docbook-xsl-version;" \
+           "/usr/share/xml/docbook/xsl-stylesheets-nons-&docbook-xsl-version;" \
+    /etc/xml/catalog &amp;&amp;
+
+xmlcatalog --noout --add "rewriteSystem" \
            "https://cdn.docbook.org/release/xsl-nons/&docbook-xsl-version;" \
            "/usr/share/xml/docbook/xsl-stylesheets-nons-&docbook-xsl-version;" \
@@ -233 +240 @@
 
 xmlcatalog --noout --add "rewriteURI" \
+           "http://cdn.docbook.org/release/xsl-nons/&docbook-xsl-version;" \
+           "/usr/share/xml/docbook/xsl-stylesheets-nons-&docbook-xsl-version;" \
+    /etc/xml/catalog &amp;&amp;
+
+xmlcatalog --noout --add "rewriteURI" \
            "https://cdn.docbook.org/release/xsl-nons/&docbook-xsl-version;" \
            "/usr/share/xml/docbook/xsl-stylesheets-nons-&docbook-xsl-version;" \
@@ -238 +250 @@
 
 xmlcatalog --noout --add "rewriteSystem" \
+           "http://cdn.docbook.org/release/xsl-nons/current" \
+           "/usr/share/xml/docbook/xsl-stylesheets-nons-&docbook-xsl-version;" \
+    /etc/xml/catalog &amp;&amp;
+
+xmlcatalog --noout --add "rewriteSystem" \
            "https://cdn.docbook.org/release/xsl-nons/current" \
+           "/usr/share/xml/docbook/xsl-stylesheets-nons-&docbook-xsl-version;" \
+    /etc/xml/catalog &amp;&amp;
+
+xmlcatalog --noout --add "rewriteURI" \
+           "http://cdn.docbook.org/release/xsl-nons/current" \
            "/usr/share/xml/docbook/xsl-stylesheets-nons-&docbook-xsl-version;" \
     /etc/xml/catalog &amp;&amp;