Merge branch 'maint'

This commit is contained in:
Nicolas Goaziou 2016-03-25 14:27:05 +01:00
commit 06177a4208
1 changed files with 4 additions and 4 deletions

View File

@ -11498,9 +11498,9 @@ enable a few new block-level elements. These are created using arbitrary
#+BEGIN and #+END blocks. For instance:
@example
#+BEGIN_ASIDE
#+BEGIN_aside
Lorem ipsum
#+END_ASIDE
#+END_aside
@end example
Will export to:
@ -11515,11 +11515,11 @@ While this:
@example
#+ATTR_HTML: :controls controls :width 350
#+BEGIN_VIDEO
#+BEGIN_video
#+HTML: <source src="movie.mp4" type="video/mp4">
#+HTML: <source src="movie.ogg" type="video/ogg">
Your browser does not support the video tag.
#+END_VIDEO
#+END_video
@end example
Becomes: