Merge branch 'master' of https://github.com/waylan/Python-Markdown2.2.1.final

1 files changed, 53 insertions, 19 deletions

diff --git a/docs/extensions/index.txt b/docs/extensions/index.txt
index 82b0eda..a51f797 100644
--- a/docs/extensions/index.txt
+++ b/docs/extensions/index.txt
@@ -15,12 +15,12 @@ actual source files.
 To use an extension, pass it's name to markdown with the `extensions` keyword.
 See the [Library Reference](../reference.html#extensions) for more details. 
 
-    markdown.markdown(some_text, extensions=['extra', 'nl2br'])
+    markdown.markdown(some_text, extensions=['footnotes', 'nl2br'])
 
 From the command line, specify an extension with the `-x` option. See the 
 [Command Line docs](../cli.html) or use the `--help` option for more details.
 
-    python -m markdown -x extra input.txt > output.html
+    python -m markdown -x footnotes -x tables input.txt > output.html
 
 Officially Supported Extensions
 -------------------------------
@@ -31,23 +31,57 @@ maintained here and all bug reports should be made to the project. If you
 have a typical install of Python-Markdown, these extensions are already 
 available to you.
 
-* [Extra](extra.html)
-    * [Abbreviations](abbreviations.html)
-    * [Attribute Lists](attr_list.html)
-    * [Definition Lists](definition_lists.html)
-    * [Fenced Code Blocks](fenced_code_blocks.html)
-    * [Footnotes](footnotes.html)
-    * [Tables](tables.html)
-    * [Smart Strong](smart_strong.html)
-* [CodeHilite](code_hilite.html)
-* [HTML Tidy](html_tidy.html)
-* [HeaderId](header_id.html)
-* [Meta-Data](meta_data.html)
-* [New Line to Break](nl2br.html)
-* [RSS](rss.html)
-* [Sane Lists](sane_lists.html)
-* [Table of Contents](toc.html)
-* [WikiLinks](wikilinks.html)
+### Markdown Extra
+
+You can enable **all** these extensions just as if it was a single
+`extra` extension. Example:
+
+    markdown.markdown(some_text, extensions=['extra', 'codehilite'])
+
+Extension              | Name in Python-Markdown
+---------              | -----------------------
+[Abbreviations][]      | `abbr`
+[Attribute Lists][]    | `attr_list`
+[Definition Lists][]   | `def_list`
+[Fenced Code Blocks][] | `fenced_code`
+[Footnotes][]          | `footnotes`
+[Tables][]             | `tables`
+[Smart Strong][]       | `smart_strong`
+
+[Abbreviations]: abbreviations.html
+[Attribute Lists]: attr_list.html
+[Definition Lists]: definition_lists.html
+[Fenced Code Blocks]: fenced_code_blocks.html
+[Footnotes]: footnotes.html
+[Tables]: tables.html
+[Smart Strong]: smart_strong.html
+
+### Other extensions
+
+There are also some extensions that are not included in Markdown Extra
+but come in the standard Python-Markdown library.
+
+Extension           | Name in Python-Markdown
+---------           | -----------------------
+[CodeHilite][]      | `codehilite`
+[HTML Tidy][]       | `html_tidy`
+[HeaderId]          | `headerid`
+[Meta-Data]         | `meta`
+[New Line to Break] | `nl2br`
+[RSS]               | `rss`
+[Sane Lists]        | `sane_lists`
+[Table of Contents] | `toc`
+[WikiLinks]         | `wikilinks`
+
+[CodeHilite]: code_hilite.html
+[HTML Tidy]: html_tidy.html
+[HeaderId]: header_id.html
+[Meta-Data]: meta_data.html
+[New Line to Break]: nl2br.html
+[RSS]: rss.html
+[Sane Lists]: sane_lists.html
+[Table of Contents]: toc.html
+[WikiLinks]: wikilinks.html
 
 Third Party Extensions
 ----------------------