From 75febf4bfd25557c6c3db5edf09008b17d8ad158 Mon Sep 17 00:00:00 2001
From: Matt Bowcock <matt.bowcock@gmail.com>
Date: Tue, 10 Apr 2012 00:15:12 -0400
Subject: [PATCH] Add support for multiple file extensions per file reader.

Conflicts:

	pelican/readers.py
---
 pelican/readers.py | 12 ++++++++++++
 1 file changed, 12 insertions(+)

diff --git a/pelican/readers.py b/pelican/readers.py
index 917d8614..326782ed 100644
--- a/pelican/readers.py
+++ b/pelican/readers.py
@@ -65,7 +65,11 @@ def render_node_to_html(document, node):
 
 class RstReader(Reader):
     enabled = bool(docutils)
+<<<<<<< HEAD
     extension = "rst"
+=======
+    extension = ['rst']
+>>>>>>> f1de695... Add support for multiple file extensions per file reader.
 
     def _parse_metadata(self, document):
         """Return the dict containing document metadata"""
@@ -111,7 +115,11 @@ class RstReader(Reader):
 
 class MarkdownReader(Reader):
     enabled = bool(Markdown)
+<<<<<<< HEAD
     extension = "md"
+=======
+    extension = ['md', 'markdown', 'mkd']
+>>>>>>> f1de695... Add support for multiple file extensions per file reader.
     extensions = ['codehilite', 'extra']
 
     def read(self, filename):
@@ -128,7 +136,11 @@ class MarkdownReader(Reader):
 
 
 class HtmlReader(Reader):
+<<<<<<< HEAD
     extension = "html"
+=======
+    extension = ['html', 'htm']
+>>>>>>> f1de695... Add support for multiple file extensions per file reader.
     _re = re.compile('\<\!\-\-\#\s?[A-z0-9_-]*\s?\:s?[A-z0-9\s_-]*\s?\-\-\>')
 
     def read(self, filename):