X-Git-Url: http://git.hcoop.net/bpt/emacs.git/blobdiff_plain/b95a0c80ae0397d4487058bd01d5aa1da87c4f4c..7b75b9937c61cbd8ac6a0fbb32cb52430f762322:/man/faq.texi

diff --git a/man/faq.texi b/man/faq.texi
index f7efa3c870..4ac0bdc979 100644
--- a/man/faq.texi
+++ b/man/faq.texi
@@ -1004,23 +1004,11 @@ spool, it might (or might not) do some good to complain to your news
 administrator, because the most recent FAQ should not expire for a
 while.
 
-@item
-Via HTTP or FTP.  You can always fetch the latest FAQ from
-
-@uref{http://www.lerner.co.il/emacs/} and
-
-@uref{ftp://ftp.lerner.co.il/pub/emacs/}
-
 @item
 In the Emacs distribution.  Since Emacs 18.56, the FAQ at the time
 of release has been part of the Emacs distribution as either
 @file{etc/FAQ} or @file{man/faq.texi} (@pxref{File-name conventions}).
 
-@item
-Via the World Wide Web.  A hypertext version is available at
-
-@uref{http://www.lerner.co.il/emacs/}
-
 @item
 Via anonymous ftp and e-mail from @file{rtfm.mit.edu} (and its mirror in
 Europe), the main repository for FAQs and other items posted to
@@ -1046,13 +1034,6 @@ send usenet/news.answers/GNU-Emacs-FAQ/part5
 
 For more information, send email to @email{mail-server@@rtfm.mit.edu}
 with @samp{help} and @samp{index} in the body on separate lines.
-
-@item
-As the very last resort, you can e-mail a request to
-@email{emacs-faq@@lerner.co.il}.  Don't do this unless you have made a
-good-faith effort to obtain the FAQ list via one of the methods listed
-above.
-
 @end itemize
 
 @c ------------------------------------------------------------
@@ -3247,7 +3228,7 @@ setting things up so that @samp{ls -l} outputs US date format.  This can
 be done by setting the locale.  See your OS manual for more information.
 
 The second approach involves changing the regular expression used by
-dired, @code{dired-move-to-filename-regexp}.
+dired, @code{directory-listing-before-filename-regexp}.
 
 @c ------------------------------------------------------------
 @node Compiling and installing Emacs, Finding Emacs and related packages, Bugs and problems, Top
@@ -4637,9 +4618,9 @@ Good question!
 @cindex Keys, swapping
 @cindex @code{keyboard-translate}
 
-In Emacs 19, you can swap two keys (or key sequences) by using the
-@code{keyboard-translate} function.  For example, to turn @kbd{C-h} into
-@key{DEL} and @key{DEL} to @kbd{C-h}, use
+You can swap two keys (or key sequences) by using the
+@code{keyboard-translate} function.  For example, to turn @kbd{C-h}
+into @key{DEL} and @key{DEL} to @kbd{C-h}, use
 
 @lisp
 (keyboard-translate ?\C-h ?\C-?)  ; translate `C-h' to DEL
@@ -4651,6 +4632,11 @@ The first key sequence of the pair after the function identifies what is
 produced by the keyboard; the second, what is matched for in the
 keymaps.
 
+However, in the specific case of @kbd{C-h} and @key{DEL}, you should
+toggle @code{normal-erase-is-backspace-mode} instead of calling
+@code{keyboard-translate}.  @inforef{DEL Does Not Delete, DEL Does Not Delete,
+emacs}.
+
 Keyboard translations are not the same as key bindings in keymaps.
 Emacs contains numerous keymaps that apply in different situations, but
 there is only one set of keyboard translations, and it applies to every
@@ -4659,8 +4645,6 @@ take place at the lowest level of input processing; the keys that are
 looked up in keymaps contain the characters that result from keyboard
 translation.
 
-@inforef{Keyboard Translations, Keyboard Translations, emacs}.
-
 @node Producing C-XXX with the keyboard, No Meta key, Swapping keys, Key bindings
 @section How do I produce C-XXX with my keyboard?
 @cindex Producing control characters