2 files changed, 12 insertions, 3 deletions

diff --git a/doc/emacs/ChangeLog b/doc/emacs/ChangeLog
index 848248963be..4c96fff8e2d 100644
--- a/doc/emacs/ChangeLog
+++ b/doc/emacs/ChangeLog
@@ -1,3 +1,8 @@
+2012-04-10  Glenn Morris  <rgm@gnu.org>
+
+        * entering.texi (Entering Emacs):
+        Do not mention initial-buffer-choice = t.
+
 2012-04-08  Glenn Morris  <rgm@gnu.org>
 
         * misc.texi (Gnus Startup): Use @env for environment variables.
diff --git a/doc/emacs/entering.texi b/doc/emacs/entering.texi
index ba7f3132b6b..d9f388a4783 100644
--- a/doc/emacs/entering.texi
+++ b/doc/emacs/entering.texi
@@ -77,9 +77,13 @@ information about @file{site-start.el}.}
 by setting the variable @code{initial-buffer-choice} to a
 non-@code{nil} value.  (In that case, even if you specify one or more
 files on the command line, Emacs opens but does not display them.)
-The value of @code{initial-buffer-choice} can be either the name of
-the desired file or directory, or @code{t}, which means to display the
-@samp{*scratch*} buffer.
+The value of @code{initial-buffer-choice} should be the name of
+the desired file or directory.
+@ignore
+@c I do not think this should be mentioned.  AFAICS it is just a dodge
+@c around inhibit-startup-screen not being settable on a site-wide basis.
+or @code{t}, which means to display the @samp{*scratch*} buffer.
+@end ignore
 
 @node Exiting, Basic, Entering Emacs, Top
 @section Exiting Emacs