Update copyright year to 2014 by running admin/update-copyright.

[bpt/emacs.git] / doc / emacs / entering.texi

diff --git a/doc/emacs/entering.texi b/doc/emacs/entering.texi
index de14351..71b1fc8 100644 (file)
--- a/doc/emacs/entering.texi
+++ b/doc/emacs/entering.texi
@@ -1,6 +1,6 @@
 @c This is part of the Emacs manual.
-@c Copyright (C) 1985-1987, 1993-1995, 2001-2012
-@c   Free Software Foundation, Inc.
+@c Copyright (C) 1985-1987, 1993-1995, 2001-2014 Free Software
+@c Foundation, Inc.
 @c See file emacs.texi for copying conditions.
 @iftex
 @chapter Entering and Exiting Emacs
@@ -74,16 +74,14 @@ up before reading @file{site-start.el}.  @xref{Init File}, for
 information about @file{site-start.el}.}
 
   You can also force Emacs to display a file or directory at startup
-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} 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 @file{*scratch*} buffer.
-@end ignore
+by setting the variable @code{initial-buffer-choice} to a string
+naming that file or directory.  The value of
+@code{initial-buffer-choice} may also be a function which should
+return a buffer which is then displayed.  @code{initial-buffer-choice}
+may also be @code{t} in which case the @file{*scratch*} buffer will be
+shown.  In any case, even if you specify one or more files on the
+command line, Emacs opens but does not display them if
+@code{initial-buffer-choice} is non-nil.
 
 @node Exiting
 @section Exiting Emacs