Merge from emacs-23

[gnu-emacs] / doc / emacs / killing.texi

diff --git a/doc/emacs/killing.texi b/doc/emacs/killing.texi
index 2ad3bc9e739e0cd51305949b2d3bbe24896cc521..119b08065e58514a0eba365f44f8ac8ec3790586 100644 (file)
--- a/doc/emacs/killing.texi
+++ b/doc/emacs/killing.texi
@@ -4,13 +4,9 @@
 @c   Free Software Foundation, Inc.
 @c See file emacs.texi for copying conditions.
 
-@node Killing, Yanking, Mark, Top
+@node Killing, Registers, Mark, Top
 @chapter Killing and Moving Text
 
-@ifnottex
-@raisesections
-@end ifnottex
-
   @dfn{Killing} means erasing text and copying it into the @dfn{kill
 ring}, from which you can bring it back into the buffer by
 @dfn{yanking} it.  (Some applications use the terms ``cutting'' and
@@ -19,9 +15,16 @@ moving or copying text within Emacs.  It is very versatile, because
 there are commands for killing many different types of syntactic
 units.
 
-@iftex
+@menu
+* Deletion and Killing:: Commands that remove text.
+* Yanking::              Commands that insert text.
+* Accumulating Text::    Other methods to add text to the buffer.
+* Rectangles::           Operating on text in rectangular areas.
+* CUA Bindings::         Using C-x/C-c/C-v to kill and yank.
+@end menu
+
+@node Deletion and Killing
 @section Deletion and Killing
-@end iftex
 
 @cindex killing text
 @cindex cutting text
@@ -233,7 +236,7 @@ explain why the text has not been erased.
 non-@code{nil} value, identical subsequent kills yield a single
 kill-ring entry, without duplication.
 
-@node Yanking, Accumulating Text, Killing, Top
+@node Yanking
 @section Yanking
 @cindex moving text
 @cindex copying text
@@ -416,7 +419,7 @@ saved.
 @code{kill-ring}; you can view the entire contents of the kill ring with
 the command @kbd{C-h v kill-ring}.
 
-@node Accumulating Text, Rectangles, Yanking, Top
+@node Accumulating Text
 @section Accumulating Text
 @findex append-to-buffer
 @findex prepend-to-buffer
@@ -487,7 +490,7 @@ can lead to losing some of your editing.
   Another way to move text around is to store it in a register.
 @xref{Registers}.
 
-@node Rectangles, CUA Bindings, Accumulating Text, Top
+@node Rectangles
 @section Rectangles
 @cindex rectangle
 @cindex columns (and rectangles)
@@ -613,7 +616,7 @@ rectangle shifts right.
 @code{string-rectangle}, but inserts the string on each line,
 shifting the original text to the right.
 
-@node CUA Bindings, Registers, Rectangles, Top
+@node CUA Bindings
 @section CUA Bindings
 @findex cua-mode
 @vindex cua-mode
@@ -665,10 +668,6 @@ navigate to each of the words you want in the list, mark it (e.g. with
 insert a newline after the word in the target list by pressing
 @key{RET}.
 
-@ifnottex
-@lowersections
-@end ifnottex
-
 @ignore
    arch-tag: d8da8f96-0928-449a-816e-ff2d3497866c
 @end ignore