Some doc for desktop-auto-save-timeout

* doc/emacs/misc.texi (Saving Emacs Sessions):
Mention desktop-auto-save-timeout.

* lisp/desktop.el (desktop-save-mode): Doc fix.

* etc/NEWS: Related edit.

5 files changed, 19 insertions, 4 deletions

diff --git a/doc/emacs/ChangeLog b/doc/emacs/ChangeLog
index 4478e4bd72c..c8508c39280 100644
--- a/doc/emacs/ChangeLog
+++ b/doc/emacs/ChangeLog
@@ -1,3 +1,7 @@
+2014-02-03  Glenn Morris  <rgm@gnu.org>
+
+        * misc.texi (Saving Emacs Sessions): Mention desktop-auto-save-timeout.
+
 2014-02-02  Glenn Morris  <rgm@gnu.org>
 
         * regs.texi (Registers): Mention previewing.
diff --git a/doc/emacs/misc.texi b/doc/emacs/misc.texi
index e2151e9144c..f89ebabd27a 100644
--- a/doc/emacs/misc.texi
+++ b/doc/emacs/misc.texi
@@ -2141,7 +2141,8 @@ subsequent Emacs sessions reload the saved desktop.
 @vindex desktop-save-mode
   You can save the desktop manually with the command @kbd{M-x
 desktop-save}.  You can also enable automatic saving of the desktop
-when you exit Emacs, and automatic restoration of the last saved
+at regular intervals and when you exit Emacs, and automatic restoration
+of the last saved
 desktop when Emacs starts: use the Customization buffer (@pxref{Easy
 Customization}) to set @code{desktop-save-mode} to @code{t} for future
 sessions, or add this line in your init file (@pxref{Init File}):
@@ -2150,6 +2151,11 @@ sessions, or add this line in your init file (@pxref{Init File}):
 (desktop-save-mode 1)
 @end example
 
+@vindex desktop-auto-save-timeout
+@noindent
+Emacs then auto-saves the desktop every @code{desktop-auto-save-timeout}
+seconds, if that is non-@code{nil} and non-zero.
+
 @findex desktop-change-dir
 @findex desktop-revert
 @vindex desktop-path
diff --git a/etc/NEWS b/etc/NEWS
index cfcb74cf782..b8251c9c87f 100644
--- a/etc/NEWS
+++ b/etc/NEWS
@@ -458,8 +458,9 @@ if your version doesn't support that option.  See option `cfengine-cf-promises'.
 
 ** Desktop
 
-*** `desktop-auto-save-timeout' defines the number of seconds idle time
-before auto-save of the desktop.
++++
+*** By default, the desktop is now auto-saved after `desktop-auto-save-timeout'.
+To disable this, customize that option to nil (or zero).
 
 *** `desktop-restore-frames', enabled by default, allows saving and
 restoring the frame/window configuration (frameset).  Additional options
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index b4391a165d3..cc6e8ac5805 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,5 +1,7 @@
 2014-02-03  Glenn Morris  <rgm@gnu.org>
 
+        * desktop.el (desktop-save-mode): Doc fix.
+
         * frameset.el (frameset-to-register):
         * kmacro.el (kmacro-to-register):
         * register.el (increment-register):
diff --git a/lisp/desktop.el b/lisp/desktop.el
index 78ecc2f5376..f603a413a82 100644
--- a/lisp/desktop.el
+++ b/lisp/desktop.el
@@ -160,7 +160,9 @@ the mode if ARG is omitted or nil.
 
 If Desktop Save mode is enabled, the state of Emacs is saved from
 one session to another.  See variable `desktop-save' and function
-`desktop-read' for details."
+`desktop-read' for details.
+
+For options you can set, browse the `desktop' customization group."
   :global t
   :group 'desktop)