[Emacs-diffs] Changes to emacs/man/faq.texi

[Romain Francoise]

Index: emacs/man/faq.texi
diff -u emacs/man/faq.texi:1.79 emacs/man/faq.texi:1.80
--- emacs/man/faq.texi:1.79     Wed Feb  8 02:21:20 2006
+++ emacs/man/faq.texi  Wed Feb  8 21:58:40 2006
@@ -59,12 +59,9 @@
 
 This is the GNU Emacs FAQ, last updated on @today{}.
 
-The FAQ is maintained as a Texinfo document, allowing us to create HTML,
-Info, and TeX documents from a single source file, and is slowly but
-surely being improved.  Please bear with us as we improve on this
-format.  This FAQ is maintained as a part of GNU Emacs.  If you find
-any errors, or have any suggestions, please use @kbd{M-x report-emacs-bug}
-to report them.
+This FAQ is maintained as a part of GNU Emacs.  If you find any errors,
+or have any suggestions, please use @kbd{M-x report-emacs-bug} to report
+them.
 
 @menu
 * FAQ notation::
@@ -1177,6 +1174,8 @@
 * Highlighting a region::
 * Controlling case sensitivity::
 * Wrapping words automatically::
+* Searching for/replacing newlines::
+* Yanking text in isearch::
 * Spell-checkers::
 * Checking TeX and *roff documents::
 * Changing load-path::
@@ -1195,7 +1194,7 @@
 * Valid X resources::
 * Evaluating Emacs Lisp code::
 * Changing the length of a Tab::
-* Inserting > at the beginning of each line::
+* Inserting text at the beginning of each line::
 * Underlining paragraphs::
 * Repeating a command as many times as possible::
 * Forcing the cursor to remain in the same column::
@@ -1534,7 +1533,7 @@
 in your @file{.emacs} file.  (Also see @ref{Turning on syntax
 highlighting}.)
 
address@hidden Controlling case sensitivity, Wrapping words automatically, 
Highlighting a region, Common requests
address@hidden Controlling case sensitivity, Searching for/replacing newlines, 
Highlighting a region, Common requests
 @section How do I control Emacs's case-sensitivity when searching/replacing?
 @cindex @code{case-fold-search}
 @cindex Case sensitivity of searches
@@ -1566,7 +1565,23 @@
            (setq case-fold-search nil)))
 @end lisp
 
address@hidden Wrapping words automatically, Spell-checkers, Controlling case 
sensitivity, Common requests
address@hidden Searching for/replacing newlines, Yanking text in isearch, 
Controlling case sensitivity, Common requests
address@hidden How do I input a newline character in isearch or query-replace?
address@hidden Searching for newlines
address@hidden Replacing newlines
+
+Use @kbd{C-q C-j}.  For more information, see @inforef{Special Isearch,
+Special Input for Incremental Search, emacs}.
+
+
address@hidden Yanking text in isearch, Wrapping words automatically, Searching 
for/replacing newlines, Common requests
address@hidden How do I copy text from the kill ring into the search string?
address@hidden Yanking text into the search string
address@hidden isearch yanking
+
+Use @kbd{M-y}.  @inforef{Isearch Yank, Isearch Yanking, emacs}.
+
address@hidden Wrapping words automatically, Spell-checkers, Yanking text in 
isearch, Common requests
 @section How do I make Emacs wrap words for me?
 @cindex Wrapping word automatically
 @cindex Wrapping lines
@@ -2102,7 +2117,7 @@
 
 @end itemize
 
address@hidden Changing the length of a Tab, Inserting > at the beginning of 
each line, Evaluating Emacs Lisp code, Common requests
address@hidden Changing the length of a Tab, Inserting text at the beginning of 
each line, Evaluating Emacs Lisp code, Common requests
 @section How do I change Emacs's idea of the @key{TAB} character's length?
 @cindex Tab length
 @cindex Length of tab character
@@ -2121,8 +2136,9 @@
 @key{TAB} characters.  The latter controls what characters are inserted
 when you press the @key{TAB} character in certain modes.
 
address@hidden Inserting > at the beginning of each line, Underlining 
paragraphs, Changing the length of a Tab, Common requests
address@hidden How do I insert @samp{>} at the beginning of every line?
address@hidden Inserting text at the beginning of each line, Underlining 
paragraphs, Changing the length of a Tab, Common requests
address@hidden How do I insert <some text> at the beginning of every line?
address@hidden Prefixing a region with some text
 @cindex Prefix character, inserting in mail/news replies
 @cindex Replies to mail/news, inserting a prefix character
 @cindex @code{mail-yank-prefix}
@@ -2130,7 +2146,7 @@
 @cindex News replies, inserting a prefix character
 
 To do this to an entire buffer, type @kbd{M-< M-x replace-regexp
address@hidden ^ @key{RET} > @key{RET}}.
address@hidden ^ @key{RET} your text @key{RET}}.
 
 To do this to a region, use @code{string-insert-rectangle}.
 Set the mark (@address@hidden) at the beginning of the first line you
@@ -2139,13 +2155,12 @@
 buffer, type @kbd{C-x h M-x string-insert-rectangle @key{RET}}.
 
 If you are trying to prefix a yanked mail message with @samp{>}, you
-might want to set the variable @code{mail-yank-prefix}.  Better yet, use
-the Supercite package (@pxref{Supercite}), which provides flexible
-citation for yanked mail and news messages; it is included in Emacs
-since version 19.20.  @xref{Changing the included text prefix}, for
-additional information.
+might want to set the variable @code{mail-yank-prefix}.  In Message
+buffers, you can even use @kbd{M-;} to cite yanked messages (@kbd{M-;}
+runs the function @code{comment-region}, it is a general-purpose
+mechanism to comment regions).
 
address@hidden Underlining paragraphs, Repeating a command as many times as 
possible, Inserting > at the beginning of each line, Common requests
address@hidden Underlining paragraphs, Repeating a command as many times as 
possible, Inserting text at the beginning of each line, Common requests
 @section How do I insert @samp{_^H} before each character in a region to get 
an underlined paragraph?
 @cindex Underlining a region of text
 @cindex @code{underline-region}