Merge from emacs-23 branch

[bpt/emacs.git] / doc / misc / nxml-mode.texi

diff --git a/doc/misc/nxml-mode.texi b/doc/misc/nxml-mode.texi
index c22ba6e..2760344 100644 (file)
--- a/doc/misc/nxml-mode.texi
+++ b/doc/misc/nxml-mode.texi
@@ -8,7 +8,7 @@
 This manual documents nxml-mode, an Emacs major mode for editing
 XML with RELAX NG support.
 
-Copyright @copyright{} 2007, 2008, 2009, 2010
+Copyright @copyright{} 2007-2011
 Free Software Foundation, Inc.
 
 @quotation
@@ -31,7 +31,7 @@ license to the document, as described in section 6 of the license.
 @end quotation
 @end copying
 
-@dircategory Emacs
+@dircategory Emacs editing modes
 @direntry
 * nXML Mode: (nxml-mode).       XML editing mode with RELAX NG support.
 @end direntry
@@ -70,8 +70,8 @@ Once in nXML mode, you can type @kbd{C-h m} for basic information on the
 mode.
 
 The @file{etc/nxml} directory in the Emacs distribution contains some data
-files used by nXML mode, and includes two files (@file{test.valid.xml} and
-@file{test.invalid.xml}) that provide examples of valid and invalid XML
+files used by nXML mode, and includes two files (@file{test-valid.xml} and
+@file{test-invalid.xml}) that provide examples of valid and invalid XML
 documents.
 
 To get validation and schema-sensitive editing, you need a RELAX NG Compact
@@ -96,7 +96,7 @@ one, you can also use the XSLT stylesheet from
 @url{http://www.pantor.com/download.html}.
 
 To convert a W3C XML Schema to an RNC schema, you need first to convert it
-to RELAX NG XML syntax using Sun's RELAX NG converter tool @code{rngconv}
+to RELAX NG XML syntax using the RELAX NG converter tool @code{rngconv}
 (built on top of MSV).  See @url{https://github.com/kohsuke/msv}
 and @url{https://msv.dev.java.net/}.