diff --git a/gdb/doc/ChangeLog b/gdb/doc/ChangeLog
index 93061fca9d..f92bbea45c 100644
--- a/gdb/doc/ChangeLog
+++ b/gdb/doc/ChangeLog
@@ -5,6 +5,8 @@
 	(Working Directory): Add a cross-reference to "info proc" command.
 	(Files): Add a tip for decreasing memory used for symtabs from
 	shared libraries.
+	(Starting): Fix whitespace; make "elaboration" stand out where it
+	is first used, and add an index entry for the term.
 
 2004-10-12  Andrew Cagney  <cagney@gnu.org>
 
diff --git a/gdb/doc/gdb.texinfo b/gdb/doc/gdb.texinfo
index 3c798be5f5..0909aa3620 100644
--- a/gdb/doc/gdb.texinfo
+++ b/gdb/doc/gdb.texinfo
@@ -1760,9 +1760,10 @@ The @samp{start} command does the equivalent of setting a temporary
 breakpoint at the beginning of the main procedure and then invoking
 the @samp{run} command.
 
-Some programs contain an elaboration phase where some startup code is
-executed before the main program is called.  This depends on the
-languages used to write your program. In C@t{++} for instance,
+@cindex elaboration phase
+Some programs contain an @dfn{elaboration} phase where some startup code is
+executed before the main procedure is called.  This depends on the
+languages used to write your program.  In C@t{++}, for instance,
 constructors for static and global objects are executed before
 @code{main} is called.  It is therefore possible that the debugger stops
 before reaching the main procedure.  However, the temporary breakpoint