Update CHANGES file

Correct one last misleading caption in the stream documentation, pending 
the more complete examples rewrite langing post 1.2.0


svn path=/trunk/ogg/; revision=17033

2 files changed, 17 insertions, 13 deletions

diff --git a/CHANGES b/CHANGES
index 35de4b6..40c60b6 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,3 +1,10 @@
+Version 1.2.0 (2010 March 25)
+
+* Alter default flushing behavior to span less often and use larger page 
+  sizes when packet sizes are large.
+* Build fixes for additional compilers
+* Documentation updates
+
 Version 1.1.4 (2009 June 24)
 
 * New async error reporting mechanism. Calls made after a fatal error are 
diff --git a/doc/oggstream.html b/doc/oggstream.html
index 29ecd82..485747d 100644
--- a/doc/oggstream.html
+++ b/doc/oggstream.html
@@ -462,7 +462,7 @@ preceding segment have terminated. </p>
 
 <em>[More to come shortly; this section is currently being revised and expanded]</em>
 
-<p>Below, we present an example of a grouped and chained bitstream:</p>
+<p>Below, we present an example of a multiplexed and chained bitstream:</p>
 
 <p><img src="stream.png" alt="stream"/></p>
 
@@ -471,18 +471,15 @@ multiplexed into a physical bitstream. Note the following
 characteristics:</p>
 
 <ol>
-<li>Grouped bitstreams begin together; all of the initial pages
-must appear before any data pages. When concurrently multiplexed
-groups are chained, the new group does not begin until all the
-bitstreams in the previous group have terminated.</li>
-
-<li>The pages of concurrently multiplexed bitstreams need not conform
-to a regular order; the only requirement is that page <tt>n</tt> of a
-logical bitstream follow page <tt>n-1</tt> in the physical bitstream.
-There are no restrictions on intervening pages belonging to other
-logical bitstreams. (Tying page appearance to bitrate demands is one
-logical strategy, ie, the page appears at the chronological point
-where decode requires more information).</li>
+<li>Multiplexed bitstreams in a given link begin together; all of the
+initial pages must appear before any data pages. When concurrently
+multiplexed groups are chained, the new group does not begin until all
+the bitstreams in the previous group have terminated.</li>
+
+<li>The ordering of pages of concurrently multiplexed bitstreams is
+goverened by timestamp (not shown here); there is no regular
+interleaving order.  Pages within a logical bitstream appear in
+sequence order.</li>
 </ol>
 
 <div id="copyright">