aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorWaylan Limberg <waylan@gmail.com>2012-03-18 18:10:09 -0700
committerWaylan Limberg <waylan@gmail.com>2012-03-18 18:10:09 -0700
commitf842c9aaabd1815a5a045b0575ef73e7d02c3136 (patch)
tree6fec87967a70e9924896a63f2714f6f8a0fb084a
parent371a637d37cac629818cf4d618299ccfcbbbc1d0 (diff)
parent5687fc045c3929b34b5d912bc5adcf2a786b1a45 (diff)
downloadmarkdown-f842c9aaabd1815a5a045b0575ef73e7d02c3136.tar.gz
markdown-f842c9aaabd1815a5a045b0575ef73e7d02c3136.tar.bz2
markdown-f842c9aaabd1815a5a045b0575ef73e7d02c3136.zip
Merge pull request #86 from SimonSapin/master
Typo fix in doc: s/extension-configs/extension_configs/
-rw-r--r--docs/reference.txt4
-rw-r--r--markdown/__init__.py2
2 files changed, 3 insertions, 3 deletions
diff --git a/docs/reference.txt b/docs/reference.txt
index b051e92..603200b 100644
--- a/docs/reference.txt
+++ b/docs/reference.txt
@@ -69,12 +69,12 @@ The following options are available on the `markdown.markdown` function:
`extensions=['extra']` will first look for the module
`markdown.extensions.extra`, then a module named `mdx_extra`.
-* __`extension-configs`__{: #extension_configs }: A dictionary of
+* __`extension_configs`__{: #extension_configs }: A dictionary of
configuration settings for extensions.
The dictionary must be of the following format:
- extension-configs = {'extension_name_1':
+ extension_configs = {'extension_name_1':
[
('option_1', 'value_1'),
('option_2', 'value_2')
diff --git a/markdown/__init__.py b/markdown/__init__.py
index f259615..3100901 100644
--- a/markdown/__init__.py
+++ b/markdown/__init__.py
@@ -86,7 +86,7 @@ class Markdown:
If they are of type string, the module mdx_name.py will be loaded.
If they are a subclass of markdown.Extension, they will be used
as-is.
- * extension-configs: Configuration settingis for extensions.
+ * extension_configs: Configuration settingis for extensions.
* output_format: Format of output. Supported formats are:
* "xhtml1": Outputs XHTML 1.x. Default.
* "xhtml5": Outputs XHTML style tags of HTML 5