diff options
| author | Fabián Ezequiel Gallina <fgallina@gnu.org> | 2014-12-27 13:31:20 -0300 |
|---|---|---|
| committer | Fabián Ezequiel Gallina <fgallina@gnu.org> | 2014-12-27 13:31:20 -0300 |
| commit | 35e1f9d9fcbaab51808e05f514e63927f959ae51 (patch) | |
| tree | e9d7d0ef8b1d61d728d4d076e46088a3b9b29d73 /lisp/org/ox-html.el | |
| parent | f315b69922db769f3358e15616aa76c965be8a89 (diff) | |
| parent | a5f38fa1cc8eafe13f2073ebfaa8205b5e919d17 (diff) | |
| download | emacs-35e1f9d9fcbaab51808e05f514e63927f959ae51.tar.gz | |
Merge from origin/emacs-24
a5f38fa Fix ChangeLog typo
c6400e1 Fix composition of characters from Syriac and Arabis scripts.
7e9dfde python.el: Fix message when sending region.
800260c python.el: Cleanup temp files even with eval errors.
ed65b91 Fix for previous commit
2dd5163 python.el: Handle file encoding for shell.
7aa506e Spelling fixes
4cd6d77 * automated/tramp-tests.el (tramp-test17-insert-directory): Do not expect a given order of "." and "..".
a41d07b Fix rendering of composed caharacters on the mode line. (Bug#19435)
b70977c Small doc markup fixes
73c050c * doc/lispref/modes.texi (Defining Minor Modes, SMIE Lexer): Markup fixes.
1783e6c ChangeLog fix
c741b1b TUTORIAL.es: Improve style consistency
f89efea TUTORIAL.es: spelling fixes
0d48826 Avoid compiler warning.
Conflicts:
doc/lispref/ChangeLog
doc/lispref/control.texi
etc/ChangeLog
lisp/ChangeLog
src/ChangeLog
test/ChangeLog
Diffstat (limited to 'lisp/org/ox-html.el')
| -rw-r--r-- | lisp/org/ox-html.el | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/lisp/org/ox-html.el b/lisp/org/ox-html.el index a3f0b501da6..c952a826db8 100644 --- a/lisp/org/ox-html.el +++ b/lisp/org/ox-html.el @@ -581,7 +581,7 @@ The function must accept two parameters: The function should return the string to be exported. For example, the variable could be set to the following function -in order to mimic default behaviour: +in order to mimic default behavior: The default value simply returns the value of CONTENTS." :group 'org-export-html |