ndwarshuis
/
org-mode
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'maint'

This commit is contained in:
Nicolas Goaziou 2016-03-25 14:27:05 +01:00
parent 2afce8b22f 780445c0aa
commit 06177a4208
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
doc/org.texi
View File

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