summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGlenn Morris <rgm@gnu.org>2013-01-05 11:21:17 -0800
committerGlenn Morris <rgm@gnu.org>2013-01-05 11:21:17 -0800
commitf8acde11051e2b777f2700f78f2090bd4db04d11 (patch)
tree8865e4f1c89f01a82462185be36e6ab0a48a84f6
parent2812660af07ef187ccd7a2af3a459cf5cdedd2b1 (diff)
downloademacs-f8acde11051e2b777f2700f78f2090bd4db04d11.tar.gz
* doc/emacs/text.texi (HTML Mode): Remove deleted nxml C-RET binding.
-rw-r--r--doc/emacs/ChangeLog4
-rw-r--r--doc/emacs/text.texi2
2 files changed, 5 insertions, 1 deletions
diff --git a/doc/emacs/ChangeLog b/doc/emacs/ChangeLog
index 82a8f8fec82..456d7efa7be 100644
--- a/doc/emacs/ChangeLog
+++ b/doc/emacs/ChangeLog
@@ -1,3 +1,7 @@
+2013-01-05 Glenn Morris <rgm@gnu.org>
+
+ * text.texi (HTML Mode): Remove deleted nxml C-RET binding.
+
2012-12-21 Glenn Morris <rgm@gnu.org>
* emacs-xtra.texi (copying): The FSF does not sell copies of this.
diff --git a/doc/emacs/text.texi b/doc/emacs/text.texi
index cc5ecc475af..d50a841d509 100644
--- a/doc/emacs/text.texi
+++ b/doc/emacs/text.texi
@@ -1917,7 +1917,7 @@ used as a cheap preview (@code{sgml-tags-invisible}).
The major mode for editing XML documents is called nXML mode. This
is a powerful major mode that can recognize many existing XML schema
and use them to provide completion of XML elements via
-@kbd{C-@key{RET}} or @kbd{M-@key{TAB}}, as well as ``on-the-fly'' XML
+@kbd{M-@key{TAB}}, as well as ``on-the-fly'' XML
validation with error highlighting. To enable nXML mode in an
existing buffer, type @kbd{M-x nxml-mode}, or, equivalently, @kbd{M-x
xml-mode}. Emacs uses nXML mode for files which have the extension