merge from trunk

2 files changed, 5 insertions, 0 deletions

diff --git a/doc/lispref/ChangeLog b/doc/lispref/ChangeLog
index 574aba493c0..ed073456e7e 100644
--- a/doc/lispref/ChangeLog
+++ b/doc/lispref/ChangeLog
@@ -1,3 +1,7 @@
+2013-09-12  Xue Fuqiao  <xfq.free@gmail.com>
+
+        * functions.texi (Obsolete Functions): Add an index for obsolete functions.
+
 2013-09-11  Xue Fuqiao  <xfq.free@gmail.com>
 
         * nonascii.texi (Character Properties): Character properties fix
diff --git a/doc/lispref/functions.texi b/doc/lispref/functions.texi
index 39a9ff6b62c..f1d8c54f49c 100644
--- a/doc/lispref/functions.texi
+++ b/doc/lispref/functions.texi
@@ -1135,6 +1135,7 @@ examining or altering the structure of closure objects.
 
 @node Obsolete Functions
 @section Declaring Functions Obsolete
+@cindex obsolete functions
 
   You can mark a named function as @dfn{obsolete}, meaning that it may
 be removed at some point in the future.  This causes Emacs to warn