Merge from emacs-23

2 files changed, 4 insertions, 5 deletions

diff --git a/doc/misc/ChangeLog b/doc/misc/ChangeLog
index 29767dfa2a7..d684bc91bb0 100644
--- a/doc/misc/ChangeLog
+++ b/doc/misc/ChangeLog
@@ -1,3 +1,7 @@
+2010-07-27  Chong Yidong  <cyd@stupidchicken.com>
+
+        * nxml-mode.texi (Limitations): Remove obsolete discussion (Bug#6708).
+
 2010-07-19  Juanma Barranquero  <lekktu@gmail.com>
 
         * org.texi: Fix typo in previous change (2010-07-19T09:47:27Z!carsten.dominik@gmail.com).
diff --git a/doc/misc/nxml-mode.texi b/doc/misc/nxml-mode.texi
index 593bf92d00a..423bdc85a24 100644
--- a/doc/misc/nxml-mode.texi
+++ b/doc/misc/nxml-mode.texi
@@ -851,11 +851,6 @@ elements. Other usage of DTDs is ignored.
 @item
 The restrictions on RELAX NG schemas in section 7 of the RELAX NG
 specification are not enforced.
-@item
-Unicode support has problems. This stems mostly from the fact that
-the XML (and RELAX NG) character model is based squarely on Unicode,
-whereas the Emacs character model is not.  Emacs 22 is slated to have
-full Unicode support, which should improve the situation here.
 @end itemize
 
 @bye