Merge branch 'maint'

This commit is contained in:
Nicolas Goaziou 2013-12-15 11:55:44 +01:00
commit b617d407ed
1 changed files with 3 additions and 3 deletions

View File

@ -11119,11 +11119,11 @@ Becomes:
@end example
Special blocks that do not correspond to HTML5 elements (see
@code{org-html-html5-elements}) will revert to the usual behavior,
i.e. @code{#+BEGIN_LEDERHOSEN} will still export to @samp{<div class="lederhosen">}.
@code{org-html-html5-elements}) will revert to the usual behavior, i.e.,
@code{#+BEGIN_LEDERHOSEN} will still export to @samp{<div class="lederhosen">}.
Headlines cannot appear within special blocks. To wrap a headline and its
contents in e.g. @samp{<section>} or @samp{<article>} tags, set the
contents in e.g., @samp{<section>} or @samp{<article>} tags, set the
@code{HTML_CONTAINER} property on the headline itself.
@node HTML preamble and postamble