2 files changed, 8 insertions, 3 deletions

diff --git a/doc/emacs/ChangeLog b/doc/emacs/ChangeLog
index 4b14f1d8f0f..9d78b7f948a 100644
--- a/doc/emacs/ChangeLog
+++ b/doc/emacs/ChangeLog
@@ -1,3 +1,7 @@
+2011-11-17  Glenn Morris  <rgm@gnu.org>
+
+        * regs.texi (Bookmarks): Small fixes related to saving.  (Bug#10058)
+
 2011-11-16  Juanma Barranquero  <lekktu@gmail.com>
 
         * killing.texi (Rectangles):
diff --git a/doc/emacs/regs.texi b/doc/emacs/regs.texi
index 7e5b07221a0..f7fd52bd28d 100644
--- a/doc/emacs/regs.texi
+++ b/doc/emacs/regs.texi
@@ -278,7 +278,7 @@ you can use it to edit your bookmark definitions or annotate the
 bookmarks.  Type @kbd{C-h m} in the bookmark buffer for more
 information about its special editing commands.
 
-  When you kill Emacs, Emacs offers to save your bookmark values, if
+  When you kill Emacs, Emacs saves your bookmarks, if
 you have changed any bookmark values.  You can also save the bookmarks
 at any time with the @kbd{M-x bookmark-save} command.  Bookmarks are
 saved to the file @file{~/.emacs.d/bookmarks} (for compatibility with
@@ -290,9 +290,10 @@ persist from one Emacs session to the next.
 @vindex bookmark-save-flag
   If you set the variable @code{bookmark-save-flag} to 1, each command
 that sets a bookmark will also save your bookmarks; this way, you
-don't lose any bookmark values even if Emacs crashes.  (The value, if
+don't lose any bookmark values even if Emacs crashes.  The value, if
 a number, says how many bookmark modifications should go by between
-saving.)
+saving.  If you set this variable to @code{nil}, Emacs only
+saves bookmarks if you explicitly use @kbd{M-x bookmark-save}.
 
 @vindex bookmark-search-size
   Bookmark position values are saved with surrounding context, so that