revert last patch, daniel

4 files changed, 6 insertions, 6 deletions

diff --git a/doc/xmlcatalog.1 b/doc/xmlcatalog.1
index 5fbb6b99..103d7f07 100644
--- a/doc/xmlcatalog.1
+++ b/doc/xmlcatalog.1
@@ -11,7 +11,7 @@
 xmlcatalog \- Command line tool to parse and manipulate XML or SGML catalog files.
 .SH "SYNOPSIS"
 .HP 11
-\fBxmlcatalog\fR|[\fB\-\-sgml\fR|\fB\-\-shell\fR|\fB\-\-create\fR|\fB\-\-del\ \fR\fB\fIVALUE(S)\fR\fR||[\ \fB\-\-add\ \fR\fB\fITYPE\fR\fR\fB\ \fR\fB\fIORIG\fR\fR\fB\ \fR\fB\fIREPLACE\fR\fR\fB\ \fR\ |\fB\-\-add\ \fR\fB\fIFILENAME\fR\fR]|\fB\-\-noout\fR|\fB\-\-no\-super\-update\fR||[\fB\-v\fR|\fB\-\-verbose\fR]]|{\fICATALOGFILE\fR}|{\fIENTITIES\fR...}
+\fBxmlcatalog\fR [\fB\-\-sgml\fR \fB\-\-shell\fR \fB\-\-create\fR \fB\-\-del\ \fR\fB\fIVALUE(S)\fR\fR [\ \fB\-\-add\ \fR\fB\fITYPE\fR\fR\fB\ \fR\fB\fIORIG\fR\fR\fB\ \fR\fB\fIREPLACE\fR\fR\fB\ \fR\ \fB\-\-add\ \fR\fB\fIFILENAME\fR\fR] \fB\-\-noout\fR \fB\-\-no\-super\-update\fR [\fB\-v\fR\ \fB\-\-verbose\fR]] {\fICATALOGFILE\fR} {\fIENTITIES\fR...}
 .SH "DESCRIPTION"
 .PP
 \fBxmlcatalog\fR
diff --git a/doc/xmlcatalog_man.xml b/doc/xmlcatalog_man.xml
index 8e6547ba..088cc233 100644
--- a/doc/xmlcatalog_man.xml
+++ b/doc/xmlcatalog_man.xml
@@ -46,7 +46,7 @@
 </refnamediv>
 
 <refsynopsisdiv>
-	<cmdsynopsis sepchar="|">
+	<cmdsynopsis>
 	<command>xmlcatalog</command>
 	<group choice="opt">
 		<arg choice="plain"><option>--sgml</option></arg>
diff --git a/doc/xmllint.1 b/doc/xmllint.1
index 10c79f56..13e38f53 100644
--- a/doc/xmllint.1
+++ b/doc/xmllint.1
@@ -11,9 +11,9 @@
 xmllint \- command line XML tool
 .SH "SYNOPSIS"
 .HP 8
-\fBxmllint\fR|[\fB\-\-version\fR|\fB\-\-debug\fR|\fB\-\-shell\fR|\fB\-\-debugent\fR|\fB\-\-copy\fR|\fB\-\-recover\fR|\fB\-\-noent\fR|\fB\-\-noout\fR|\fB\-\-nonet\fR|\fB\-\-path\ "\fR\fB\fIPATH(S)\fR\fR\fB"\fR|\fB\-\-load\-trace\fR|\fB\-\-htmlout\fR|\fB\-\-nowrap\fR|\fB\-\-valid\fR|\fB\-\-postvalid\fR|\fB\-\-dtdvalid\ \fR\fB\fIURL\fR\fR|\fB\-\-dtdvalidfpi\ \fR\fB\fIFPI\fR\fR|\fB\-\-timing\fR|\fB\-\-output\ \fR\fB\fIFILE\fR\fR|\fB\-\-repeat\fR|\fB\-\-insert\fR|\fB\-\-compress\fR|\fB\-\-html\fR|\fB\-\-xmlout\fR|\fB\-\-push\fR|\fB\-\-memory\fR|\fB\-\-maxmem\ \fR\fB\fINBBYTES\fR\fR|\fB\-\-nowarning\fR|\fB\-\-noblanks\fR|\fB\-\-nocdata\fR|\fB\-\-format\fR|\fB\-\-encode\ \fR\fB\fIENCODING\fR\fR|\fB\-\-dropdtd\fR|\fB\-\-nsclean\fR|\fB\-\-testIO\fR|\fB\-\-catalogs\fR|\fB\-\-nocatalogs\fR|\fB\-\-auto\fR|\fB\-\-xinclude\fR|\fB\-\-noxincludenode\fR|\fB\-\-loaddtd\fR|\fB\-\-dtdattr\fR|\fB\-\-stream\fR|\fB\-\-walker\fR|\fB\-\-pattern\ \fR\fB\fIPATTERNVALUE\fR\fR|\fB\-\-chkregister\fR|\fB\-\-relaxng\ \fR\fB\fISCHEMA\fR\fR|\fB\-\-schema\ \fR\fB\fISCHEMA\fR\fR|\fB\-\-c14n\fR]|{\fIXML\-FILE(S)\fR...|\-}
+\fBxmllint\fR [\fB\-\-version\fR \fB\-\-debug\fR \fB\-\-shell\fR \fB\-\-debugent\fR \fB\-\-copy\fR \fB\-\-recover\fR \fB\-\-noent\fR \fB\-\-noout\fR \fB\-\-nonet\fR \fB\-\-path\ "\fR\fB\fIPATH(S)\fR\fR\fB"\fR \fB\-\-load\-trace\fR \fB\-\-htmlout\fR \fB\-\-nowrap\fR \fB\-\-valid\fR \fB\-\-postvalid\fR \fB\-\-dtdvalid\ \fR\fB\fIURL\fR\fR \fB\-\-dtdvalidfpi\ \fR\fB\fIFPI\fR\fR \fB\-\-timing\fR \fB\-\-output\ \fR\fB\fIFILE\fR\fR \fB\-\-repeat\fR \fB\-\-insert\fR \fB\-\-compress\fR \fB\-\-html\fR \fB\-\-xmlout\fR \fB\-\-push\fR \fB\-\-memory\fR \fB\-\-maxmem\ \fR\fB\fINBBYTES\fR\fR \fB\-\-nowarning\fR \fB\-\-noblanks\fR \fB\-\-nocdata\fR \fB\-\-format\fR \fB\-\-encode\ \fR\fB\fIENCODING\fR\fR \fB\-\-dropdtd\fR \fB\-\-nsclean\fR \fB\-\-testIO\fR \fB\-\-catalogs\fR \fB\-\-nocatalogs\fR \fB\-\-auto\fR \fB\-\-xinclude\fR \fB\-\-noxincludenode\fR \fB\-\-loaddtd\fR \fB\-\-dtdattr\fR \fB\-\-stream\fR \fB\-\-walker\fR \fB\-\-pattern\ \fR\fB\fIPATTERNVALUE\fR\fR \fB\-\-chkregister\fR \fB\-\-relaxng\ \fR\fB\fISCHEMA\fR\fR \fB\-\-schema\ \fR\fB\fISCHEMA\fR\fR \fB\-\-c14n\fR] {\fIXML\-FILE(S)\fR... \-}
 .HP 8
-\fBxmllint\fR|\fB\-\-help\fR
+\fBxmllint\fR \fB\-\-help\fR
 .SH "DESCRIPTION"
 .PP
 The
diff --git a/doc/xmllint.xml b/doc/xmllint.xml
index cf063d64..904e706a 100644
--- a/doc/xmllint.xml
+++ b/doc/xmllint.xml
@@ -63,7 +63,7 @@
 </refnamediv>
 
 <refsynopsisdiv>
-	<cmdsynopsis sepchar="|">
+	<cmdsynopsis>
 	<command>xmllint</command>
 		<group choice="opt">
 			<arg choice="plain"><option>--version</option></arg>
@@ -121,7 +121,7 @@
 			<arg choice="plain" rep="norepeat">-</arg>
 		</group>
 	</cmdsynopsis>
-	<cmdsynopsis sepchar="|">
+	<cmdsynopsis>
 		<command>xmllint</command>
 		<arg choice="plain"><option>--help</option></arg>
 	</cmdsynopsis>