diff options
| author | Glenn Morris <rgm@gnu.org> | 2014-07-02 23:00:53 -0700 |
|---|---|---|
| committer | Glenn Morris <rgm@gnu.org> | 2014-07-02 23:00:53 -0700 |
| commit | 2d3c9015c70fd05ac1bec42cc59d57c3fb6b82b5 (patch) | |
| tree | 572bc2de8c74eee49d8c49eb84a618b55fa3abf7 /doc/lispintro | |
| parent | e993f8d5d39431545ac0071655071a740534917b (diff) | |
| parent | cbb6a7aeff3b901645ee8e4f2c4abeceafdfc073 (diff) | |
| download | emacs-2d3c9015c70fd05ac1bec42cc59d57c3fb6b82b5.tar.gz emacs-2d3c9015c70fd05ac1bec42cc59d57c3fb6b82b5.tar.bz2 emacs-2d3c9015c70fd05ac1bec42cc59d57c3fb6b82b5.zip | |
Merge from emacs-24; up to 2014-06-15T04:52:34Z!eli@barzilay.org
Diffstat (limited to 'doc/lispintro')
| -rw-r--r-- | doc/lispintro/ChangeLog | 5 | ||||
| -rw-r--r-- | doc/lispintro/emacs-lisp-intro.texi | 8 |
2 files changed, 9 insertions, 4 deletions
diff --git a/doc/lispintro/ChangeLog b/doc/lispintro/ChangeLog index 13bc65eef4a..1ac7258e85a 100644 --- a/doc/lispintro/ChangeLog +++ b/doc/lispintro/ChangeLog @@ -1,3 +1,8 @@ +2014-07-03 Glenn Morris <rgm@gnu.org> + + * emacs-lisp-intro.texi (Note for Novices, Finding More, Conclusion): + "Online" help doesn't mean what it used to any more. + 2014-06-23 Glenn Morris <rgm@gnu.org> * Makefile.in (%.texi): Disable implicit rules. diff --git a/doc/lispintro/emacs-lisp-intro.texi b/doc/lispintro/emacs-lisp-intro.texi index 6001e3d0084..7ff91758670 100644 --- a/doc/lispintro/emacs-lisp-intro.texi +++ b/doc/lispintro/emacs-lisp-intro.texi @@ -903,7 +903,7 @@ file, @file{cl.el}, that adds many Common Lisp features to Emacs Lisp.) If you don't know GNU Emacs, you can still read this document profitably. However, I recommend you learn Emacs, if only to learn to move around your computer screen. You can teach yourself how to use -Emacs with the on-line tutorial. To use it, type @kbd{C-h t}. (This +Emacs with the built-in tutorial. To use it, type @kbd{C-h t}. (This means you press and release the @key{CTRL} key and the @kbd{h} at the same time, and then press and release @kbd{t}.) @@ -4657,7 +4657,7 @@ specialized library, such as a law library or an engineering library, rather than a general library. Each library, or file, contains functions that relate to a particular topic or activity, such as @file{abbrev.el} for handling abbreviations and other typing -shortcuts, and @file{help.el} for on-line help. (Sometimes several +shortcuts, and @file{help.el} for help. (Sometimes several libraries provide code for a single activity, as the various @file{rmail@dots{}} files provide code for reading electronic mail.) In @cite{The GNU Emacs Manual}, you will see sentences such as ``The @@ -18685,9 +18685,9 @@ easy-to-read description of Emacs Lisp. It is written not only for experts, but for people who know what you know. (The @cite{Reference Manual} comes with the standard GNU Emacs distribution. Like this introduction, it comes as a Texinfo source file, so you can read it -on-line and as a typeset, printed book.) +on your computer and as a typeset, printed book.) -Go to the other on-line help that is part of GNU Emacs: the on-line +Go to the other built-in help that is part of GNU Emacs: the built-in documentation for all functions and variables, and @code{find-tag}, the program that takes you to sources. |