* variables.texi (Constant Variables): Distinguish from defconst

variables.
(Defining Variables): Add cindex.

2 files changed, 13 insertions, 0 deletions

diff --git a/doc/lispref/ChangeLog b/doc/lispref/ChangeLog
index 833ff8b57ff..42069cd4e94 100644
--- a/doc/lispref/ChangeLog
+++ b/doc/lispref/ChangeLog
@@ -1,3 +1,9 @@
+2009-10-16  Chong Yidong  <cyd@stupidchicken.com>
+
+        * variables.texi (Constant Variables): Distinguish from defconst
+        variables.
+        (Defining Variables): Add cindex.
+
 2009-10-15  Chong Yidong  <cyd@stupidchicken.com>
 
         * os.texi (Time of Day): Clarify that the microsecond part is
diff --git a/doc/lispref/variables.texi b/doc/lispref/variables.texi
index 89fb19b8d62..4f9f9c17369 100644
--- a/doc/lispref/variables.texi
+++ b/doc/lispref/variables.texi
@@ -134,6 +134,12 @@ starts with @samp{:}, interned in the standard obarray, and returns
 @code{nil} otherwise.
 @end defun
 
+These constants are fundamentally different from the ``constants''
+defined using the @code{defconst} special form (@pxref{Defining
+Variables}).  A @code{defconst} form serves to inform human readers
+that you do not intend to change the value of a variable, but Emacs
+does not raise an error if you actually change it.
+
 @node Local Variables
 @section Local Variables
 @cindex binding local variables
@@ -523,6 +529,7 @@ The @code{defvar} form returns @var{symbol}, but it is normally used
 at top level in a file where its value does not matter.
 @end defspec
 
+@cindex constant variables
 @defspec defconst symbol value [doc-string]
 This special form defines @var{symbol} as a value and initializes it.
 It informs a person reading your code that @var{symbol} has a standard