Index: openacs-4/packages/acs-core-docs/www/nxml-mode.html =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/acs-core-docs/www/nxml-mode.html,v diff -u -r1.14.2.1 -r1.14.2.2 --- openacs-4/packages/acs-core-docs/www/nxml-mode.html 18 Jun 2010 21:29:35 -0000 1.14.2.1 +++ openacs-4/packages/acs-core-docs/www/nxml-mode.html 12 Dec 2010 00:07:02 -0000 1.14.2.2 @@ -1,11 +1,23 @@ +<<<<<<< nxml-mode.html Using nXML mode in Emacs

Using nXML mode in Emacs

By Jeff Davis

+======= + +Using nXML mode in Emacs

Using nXML mode in Emacs

By Jeff Davis

+>>>>>>> 1.16 OpenACS docs are written by the named authors, and may be edited by OpenACS documentation staff.

An alternative to psgml mode is nXML by James Clark, a new major mode for GNU Emacs for editing XML, and which features highlighting, indentation, and on the fly validation versus a RelaxNG Schema. +<<<<<<< nxml-mode.html

View comments on this page at openacs.org
+======= +

View comments on this page at openacs.org
+>>>>>>> 1.16