aboutsummaryrefslogtreecommitdiffstats
path: root/doc
diff options
context:
space:
mode:
authorGlenn Morris2013-01-05 11:21:17 -0800
committerGlenn Morris2013-01-05 11:21:17 -0800
commitf8acde11051e2b777f2700f78f2090bd4db04d11 (patch)
tree8865e4f1c89f01a82462185be36e6ab0a48a84f6 /doc
parent2812660af07ef187ccd7a2af3a459cf5cdedd2b1 (diff)
downloademacs-f8acde11051e2b777f2700f78f2090bd4db04d11.tar.gz
emacs-f8acde11051e2b777f2700f78f2090bd4db04d11.zip
* doc/emacs/text.texi (HTML Mode): Remove deleted nxml C-RET binding.
Diffstat (limited to 'doc')
-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 @@
12013-01-05 Glenn Morris <rgm@gnu.org>
2
3 * text.texi (HTML Mode): Remove deleted nxml C-RET binding.
4
12012-12-21 Glenn Morris <rgm@gnu.org> 52012-12-21 Glenn Morris <rgm@gnu.org>
2 6
3 * emacs-xtra.texi (copying): The FSF does not sell copies of this. 7 * 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}).
1917 The major mode for editing XML documents is called nXML mode. This 1917 The major mode for editing XML documents is called nXML mode. This
1918is a powerful major mode that can recognize many existing XML schema 1918is a powerful major mode that can recognize many existing XML schema
1919and use them to provide completion of XML elements via 1919and use them to provide completion of XML elements via
1920@kbd{C-@key{RET}} or @kbd{M-@key{TAB}}, as well as ``on-the-fly'' XML 1920@kbd{M-@key{TAB}}, as well as ``on-the-fly'' XML
1921validation with error highlighting. To enable nXML mode in an 1921validation with error highlighting. To enable nXML mode in an
1922existing buffer, type @kbd{M-x nxml-mode}, or, equivalently, @kbd{M-x 1922existing buffer, type @kbd{M-x nxml-mode}, or, equivalently, @kbd{M-x
1923xml-mode}. Emacs uses nXML mode for files which have the extension 1923xml-mode}. Emacs uses nXML mode for files which have the extension