From d8caf6045d10344c431918128e3803ca497565f3 Mon Sep 17 00:00:00 2001
From: "gerv%gerv.net" <>
Date: Sun, 28 Jul 2002 05:00:17 +0000
Subject: Merging new docs from 2.16 branch.

---
 docs/sgml/conventions.sgml | 15 ++++++---------
 1 file changed, 6 insertions(+), 9 deletions(-)

(limited to 'docs/sgml/conventions.sgml')

diff --git a/docs/sgml/conventions.sgml b/docs/sgml/conventions.sgml
index f6aa00338..7334b02b8 100644
--- a/docs/sgml/conventions.sgml
+++ b/docs/sgml/conventions.sgml
@@ -6,7 +6,7 @@
     <primary>conventions</primary>
   </indexterm>
 
-  <para>This document uses the following conventions</para>
+  <para>This document uses the following conventions:</para>
 
   <informaltable frame="none">
     <tgroup cols="2">
@@ -34,7 +34,7 @@
 
           <entry>
             <tip>
-              <para>Warm jar lids under the hot tap to loosen them.</para>
+              <para>Would you like a breath mint?</para>
             </tip>
           </entry>
         </row>
@@ -63,7 +63,7 @@
           <entry>File Names</entry>
 
           <entry>
-            <filename>file.extension</filename>
+            <filename>filename</filename>
           </entry>
         </row>
 
@@ -138,12 +138,9 @@
           <entry>Code Example</entry>
 
           <entry>
-            <programlisting>
-            <sgmltag class="starttag">para</sgmltag>
-
-            Beginning and end of paragraph
-            <sgmltag class="endtag">para</sgmltag>
-            </programlisting>
+            <programlisting><sgmltag class="starttag">para</sgmltag>
+Beginning and end of paragraph
+<sgmltag class="endtag">para</sgmltag></programlisting>
           </entry>
         </row>
       </tbody>
-- 
cgit v1.2.3-24-g4f1b