aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorXue Fuqiao2013-11-09 10:36:46 +0800
committerXue Fuqiao2013-11-09 10:36:46 +0800
commitbe9d2b46f0571503adfc7f82d666cec73e3a1cff (patch)
tree49116f0dd669f4e4ccecd859095335a9810f2ef0
parentfa47d79686438467deae169e206af0be1bf5ff1d (diff)
downloademacs-be9d2b46f0571503adfc7f82d666cec73e3a1cff.tar.gz
emacs-be9d2b46f0571503adfc7f82d666cec73e3a1cff.zip
* doc/lispref/os.texi (Startup Summary): Add an index about startup screen.
-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 @@
12013-11-09 Xue Fuqiao <xfq.free@gmail.com>
2
3 * os.texi (Startup Summary): Add an index about startup screen.
4
12013-11-08 Eli Zaretskii <eliz@gnu.org> 52013-11-08 Eli Zaretskii <eliz@gnu.org>
2 6
3 * display.texi (Truncation): Document that cache-long-scans is now 7 * 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.
218It runs @code{window-setup-hook}. @xref{Window Systems}. 218It runs @code{window-setup-hook}. @xref{Window Systems}.
219 219
220@item 220@item
221@cindex startup screen
221It displays the @dfn{startup screen}, which is a special buffer that 222It displays the @dfn{startup screen}, which is a special buffer that
222contains information about copyleft and basic Emacs usage. This is 223contains information about copyleft and basic Emacs usage. This is
223not done if @code{inhibit-startup-screen} or @code{initial-buffer-choice} 224not done if @code{inhibit-startup-screen} or @code{initial-buffer-choice}