Hopefully I got everything covered.

svn path=/trunk/vorbis/; revision=15230

diff --git a/doc/Makefile.am b/doc/Makefile.am
index 80bf0a7..b116ea0 100644 (file)
--- a/doc/Makefile.am
+++ b/doc/Makefile.am
@@ -6,8 +6,8 @@ docdir = $(datadir)/doc/$(PACKAGE)-$(VERSION)
 
 ### all of the static docs, commited to SVN and included as is
 static_docs = \
-       draft-ietf-avt-rtp-vorbis-09.xml \
-       draft-ietf-avt-rtp-vorbis-09.txt \
+       rfc5215.xml \
+       rfc5215.txt \
        eightphase.png \
        evenlsp.png \
        fish_xiph_org.png \
@@ -102,8 +102,8 @@ $(BUILDDIR)/%: $(srcdir)/%
 $(BUILDDIR)/Vorbis_I_spec.xml: $(doc_sources)
        @mkdir -p $(BUILDDIR)
        @for file in $(doc_sources); do cp $(srcdir)/$$file $(BUILDDIR); done
-# translate the draft rtp.txt to .xml in the BUILDDIR
-$(BUILDDIR)/draft-rtp.xml: draft-ietf-avt-rtp-vorbis-09.txt
+# translate rfc5215.txt to .xml in the BUILDDIR
+$(BUILDDIR)/draft-rtp.xml: rfc5215.txt
        cat $< | sed 's/\f//g' > $@
 # cat $< | sed 's/\f//g' | sed 's/</\&lt;/g' | sed 's/>/\&gt;/g' > $@
 

diff --git a/doc/Vorbis_I_spec.html b/doc/Vorbis_I_spec.html
index 628cf8c..9c75e85 100644 (file)
--- a/doc/Vorbis_I_spec.html
+++ b/doc/Vorbis_I_spec.html
@@ -2279,11 +2279,10 @@ Ogg encapsulation of a Vorbis packet stream is straightforward.</p><div class="i
 
 
 
-    <p>Please consult the internet draft <em class="citetitle">RTP Payload Format for Vorbis Encoded
-    Audio</em> for description of how to embed Vorbis audio in an RTP stream.</p>
+    <p>Please consult RFC 5215 <em class="citetitle">RTP Payload Format for Vorbis Encoded Audio</em> for description of how to embed Vorbis audio in an RTP stream.</p>
   
 </pre></div><div class="appendix" lang="en"><h2 class="title" style="clear: both"><a name="footer"></a>3. Colophon</h2><div class="mediaobject"><img src="white-xifish.png" alt="[Xiph.org logo]"></div><p>
-Ogg is a <a href="http://www.xiph.org/" target="_top">Xiph.org Foundation</a> effort
+Ogg is a <a href="http://www.xiph.org/" target="_top">Xiph.Org Foundation</a> effort
 to protect essential tenets of Internet multimedia from corporate
 hostage-taking; Open Source is the net's greatest tool to keep
 everyone honest. See <a href="http://www.xiph.org/about.html" target="_top">About

diff --git a/doc/index.html b/doc/index.html
index 470140f..bcf18c0 100644 (file)
--- a/doc/index.html
+++ b/doc/index.html
@@ -84,7 +84,7 @@ li {
 <li>Vorbis I specification [<a href="Vorbis_I_spec.html">html</a>]
   [<a href="Vorbis_I_spec.pdf">pdf</a>]</li>
 <li><a href="v-comment.html">Vorbis comment header specification</a></li>
-<li><a href="draft-ietf-avt-rtp-vorbis-09.txt">Embedding Vorbis encoded 
+<li><a href="rfc5215.txt">Embedding Vorbis encoded 
 audio in an RTP payload format</a></li>
 </ul>
 

diff --git a/doc/xml/a2-encapsulation_rtp.xml b/doc/xml/a2-encapsulation_rtp.xml
index 4d99934..56495e7 100644 (file)
--- a/doc/xml/a2-encapsulation_rtp.xml
+++ b/doc/xml/a2-encapsulation_rtp.xml
@@ -20,7 +20,7 @@ fileref="draft-rtp.xml"/></textobject> -->
 <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
       href="draft-rtp.xml" parse="text">
   <xi:fallback xmlns:xi="http://www.w3.org/2001/XInclude">
-    <para>Please consult the internet draft <citetitle>RTP Payload Format for Vorbis Encoded
+    <para>Please consult RFC 5215 <citetitle>RTP Payload Format for Vorbis Encoded
     Audio</citetitle> for description of how to embed Vorbis audio in an RTP stream.</para>
   </xi:fallback>
 </xi:include>