diff options
author | Paul Eggert <eggert@cs.ucla.edu> | 2015-03-18 11:45:36 -0700 |
---|---|---|
committer | Paul Eggert <eggert@cs.ucla.edu> | 2015-03-18 11:45:36 -0700 |
commit | 81deba3d7a2b187d58fe26bd8b4eafb5687095e1 (patch) | |
tree | 82feff9e8228de216840a6c96ba7c006ce337e24 /doc/emacs/ChangeLog | |
parent | 8dfff871bdf0e420c6f5570e72afc80471d40d51 (diff) | |
parent | 1a941d6c9eab9a35682408d6b85a1a98cfb6b01d (diff) | |
download | emacs-81deba3d7a2b187d58fe26bd8b4eafb5687095e1.tar.gz |
Merge from origin/emacs-24
1a941d6 Fix incorrect usage of @key in the User Manual (Bug#20135)
14c47d3 doc/misc/efaq-w32.texi: Spell-check.
ac85901 doc/misc/efaq-w32.texi: Remove outdated information and update.
c43762d Fix description of fullscreen mode on MS-Windows (Bug#20110).
ea8cab3 doc/lispref/minibuf.texi (Basic Completion): Fix a typo. (Bug#20108)
2fdec80 Improve indexing in Emacs manual (Bug#20105)
cc11321 Fix --no-bitmap-icon
Conflicts:
doc/emacs/ChangeLog
doc/lispref/ChangeLog
doc/misc/ChangeLog
src/ChangeLog
Diffstat (limited to 'doc/emacs/ChangeLog')
-rw-r--r-- | doc/emacs/ChangeLog | 20 |
1 files changed, 20 insertions, 0 deletions
diff --git a/doc/emacs/ChangeLog b/doc/emacs/ChangeLog index 13536406158..644281c76b7 100644 --- a/doc/emacs/ChangeLog +++ b/doc/emacs/ChangeLog @@ -1,3 +1,23 @@ +2015-03-18 Eli Zaretskii <eliz@gnu.org> + + * misc.texi (Term Mode): + * programs.texi (Basic Indent, Custom C Indent): + * mini.texi (Minibuffer History): + * text.texi (Org Mode): + * display.texi (View Mode): Use @kbd where @key was mistakenly + used. (Bug#20135) + +2015-03-18 Eli Zaretskii <eliz@gnu.org> + + * basic.texi (Moving Point): Improve indexing for HOME and END. + + * cmdargs.texi (General Variables): Improve indexing for + environment variables. + + * msdog.texi (Windows HOME): + * msdog-xtra.texi (MS-DOS File Names): Remove markup from HOME in + the index entries. (Bug#20105) + 2015-02-26 Eli Zaretskii <eliz@gnu.org> * msdog.texi (Windows Files): Document characters invalid in |