summaryrefslogtreecommitdiff
path: root/doc
diff options
context:
space:
mode:
authorXue Fuqiao <xfq.free@gmail.com>2013-11-09 10:36:46 +0800
committerXue Fuqiao <xfq.free@gmail.com>2013-11-09 10:36:46 +0800
commitbe9d2b46f0571503adfc7f82d666cec73e3a1cff (patch)
tree49116f0dd669f4e4ccecd859095335a9810f2ef0 /doc
parentfa47d79686438467deae169e206af0be1bf5ff1d (diff)
downloademacs-be9d2b46f0571503adfc7f82d666cec73e3a1cff.tar.gz
* doc/lispref/os.texi (Startup Summary): Add an index about startup screen.
Diffstat (limited to 'doc')
-rw-r--r--doc/lispref/ChangeLog4
-rw-r--r--doc/lispref/os.texi1
2 files changed, 5 insertions, 0 deletions
diff --git a/doc/lispref/ChangeLog b/doc/lispref/ChangeLog
index 12830ef884d..ab56cb2d5f8 100644
--- a/doc/lispref/ChangeLog
+++ b/doc/lispref/ChangeLog
@@ -1,3 +1,7 @@
+2013-11-09 Xue Fuqiao <xfq.free@gmail.com>
+
+ * os.texi (Startup Summary): Add an index about startup screen.
+
2013-11-08 Eli Zaretskii <eliz@gnu.org>
* display.texi (Truncation): Document that cache-long-scans is now
diff --git a/doc/lispref/os.texi b/doc/lispref/os.texi
index 071fcf526da..f9cbca77fab 100644
--- a/doc/lispref/os.texi
+++ b/doc/lispref/os.texi
@@ -218,6 +218,7 @@ specify.
It runs @code{window-setup-hook}. @xref{Window Systems}.
@item
+@cindex startup screen
It displays the @dfn{startup screen}, which is a special buffer that
contains information about copyleft and basic Emacs usage. This is
not done if @code{inhibit-startup-screen} or @code{initial-buffer-choice}