diff options
| author | Paul Eggert <eggert@cs.ucla.edu> | 2016-08-22 14:40:35 -0700 |
|---|---|---|
| committer | Paul Eggert <eggert@cs.ucla.edu> | 2016-08-22 14:40:35 -0700 |
| commit | c325e199668a2449a9b0d662e114eec9d4802288 (patch) | |
| tree | 274955e934a223b81d593cb27d4d444a1eaf4ab6 /lisp/org/ChangeLog.1 | |
| parent | 512b06e4309ba6c5cd3d2d2518a931b0664c4150 (diff) | |
| parent | 927afa1ef6514e62162068d7dbdc9d8381a71598 (diff) | |
| download | emacs-c325e199668a2449a9b0d662e114eec9d4802288.tar.gz | |
Merge from origin/emacs-25
927afa1 ; Update ChangeLog.2 and ldef-boot.el for Emacs 25.1 RC2
6bf83b5 * etc/AUTHORS: Update the AUTHORS file
73cbb81 ; ChangeLog spelling fixes
9b99772 Some assorted documentation clarifications
37d4723 Improve commentary in src/character.h
5ccd593 ; Fix typo in /etc/NEWS
96e3d16 * etc/NEWS: Mention the change in json-encode-string.
2e524034 ; * etc/NEWS: Mention incompatible change in url-http-create...
2e4e74e Merge branch 'emacs-25' of git.savannah.gnu.org:/srv/git/emac...
66dea65 ; * doc/lispref/windows.texi (Window Parameters): Grammar twe...
# Conflicts:
# ChangeLog.2
# lisp/ldefs-boot.el
Diffstat (limited to 'lisp/org/ChangeLog.1')
| -rw-r--r-- | lisp/org/ChangeLog.1 | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/lisp/org/ChangeLog.1 b/lisp/org/ChangeLog.1 index 9b6702f01ed..caa461d7714 100644 --- a/lisp/org/ChangeLog.1 +++ b/lisp/org/ChangeLog.1 @@ -2809,7 +2809,7 @@ * ox-html.el (org-html-style-default): New classes `footpara' and `footdef' for the footnotes paragraphs and definitions. (org-html-format-footnote-definition): Wrap the footnote - defintions into their own div. + definitions into their own div. (org-html-paragraph): Don't add extra <br/> after a paragraph in a footnote. (org-html-container-element, org-html-divs): Mention that |