Bug 391274: Warning box says "Caution". Info requiring attention says "Warning"...

diff --git a/docs/xml/conventions.xml b/docs/xml/conventions.xml
index 24986d66b4c4d4b7e51e7a663130b2fff90a7d28..70e6624f7e683719ff48aae2756fd80c9c0f94be 100644 (file)
--- a/docs/xml/conventions.xml
+++ b/docs/xml/conventions.xml
@@ -20,7 +20,7 @@
 
       <tbody>
         <row>
-          <entry>Warning</entry>
+          <entry>Caution</entry>
 
           <entry>
             <caution>
@@ -30,11 +30,11 @@
         </row>
 
         <row>
-          <entry>Hint</entry>
+          <entry>Hint or Tip</entry>
 
           <entry>
             <tip>
-              <para>Would you like a breath mint?</para>
+              <para>For best results... </para>
             </tip>
           </entry>
         </row>
@@ -50,7 +50,7 @@
         </row>
 
         <row>
-          <entry>Information requiring special attention</entry>
+          <entry>Warning</entry>
 
           <entry>
             <warning>