Document #2149 (cc @bameda)

Signed-off-by: Chris Warrick <kwpolska@gmail.com>
getnikola · Oct 20, 2015 · 9bf05a5 · 9bf05a5
1 parent f23316b
commit 9bf05a5
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 2 deletions.
diff --git a/AUTHORS.txt b/AUTHORS.txt
@@ -22,6 +22,7 @@
 * `Daniel Devine <https://github.com/DDevine>`_
 * `Daniel F. Moisset <https://github.com/dmoisset>`_
 * `David Beath <https://github.com/DBeath>`_
+* `David Barragán Merino <https://github.com/bameda>`_
 * `Dhruv Baldawa <https://github.com/dhruvbaldawa>`_
 * `Dirk Engling <https://github.com/erdgeist>`_
 * `Dmitry Verkhoturov <https://github.com/paskal>`_

diff --git a/CHANGES.txt b/CHANGES.txt
@@ -4,6 +4,7 @@ New in master
 Features
 --------
 
+* Support for ``~~strikethrough~~`` in Markdown (Issue #2149)
 * Hungarian translation (by Baptiste Darthenay)
 * ``serve`` and ``auto`` publishes DNS Service Discovery records
   to the local network announcing they’re running web servers.

diff --git a/docs/manual.txt b/docs/manual.txt
@@ -758,6 +758,9 @@ config option:
 
     MARKDOWN_EXTENSIONS = ['fenced_code', 'codehilite', 'extra']
 
+Nikola comes with some Markdown Extensions built-in and enabled by default,
+namely a gist directive, a podcast directive, and ``~~strikethrough~~`` support.
+
 IPython Notebook/Jupyter
 ````````````````````````
 

diff --git a/nikola/plugins/compile/markdown/mdx_nikola.py b/nikola/plugins/compile/markdown/mdx_nikola.py
@@ -63,15 +63,15 @@ def run(self, text):
 
 
 class NikolaExtension(MarkdownExtension, Extension):
-    """MNikola markdown extensions."""
+    """Nikola Markdown extensions."""
 
     def _add_nikola_post_processor(self, md):
         """Extend Markdown with the postprocessor."""
         pp = NikolaPostProcessor()
         md.postprocessors.add('nikola_post_processor', pp, '_end')
 
     def _add_strikethrough_inline_pattern(self, md):
-        """Support PHP-Markdown style strikethrough.For example: ``~~strike~~``."""
+        """Support PHP-Markdown style strikethrough, for example: ``~~strike~~``."""
         pattern = SimpleTagPattern(STRIKE_RE, 'del')
         md.inlinePatterns.add('strikethrough', pattern, '_end')