From a9e32505debea9077c0cca49b84a8c0d363bf3e8 Mon Sep 17 00:00:00 2001
From: fiddlosopher <fiddlosopher@788f1e2b-df1e-0410-8736-df70ead52e1b>
Date: Mon, 1 Jan 2007 21:08:12 +0000
Subject: Merged changes from docbook branch since r363.

git-svn-id: https://pandoc.googlecode.com/svn/trunk@386 788f1e2b-df1e-0410-8736-df70ead52e1b
---
 man/man1/pandoc.1 | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

(limited to 'man/man1/pandoc.1')

diff --git a/man/man1/pandoc.1 b/man/man1/pandoc.1
index 820be3276..a1df84208 100644
--- a/man/man1/pandoc.1
+++ b/man/man1/pandoc.1
@@ -6,8 +6,8 @@ pandoc \- general markup converter
 .SH DESCRIPTION
 \fBPandoc\fR converts files from one markup format to another. It can
 read markdown and (subsets of) reStructuredText, HTML, and LaTeX, and
-it can write markdown, reStructuredText, HTML, LaTeX, RTF, and S5 HTML
-slide shows.
+it can write markdown, reStructuredText, HTML, LaTeX, RTF, DocBook
+XML, and S5 HTML slide shows.
 .PP
 If no \fIinput\-file\fR is specified, input is read from STDIN.
 Otherwise, the \fIinput\-files\fR are concatenated (with a blank
@@ -80,6 +80,8 @@ can be
 (HTML),
 .B latex
 (LaTeX),
+.B docbook
+(DocBook XML),
 .B s5
 (S5 HTML and javascript slide show),
 or
@@ -141,7 +143,7 @@ default header, which can be printed by using the \fB\-D\fR option).
 Implies \fB-s\fR.
 .TP
 .B \-D \fIFORMAT\fB, \-\-print-default-header=\fIFORMAT\fB
-Print the default header for \fIFORMAT\fR (\fIhtml, s5, latex,
+Print the default header for \fIFORMAT\fR (\fIhtml, s5, latex, docbook,
 markdown, rst, rtf\fR).
 .TP
 .B \-T \fISTRING\fB, \-\-title-prefix=\fISTRING\fB
-- 
cgit v1.2.3