Merge from emacs-23 branch, up to 2010-05-20T21:33:58Z!juri@jurta.org.

Note:
emacs-23 2010-05-20T01:32:08Z!lekktu@gmail.com is rendered unnecessary by pre-existing 2010-05-20
trunk change.

3 files changed, 14 insertions, 8 deletions

diff --git a/doc/emacs/ChangeLog b/doc/emacs/ChangeLog
index fa7b38e8bcb..84fa7f875c4 100644
--- a/doc/emacs/ChangeLog
+++ b/doc/emacs/ChangeLog
@@ -1,5 +1,11 @@
 2011-01-15  Chong Yidong  <cyd@stupidchicken.com>
 
+        * building.texi (Compilation): Improve instructions for running two
+        compilations (Bug#7573).
+
+        * files.texi (Backup Names): Document the new location of the
+        last-resort backup file.
+
         * files.texi (File Aliases): Move directory-abbrev-alist doc from Lisp
         manual.  Explain why directory-abbrev-alist elements should be anchored
         (Bug#7777).
diff --git a/doc/emacs/building.texi b/doc/emacs/building.texi
index 98420b1f569..f9602e4dcf7 100644
--- a/doc/emacs/building.texi
+++ b/doc/emacs/building.texi
@@ -122,10 +122,10 @@ confirmation before actually killing a compilation that is running.
 You can also kill the compilation process with @kbd{M-x
 kill-compilation}.
 
-  If you want to run two compilations at once, you should start the
-first one, then rename the @samp{*compilation*} buffer (perhaps using
-@code{rename-uniquely}; @pxref{Misc Buffer}), and start the other
-compilation.  That will create a new @samp{*compilation*} buffer.
+  To run two compilations at once, start the first one, then rename
+the @samp{*compilation*} buffer (perhaps using @code{rename-uniquely};
+@pxref{Misc Buffer}), then switch buffers and start the other
+compilation.  This will create a new @samp{*compilation*} buffer.
 
   Emacs does not expect a compiler process to launch asynchronous
 subprocesses; if it does, and they keep running after the main
diff --git a/doc/emacs/files.texi b/doc/emacs/files.texi
index c869e19afe7..b8745436f1f 100644
--- a/doc/emacs/files.texi
+++ b/doc/emacs/files.texi
@@ -568,10 +568,10 @@ another from the newly saved contents if you save again.
 appending @samp{~} to the file name being edited; thus, the backup
 file for @file{eval.c} would be @file{eval.c~}.
 
-  If access control stops Emacs from writing backup files under the usual
-names, it writes the backup file as @file{%backup%~} in your home
-directory.  Only one such file can exist, so only the most recently
-made such backup is available.
+  If access control stops Emacs from writing backup files under the
+usual names, it writes the backup file as @file{~/.emacs.d/%backup%~}.
+Only one such file can exist, so only the most recently made such
+backup is available.
 
   Emacs can also make @dfn{numbered backup files}.  Numbered backup
 file names contain @samp{.~}, the number, and another @samp{~} after