Merge from emacs-24; up to 2012-05-05T02:50:20Z!monnier@iro.umontreal.ca

[gnu-emacs] / doc / lispref / nonascii.texi

diff --git a/doc/lispref/nonascii.texi b/doc/lispref/nonascii.texi
index 315a25c7e52436584afc6b09c4e0a567446728ce..2f6f516c587870d8a897a82c2e72514de618ffce 100644 (file)
--- a/doc/lispref/nonascii.texi
+++ b/doc/lispref/nonascii.texi
@@ -2,7 +2,7 @@
 @c This is part of the GNU Emacs Lisp Reference Manual.
 @c Copyright (C) 1998-1999, 2001-2012 Free Software Foundation, Inc.
 @c See the file elisp.texi for copying conditions.
-@node Non-ASCII Characters, Searching and Matching, Text, Top
+@node Non-ASCII Characters
 @chapter Non-@acronym{ASCII} Characters
 @cindex multibyte characters
 @cindex characters, multi-byte
@@ -408,16 +408,15 @@ codepoint belongs: most unassigned codepoints get the value of
 or @code{R} (strong R).
 
 @item decomposition
-Corresponds to the Unicode @code{Decomposition_Type} and
-@code{Decomposition_Value} properties.  The value is a list, whose
-first element may be a symbol representing a compatibility formatting
-tag, such as @code{small}@footnote{The Unicode specification writes
-these tag names inside @samp{<..>} brackets, but the tag names in
-Emacs do not include the brackets; e.g.@: Unicode specifies
-@samp{<small>} where Emacs uses @samp{small}.  }; the other elements
-are characters that give the compatibility decomposition sequence of
-this character.  For unassigned codepoints, the value is the character
-itself.
+Corresponds to the Unicode properties @code{Decomposition_Type} and
+@code{Decomposition_Value}.  The value is a list, whose first element
+may be a symbol representing a compatibility formatting tag, such as
+@code{small}@footnote{The Unicode specification writes these tag names
+inside @samp{<..>} brackets, but the tag names in Emacs do not include
+the brackets; e.g.@: Unicode specifies @samp{<small>} where Emacs uses
+@samp{small}.  }; the other elements are characters that give the
+compatibility decomposition sequence of this character.  For
+unassigned codepoints, the value is the character itself.
 
 @item decimal-digit-value
 Corresponds to the Unicode @code{Numeric_Value} property for
@@ -607,7 +606,7 @@ The value is a list of all defined character set names.
 @end defvar
 
 @defun charset-priority-list &optional highestp
-This functions returns a list of all defined character sets ordered by
+This function returns a list of all defined character sets ordered by
 their priority.  If @var{highestp} is non-@code{nil}, the function
 returns a single character set of the highest priority.
 @end defun