From 4de668159dfb5afd18532ad8a08f75953d1d36d3 Mon Sep 17 00:00:00 2001 From: Michael Reneer Date: Mon, 26 Nov 2012 11:26:33 -0500 Subject: [PATCH 1/2] Update docs/settings.rst Updated the documentation for the MARKUP setting to reflect the current supported markup file extensions. --- docs/settings.rst | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/docs/settings.rst b/docs/settings.rst index ba9a7a69..eb88233e 100644 --- a/docs/settings.rst +++ b/docs/settings.rst @@ -60,9 +60,9 @@ Setting name (default value) What doe here or a single string representing one locale. When providing a list, all the locales will be tried until one works. -`MARKUP` (``('rst', 'md')``) A list of available markup languages you want +`MARKUP` (``('rst', 'md', 'markdown', 'mkd')``) A list of available markup languages you want to use. For the moment, the only available values - are `rst` and `md`. + are `rst`, `md`, `markdown`, and `mkd`. `MD_EXTENSIONS` (``['codehilite','extra']``) A list of the extensions that the Markdown processor will use. Refer to the extensions chapter in the Python-Markdown documentation for a complete list of From 103ae436c9f404e2d25cf9deab7ab2476e9f2f84 Mon Sep 17 00:00:00 2001 From: Michael Reneer Date: Mon, 26 Nov 2012 13:03:25 -0500 Subject: [PATCH 2/2] Update docs/settings.rst Updated commit based on the discussion in the pull request. --- docs/settings.rst | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/docs/settings.rst b/docs/settings.rst index eb88233e..be091596 100644 --- a/docs/settings.rst +++ b/docs/settings.rst @@ -60,9 +60,9 @@ Setting name (default value) What doe here or a single string representing one locale. When providing a list, all the locales will be tried until one works. -`MARKUP` (``('rst', 'md', 'markdown', 'mkd')``) A list of available markup languages you want +`MARKUP` (``('rst', 'md')``) A list of available markup languages you want to use. For the moment, the only available values - are `rst`, `md`, `markdown`, and `mkd`. + are `rst`, `md`, `markdown`, `mkd`, `html`, and `htm`. `MD_EXTENSIONS` (``['codehilite','extra']``) A list of the extensions that the Markdown processor will use. Refer to the extensions chapter in the Python-Markdown documentation for a complete list of