preparatory work

doc/org.texi

@@ -295,6 +295,7 @@ Exporting
 * ASCII export::                Exporting to plain ASCII
 * HTML export::                 Exporting to HTML
 * LaTeX and PDF export::        Exporting to LaTeX, and processing to PDF
+* Docbook export::              Exporting to Docbook
 * XOXO export::                 Exporting to XOXO
 * iCalendar export::            Exporting in iCalendar format
 
@@ -7714,6 +7715,7 @@ enabled (default in Emacs 23).
 * ASCII export::                Exporting to plain ASCII
 * HTML export::                 Exporting to HTML
 * LaTeX and PDF export::        Exporting to LaTeX, and processing to PDF
+* Docbook export::              Exporting to Docbook
 * XOXO export::                 Exporting to XOXO
 * iCalendar export::            Exporting in iCalendar format
 @end menu
@@ -8658,7 +8660,7 @@ You can choose default values for these options by customizing the variable
 @code{org-infojs-options}.  If you always want to apply the script to your
 pages, configure the variable @code{org-export-html-use-infojs}.
 
-@node LaTeX and PDF export, XOXO export, HTML export, Exporting
+@node LaTeX and PDF export, Docbook export, HTML export, Exporting
 @section LaTeX and PDF export
 @cindex LaTeX export
 @cindex PDF export
@@ -8823,7 +8825,25 @@ pdflatex (@file{png}, @file{jpg}, and @file{pdf} files).  If you process your
 files in a different way, you may need to customize the variable
 @code{org-export-latex-inline-image-extensions}.
 
-@node XOXO export, iCalendar export, LaTeX and PDF export, Exporting
+@node Docbook export, XOXO export, LaTeX and PDF export, Exporting
+@section Docbook export
+@cindex Docbook export
+
+The Docbook exporter was contributed to Org by Baoqiu Cui.
+
+@table @kbd
+@kindex C-c C-e D
+@item C-c C-e D
+Export as Docbook file @file{myfile.xml}.
+@kindex C-c C-e V
+@item C-c C-e V
+Export as Docbook file and launch a viewer.
+@kindex C-c C-e v
+@item C-c C-e v D
+Export only the visible part of the document.
+@end table
+
+@node XOXO export, iCalendar export, Docbook, Exporting
 @section XOXO export
 @cindex XOXO export
 

lisp/org-exp.el

@@ -32,7 +32,7 @@
   (require 'cl))
 
 (declare-function org-export-latex-preprocess "org-export-latex" (parameters))
-(declare-function org-export-docbook-preprocess "org-export-docbook" (parameters))
+(declare-function org-export-docbook-preprocess "org-docbook" (parameters))
 (declare-function org-agenda-skip "org-agenda" ())
 (declare-function org-infojs-options-inbuffer-template "org-jsinfo" ())
 (declare-function htmlize-region "ext:htmlize" (beg end))
@@ -1164,25 +1164,23 @@ value of `org-export-run-in-background'."
 
 \[a] export as ASCII
 
-\[h] export as HTML
-\[H] export as HTML to temporary buffer
-\[R] export region as HTML
-\[b] export as HTML and browse immediately
-\[x] export as XOXO
+\[h] export as HTML    [H] to temporary buffer   [R] export region
+\[b] export as HTML and open in browser
 
-\[l] export as LaTeX
+\[l] export as LaTeX   [L] to temporary buffer
 \[p] export as LaTeX and process to PDF
 \[d] export as LaTeX, process to PDF, and open the resulting PDF document
-\[L] export as LaTeX to temporary buffer
+
+\[D] export as Docbook             [V] export and view Docbook file
+
+\[x] export as XOXO
 
 \[i] export current file as iCalendar file
 \[I] export all agenda files as iCalendar files
 \[c] export agenda files into combined iCalendar file
 
-\[F] publish current file
-\[P] publish current project
-\[X] publish... (project will be prompted for)
-\[A] publish all projects")
+\[F] publish current file          [P] publish current project
+\[X] publish a project...          [A] publish all projects")
 	 (cmds
 	  '((?t org-insert-export-options-template nil)
 	    (?v org-export-visible nil)
@@ -1192,6 +1190,8 @@ value of `org-export-run-in-background'."
 	    (?H org-export-as-html-to-buffer nil)
 	    (?R org-export-region-as-html nil)
 	    (?x org-export-as-xoxo t)
+	    (?D org-export-as-docbook t)
+	    (?V org-export-as-docbook-and-open t)
 	    (?l org-export-as-latex t)
 	    (?p org-export-as-pdf t)
 	    (?d org-export-as-pdf-and-open t)