Merge branch 'release/3.6' into master

* release/3.6: Update screenshot for 3.6 release Bump plug-in version to 3.6 Update Bootstrap docs references to latest: 4.5 Update header link to latest Bootstrap (4.5.3) CSS Add new installation syntax for DITA-OT 3.5 and up Update RELAX NG schema reference to use public URL
infotexture · Dec 19, 2020 · 0006b95 · 0006b95
2 parents 300b296 + a2ab94f
commit 0006b95
Show file tree

Hide file tree

Showing 5 changed files with 10 additions and 6 deletions.
diff --git a/README.md b/README.md
@@ -17,6 +17,10 @@ A plug-in for [DITA Open Toolkit][1] that extends the default HTML5 output with
 
 Use the `dita` command to add this plug-in to your DITA Open Toolkit installation:
 
+DITA-OT 3.5 and newer:
+
+    dita install net.infotexture.dita-bootstrap
+
 DITA-OT 3.3 and newer:
 
     dita --install net.infotexture.dita-bootstrap
@@ -64,7 +68,7 @@ For more extensive customizations, you may want to [fork][5] this repository and
 - If you know how to fix it yourself, [submit a pull request][8] with the proposed changes.
 
 [1]: http://www.dita-ot.org
-[2]: https://getbootstrap.com/docs/4.4
+[2]: https://getbootstrap.com/docs/4.5
 [3]: https://github.com/infotexture/dita-bootstrap/blob/master/includes/bs-navbar-inverse.hdr.xml
 [4]: https://github.com/infotexture/dita-bootstrap/blob/master/css/custom.css
 [5]: https://help.github.com/articles/fork-a-repo/

diff --git a/images/dita-bootstrap-default-screenshot.png b/images/dita-bootstrap-default-screenshot.png
diff --git a/includes/bootstrap.hdf.xml b/includes/bootstrap.hdf.xml
@@ -1,3 +1,3 @@
 <div>
-  <link rel="stylesheet" href="https://stackpath.bootstrapcdn.com/bootstrap/4.4.1/css/bootstrap.min.css" integrity="sha384-Vkoo8x4CGsO3+Hhxv8T/Q5PaXtkKtu6ug5TOeNV6gBiFeWPGFN9MuhOf23Q9Ifjh" crossorigin="anonymous"/>
+  <link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/bootstrap@4.5.3/dist/css/bootstrap.min.css" integrity="sha384-TX8t27EcRE3e/ihU7zmQxVncDAy5uIKz4rEkgIXeMed4M0jlfIDPvg6uqKI2xXr2" crossorigin="anonymous"/>
 </div>
diff --git a/plugin.xml b/plugin.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<?xml-model href="dita-ot/plugin.rnc" type="application/relax-ng-compact-syntax"?>
+<?xml-model href="https://www.dita-ot.org/rng/plugin.rnc" type="application/relax-ng-compact-syntax"?>
 
 <!-- Copyright © 2017 · infotexture · Roger W. Fienhold Sheen -->
 <!-- See the accompanying LICENSE file for applicable license -->
 
 <plugin id="net.infotexture.dita-bootstrap">
-  <feature extension="package.version" value="3.4.1"/>
+  <feature extension="package.version" value="3.6"/>
   <require plugin="org.dita.html5"/>
   <transtype name="html5-bootstrap" extends="html5" desc="HTML5 with Bootstrap style"/>
   <feature extension="ant.import" file="build_dita2html5-bootstrap.xml"/>

diff --git a/xsl/html5-bootstrap.xsl b/xsl/html5-bootstrap.xsl
@@ -33,7 +33,7 @@
   </xsl:template>
 
   <!-- Override to add Bootstrap container & row to page -->
-  <!-- https://getbootstrap.com/docs/4.4/layout/grid/ -->
+  <!-- https://getbootstrap.com/docs/4.5/layout/grid/ -->
   <xsl:template match="*" mode="chapterBody">
     <body>
       <xsl:apply-templates select="." mode="addAttributesToHtmlBodyElement"/>
@@ -57,7 +57,7 @@
   </xsl:template>
 
   <!-- Override to add Bootstrap large grid classes. -->
-  <!-- https://getbootstrap.com/docs/4.4/layout/grid -->
+  <!-- https://getbootstrap.com/docs/4.5/layout/grid -->
   <xsl:attribute-set name="main">
     <xsl:attribute name="class">col-lg-9</xsl:attribute>
     <xsl:attribute name="role">main</xsl:attribute>