* misc.texi (Document View): Update DocView section with newly

supported document formats.

2 files changed, 28 insertions, 12 deletions

diff --git a/doc/emacs/ChangeLog b/doc/emacs/ChangeLog
index 23a05240162..ba2156bd745 100644
--- a/doc/emacs/ChangeLog
+++ b/doc/emacs/ChangeLog
@@ -1,3 +1,8 @@
+2010-12-30  Tassilo Horn  <tassilo@member.fsf.org>
+
+	* misc.texi (Document View): Update DocView section with newly
+	supported document formats.
+
 2010-12-21  Chong Yidong  <cyd@stupidchicken.com>
 
 	* killing.texi: Resection the Info version to conform to the
diff --git a/doc/emacs/misc.texi b/doc/emacs/misc.texi
index 11d6ad70e62..0ead2b53c21 100644
--- a/doc/emacs/misc.texi
+++ b/doc/emacs/misc.texi
@@ -27,28 +27,39 @@ other editors, and various diversions and amusements.
 @cindex PDF file
 @cindex PS file
 @cindex Postscript file
+@cindex OpenDocument file
+@cindex Microsoft Office file
 @cindex DocView mode
 @cindex mode, DocView
 @cindex document viewer (DocView)
 @findex doc-view-mode
 
 DocView mode (@code{doc-view-mode}) is a viewer for DVI, Postscript
-(PS), and PDF documents.  It provides features such as slicing,
-zooming, and searching inside documents.  It works by converting the
-document to a set of images using the @command{gs} (GhostScript)
-command, and displaying those images.
+(PS), PDF, OpenDocument, and Microsoft Office documents.  It provides
+features such as slicing, zooming, and searching inside documents.  It
+works by converting the document to a set of images using the
+@command{gs} (GhostScript) command and other external tools
+@footnote{@code{gs} is a hard requirement.  For DVI files,
+@code{dvipdf} or @code{dvipdfm} is needed.  For OpenDocument and
+Microsoft Office documents, the @code{unoconv} tool is needed.}, and
+displaying those images.
 
 @findex doc-view-toggle-display
 @findex doc-view-toggle-display
 @cindex doc-view-minor-mode
-  When you visit a PDF or DVI file, Emacs automatically switches to
-DocView mode.  When you visit a Postscript file, Emacs switches to PS
-mode, a major mode for editing Postscript files as text; however, it
-also enables DocView minor mode, so you can type @kbd{C-c C-c} to view
-the document with DocView.  (PDF and DVI files, unlike Postscript
-files, are not usually human-editable.)  In either case, repeating
-@kbd{C-c C-c} (@code{doc-view-toggle-display}) toggles between DocView
-and the file text.
+  When you visit a document file with the exception of Postscript
+files, Emacs automatically switches to DocView mode if possible
+@footnote{The needed external tools for this document type have to be
+available, emacs needs to run in a graphical frame, and PNG image
+support has to be compiled into emacs.  If any of these requirements
+is not fulfilled, DocView falls back to an appropriate mode.}.  When
+you visit a Postscript file, Emacs switches to PS mode, a major mode
+for editing Postscript files as text; however, it also enables DocView
+minor mode, so you can type @kbd{C-c C-c} to view the document with
+DocView.  (PDF and DVI files, unlike Postscript files, are not usually
+human-editable.)  In either case, repeating @kbd{C-c C-c}
+(@code{doc-view-toggle-display}) toggles between DocView and the file
+text.
 
   You can explicitly toggle DocView mode with the command @code{M-x
 doc-view-mode}, and DocView minor mode with the command @code{M-x