summaryrefslogtreecommitdiff
path: root/docs/extensions
diff options
context:
space:
mode:
authorWaylan Limberg <waylan@gmail.com>2013-12-23 06:58:12 -0800
committerWaylan Limberg <waylan@gmail.com>2013-12-23 06:58:12 -0800
commit2587fae92e504795c146055c595a9bc538a9665f (patch)
tree5d07c795d36aa23bb01bfbc625383c1474a061ef /docs/extensions
parent0fe5f72797e098c46a9e710e3da5bfadb7f752ca (diff)
parentb11926de44429e8a17df5ea74db7a1edcc6b2dcb (diff)
downloadpython-markdown-2587fae92e504795c146055c595a9bc538a9665f.tar.gz
Merge pull request #266 from ryneeverett/issue52
miscellaneous issue52 improvements
Diffstat (limited to 'docs/extensions')
-rw-r--r--docs/extensions/extra.txt12
1 files changed, 5 insertions, 7 deletions
diff --git a/docs/extensions/extra.txt b/docs/extensions/extra.txt
index 6140647..0507e8f 100644
--- a/docs/extensions/extra.txt
+++ b/docs/extensions/extra.txt
@@ -47,12 +47,10 @@ Markdown Inside HTML Blocks
Unlike the other Extra features, this feature is build into the markdown core and is turned on when `extra` is enabled.
-The content of any block-level element can be Markdown-formatted simply by adding a `markdown` attribute to the opening tag. The markdown attribute will be stripped from the output, but all other attributes will be preserved.
+The content of any raw html block element can be Markdown-formatted simply by adding a `markdown` attribute to the opening tag. The markdown attribute will be stripped from the output, but all other attributes will be preserved.
If the markdown value is set to `1` (recommended) or any value other than `span` or `block`, the default behavior will be executed: `p`,`h[1-6]`,`li`,`dd`,`dt`,`td`,`th`,`legend`, and `address` elements skip block parsing while others do not. If the default is overrident by a value of `span`, *block parsing will be skipped* regardless of tag. If the default is overriden by a value of `block`, *block parsing will occur* regardless of tag.
-*An opening tag with the markdown attribute must start immediately on a line following a blank line.*
-
#### Simple Example:
```
This is *true* markdown text.
@@ -70,10 +68,10 @@ This is *true* markdown text.
```
### Nested Markdown Inside HTML BLocks
-Nested elements are more sensitive and must be used cautiously. Violation of the following will lead to unexpected behavior or unhandled exceptions.
- * Only block mode elements may have further elements nested within them.
- * The closing tag of inner elements must be followed by a blank line.
- * More than one level of nesting is not supported (i.e., elements nested within elements nested within elements). This feature is not an alternative to templating.
+Nested elements are more sensitive and must be used cautiously. To avoid unexpected results:
+ * Only nest elements within block mode elements.
+ * Follow the closing tag of inner elements with a blank line.
+ * Only have one level of nesting.
#### Complex Example:
```