diff --git a/demo/org-mode-syntax.html b/demo/org-mode-syntax.html index 39960aa..4d82cb7 100755 --- a/demo/org-mode-syntax.html +++ b/demo/org-mode-syntax.html @@ -115,11 +115,11 @@
-You can create several other boxes (info
, tip
, note
or warning
) which all have
-a different default image.
+Admonitions are statements taken out of the content’s flow and labeled with
+a title.
-Admonitions: attention, caution, danger, error, hint, important, note, tip, -warning and the generic admonition. +Common admonitions are:
+note
warning
tip
caution
important
(Most themes style only note
and warning
specially.)
+A warning box is displayed as follows: +
+ +#+begin_warning +Be careful! Check that you have... +#+end_warning ++
+Be careful! Check that you have… +
+ +#+begin_caution +Caution +#+end_caution ++
+Caution +
+ ++A tip box is displayed as follows: +
+ +#+begin_tip +Try doing it this way... +#+end_tip ++
+Try doing it this way… +
+ +#+begin_important +Important +#+end_important ++
+Important +
+ +#+begin_error +Error +#+end_error ++
+Error +
+ +Simple box (“inline task”):
@@ -1582,6 +1731,10 @@ Description of inline task.END |
TODO | Do this task +Description of inline task. + + |
or:
@@ -1603,329 +1756,6 @@ or: Admonitiontodo -Total | -- | rST | -RTD | -AsciiDoc | -DocBook | -MoinMoin (Modern) | -DocOnce | -Confluence | -SuperCollider | -
---|---|---|---|---|---|---|---|---|---|
6 | -note | -1 | -1 | -1 | -1 | -1 | -- | 1 | -1 | -
7 | -warning | -1 | -1 | -1 | -1 | -1 | -1 | -1 | -1 | -
6 | -tip | -1 | -1 | -1 | -1 | -1 | -- | 1 | -- |
5 | -important | -1 | -1 | -1 | -1 | -1 | -- | - | - |
5 | -caution | -1 | -1 | -1 | -1 | -1 | -- | - | - |
2 | -attention | -1 | -1 | -- | - | - | - | - | - |
2 | -danger | -1 | -1 | -- | - | - | - | - | - |
2 | -error | -1 | -1 | -- | - | - | - | - | - |
2 | -hint | -1 | -1 | -- | - | - | - | - | - |
#ERROR | -seealso | -- | ? | -- | - | - | - | - | - |
#ERROR | -todo | -- | ? | -- | - | - | - | - | - |
1 | -notice | -- | - | - | - | - | 1 | -- | - |
1 | -question | -- | - | - | - | - | 1 | -- | - |
1 | -summary | -- | - | - | - | - | 1 | -- | - |
1 | -info | -- | - | - | - | - | - | 1 | -- |
-A warning box is displayed as follows: -
- --Be careful! Check that you have… -
- --Caution -
- --A tip box is displayed as follows: -
- --Try doing it this way… -
- --Important -
- --Error -
--2015-03-04 +2015-03-05diff --git a/demo/org-mode-syntax.org b/demo/org-mode-syntax.org index 1f71f10..d2da131 100755 --- a/demo/org-mode-syntax.org +++ b/demo/org-mode-syntax.org @@ -550,34 +550,20 @@ Though, you can add an image with a link to the video like this: * Admonitions -You can create several other boxes (~info~, ~tip~, ~note~ or ~warning~) which all have -a different default image. +Admonitions are statements taken out of the content's flow and labeled with +a title. -Admonitions: attention, caution, danger, error, hint, important, note, tip, -warning and the generic admonition. +Common admonitions are: + +1. ~note~ +2. ~warning~ +3. ~tip~ +4. ~caution~ +5. ~important~ (Most themes style only ~note~ and ~warning~ specially.) -Simple box ("inline task"): - -#+begin_src org -*************** TODO Do this task -Description of inline task. -*************** END -#+end_src - -or: - -#+begin_src org -*************** WAIT [#B] Do also this other task :phone: -*************** END -#+end_src - -#+begin_admonitiontodo -Admonitiontodo -#+end_admonitiontodo - -** List of supported admonitions +** List of supported admonitions :noexport: | Total | | rST | RTD | AsciiDoc | DocBook | MoinMoin (Modern) | DocOnce | Confluence | SuperCollider | |--------+-----------+-----+-----+----------+---------+-------------------+---------+------------+---------------| @@ -604,51 +590,87 @@ Admonitiontodo A note box is displayed as follows: -#+begin_note +#+begin_src org +,#+begin_note This is a useful note. -#+end_note +,#+end_note +#+end_src # #+attr_html: :options [By the way...] # #+begin_note # This is a useful note (with a title). # #+end_note -#+begin_seealso +#+begin_src org +,#+begin_seealso - [[http://en.wikipedia.org/wiki/Apple][Apples]] :: A kind of [[http://en.wikipedia.org/wiki/Fruit][fruit]]. -#+end_seealso +,#+end_seealso +#+end_src ** Warning A warning box is displayed as follows: -#+begin_warning +#+begin_src org +,#+begin_warning Be careful! Check that you have... -#+end_warning +,#+end_warning +#+end_src -# #+html: