Rearrange Ogg Opus references.

Sort alphabetically, and move vorbis-trim to "Informative".
Also fix a misuse of "streams" instead of "channels" in the packet
 size limits exposition.

doc/draft-terriberry-oggopus.xml

@@ -941,7 +941,7 @@ A more reasonable limit is (7,664*N - 2) octets, or about 7.5 kB
 This corresponds to 120 ms of audio encoded as 20 ms stereo MDCT-mode
  frames, with a total bitrate just under 511 kbps (not counting the Ogg
  encapsulation overhead).
-With N=8, the maximum number of streams currently defined by mapping
+With N=8, the maximum number of channels currently defined by mapping
  family 1, this gives a maximum packet size of 61,310 octets, or just
  under 60 kB.
 This is still quite conservative, as it assumes each output channel is taken
@@ -1048,21 +1048,10 @@ The authors agree to grant third parties the irrevocable right to copy, use,
 <seriesInfo name="RFC" value="XXXX"/>
 </reference>
 
-<reference anchor="vorbis-trim"
-  target="http://xiph.org/vorbis/doc/Vorbis_I_spec.html#x1-130000A.2">
-<front>
-<title>The Vorbis I Specification, Appendix A Embedding Vorbis into an Ogg stream</title>
-<author initials="C." surname="Montgomery"
- fullname="Christopher &quot;Monty&quot; Montgomery"/>
-</front>
-</reference>
-
-<reference anchor="vorbis-mapping"
- target="http://www.xiph.org/vorbis/doc/Vorbis_I_spec.html#x1-800004.3.9">
+<reference anchor="EBU-R128" target="http://tech.ebu.ch/loudness">
 <front>
-<title>The Vorbis I Specification, Section 4.3.9 Output Channel Order</title>
-<author initials="C." surname="Montgomery"
- fullname="Christopher &quot;Monty&quot; Montgomery"/>
+<title>"Loudness Recommendation EBU R128</title>
+<author fullname="EBU Technical Committee"/>
 </front>
 </reference>
 
@@ -1076,10 +1065,12 @@ The authors agree to grant third parties the irrevocable right to copy, use,
 </front>
 </reference>
 
-<reference anchor="EBU-R128" target="http://tech.ebu.ch/loudness">
+<reference anchor="vorbis-mapping"
+ target="http://www.xiph.org/vorbis/doc/Vorbis_I_spec.html#x1-800004.3.9">
 <front>
-<title>"Loudness Recommendation EBU R128</title>
-<author fullname="EBU Technical Committee"/>
+<title>The Vorbis I Specification, Section 4.3.9 Output Channel Order</title>
+<author initials="C." surname="Montgomery"
+ fullname="Christopher &quot;Monty&quot; Montgomery"/>
 </front>
 </reference>
 
@@ -1090,6 +1081,15 @@ The authors agree to grant third parties the irrevocable right to copy, use,
 <!--?rfc include="http://xml.resource.org/public/rfc/bibxml/reference.RFC.3550.xml"?-->
 <?rfc include="http://xml.resource.org/public/rfc/bibxml/reference.RFC.4732.xml"?>
 
+<reference anchor="replay-gain"
+ target="http://wiki.xiph.org/VorbisComment#Replay_Gain">
+<front>
+<title>VorbisComment: Replay Gain</title>
+<author initials="C." surname="Parker" fullname="Conrad Parker"/>
+<author initials="M." surname="Leese" fullname="Martin Leese"/>
+</front>
+</reference>
+
 <reference anchor="seeking"
  target="http://wiki.xiph.org/Seeking">
 <front>
@@ -1100,12 +1100,12 @@ The authors agree to grant third parties the irrevocable right to copy, use,
 </front>
 </reference>
 
-<reference anchor="replay-gain"
- target="http://wiki.xiph.org/VorbisComment#Replay_Gain">
+<reference anchor="vorbis-trim"
+  target="http://xiph.org/vorbis/doc/Vorbis_I_spec.html#x1-130000A.2">
 <front>
-<title>VorbisComment: Replay Gain</title>
-<author initials="C." surname="Parker" fullname="Conrad Parker"/>
-<author initials="M." surname="Leese" fullname="Martin Leese"/>
+<title>The Vorbis I Specification, Appendix A Embedding Vorbis into an Ogg stream</title>
+<author initials="C." surname="Montgomery"
+ fullname="Christopher &quot;Monty&quot; Montgomery"/>
 </front>
 </reference>