Harmonize the spec and stand-alone versions of the comment header docs.

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

diff --git a/doc/v-comment.html b/doc/v-comment.html
index 0e995fe..e654004 100644 (file)
--- a/doc/v-comment.html
+++ b/doc/v-comment.html
@@ -89,7 +89,7 @@ they turn out to be, eg:</p>
 \r
 <blockquote><p>\r
 "Honest Bob and the Factory-to-Dealer-Incentives, _I'm Still Around_,\r
-opening for Moxy Fruvous, 1997"\r
+opening for Moxy Fr&uuml;vous, 1997"\r
 </p></blockquote>\r
 \r
 <h1>Comment encoding</h1>\r
@@ -101,8 +101,8 @@ number of vectors is bounded to 2^32-1 and the length of each vector
 is limited to 2^32-1 bytes. The vector length is encoded; the vector\r
 contents themselves are not null terminated. In addition to the vector\r
 list, there is a single vector for vendor name (also 8 bit clean,\r
-length encoded in 32 bits). Libvorbis currently sets the vendor string\r
-to "Xiph.Org libVorbis I 20020717".</p>\r
+length encoded in 32 bits). For example, the 1.0 release of libvorbis \r
+set the vendor string to "Xiph.Org libVorbis I 20020717".</p>\r
 \r
 <p>The comment header is decoded as follows:</p>\r
 \r
@@ -118,14 +118,14 @@ to "Xiph.Org libVorbis I 20020717".</p>
      }\r
 \r
   7) [framing_bit] = read a single bit as boolean\r
-  8) if ( [framing_bit]  unset or end of packet ) then ERROR\r
+  8) if ( [framing_bit] unset or end of packet ) then ERROR\r
   9) done.\r
 </pre>\r
 \r
 <h2>Content vector format</h2>\r
 \r
 <p>The comment vectors are structured similarly to a UNIX environment variable.\r
-That is, comment fields consist of a field name and a field value and\r
+That is, comment fields consist of a field name and a corresponding value and\r
 look like:</p>\r
 \r
 <pre>\r
@@ -138,10 +138,10 @@ comment[1]="TITLE=the sound of Vorbis";
 0x7D, 0x3D ('=') excluded. ASCII 0x41 through 0x5A inclusive (A-Z) is\r
 to be considered equivalent to ASCII 0x61 through 0x7A inclusive\r
 (a-z).</li>\r
-<li>The field name is immediately followed by ASCII 0x3D ('='); this\r
-equals sign is used to terminate the field name.</li>\r
-<li>0x3D is followed by 8 bit clean UTF-8 encoded field contents\r
-to the end of the field.</li>\r
+<li>The field name is immediately followed by ASCII 0x3D ('='); \r
+this equals sign is used to terminate the field name.</li>\r
+<li>0x3D is followed by the 8 bit clean UTF-8 encoded value of the \r
+field contents to the end of the field.</li>\r
 </ul>\r
 \r
 <h3>Field names</h3>\r
@@ -221,8 +221,9 @@ ISRC intro page</a> for more information on ISRC numbers.</dd>
 <ul>\r
 <li>Field names should not be 'internationalized'; this is a\r
 concession to simplicity not an attempt to exclude the majority of\r
-the world that doesn't speak English. Field *contents*, however,\r
-are represented in UTF-8 to allow easy representation of any language.</li>\r
+the world that doesn't speak English. Field <emph>contents</emph>, \r
+however, use the UTF-8 character encoding to allow easy representation \r
+of any language.</li>\r
 <li>We have the length of the entirety of the field and restrictions on\r
 the field name so that the field name is bounded in a known way. Thus\r
 we also have the length of the field contents.</li>\r
@@ -249,7 +250,7 @@ well know artists; the following is permissible, and encouraged:
 header packet. Unlike the first bitstream header packet, it is not\r
 generally the only packet on the second page and may not be restricted\r
 to within the second bitstream page. The length of the comment header\r
-packet is [practically] unbounded. The comment header packet is not\r
+packet is (practically) unbounded. The comment header packet is not\r
 optional; it must be present in the bitstream even if it is\r
 effectively empty.</p>\r
 \r

diff --git a/doc/xml/05-comment.xml b/doc/xml/05-comment.xml
index 701e3dd..953243e 100644 (file)
--- a/doc/xml/05-comment.xml
+++ b/doc/xml/05-comment.xml
@@ -202,9 +202,9 @@ intro page</ulink> for more information on ISRC numbers.
 
 <para>Field names should not be 'internationalized'; this is a
 concession to simplicity not an attempt to exclude the majority of
-the world that doesn't speak English. Field <emphasis>contents</emphasis>
-however, use the UTF-8 character encoding to allow easy representation of any
-language.</para>
+the world that doesn't speak English. Field <emphasis>contents</emphasis>,
+however, use the UTF-8 character encoding to allow easy representation 
+of any language.</para>
 
 <para>We have the length of the entirety of the field and restrictions on
 the field name so that the field name is bounded in a known way. Thus