Merge from emacs--rel--22

Revision: [email protected]/emacs--devo--0--patch-1107

6 files changed, 18 insertions, 1 deletions

diff --git a/doc/emacs/ChangeLog b/doc/emacs/ChangeLog
index a94c43e1af..1a3bb605ef 100644
--- a/doc/emacs/ChangeLog
+++ b/doc/emacs/ChangeLog
@@ -11,6 +11,15 @@
 	* calendar.texi: Update for `calendar-date-style' replacing
 	`european-calendar'.
 
+2008-03-28  Jason Rumney  <[email protected]>
+
+	* display.texi (Display Custom): Mention overlay-margin in text.
+
+2008-03-12  Reiner Steib  <[email protected]>
+
+	* custom.texi, dired.texi, mini.texi, mule.texi: Add `referenced in the
+	tutorial' comments.
+
 2008-03-28  Chong Yidong  <[email protected]>
 
 	* mark.texi (Mark): Rearrange nodes.
diff --git a/doc/emacs/custom.texi b/doc/emacs/custom.texi
index 1d0d6668d6..e270f86325 100644
--- a/doc/emacs/custom.texi
+++ b/doc/emacs/custom.texi
@@ -1592,6 +1592,8 @@ command is less work to invoke when you really want to.
 
 @node Init Rebinding
 @subsection Rebinding Keys in Your Init File
+@c This node is referenced in the tutorial.  When renaming or deleting
+@c it, the tutorial needs to be adjusted.  (TUTORIAL.de)
 
   If you have a set of key bindings that you like to use all the time,
 you can specify them in your @file{.emacs} file by using their Lisp
diff --git a/doc/emacs/dired.texi b/doc/emacs/dired.texi
index 81d2a00461..72cc04dfcd 100644
--- a/doc/emacs/dired.texi
+++ b/doc/emacs/dired.texi
@@ -4,6 +4,8 @@
 @c See file emacs.texi for copying conditions.
 @node Dired, Calendar/Diary, Rmail, Top
 @chapter Dired, the Directory Editor
+@c This node is referenced in the tutorial.  When renaming or deleting
+@c it, the tutorial needs to be adjusted.
 @cindex Dired
 @cindex file management
 
diff --git a/doc/emacs/display.texi b/doc/emacs/display.texi
index bb84610d74..5ef7e7fa78 100644
--- a/doc/emacs/display.texi
+++ b/doc/emacs/display.texi
@@ -1217,7 +1217,7 @@ amount of time Emacs must remain busy before the busy indicator is
 displayed, by setting the variable @code{hourglass-delay}.
 
 @vindex overline-margin
-  On graphical display, this variables specifies the vertical position
+  On graphical display, the variable @code{overline-margin} specifies the vertical position
 of an overline above the text, including the height of the overline
 itself (1 pixel).  The default value is 2 pixels.
 
diff --git a/doc/emacs/mini.texi b/doc/emacs/mini.texi
index cbc3930203..8510fea9b9 100644
--- a/doc/emacs/mini.texi
+++ b/doc/emacs/mini.texi
@@ -175,6 +175,8 @@ minibuffer, set the variable @code{enable-recursive-minibuffers} to
 
 @node Completion
 @section Completion
+@c This node is referenced in the tutorial.  When renaming or deleting
+@c it, the tutorial needs to be adjusted.
 @cindex completion
   
   Some arguments allow @dfn{completion} to enter their value.  This
diff --git a/doc/emacs/mule.texi b/doc/emacs/mule.texi
index 504e28acc8..a5d4e46200 100644
--- a/doc/emacs/mule.texi
+++ b/doc/emacs/mule.texi
@@ -4,6 +4,8 @@
 @c See file emacs.texi for copying conditions.
 @node International, Major Modes, Frames, Top
 @chapter International Character Set Support
+@c This node is referenced in the tutorial.  When renaming or deleting
+@c it, the tutorial needs to be adjusted.  (TUTORIAL.de)
 @cindex MULE
 @cindex international scripts
 @cindex multibyte characters