Index: introduction/welcome/changelog.xml
===================================================================
--- introduction/welcome/changelog.xml (revision 377f5f2835fb5a69255c86853c4dd4ea6882564c)
+++ introduction/welcome/changelog.xml (revision c960b368d3015fff04c10cd9b32722d5610a7665)
@@ -45,4 +45,8 @@
January 18th, 2019
+
+ [bdubbs] - Change to docbook-xsl-nons. Fixes
+ #11559.
+
[renodr] - Update to gtk-vnc-0.9.0. Fixes
Index: pst/xml/docbook-xsl.xml
===================================================================
--- pst/xml/docbook-xsl.xml (revision 377f5f2835fb5a69255c86853c4dd4ea6882564c)
+++ pst/xml/docbook-xsl.xml (revision c960b368d3015fff04c10cd9b32722d5610a7665)
@@ -7,7 +7,7 @@
-
+
-
+
@@ -28,5 +28,5 @@
- docbook-xsl-&docbook-xsl-version;
+ docbook-xsl-nons-&docbook-xsl-version;
@@ -70,5 +70,5 @@
Required patch:
+ url="&patch-root;/docbook-xsl-nons-&docbook-xsl-version;-stack_fix-1.patch"/>
@@ -124,5 +124,5 @@
First, fix a problem that causes stack overflows when doing recursion:
-patch -Np1 -i ../docbook-xsl-&docbook-xsl-version;-stack_fix-1.patch
+patch -Np1 -i ../docbook-xsl-nons-&docbook-xsl-version;-stack_fix-1.patch
If you downloaded the optional documentation tarball, unpack it
@@ -138,5 +138,5 @@
root user:
-install -v -m755 -d /usr/share/xml/docbook/xsl-stylesheets-&docbook-xsl-version; &&
+install -v -m755 -d /usr/share/xml/docbook/xsl-stylesheets-nons-&docbook-xsl-version; &&
cp -v -R VERSION assembly common eclipse epub epub3 extensions fo \
@@ -144,12 +144,12 @@
profiling roundtrip slides template tests tools webhelp website \
xhtml xhtml-1_1 xhtml5 \
- /usr/share/xml/docbook/xsl-stylesheets-&docbook-xsl-version; &&
-
-ln -s VERSION /usr/share/xml/docbook/xsl-stylesheets-&docbook-xsl-version;/VERSION.xsl &&
+ /usr/share/xml/docbook/xsl-stylesheets-nons-&docbook-xsl-version; &&
+
+ln -s VERSION /usr/share/xml/docbook/xsl-stylesheets-nons-&docbook-xsl-version;/VERSION.xsl &&
install -v -m644 -D README \
- /usr/share/doc/docbook-xsl-&docbook-xsl-version;/README.txt &&
+ /usr/share/doc/docbook-xsl-nons-&docbook-xsl-version;/README.txt &&
install -v -m644 RELEASE-NOTES* NEWS* \
- /usr/share/doc/docbook-xsl-&docbook-xsl-version;
+ /usr/share/doc/docbook-xsl-nons-&docbook-xsl-version;
If you downloaded the optional documentation tarball, install the
@@ -157,5 +157,5 @@
root user:
-cp -v -R doc/* /usr/share/doc/docbook-xsl-&docbook-xsl-version;
+cp -v -R doc/* /usr/share/doc/docbook-xsl-nons-&docbook-xsl-version;
@@ -177,4 +177,13 @@
Configuration Information
+
+
+ If you are installing the current version of docbook-xsl-nons
+ over a previous version of docbook-xsl, then remove the old
+ rewrite entries in the catalog as the root user:
+
+sed -i '/rewrite/d' /etc/xml/catalog
+
Create (or append) and populate the XML catalog file using the
@@ -188,21 +197,31 @@
xmlcatalog --noout --add "rewriteSystem" \
- "http://docbook.sourceforge.net/release/xsl/&docbook-xsl-version;" \
- "/usr/share/xml/docbook/xsl-stylesheets-&docbook-xsl-version;" \
- /etc/xml/catalog &&
-
-xmlcatalog --noout --add "rewriteURI" \
- "http://docbook.sourceforge.net/release/xsl/&docbook-xsl-version;" \
- "/usr/share/xml/docbook/xsl-stylesheets-&docbook-xsl-version;" \
+ "https://cdn.docbook.org/release/xsl-nons/1.79.2" \
+ "/usr/share/xml/docbook/xsl-stylesheets-nons-1.79.2" \
+ /etc/xml/catalog &&
+
+xmlcatalog --noout --add "rewriteURI" \
+ "https://cdn.docbook.org/release/xsl-nons/1.79.2" \
+ "/usr/share/xml/docbook/xsl-stylesheets-nons-1.79.2" \
+ /etc/xml/catalog &&
+
+xmlcatalog --noout --add "rewriteSystem" \
+ "https://cdn.docbook.org/release/xsl-nons/current" \
+ "/usr/share/xml/docbook/xsl-stylesheets-nons-1.79.2" \
+ /etc/xml/catalog &&
+
+xmlcatalog --noout --add "rewriteURI" \
+ "https://cdn.docbook.org/release/xsl-nons/current" \
+ "/usr/share/xml/docbook/xsl-stylesheets-nons-1.79.2" \
/etc/xml/catalog &&
xmlcatalog --noout --add "rewriteSystem" \
"http://docbook.sourceforge.net/release/xsl/current" \
- "/usr/share/xml/docbook/xsl-stylesheets-&docbook-xsl-version;" \
+ "/usr/share/xml/docbook/xsl-stylesheets-nons-1.79.2" \
/etc/xml/catalog &&
xmlcatalog --noout --add "rewriteURI" \
"http://docbook.sourceforge.net/release/xsl/current" \
- "/usr/share/xml/docbook/xsl-stylesheets-&docbook-xsl-version;" \
+ "/usr/share/xml/docbook/xsl-stylesheets-nons-1.79.2" \
/etc/xml/catalog