2 files changed, 11 insertions, 0 deletions

diff --git a/doc/emacs/ChangeLog b/doc/emacs/ChangeLog
index fa78cc4c502..a4f9985ad85 100644
--- a/doc/emacs/ChangeLog
+++ b/doc/emacs/ChangeLog
@@ -1,3 +1,9 @@
+2012-08-24  Michael Albinus  <michael.albinus@gmx.de>
+
+        * cmdargs.texi (General Variables): Setting
+        $DBUS_SESSION_BUS_ADDRESS to a dummy value suppresses connections
+        to the D-Bus session bus.  (Bug#12112)
+
 2012-08-14  Eli Zaretskii  <eliz@gnu.org>
 
         * building.texi (Debugger Operation): Correct and improve
diff --git a/doc/emacs/cmdargs.texi b/doc/emacs/cmdargs.texi
index 2dea1577c04..d4573eed5a8 100644
--- a/doc/emacs/cmdargs.texi
+++ b/doc/emacs/cmdargs.texi
@@ -434,6 +434,11 @@ variables to be set, but it uses their values if they are set.
 @item CDPATH
 Used by the @code{cd} command to search for the directory you specify,
 when you specify a relative directory name.
+@item DBUS_SESSION_BUS_ADDRESS
+Used by D-Bus when Emacs is compiled with it.  Usually, there is no
+need to change it.  Setting it to a dummy address, like
+@samp{unix:path=/tmp/foo}, suppresses connections to the D-Bus session
+bus.
 @item EMACSDATA
 Directory for the architecture-independent files that come with Emacs.
 This is used to initialize the variable @code{data-directory}.