Merge commit '5d71e657c405b9e5ce4dbe3f867561e7b22480f6'

Author: bengtmartensson

common/schemas/catalog.xml

@@ -6,15 +6,15 @@
 
     <!-- Our own DTDs -->
     <public publicId="-//harctoolbox.org//version//en" uri="../dtds/version.dtd"/>
-    <system systemId="http://www.harctoolbox.org/dtds/version.dtd" uri="../dtds/version.dtd"/>
+    <system systemId="https://www.harctoolbox.org/dtds/version.dtd" uri="../dtds/version.dtd"/>
     <public publicId="-//harctoolbox.org//properties//en" uri="../dtds/properties.dtd"/>
-    <system systemId="http://www.harctoolbox.org/dtds/properties.dtd" uri="../dtds/properties.dtd"/>
+    <system systemId="https://www.harctoolbox.org/dtds/properties.dtd" uri="../dtds/properties.dtd"/>
 
     <!-- Our own schemas -->
-    <system systemId="http://www.harctoolbox.org/schemas/exportformats.xsd" uri="./exportformats.xsd"/>
-    <system systemId="http://www.harctoolbox.org/schemas/girr_ns.xsd" uri="./girr_ns.xsd"/>
-    <system systemId="http://www.harctoolbox.org/schemas/girr.xsd" uri="./girr.xsd"/>
-    <system systemId="http://www.harctoolbox.org/schemas/irp-protocols.xsd" uri="./irp-protocols.xsd"/>
+    <system systemId="https://www.harctoolbox.org/schemas/exportformats.xsd" uri="./exportformats.xsd"/>
+    <system systemId="https://www.harctoolbox.org/schemas/girr_ns.xsd" uri="./girr_ns.xsd"/>
+    <system systemId="https://www.harctoolbox.org/schemas/girr.xsd" uri="./girr.xsd"/>
+    <system systemId="https://www.harctoolbox.org/schemas/irp-protocols.xsd" uri="./irp-protocols.xsd"/>
 
     <!-- Apache Forrest, used by the documentation files -->
     <!--public publicId="-//APACHE//DTD DocumentationV2.0//en" uri="./document-v20.dtd"/-->

common/schemas/girr.xsd

@@ -15,7 +15,7 @@
         <xs:documentation>
             <html:div>
                 The Girr format
-                is documented at <html:a href="http://www.harctoolbox.org/Girr.html">www.harctoolbox.org/Girr.html</html:a>
+                is documented at <html:a href="https://www.harctoolbox.org/Girr.html">www.harctoolbox.org/Girr.html</html:a>
             </html:div>
         </xs:documentation>
     </xs:annotation>

common/schemas/girr_ns-1.2.xsd

@@ -18,15 +18,15 @@
         <xs:documentation>
             <html:div>
                 The Girr format
-                is documented at <html:a href="http://www.harctoolbox.org/Girr.html">www.harctoolbox.org/Girr.html</html:a>
+                is documented at <html:a href="https://www.harctoolbox.org/Girr.html">www.harctoolbox.org/Girr.html</html:a>
             </html:div>
         </xs:documentation>
     </xs:annotation>
 
     <xs:import namespace="http://www.w3.org/XML/1998/namespace" schemaLocation="http://www.w3.org/2001/xml.xsd"/>
     <xs:import namespace="http://www.w3.org/1999/xhtml" schemaLocation="http://www.w3.org/2002/08/xhtml/xhtml1-strict.xsd"/>
     <xs:import namespace="http://www.w3.org/2001/XInclude" schemaLocation="https://www.w3.org/2001/XInclude/XInclude.xsd"/>
-    <xs:import namespace="http://www.harctoolbox.org/irp-protocols" schemaLocation="http://www.harctoolbox.org/schemas/irp-protocols.xsd"/>
+    <xs:import namespace="http://www.harctoolbox.org/irp-protocols" schemaLocation="https://www.harctoolbox.org/schemas/irp-protocols.xsd"/>
 
     <xs:simpleType name="masterEnum">
         <xs:annotation>

common/schemas/girr_ns.xsd

@@ -18,15 +18,15 @@
         <xs:documentation>
             <html:div>
                 The Girr format
-                is documented at <html:a href="http://www.harctoolbox.org/Girr.html">www.harctoolbox.org/Girr.html</html:a>
+                is documented at <html:a href="https://www.harctoolbox.org/Girr.html">www.harctoolbox.org/Girr.html</html:a>
             </html:div>
         </xs:documentation>
     </xs:annotation>
 
     <xs:import namespace="http://www.w3.org/XML/1998/namespace" schemaLocation="http://www.w3.org/2001/xml.xsd"/>
     <xs:import namespace="http://www.w3.org/1999/xhtml" schemaLocation="http://www.w3.org/2002/08/xhtml/xhtml1-strict.xsd"/>
     <xs:import namespace="http://www.w3.org/2001/XInclude" schemaLocation="https://www.w3.org/2001/XInclude/XInclude.xsd"/>
-    <xs:import namespace="http://www.harctoolbox.org/irp-protocols" schemaLocation="http://www.harctoolbox.org/schemas/irp-protocols.xsd"/>
+    <xs:import namespace="http://www.harctoolbox.org/irp-protocols" schemaLocation="https://www.harctoolbox.org/schemas/irp-protocols.xsd"/>
 
     <xs:simpleType name="masterEnum">
         <xs:annotation>

common/schemas/irp-protocols.xsd

@@ -16,13 +16,13 @@
         <xs:documentation>
             <html:div>
                 This document determines and documents the format of the protocol data base <html:code>IrpProtocols.xml</html:code> as used in
-                <html:a href="http://www.harctoolbox.org/IrpTransmogrifier.html">IrpTransmogrifier</html:a>,
+                <html:a href="https://www.harctoolbox.org/IrpTransmogrifier.html">IrpTransmogrifier</html:a>,
                 (and possibly other programs).
                 It is maintained in the repository
                 <html:a href="https://github.com/bengtmartensson/IrpTransmogrifier">https://github.com/bengtmartensson/IrpTransmogrifier"</html:a>
                 with path <html:a href="https://raw.githubusercontent.com/bengtmartensson/IrpTransmogrifier/master/src/main/schemas/irp-protocols.xsd">
                     main/schemas/irp-protocols.xsd</html:a>, and can be used with <html:code>schemaLocation</html:code>
-                    <html:a href="http://www.harctoolbox.org/schemas/irp-protocols.xsd">http://www.harctoolbox.org/schemas/irp-protocols.xsd</html:a>.
+                    <html:a href="https://www.harctoolbox.org/schemas/irp-protocols.xsd">https://www.harctoolbox.org/schemas/irp-protocols.xsd</html:a>.
             </html:div>
         </xs:documentation>
     </xs:annotation>

common/xslt/xdoc2html.xsl

@@ -63,7 +63,7 @@
    <xsl:template match="/document/body/table">
        <p>For the revision history of this document, see
            the original document on the
-           <a><xsl:attribute name="href">http://www.harctoolbox.org</xsl:attribute>web site</a>.
+           <a><xsl:attribute name="href">https://www.harctoolbox.org</xsl:attribute>web site</a>.
        </p>
    </xsl:template>
 
@@ -143,7 +143,7 @@
                                 or starts-with(.,'IrpTransmogrifier')
                                 or starts-with(.,'Glossary'))]">
         <xsl:attribute name="href">
-            <xsl:text>http://www.harctoolbox.org/</xsl:text>
+            <xsl:text>https://www.harctoolbox.org/</xsl:text>
             <xsl:value-of select="."/>
         </xsl:attribute>
     </xsl:template>

common/xslt/xdoc2md.xsl

@@ -81,12 +81,12 @@
 
     <!-- Fix up local references; they won't be local any more -->
     <xsl:template match="@href[not(starts-with(., 'http'))]">
-        <xsl:text>http://harctoolbox.org/</xsl:text>
+        <xsl:text>https://harctoolbox.org/</xsl:text>
         <xsl:value-of select="."/>
     </xsl:template>
 
     <xsl:template match="@href[substring(.,1,1)='#']">
-        <xsl:text>http://harctoolbox.org/Girr.html</xsl:text>
+        <xsl:text>https://harctoolbox.org/Girr.html</xsl:text>
         <xsl:value-of select="."/>
     </xsl:template>