; Fix wording of recent documentation changes

* lisp/desktop.el (desktop-restore-frames):
* etc/NEWS:
* doc/emacs/misc.texi (Saving Emacs Sessions): Fix wording of the
recent changes.

(cherry picked from commit cffe5a02454f0d2201172c07a239bd9a3682ad68)

diff --git a/doc/emacs/misc.texi b/doc/emacs/misc.texi
index 7e9edfce26d2c345b38655fe34c780bea0c9330f..d7b057df56d01dadcf1b7c5fff9aedca730bbbaf 100644 (file)
--- a/doc/emacs/misc.texi
+++ b/doc/emacs/misc.texi
@@ -2854,13 +2854,14 @@ if the current Emacs session didn't load any desktop yet.
 
 @vindex desktop-restore-frames
   By default, the desktop tries to save and restore the frame and window
-configuration.@footnote{Except on Android, where this option defaults to
-@code{nil} because the window manager (@pxref{Android Windowing}) is too
-prohibitive to admit of restoring frame configurations.}  To disable or
-enable this, set @code{desktop-restore-frames} to @code{nil} or any
-non-@code{nil} value respectively.  (See that variable's documentation
-for some related options that you can customize to fine-tune this
-behavior.)
+configuration.@footnote{
+Except on Android, where this option defaults to @code{nil} because the
+window manager (@pxref{Android Windowing}) is too prohibitive, and
+doesn't allow restoring frame configurations.}
+To disable or enable this, set @code{desktop-restore-frames} to
+@code{nil} or any non-@code{nil} value respectively.  (See that
+variable's documentation for some related options that you can customize
+to fine-tune this behavior.)
 
 @vindex frameset-filter-alist
   When the desktop restores the frame and window configuration, it

diff --git a/lisp/desktop.el b/lisp/desktop.el
index ec5267b7073caf8a99dd24a4ccb5cb627ca8f9ab..15072546f657857108c28295e8ef246c0918c72f 100644 (file)
--- a/lisp/desktop.el
+++ b/lisp/desktop.el
@@ -428,9 +428,9 @@ host is off-line."
 See related options `desktop-restore-reuses-frames',
 `desktop-restore-in-current-display', and `desktop-restore-forces-onscreen'.
 
-This option is enabled by default elsewhere than on Android, where it is
-disabled by default as programs are too handicapped by the window
-manager for frames to be restored."
+This option is enabled by default, except on Android.  It is disabled by
+default on Android because the window manager there prevents programs from
+restoring frames."
   :type 'boolean
   :group 'desktop
   :version "31.1")