aboutsummaryrefslogtreecommitdiffstats
path: root/etc/schema
diff options
context:
space:
mode:
authorPaul Eggert2017-09-13 15:52:52 -0700
committerPaul Eggert2017-09-13 15:54:37 -0700
commitbc511a64f6da9ab51acc7c8865e80c4a4cb655c2 (patch)
treeef96fb35c034096404b7edaa25982023f38cf84f /etc/schema
parent5da53a01912c2f5d46f5df4ef8cc13a34b5017d4 (diff)
downloademacs-bc511a64f6da9ab51acc7c8865e80c4a4cb655c2.tar.gz
emacs-bc511a64f6da9ab51acc7c8865e80c4a4cb655c2.zip
Prefer HTTPS to FTP and HTTP in documentation
Most of this change is to boilerplate commentary such as license URLs. This change was prompted by ftp://ftp.gnu.org's going-away party, planned for November. Change these FTP URLs to https://ftp.gnu.org instead. Make similar changes for URLs to other organizations moving away from FTP. Also, change HTTP to HTTPS for URLs to gnu.org and fsf.org when this works, as this will further help defend against man-in-the-middle attacks (for this part I omitted the MS-DOS and MS-Windows sources and the test tarballs to keep the workload down). HTTPS is not fully working to lists.gnu.org so I left those URLs alone for now.
Diffstat (limited to 'etc/schema')
-rw-r--r--etc/schema/locate.rnc6
-rw-r--r--etc/schema/relaxng.rnc8
-rw-r--r--etc/schema/schemas.xml2
3 files changed, 8 insertions, 8 deletions
diff --git a/etc/schema/locate.rnc b/etc/schema/locate.rnc
index 9af01981054..3f4e7bba125 100644
--- a/etc/schema/locate.rnc
+++ b/etc/schema/locate.rnc
@@ -13,7 +13,7 @@
13# GNU General Public License for more details. 13# GNU General Public License for more details.
14 14
15# You should have received a copy of the GNU General Public License 15# You should have received a copy of the GNU General Public License
16# along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. 16# along with GNU Emacs. If not, see <https://www.gnu.org/licenses/>.
17 17
18default namespace this = "http://thaiopensource.com/ns/locating-rules/1.0" 18default namespace this = "http://thaiopensource.com/ns/locating-rules/1.0"
19namespace local = "" 19namespace local = ""
@@ -36,7 +36,7 @@ rule =
36 | typeId 36 | typeId
37 # | typeIdBase 37 # | typeIdBase
38 | extensionRule 38 | extensionRule
39 39
40## Group of rules. Useful with xml:base. 40## Group of rules. Useful with xml:base.
41group = element group { common, rule* } 41group = element group { common, rule* }
42 42
@@ -212,6 +212,6 @@ extensionRule =
212 212
213anyElement = element * { attribute * { text }*, (text|anyElement)* } 213anyElement = element * { attribute * { text }*, (text|anyElement)* }
214 214
215common = 215common =
216 # attribute xml:base { xsd:anyURI }?, 216 # attribute xml:base { xsd:anyURI }?,
217 attribute * - (xml:base|this:*|local:*) { text }* 217 attribute * - (xml:base|this:*|local:*) { text }*
diff --git a/etc/schema/relaxng.rnc b/etc/schema/relaxng.rnc
index fae2bf1f012..7961457dd00 100644
--- a/etc/schema/relaxng.rnc
+++ b/etc/schema/relaxng.rnc
@@ -15,7 +15,7 @@
15# GNU General Public License for more details. 15# GNU General Public License for more details.
16 16
17# You should have received a copy of the GNU General Public License 17# You should have received a copy of the GNU General Public License
18# along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. 18# along with GNU Emacs. If not, see <https://www.gnu.org/licenses/>.
19 19
20default namespace rng = "http://relaxng.org/ns/structure/1.0" 20default namespace rng = "http://relaxng.org/ns/structure/1.0"
21namespace local = "" 21namespace local = ""
@@ -39,7 +39,7 @@ param = element param { commonAttributes, nameNCName, xsd:string }
39 39
40exceptPattern = element except { common & pattern+ } 40exceptPattern = element except { common & pattern+ }
41 41
42grammarContent = 42grammarContent =
43 definition 43 definition
44 | element div { common & grammarContent* } 44 | element div { common & grammarContent* }
45 | element include { href, (common & includeContent*) } 45 | element include { href, (common & includeContent*) }
@@ -54,7 +54,7 @@ definition =
54 54
55combine = attribute combine { "choice" | "interleave" } 55combine = attribute combine { "choice" | "interleave" }
56 56
57nameClass = 57nameClass =
58 element name { commonAttributes, xsd:QName } 58 element name { commonAttributes, xsd:QName }
59 | element anyName { common & exceptNameClass? } 59 | element anyName { common & exceptNameClass? }
60 | element nsName { common & exceptNameClass? } 60 | element nsName { common & exceptNameClass? }
@@ -69,7 +69,7 @@ type = attribute type { xsd:NCName }
69 69
70common = commonAttributes, foreignElement* 70common = commonAttributes, foreignElement*
71 71
72commonAttributes = 72commonAttributes =
73 attribute ns { xsd:string }?, 73 attribute ns { xsd:string }?,
74 attribute datatypeLibrary { xsd:anyURI }?, 74 attribute datatypeLibrary { xsd:anyURI }?,
75 foreignAttribute* 75 foreignAttribute*
diff --git a/etc/schema/schemas.xml b/etc/schema/schemas.xml
index 97b29617c79..ef4a0b3e0ef 100644
--- a/etc/schema/schemas.xml
+++ b/etc/schema/schemas.xml
@@ -13,7 +13,7 @@ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
13GNU General Public License for more details. 13GNU General Public License for more details.
14 14
15You should have received a copy of the GNU General Public License 15You should have received a copy of the GNU General Public License
16along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. --> 16along with GNU Emacs. If not, see <https://www.gnu.org/licenses/>. -->
17 17
18<locatingRules xmlns="http://thaiopensource.com/ns/locating-rules/1.0"> 18<locatingRules xmlns="http://thaiopensource.com/ns/locating-rules/1.0">
19 <transformURI fromPattern="*.xml" toPattern="*.rnc"/> 19 <transformURI fromPattern="*.xml" toPattern="*.rnc"/>