corrections

git-svn-id: file:///home/ksmith/gitmigration/svn/xmpp/trunk@51 4b5297f7-1745-476d-ba37-a9c6900126ab
xsf · Oct 4, 2006 · 56412aa · 56412aa
1 parent 2d4af4e
commit 56412aa
Show file tree

Hide file tree

Showing 84 changed files with 249 additions and 273 deletions.
diff --git a/all.sh b/all.sh
@@ -1,31 +1,20 @@
 #!/bin/sh
-# for each XEP, generates HTML file and IETF reference, then copies XML file
-# also generates HTML for the README and template
-# finally, copies the stylesheet, DTD, and schema
-# usage: ./all.sh
+# for one XEP, generates HTML file and IETF reference, then copies XML file
+# usage: ./gen.sh xxxx 
+# (where xxxx is the 4-digit XEP number)
 
 xeppath=/var/www/stage.xmpp.org/extensions
 
-ls xep-0*.xml > tmp.txt
-sed s/xep-\(.*\).xml/\1/ tmp.txt > nums.txt
-rm tmp.txt
+xsltproc xep.xsl xep-$1.xml > $xeppath/jep-$1.html
+xsltproc ref.xsl xep-$1.xml > $xeppath/refs/reference.JSF.XEP-$1.xml
 
-while read f
-do
-    xsltproc xep.xsl xep-$f.xml > $xeppath/xep-$f.html
-    xsltproc ref.xsl xep-$f.xml > $xeppath/refs/reference.JSF.XEP-$f.xml
-    cp xep-$f.xml $xeppath/
-done < nums.txt
+cp xep-$1.xml $xeppath/
 
-rm nums.txt
-
-xsltproc xep.xsl xep-README.xml > $xeppath/README.html
-xsltproc xep.xsl xep-template.xml > $xeppath/template.html
-
-cp xep.dtd $xeppath/
-cp xep.ent $xeppath/
-cp xep.xsd $xeppath/
-cp xep.xsl $xeppath/
+cp *.dtd $xeppath/
+cp *.ent $xeppath/
+cp *.gif $xeppath/
+cp *.html $xeppath/
+cp *.shtml $xeppath/
+cp *.xsd $xeppath/
 
 # END
-
diff --git a/deferred.py b/deferred.py
@@ -2,7 +2,7 @@
 
 # File: deferred.py
 # Version: 0.2
-# Description: a script for setting a JEP to Deferred
+# Description: a script for setting a XEP to Deferred
 # Last Modified: 2006-04-24
 # Author: Peter Saint-Andre (stpeter@jabber.org)
 # License: public domain
@@ -33,7 +33,7 @@ def getText(nodelist):
 
 # READ IN ARGS: 
 #
-# 1. JEP number
+# 1. XEP number
 # 2. database user
 # 3. database password
 
@@ -43,7 +43,7 @@ def getText(nodelist):
 
 jepfile = jepnum + '/jep-' + jepnum + '.xml'
 
-# PARSE JEP HEADERS:
+# PARSE XEP HEADERS:
 #
 # - title
 # - abstract
@@ -79,15 +79,15 @@ def getText(nodelist):
 # name is $title
 # type is $jeptype
 # status is $jepstatus
-# notes is "Version $version of JEP-$jepnum released $date."
+# notes is "Version $version of XEP-$jepnum released $date."
 # version is $version
 # last_modified is $now
 # abstract is $abstract
 # changelog is "$remark ($initials)"
 
 db = MySQLdb.connect("localhost", dbuser, dbpw, "foundation")
 cursor = db.cursor()
-theNotes = "Version " + version + " of JEP-" + jepnum + " released " + date + "; consideration deferred because of inactivity."
+theNotes = "Version " + version + " of XEP-" + jepnum + " released " + date + "; consideration deferred because of inactivity."
 theLog = remark + " (" + initials + ")"
 theStatement = "UPDATE jeps SET name='" + title + "', type='" + jeptype + "', status='Deferred', notes='" + theNotes + "', version='" + str(version) + "', last_modified='" + str(now) + "', abstract='" + abstract + "', changelog='" + theLog + "' WHERE number='" + str(jepnum) + "';"
 cursor.execute(theStatement) 
@@ -97,15 +97,15 @@ def getText(nodelist):
 #
 # From: editor@jabber.org
 # To: standards-jig@jabber.org
-# Subject: DEFERRED: JEP-$jepnum ($title)
+# Subject: DEFERRED: XEP-$jepnum ($title)
 # Body:
-#    JEP-$jepnum ($title) has been Deferred because of inactivity.
+#    XEP-$jepnum ($title) has been Deferred because of inactivity.
 #
 #    Abstract: $abstract
 #
 #    URL: http://www.jabber.org/jeps/jep-$jepnum.html
 #
-#    If and when a new revision of this JEP is published,
+#    If and when a new revision of this XEP is published,
 #    its status will be changed back to Experimental.
 #
 
@@ -115,14 +115,14 @@ def getText(nodelist):
 # for real...
 toaddrs = "standards-jig@jabber.org"
 
-thesubject = 'DEFERRED: JEP-' + jepnum + " (" + title + ")"
-introline = 'JEP-' + jepnum + ' (' + title + ') has been Deferred because of inactivity.'
+thesubject = 'DEFERRED: XEP-' + jepnum + " (" + title + ")"
+introline = 'XEP-' + jepnum + ' (' + title + ') has been Deferred because of inactivity.'
 abstractline = 'Abstract: ' + abstract
 urlline = 'URL: http://www.jabber.org/jeps/jep-' + jepnum + '.html'
-endline = 'If and when a new revision of this JEP is published, its status will be changed back to Experimental.'
+endline = 'If and when a new revision of this XEP is published, its status will be changed back to Experimental.'
 
 #msg = "From: %s\r\n" % fromaddr
-msg = "From: JEP Editor <%s>\r\n" % fromaddr
+msg = "From: XMPP Extensions Editor <%s>\r\n" % fromaddr
 msg = msg + "To: %s\r\n" % toaddrs
 msg = msg + "Subject: %s\r\n" % thesubject
 msg = msg + introline

diff --git a/fo.xsl b/fo.xsl
@@ -27,7 +27,7 @@
       <page-sequence master-reference="jep_sequence">
         <flow flow-name="xsl-region-body" font-family="serif" color="black" font-size="10pt">
           <block space-before="1.5in" text-align="right" font-family="sans-serif" font-size="18pt">
-            JEP-<xsl:value-of select="/jep/header/number"/>
+            XEP-<xsl:value-of select="/jep/header/number"/>
           </block>
           <block text-align="right" font-family="sans-serif" font-size="18pt">
             <xsl:value-of select="/jep/header/title"/>
@@ -105,21 +105,9 @@
         </flow>
       </page-sequence>
       <page-sequence master-reference="std_page" initial-page-number="1">
-        <!--<static-content flow-name="xsl-region-before" margin-top=".5in">
-                    <block margin-left="1in" margin-right="1in" text-align-last="justify" font-size="9pt" font-family="sans-serif" color="silver">
-                        <xsl:value-of select="/jep/header/customer"/>
-                        <leader leader-pattern="space"/>
-                    Requirements Proposal
-                    </block>
-                    <block margin-left="1in" margin-right="1in" padding-bottom="10pt" border-after-color="black" border-after-width=".25pt" border-after-style="solid" text-align-last="justify" font-size="9pt" font-family="sans-serif" color="silver">
-                        <xsl:value-of select="/jep/header/title"/>
-                        <leader leader-pattern="space"/>
-                        <xsl:value-of select="/jep/header/revision[last()]/date"/>
-                    </block>
-                </static-content>-->
         <static-content flow-name="xsl-region-after">
           <block margin-left="1in" margin-right="1in" padding-top="10pt" border-before-color="black" border-before-width=".125pt" border-before-style="solid" text-align-last="justify" font-size="8pt" font-family="sans-serif" color="black">
-                        IJEP-<xsl:value-of select="/jep/header/number"/>:<xsl:text> </xsl:text>
+                        XEP-<xsl:value-of select="/jep/header/number"/>:<xsl:text> </xsl:text>
             <xsl:value-of select="/jep/header/title"/>
             <leader leader-pattern="space"/>
                         Page <page-number/> of <page-number-citation ref-id="lastpage"/>

diff --git a/gps_datum.html b/gps_datum.html
@@ -4,7 +4,7 @@
 </head>
 <body>
 <h1>GPS Datum Example</h1>
-<p>The following example of GPS datum differences was kindly provided by Randy Steele of Apollo, Pennsylvania (URL: &lt;<a href="http://www.nb.net/~resteele/">http://www.nb.net/~resteele/</a>&gt;) and is archived here so that a permanent link is available from <a href="http://www.jabber.org/jeps/jep-0080.html">JEP-0080: User Geolocation</a>.</p>
+<p>The following example of GPS datum differences was kindly provided by Randy Steele of Apollo, Pennsylvania (URL: &lt;<a href="http://www.nb.net/~resteele/">http://www.nb.net/~resteele/</a>&gt;) and is archived here so that a permanent link is available from <a href="http://www.xmpp.org/extensions/sep-0080.html">XEP-0080: User Geolocation</a>.</p>
 <p>BEGIN EXAMPLE</p>
 <hr />
 <p>This is an example of the differences in the datums you can use with a GPS.

diff --git a/inxep.py b/inxep.py
@@ -2,7 +2,7 @@
 
 # File: protojep.py
 # Version: 0.1
-# Description: a script for announcing proto-JEPs
+# Description: a script for announcing proto-XEPs
 # Last Modified: 2004-09-14
 # Author: Peter Saint-Andre (stpeter@jabber.org)
 # License: public domain
@@ -30,13 +30,13 @@ def getText(nodelist):
 
 # READ IN ARGS: 
 #
-# 1. JEP filename (sans extension)
+# 1. XEP filename (sans extension)
 
 jepname = sys.argv[1];
 
 jepfile = 'inbox/' + jepname + '.xml'
 
-# PARSE JEP HEADERS:
+# PARSE XEP HEADERS:
 #
 # - title
 # - abstract
@@ -70,18 +70,18 @@ def getText(nodelist):
 #
 # From: editor@jabber.org
 # To: standards-jig@jabber.org
-# Subject: LAST CALL: JEP-$jepnum ($title)
+# Subject: LAST CALL: XEP-$jepnum ($title)
 # Body:
-#    The JEP Editor has received a proposal for a new JEP.
+#    The XMPP Extensions Editor has received a proposal for a new XEP.
 #
 #    Title: $title
 #
 #    Abstract: $abstract
 #
 #    URL: http://www.jabber.org/jeps/inbox/$jepname.html
 #
-#    The Jabber Council will now consider whether to accept
-#    this proposal as a full JEP.
+#    The XMPP Council will now consider whether to accept
+#    this proposal as a full XEP.
 #
 
 fromaddr = "editor@jabber.org"
@@ -90,15 +90,15 @@ def getText(nodelist):
 # for real...
 toaddrs = "standards-jig@jabber.org"
 
-thesubject = 'proto-JEP: ' + title
-introline = 'The JEP Editor has received a proposal for a new JEP.'
+thesubject = 'proto-XEP: ' + title
+introline = 'The XMPP Extensions Editor has received a proposal for a new XEP.'
 titleline = 'Title: ' + title
 abstractline = 'Abstract: ' + abstract
 urlline = 'URL: http://www.jabber.org/jeps/inbox/' + jepname + '.html'
-actionline = 'The Jabber Council will decide within 7 days (or at its next meeting) whether to accept this proposal as an official JEP.'
+actionline = 'The XMPP Council will decide within 7 days (or at its next meeting) whether to accept this proposal as an official XEP.'
 
 #msg = "From: %s\r\n" % fromaddr
-msg = "From: JEP Editor <%s>\r\n" % fromaddr
+msg = "From: XEP Editor <%s>\r\n" % fromaddr
 msg = msg + "To: %s\r\n" % toaddrs
 msg = msg + "Subject: %s\r\n" % thesubject
 msg = msg + introline

diff --git a/ipr-policy.shtml b/ipr-policy.shtml
@@ -79,7 +79,7 @@ License (&lt;http://creativecommons.org/by/2.5/&gt;).
   </pre></blockquote>
 <p><hr></p>
 <h3>Notes</h3>
-<p><a name="note1"></a>1. For information about XMPP Extension Protocols, see &lt;<a href="http://www.xmpp.org/extensions/">http://www.xmpp.org/extensions/</a>&gt; and <a href="http://www.xmpp.org/extensions/xep-0001.html">JEP-0001</a>.</p>
+<p><a name="note1"></a>1. For information about XMPP Extension Protocols, see &lt;<a href="http://www.xmpp.org/extensions/">http://www.xmpp.org/extensions/</a>&gt; and <a href="http://www.xmpp.org/extensions/xep-0001.html">XEP-0001</a>.</p>
 <p><a name="note2"></a>2. For information about intellectual property conservancies, see &lt;<a href="http://www.creativecommons.org/concepts/#ip">http://www.creativecommons.org/concepts/#ip</a>&gt; and M. van Houweling, "Cultivating Open Information Platforms: A Land Trust Model." <cite>Journal of Telecommunications &amp; High Technology Law</cite> 1, no. 1 (2002): 309-23.</p>
 <h3>Acknowledgements</h3>
 <p>Many thanks to Lawrence Lessig and Molly van Houweling for their assistance in formulating this policy.</p>

diff --git a/lastcall.py b/lastcall.py
@@ -2,7 +2,7 @@
 
 # File: lastcall.py
 # Version: 0.2
-# Description: a script for announcing JEP Last Calls
+# Description: a script for announcing Last Calls
 # Last Modified: 2004-09-29
 # Author: Peter Saint-Andre (stpeter@jabber.org)
 # License: public domain
@@ -33,7 +33,7 @@ def getText(nodelist):
 
 # READ IN ARGS: 
 #
-# 1. JEP number
+# 1. XEP number
 # 2. end date
 # 3. database user
 # 4. database password
@@ -45,7 +45,7 @@ def getText(nodelist):
 
 jepfile = jepnum + '/jep-' + jepnum + '.xml'
 
-# PARSE JEP HEADERS:
+# PARSE XEP HEADERS:
 #
 # - title
 # - abstract
@@ -81,15 +81,15 @@ def getText(nodelist):
 # name is $title
 # type is $jeptype
 # status is $jepstatus
-# notes is "Version $version of JEP-$jepnum released $date."
+# notes is "Version $version of XEP-$jepnum released $date."
 # version is $version
 # last_modified is $now
 # abstract is $abstract
 # changelog is "$remark ($initials)"
 
 db = MySQLdb.connect("localhost", dbuser, dbpw, "foundation")
 cursor = db.cursor()
-theNotes = "Version " + version + " of JEP-" + jepnum + " released " + date + "; Last Call ends " + enddate + "."
+theNotes = "Version " + version + " of XEP-" + jepnum + " released " + date + "; Last Call ends " + enddate + "."
 theLog = remark + " (" + initials + ")"
 theStatement = "UPDATE jeps SET name='" + title + "', type='" + jeptype + "', status='Proposed', notes='" + theNotes + "', version='" + str(version) + "', last_modified='" + str(now) + "', abstract='" + abstract + "', changelog='" + theLog + "' WHERE number='" + str(jepnum) + "';"
 cursor.execute(theStatement) 
@@ -99,10 +99,10 @@ def getText(nodelist):
 #
 # From: editor@jabber.org
 # To: standards-jig@jabber.org
-# Subject: LAST CALL: JEP-$jepnum ($title)
+# Subject: LAST CALL: XEP-$jepnum ($title)
 # Body:
 #    This message constitutes notice of a Last Call
-#    for JEP-$jepnum ($title).
+#    for XEP-$jepnum ($title).
 #
 #    Abstract: $abstract
 #
@@ -118,14 +118,14 @@ def getText(nodelist):
 # for real...
 toaddrs = "standards-jig@jabber.org"
 
-thesubject = 'LAST CALL: JEP-' + jepnum + " (" + title + ")"
-introline = 'This message constitutes notice of a Last Call for JEP-' + jepnum + ' (' + title + ').'
+thesubject = 'LAST CALL: XEP-' + jepnum + " (" + title + ")"
+introline = 'This message constitutes notice of a Last Call for XEP-' + jepnum + ' (' + title + ').'
 abstractline = 'Abstract: ' + abstract
 urlline = 'URL: http://www.jabber.org/jeps/jep-' + jepnum + '.html'
 schedline = 'This Last Call begins today and shall end at the close of business on ' + enddate + '.'
 
 #msg = "From: %s\r\n" % fromaddr
-msg = "From: JEP Editor <%s>\r\n" % fromaddr
+msg = "From: XMPP Extensions Editor <%s>\r\n" % fromaddr
 msg = msg + "To: %s\r\n" % toaddrs
 msg = msg + "Subject: %s\r\n" % thesubject
 msg = msg + introline

diff --git a/protopage.xsl b/protopage.xsl
@@ -9,7 +9,7 @@
     <html>
       <head>
         <title><xsl:value-of select='/jep/header/shortname'/></title>
-        <link rel='stylesheet' type='text/css' href='/jeps/jep.css' />
+        <link rel='stylesheet' type='text/css' href='/xmpp.css' />
         <link rel='shortcut icon' type='image/x-icon' href='/favicon.ico' />
         <link>
           <xsl:attribute name='rel'><xsl:text>alternate</xsl:text></xsl:attribute>
@@ -39,9 +39,9 @@
             <xsl:value-of select='/jep/header/number'/>
             <xsl:text>.html</xsl:text>
           </xsl:attribute>
-          <xsl:text>JEP-</xsl:text><xsl:value-of select='/jep/header/number' />:<xsl:text> </xsl:text><xsl:value-of select='/jep/header/title' />
+          <xsl:text>XEP-</xsl:text><xsl:value-of select='/jep/header/number' />:<xsl:text> </xsl:text><xsl:value-of select='/jep/header/title' />
         </a>
-        (part of the <a href="http://www.jabber.org/jeps/">JEP series</a> published by the <a href="http://www.jabber.org/jsf/">Jabber Software Foundation</a>).</p>
+        (part of the <a href="http://www.jabber.org/jeps/">XEP series</a> published by the <a href="http://www.jabber.org/jsf/">Jabber Software Foundation</a>).</p>
 
         <xsl:variable name='schema.count' select='count(/jep/header/schemaloc)'/>
         <xsl:if test='$schema.count &gt; 0'>

diff --git a/submit.shtml b/submit.shtml
@@ -8,7 +8,7 @@
 <li><p>Contact the <a href="editor.shtml">XMPP Extensions Editor</a> so that he knows to expect your submission.</p></li>
 <li><p>Write your proposal following the guidelines described in <a href="/extensions/xep-0143.html">XEP-0143: Guidelines for Authors of XMPP Extension Protocols</a>.</p></li>
 <li>Make sure you read, understand, and agree to the JSF's <a href="/extensions/ipr-policy.shtml">IPR Policy</a> before you submit your proposal!</li>
-<li><p>Email the XML file (or a URL for the file) to the <a href="editor.shtml">XMPP Extensions Editor</a> with a subject line of "ProtoJEP: [your title here]".</li>
+<li><p>Email the XML file (or a URL for the file) to the <a href="editor.shtml">XMPP Extensions Editor</a> with a subject line of "ProtoXEP: [your title here]".</li>
 </ol>
 <p><strong>Note:</strong> It is the author's responsibility to provide a properly-formatted source file (see the <a href='template.xml'>template</a> and <a href='http://www.jabberstudio.org/cgi-bin/viewcvs.cgi/jeps/'>CVS repository</a>). Proposals submitted in HTML, TXT, MS Word, Open Document Format, etc. will be returned to the proposal author for proper formatting.</p>
 </div>