aboutsummaryrefslogtreecommitdiffstats
path: root/doc
diff options
context:
space:
mode:
authorJoakim Verona2011-10-27 11:15:25 +0200
committerJoakim Verona2011-10-27 11:15:25 +0200
commitb70516db12801e015c538c4e7eb44cb87316afc4 (patch)
treeb5ed66a971e6f55d0b4628f7a56316b0fa383ddc /doc
parent51a9916f39ce1cd562816a5429bc3cf6f407fabc (diff)
parent435c1d6793ce358f4d2c77c9e9c1ad81fd754651 (diff)
downloademacs-b70516db12801e015c538c4e7eb44cb87316afc4.tar.gz
emacs-b70516db12801e015c538c4e7eb44cb87316afc4.zip
upstream
Diffstat (limited to 'doc')
-rw-r--r--doc/emacs/ChangeLog4
-rw-r--r--doc/emacs/emacs.texi2
2 files changed, 5 insertions, 1 deletions
diff --git a/doc/emacs/ChangeLog b/doc/emacs/ChangeLog
index 4b51486069c..9a501d38375 100644
--- a/doc/emacs/ChangeLog
+++ b/doc/emacs/ChangeLog
@@ -1,3 +1,7 @@
12011-10-26 Juanma Barranquero <lekktu@gmail.com>
2
3 * emacs.texi (Top): Fix typo.
4
12011-10-25 Glenn Morris <rgm@gnu.org> 52011-10-25 Glenn Morris <rgm@gnu.org>
2 6
3 * abbrevs.texi (Saving Abbrevs): 7 * abbrevs.texi (Saving Abbrevs):
diff --git a/doc/emacs/emacs.texi b/doc/emacs/emacs.texi
index b25c09aa29d..55fdb9ec875 100644
--- a/doc/emacs/emacs.texi
+++ b/doc/emacs/emacs.texi
@@ -295,7 +295,7 @@ Help
295* Package Keywords:: Finding Lisp libraries by keywords (topics). 295* Package Keywords:: Finding Lisp libraries by keywords (topics).
296* Language Help:: Help relating to international language support. 296* Language Help:: Help relating to international language support.
297* Misc Help:: Other help commands. 297* Misc Help:: Other help commands.
298* Help Files:: Commands to display auxilliary help files. 298* Help Files:: Commands to display auxiliary help files.
299* Help Echo:: Help on active text and tooltips (`balloon help'). 299* Help Echo:: Help on active text and tooltips (`balloon help').
300 300
301The Mark and the Region 301The Mark and the Region