Finished proof-reading to the end of the doc. Fixed a problem

with a <trademark> in the biblio and update the conventions.xml
because of that.  Changed and re-arranged a couple of conventions.

LDP/howto/docbook/rpmupgrade.sgml/conventions.xml

@@ -16,7 +16,7 @@
 <para>xrefs have linkend and endterm attributes.</para></listitem>
 
         <listitem>
-<para>biliographicentries have their title's id attribute
+<para>bilioentries have their title's id attribute
         filled in so that xrefs can refer to the title with the
         endterm attribute.</para></listitem>
 
@@ -30,12 +30,12 @@
         appropriate.</para></listitem>
 
         <listitem>
-<para>Otherwise, tag the applications with the
-        application tags.</para></listitem>
+<para>All commands or series of commands get their own
+        paragraph.</para></listitem>
 
         <listitem>
-<para>Commands should be formatted to match their
-        man/info pages.</para></listitem>
+<para>Tag the applications with the
+        application tags.</para></listitem>
 
         <listitem>
 <para>When talking about my personal experience, use a
@@ -55,10 +55,6 @@
         within an application program. Tag them with
         prompt.</para></listitem>
 
-        <listitem>
-<para>All commands or series of commands get their own
-        paragraph.</para></listitem>
-
         <listitem>
 <para>URLs to documents go at the end of the
         article.</para></listitem>
@@ -118,14 +114,14 @@ backmatter, frontmatter, etc</para>
 
 <listitem>
 <para>
-tidy screws up the text in the &lt;screen&gt; from the
+tidy screws up the text in the &#60;screen&#62; from the
 kernel's Changes file.
 </para>
 </listitem>
 
 <listitem>
 <para>
-tidy screws up the text in the &lt;literallayout&gt; from 
+tidy screws up the text in the &#60;literallayout&#62; from 
 the package order lists.
 </para>
 </listitem>
@@ -138,8 +134,8 @@ and &amp;#60 to &amp;lt).
 </listitem>
 
 <listitem>
-<para>"1-57595-199-1B, Red Hat? is a trademark" has a
-strange question mark in it.  why????</para>
+<para>&amp;GFDLDOC; gets reformatted as &amp;amp;GFDLDOC; 
+by tidy.</para>
 </listitem>
 
       </itemizedlist>