Browse Source

Fix legal notice on old public domain XEPs

I have no idea if any of this makes sense legally, so just leave it as
it was before (except make it match the DTD so the linter won't
complain).
Sam Whited 2 years ago
parent
commit
e3acaa93f8
6 changed files with 19 additions and 14 deletions
  1. 0
    5
      .travis.yml
  2. 2
    6
      Makefile
  3. 1
    1
      xep-0017.xml
  4. 1
    1
      xep-0024.xml
  5. 1
    1
      xep-0037.xml
  6. 14
    0
      xep.ent

+ 0
- 5
.travis.yml View File

@@ -3,10 +3,5 @@ addons:
3 3
     packages:
4 4
       - xsltproc
5 5
       - libxml2-utils
6
-before_install:
7
-  - wget -O git-ratchet https://github.com/iangrunert/git-ratchet/releases/download/v0.3.1/linux_amd64_git-ratchet
8
-  - chmod +x git-ratchet
9
-  - git fetch https://github.com/xsf/xeps.git refs/notes/*:refs/notes/*
10 6
 script:
11 7
   - make all
12
-  - echo "lint,$(xmllint --nonet --noout --noent --loaddtd --valid *.xml 2>&1 | wc -l)" | ./git-ratchet check -v

+ 2
- 6
Makefile View File

@@ -46,9 +46,7 @@ xep-%.pdf: $(OUTDIR)/xep-%.pdf ;
46 46
 dependencies: $(OUTDIR)/prettify.css $(OUTDIR)/prettify.js $(OUTDIR)/xmpp.css ;
47 47
 
48 48
 $(OUTDIR)/%.html: %.xml $(XMLDEPS) dependencies
49
-	# TODO: After existing issues are worked out this and the ratcheting CI build
50
-	#       should be removed and become an error, not just a warning.
51
-	xmllint --nonet --noout --noent --loaddtd --valid "$<" || true
49
+	xmllint --nonet --noout --noent --loaddtd --valid "$<"
52 50
 	# Check for non-data URIs
53 51
 	! xmllint --nonet --noout --noent --loaddtd --xpath "//img/@src[not(starts-with(., 'data:'))]" $< 2>/dev/null && true
54 52
 
@@ -59,9 +57,7 @@ $(OUTDIR)/xmpp.pdf $(OUTDIR)/xmpp-text.pdf:
59 57
 	cp "resources/$(notdir $@)" "$@"
60 58
 
61 59
 $(OUTDIR)/%.pdf: %.xml $(TEXMLDEPS) $(XMLDEPS) dependencies
62
-	# TODO: After existing issues are worked out this and the ratcheting CI build
63
-	#       should be removed and become an error, not just a warning.
64
-	xmllint --nonet --noout --noent --loaddtd --valid "$<" || true
60
+	xmllint --nonet --noout --noent --loaddtd --valid "$<"
65 61
 	# Check for non-data URIs
66 62
 	! xmllint --nonet --noout --noent --loaddtd --xpath "//img/@src[not(starts-with(., 'data:'))]" $< 2>/dev/null && true
67 63
 

+ 1
- 1
xep-0017.xml View File

@@ -8,7 +8,7 @@
8 8
 <header>
9 9
 <title>Naive Packet Framing Protocol</title>
10 10
 <abstract>An intermediate method for more efficient framing of the Jabber XML Stream.</abstract>
11
-<legal>This document has been placed in the public domain.</legal>
11
+&PUBLICDOMAINNOTICE;
12 12
 <number>0017</number>
13 13
 <status>Rejected</status>
14 14
 <type>Informational</type>

+ 1
- 1
xep-0024.xml View File

@@ -8,7 +8,7 @@
8 8
 <header>
9 9
   <title>Publish/Subscribe</title>
10 10
   <abstract>A publish-subscribe protocol for Jabber.</abstract> 
11
-  <legal>This document has been placed in the public domain.</legal>
11
+  &PUBLICDOMAINNOTICE;
12 12
   <number>0024</number>
13 13
   <status>Retracted</status>
14 14
   <type>Standards Track</type>

+ 1
- 1
xep-0037.xml View File

@@ -8,7 +8,7 @@
8 8
 <header>
9 9
   <title>DSPS - Data Stream Proxy Service</title>
10 10
   <abstract>A proposal for proxy support in Jabber.</abstract>
11
-  <legal>This document has been placed in the public domain.</legal>
11
+  &PUBLICDOMAINNOTICE;
12 12
   <number>0037</number>
13 13
   <status>Rejected</status>
14 14
   <type>Standards Track</type>

+ 14
- 0
xep.ent View File

@@ -230,6 +230,20 @@ THE SOFTWARE.
230 230
 <conformance>This XMPP Extension Protocol has been contributed in full conformance with the XSF's Intellectual Property Rights Policy (a copy of which can be found at &lt;<link url='http://xmpp.org/about-xmpp/xsf/xsf-ipr-policy/'>http://xmpp.org/about-xmpp/xsf/xsf-ipr-policy/</link>&gt; or obtained by writing to XMPP Standards Foundation, P.O. Box 787, Parker, CO 80134 USA).</conformance>
231 231
 </legal>" >
232 232
 
233
+<!-- NOTE: New XEPs should not use this. Use LEGALNOTICE. -->
234
+<!ENTITY PUBLICDOMAINNOTICE "
235
+<legal>
236
+<copyright>This document has been placed in the public domain.</copyright>
237
+<!-- These probably need to be fixed, but they weren't in the documents this
238
+		 entity replaces and I have no idea if adding them makes any sense legally.
239
+		 Needs expert review.
240
+-->
241
+<permissions/>
242
+<warranty/>
243
+<liability/>
244
+<conformance/>
245
+</legal>" >
246
+
233 247
 <!-- other XSF-related text shortcuts -->
234 248
 
235 249
 <!ENTITY BOOLEANNOTE "<note>In accordance with Section 3.2.2.1 of <cite>XML Schema Part 2: Datatypes</cite>, the allowable lexical representations for the xs:boolean datatype are the strings &quot;0&quot; and &quot;false&quot; for the concept 'false' and the strings &quot;1&quot; and &quot;true&quot; for the concept 'true'; implementations MUST support both styles of lexical representation.</note>" >

Loading…
Cancel
Save