merge from trunk

1 files changed, 5 insertions, 3 deletions

diff --git a/doc/lispref/objects.texi b/doc/lispref/objects.texi
index afd63d69808..61007cc5a12 100644
--- a/doc/lispref/objects.texi
+++ b/doc/lispref/objects.texi
@@ -565,8 +565,8 @@ Lisp, upper case and lower case letters are distinct.
 @end quotation
 
   Here are several examples of symbol names.  Note that the @samp{+} in
-the fifth example is escaped to prevent it from being read as a number.
-This is not necessary in the fourth example because the rest of the name
+the fourth example is escaped to prevent it from being read as a number.
+This is not necessary in the sixth example because the rest of the name
 makes it invalid as a number.
 
 @example
@@ -1177,8 +1177,10 @@ inherit from, a default value, and a small number of extra slots to use for
 special purposes.  A char-table can also specify a single value for
 a whole character set.
 
+@cindex @samp{#^} read syntax
   The printed representation of a char-table is like a vector
-except that there is an extra @samp{#^} at the beginning.
+except that there is an extra @samp{#^} at the beginning.@footnote{You
+may also encounter @samp{#^^}, used for ``sub-char-tables''.}
 
   @xref{Char-Tables}, for special functions to operate on char-tables.
 Uses of char-tables include: