diff options
| author | Stefan Monnier <monnier@iro.umontreal.ca> | 2013-03-16 18:08:22 -0400 |
|---|---|---|
| committer | Stefan Monnier <monnier@iro.umontreal.ca> | 2013-03-16 18:08:22 -0400 |
| commit | 78be8b64657aeca0472d708450ea1ce2bc142606 (patch) | |
| tree | dccbdc45e747a47b44be92abab79cca15a30111f /doc/emacs | |
| parent | 6615748ac6bcff258ef548f70bdcc1ab9f740472 (diff) | |
| parent | 67ed8fcd04edeff2d4931acf476e7067c5ceeef2 (diff) | |
| download | emacs-78be8b64657aeca0472d708450ea1ce2bc142606.tar.gz | |
Merge from emacs-24
Diffstat (limited to 'doc/emacs')
| -rw-r--r-- | doc/emacs/ChangeLog | 8 | ||||
| -rw-r--r-- | doc/emacs/emacs.texi | 13 |
2 files changed, 20 insertions, 1 deletions
diff --git a/doc/emacs/ChangeLog b/doc/emacs/ChangeLog index 776e5c6191e..d2554349d01 100644 --- a/doc/emacs/ChangeLog +++ b/doc/emacs/ChangeLog @@ -1,3 +1,11 @@ +2013-03-16 Glenn Morris <rgm@gnu.org> + + * emacs.texi (Top): Add some stuff specific to www.gnu.org. + +2013-03-16 Glenn Morris <rgm@gnu.org> + + * Version 24.3 released. + 2013-03-04 Paul Eggert <eggert@cs.ucla.edu> Prefer UTF-8 for documentation. diff --git a/doc/emacs/emacs.texi b/doc/emacs/emacs.texi index 2efa9b084df..e78eb7845f3 100644 --- a/doc/emacs/emacs.texi +++ b/doc/emacs/emacs.texi @@ -111,10 +111,21 @@ Cover art by Etienne Suvasa; cover design by Matt Lee. @top The Emacs Editor Emacs is the extensible, customizable, self-documenting real-time -display editor. This Info file describes how to edit with Emacs and +display editor. This manual describes how to edit with Emacs and some of the ways to customize it; it corresponds to GNU Emacs version @value{EMACSVER}. +@ifset WWW_GNU_ORG +@html +The homepage for GNU Emacs is at +<a href="/software/emacs/">http://www.gnu.org/software/emacs/</a>.<br> +To view this manual in other formats, click +<a href="/software/emacs/manual/emacs.html">here</a>.<br> +You can also purchase a printed copy from the +<a href="http://shop.fsf.org/product/emacs-manual/">FSF store</a>. +@end html +@end ifset + @ifinfo If you are reading this in Emacs, type @kbd{h} to read a basic introduction to the Info documentation system. |