diff options
| author | Stefan Monnier <monnier@iro.umontreal.ca> | 2011-02-21 17:34:51 -0500 |
|---|---|---|
| committer | Stefan Monnier <monnier@iro.umontreal.ca> | 2011-02-21 17:34:51 -0500 |
| commit | f619ad4ca2ce943d53589469c010e451afab97dd (patch) | |
| tree | e1b71f79518372ecab4c677ae948504450d8bf5d /doc/lispintro | |
| parent | a647cb26b695a542e3a546104afdf4c7c47eb061 (diff) | |
| parent | 9f8370e63f65f76887b319ab6a0368d4a332777c (diff) | |
| download | emacs-f619ad4ca2ce943d53589469c010e451afab97dd.tar.gz emacs-f619ad4ca2ce943d53589469c010e451afab97dd.tar.bz2 emacs-f619ad4ca2ce943d53589469c010e451afab97dd.zip | |
Merge from trunk
Diffstat (limited to 'doc/lispintro')
| -rw-r--r-- | doc/lispintro/ChangeLog | 4 | ||||
| -rw-r--r-- | doc/lispintro/emacs-lisp-intro.texi | 2 |
2 files changed, 5 insertions, 1 deletions
diff --git a/doc/lispintro/ChangeLog b/doc/lispintro/ChangeLog index a6897fc4ec9..d2e6954025a 100644 --- a/doc/lispintro/ChangeLog +++ b/doc/lispintro/ChangeLog @@ -1,3 +1,7 @@ +2011-02-19 Eli Zaretskii <eliz@gnu.org> + + * emacs-lisp-intro.texi: Sync @dircategory with ../../info/dir. + 2011-01-23 Werner Lemberg <wl@gnu.org> * Makefile.in (MAKEINFO): Now controlled by `configure'. diff --git a/doc/lispintro/emacs-lisp-intro.texi b/doc/lispintro/emacs-lisp-intro.texi index 7b9ec75446b..11ceea19eef 100644 --- a/doc/lispintro/emacs-lisp-intro.texi +++ b/doc/lispintro/emacs-lisp-intro.texi @@ -216,7 +216,7 @@ @c ---------------------------------------------------- -@dircategory Emacs +@dircategory GNU Emacs Lisp @direntry * Emacs Lisp Intro: (eintr). A simple introduction to Emacs Lisp programming. |