//bugzilla.redhat.com/bugzilla/show_bug.cgi?id=54392

Sun Oct  7 16:43:57 MDT 2001 John Fleck <jfleck@inkstain.net>

	* doc/xmlcatalog_man.xml, xmlcatalog.1
	One more crack at
	https://bugzilla.redhat.com/bugzilla/show_bug.cgi?id=54392

3 files changed, 61 insertions, 50 deletions

diff --git a/ChangeLog b/ChangeLog
index 7f1955bb..35a3a6b8 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+Sun Oct  7 16:43:57 MDT 2001 John Fleck <jfleck@inkstain.net>
+
+	* doc/xmlcatalog_man.xml, xmlcatalog.1
+	One more crack at
+	https://bugzilla.redhat.com/bugzilla/show_bug.cgi?id=54392 
+	
+
 Sun Oct  7 18:47:02 CEST 2001 Thomas Broyer <tbroyer@ltgt.net>
 
 	* xpath.c: implemented xmlXPathObjectCopy for external objects
diff --git a/doc/xmlcatalog.1 b/doc/xmlcatalog.1
index 9e76b1dc..9f71b149 100644
--- a/doc/xmlcatalog.1
+++ b/doc/xmlcatalog.1
@@ -36,32 +36,32 @@ Its functions can be invoked from a single command from the command line, or it
 
 .TP
 \fB--shell\fR \fIfilename\fR
-.PP
+
 Run a shell allowing interactive queries on catalog file \fIfilename\fR.
 
 .TP
 \fB--create\fR \fIfilename\fR
-.PP
+
 Create a new XML catalog. Outputs to stdout, ignoring \fIfilename\fR unless \fB--noout\fR is used, in which case it creates a new catalog file \fIfilename\fR.
 
 .TP
 \fB--add\fR \fI'type'\fR \fI'orig'\fR \fI'replace'\fR \fIfilename\fR
-.PP
+
 Add an entry to catalog file \fIfilename\fR. \fItype\fR indicates the type of entry. Possible types are 'public', 'system', 'rewriteSystem', 'delegatePublic' and 'delegateSystem'. \fI'orig'\fR is the original reference to be replaced, and \fI'replace'\fR is the URI of the replacement entity to be used. The \fB-add\fR option will not overwrite \fIfilename\fR, outputing to stdout, unless \fB--noout\fR is used. The \fB--add\fR will always take three parameters even if some of the XML catalog constructs will have only a single argument.
 
 .TP
 \fB--del\fR \fI'values'\fR \fIfilename\fR
-.PP
+
 Remove entries from the catalog file \fIfilename\fR matching \fI'values'\fR. The \fB--del\fR option will not overwrite \fIfilename\fR, outputing to stdout, unless \fB--noout\fR is used.
 
 .TP
 \fB--noout\fR
-.PP
+
 Save output to the named file rather than outputing to stdout.
 
 .TP
 \fB-v\fR or \fB--verbose\fR
-.PP
+
 output debugging information.
 
 .SH "SHELL COMMANDS"
@@ -71,62 +71,66 @@ Invoking xmlcatalog with the \fB--shell\fR \fIfilename\fR option opens a command
 
 .TP
 \fBpublic\fR \fI'PublicID'\fR
-.PP
+
 Execute a public identifier lookup of the catalog entry for \fI'PublicID'\fR. The corresponding entry will be output to the command line.
 
 .TP
 \fBsystem\fR \fI'SystemID'\fR
-.PP
+
 Execute a public identifier lookup of the catalog entry for \fI'SystemID'\fR. The corresponding entry will be output to the command line.
 
 .TP
 \fBadd \fR \fI'type'\fR \fI'orig'\fR \fI'replace'\fR
-.PP
+
 Add an entry to the catalog file. \fItype\fR indicates the type of entry. Possible types are 'public', 'system', 'rewriteSystem', 'delegatePublic' and 'delegateSystem'. \fI'orig'\fR is the original reference to be replaced, and \fI'replace'\fR is the URI of the replacement entity to be used.
 
 .TP
 \fBdel\fR \fI'values'\fR
-.PP
+
 Remove the catalog entry corresponding to \fI'values'\fR.
 
 .TP
 \fBdump\fR
-.PP
+
 Print the current catalog.
 
 .TP
 \fBdebug\fR
-.PP
+
 Print debugging statements showing the steps xmlcatalog is executing.
 
 .TP
 \fBquiet\fR
-.PP
+
 Stop printing debugging statements.
 
 .TP
 \fBexit\fR
-.PP
+
 Quit the shell.
 
 .SH "REFERENCES"
 
 .TP
 libxml web page:
-	  http://www.xmlsoft.org/: \fIhttp://www.xmlsoft.org/\fR
-	  
+
+http://www.xmlsoft.org/: \fIhttp://www.xmlsoft.org/\fR
+
 .TP
 libxml catalog support web page:
-	    http://www.xmlsoft.org/catalog.html: \fIhttp://www.xmlsoft.org/catalog.html\fR
-	  
+
+http://www.xmlsoft.org/catalog.html: \fIhttp://www.xmlsoft.org/catalog.html\fR
+
 .TP
 James Clark's SGML catalog page:
-	     http://www.jclark.com/sp/catalog.htm: \fIhttp://www.jclark.com/sp/catalog.htm\fR
-	  
+
+http://www.jclark.com/sp/catalog.htm: \fIhttp://www.jclark.com/sp/catalog.htm\fR
+
 .TP
 OASIS XML catalog specification:
-	     http://www.oasis-open.org/committees/entity/spec.html: \fIhttp://www.oasis-open.org/committees/entity/spec.html\fR
-	  
+
+http://www.oasis-open.org/committees/entity/spec.html: \fIhttp://www.oasis-open.org/committees/entity/spec.html\fR
+
 .SH AUTHOR
 Copyright 2001
 .Sp
diff --git a/doc/xmlcatalog_man.xml b/doc/xmlcatalog_man.xml
index cb794fe8..6e243288 100644
--- a/doc/xmlcatalog_man.xml
+++ b/doc/xmlcatalog_man.xml
@@ -79,30 +79,30 @@
       <varlistentry>
 	<term><option>--shell</option> <replaceable>filename</replaceable></term>
 	<listitem>
-	  <para>
+	  <simpara>
 	    Run a shell
 	    allowing interactive queries on catalog file
 	    <replaceable>filename</replaceable>.
-	  </para>
+	  </simpara>
 	</listitem>
       </varlistentry>
       <varlistentry>
 	<term><option>--create</option> <replaceable>filename</replaceable></term>
 	<listitem>
-	  <para>
+	  <simpara>
 	    Create a new
 	    <acronym>XML</acronym> catalog. Outputs to stdout, ignoring
 	    <replaceable>filename</replaceable> unless <option>--noout</option> is
 	    used, in which case it creates a new catalog file
 	    <replaceable>filename</replaceable>.
-	  </para>
+	  </simpara>
 	</listitem>
       </varlistentry>
 
       <varlistentry>
 	<term><option>--add</option> <replaceable>'type'</replaceable> <replaceable>'orig'</replaceable> <replaceable>'replace'</replaceable> <replaceable>filename</replaceable></term>
 	<listitem>
-	  <para>
+	  <simpara>
 	    Add an entry to catalog file
 	    <filename>filename</filename>. <replaceable>type</replaceable> indicates
 	    the type of entry. Possible types are 'public', 'system', 'rewriteSystem',
@@ -118,37 +118,37 @@
 <!--
 FIXME - Is my list of possible types correct? Are SGML types the same? 
 -->
-	  </para>
+	  </simpara>
 	</listitem>
       </varlistentry>
       <varlistentry>
 	<term><option>--del</option> <replaceable>'values'</replaceable> <replaceable>filename</replaceable></term>
 	<listitem>
-	 <para>
+	 <simpara>
 	    Remove entries from the catalog file
 	    <replaceable>filename</replaceable> matching
 	    <replaceable>'values'</replaceable>. The <option>--del</option> option
 	    will not overwrite <replaceable>filename</replaceable>, outputing to
 	    stdout, unless <option>--noout</option> is used.
-	  </para>
+	  </simpara>
 	</listitem>
       </varlistentry>
       <varlistentry>
 	<term><option>--noout</option></term>
 	<listitem>
-	  <para>
+	  <simpara>
 	    Save output to the named file rather than
 	    outputing to stdout.
-	  </para>
+	  </simpara>
 	</listitem>
       </varlistentry>
       <varlistentry>
 	<term><option>-v</option> or <option>--verbose</option></term>
 	<listitem>
-	  <para>
+	  <simpara>
 	    output debugging
 	    information.
-	  </para>
+	  </simpara>
 	</listitem>
       </varlistentry>
     </variablelist>
@@ -167,30 +167,30 @@ FIXME - Is my list of possible types correct? Are SGML types the same?
       <varlistentry>
 	<term><option>public</option> <replaceable>'PublicID'</replaceable></term>
 	<listitem>
-	  <para>
+	  <simpara>
 	    Execute a
 	    public identifier lookup of the catalog entry for
 	    <replaceable>'PublicID'</replaceable>. The corresponding entry will be
 	    output to the command line.
-	  </para>
+	  </simpara>
 	</listitem>
       </varlistentry>
     
       <varlistentry>
 	<term><option>system</option> <replaceable>'SystemID'</replaceable></term>
 	<listitem>
-	 <para>
+	 <simpara>
 	    Execute a
 	    public identifier lookup of the catalog entry for
 	    <replaceable>'SystemID'</replaceable>. The corresponding entry will be
 	    output to the command line.
-	  </para>
+	  </simpara>
 	</listitem>
       </varlistentry>
       <varlistentry>
 	<term><option>add </option> <replaceable>'type'</replaceable> <replaceable>'orig'</replaceable> <replaceable>'replace'</replaceable></term>
 	<listitem>
-	  <para>
+	  <simpara>
 	    Add an entry to the catalog
 	    file. <replaceable>type</replaceable> indicates the type of
 	    entry. Possible types are 'public', 'system', 'rewriteSystem',
@@ -198,53 +198,53 @@ FIXME - Is my list of possible types correct? Are SGML types the same?
 	    is the original reference to  be replaced, and
 	    <replaceable>'replace'</replaceable> is the <acronym>URI</acronym> of the
 	    replacement entity to be used.
-	  </para>
+	  </simpara>
 	</listitem>
       </varlistentry>
       <varlistentry>
 	<term><option>del</option> <replaceable>'values'</replaceable></term>
 	<listitem>
-	  <para>
+	  <simpara>
 	    Remove the
 	    catalog entry corresponding to <replaceable>'values'</replaceable>.
-	  </para>
+	  </simpara>
 	</listitem>
       </varlistentry>
 
       <varlistentry>
 	<term><option>dump</option></term>
 	<listitem>
-	   <para>
+	   <simpara>
 	    Print the current catalog.
-	  </para> 
+	  </simpara> 
 	</listitem>
       </varlistentry>
 
       <varlistentry>
 	<term><option>debug</option></term>
 	<listitem>
-	  <para>
+	  <simpara>
 	    Print debugging statements showing the steps
 	    <application>xmlcatalog</application> is executing.
-	  </para>
+	  </simpara>
 	</listitem>
       </varlistentry>
     
       <varlistentry>
 	<term><option>quiet</option></term>
 	<listitem>
-	<para>
+	<simpara>
 	    Stop printing debugging statements.
-	  </para>
+	  </simpara>
 	</listitem>
       </varlistentry>
     
       <varlistentry>
 	<term><option>exit</option></term>
 	<listitem>
-	  <para>
+	  <simpara>
 	    Quit the shell.
-	  </para>
+	  </simpara>
 	</listitem>
       </varlistentry>
     </variablelist>