diff --git a/doc/misc/gnus.texi b/doc/misc/gnus.texi
index fffe81eac06..fa436e0b87d 100644
--- a/doc/misc/gnus.texi
+++ b/doc/misc/gnus.texi
@@ -26680,11 +26680,11 @@ CloudSynchronizationDataPack(TM)s.  It's easiest to set this from the
 Server buffer (@pxref{Gnus Cloud Setup}).
 @end defvar
 
+@c Section name changed from this in Emacs 31.  @c
+@c This anchor allows old links to continue working.  @c
+@anchor{D-Bus Integration}
 @node System Sleep Integration
 @section System Sleep Integration
-@c Section name changed from this in Emacs 31. @c
-@c This anchor allows old links to continue working. @c
-@anchor{D-Bus Integration}
 @cindex system sleep
 @cindex closing servers automatically
 @cindex hung connections
diff --git a/etc/NEWS b/etc/NEWS
index 1fe24bd61e4..c0e05deed2e 100644
--- a/etc/NEWS
+++ b/etc/NEWS
@@ -795,7 +795,7 @@ docstring for the new option.
 See the file "etc/ORG-NEWS" for user-visible changes in Org.
 
 +++
-** New user option 'compilation-search-extra-path'
+** New user option 'compilation-search-extra-path'.
 compile.el will now use paths specified in both
 'compilation-search-extra-path' and 'compilation-search-path', when
 doing search.  'compilation-search-extra-path' is consulted first.
@@ -1967,13 +1967,16 @@ Gnus, see "(gnus) Symbolic Prefixes" in the Gnus manual.
 ---
 *** Sorting selected groups is now possible with 'gnus-topic-mode'.
 
+---
+*** gnus-dbus.el is now obsolete.
+
 +++
 *** System sleep integration is now independent of D-Bus.
 The system sleep integration previously provided by customizing the
 variable 'gnus-dbus-close-on-sleep' is now deprecated.  A new system
-using the builtin sleep library is now available by customizing
-'gnus-close-on-sleep'.  This will work on all systems that the sleep
-library supports.
+using the builtin 'system-sleep' library is now available by customizing
+'gnus-close-on-sleep'.  This will work on all systems that the
+'system-sleep' library supports.
 
 ** Sieve
 
@@ -2819,7 +2822,7 @@ another branch.
 ---
 *** VC Annotate for Mercurial repositories shows changeset hashes.
 To restore showing revision numbers instead of changeset hashes,
-customize the new option vc-hg-annotate-show-revision-numbers to
+customize the new user option 'vc-hg-annotate-show-revision-numbers' to
 non-nil.
 
 +++
@@ -4613,7 +4616,7 @@ singleton list.
 By default it kills Emacs, as before, but 'kill-emacs-on-sigint'
 can be set to nil to change that.
 The response to SIGINT in interactive sessions is unaffected,
-e.g. in a normal GUI session it still kills Emacs whereas in a terminal
+e.g., in a normal GUI session it still kills Emacs whereas in a terminal
 it causes 'quit' since it is used for 'C-g'.
 
 +++
@@ -4622,6 +4625,7 @@ While it is marginally more efficient than ':after' or ':before',
 the main purpose is to make the intention more obvious when the advice
 modifies only the interactive form and not the actual behavior
 of the function.
+
 
 * Changes in Emacs 31.1 on Non-Free Operating Systems
 
diff --git a/lisp/gnus/gnus-start.el b/lisp/gnus/gnus-start.el
index ba308990407..62faa26468d 100644
--- a/lisp/gnus/gnus-start.el
+++ b/lisp/gnus/gnus-start.el
@@ -734,6 +734,7 @@ the first newsgroup."
 
 (defcustom gnus-close-on-sleep nil
   "When non-nil, close Gnus servers on system sleep."
+  :version "31.1"
   :type 'boolean
   :group 'gnus-start)
 
@@ -744,9 +745,7 @@ See `gnus-close-on-sleep' to enable this functionality.
 SLEEP-EVENT is checked to ensure this is only run before sleep."
   (when (and (eq 'pre-sleep (sleep-event-state sleep-event))
              (gnus-alive-p))
-    (condition-case nil
-        (gnus-close-all-servers)
-      (error nil))))
+    (ignore-errors (gnus-close-all-servers))))
 
 (defun gnus-no-server-1 (&optional arg child)
   "Read network news.