10 files changed, 124 insertions, 67 deletions
diff --git a/docs/AUTHORS b/docs/AUTHORS
deleted file mode 100644
index 2843b56..0000000
--- a/docs/AUTHORS
+++ /dev/null
@@ -1,44 +0,0 @@
-Primary Authors
-===============
-
-Yuri Takteyev <http://freewisdom.org/>, who has written much of the current code
-while procrastingating his Ph.D.
-
-Waylan Limberg <http://achinghead.com/>, who has written most of the available 
-extensions and later was asked to join Yuri, fixing nummrious bugs, adding
-documentation and making general improvements to the existing codebase,
-included a complete refactor of the core.
-
-Artem Yunusov, who as part of a 2008 GSoC project, has refactored inline 
-patterns, replaced the NanoDOM with ElementTree support and made various other 
-improvements.
-
-Manfed Stienstra <http://www.dwerg.net/>, who wrote the original version of 
-the script and is responsible for various parts of the existing codebase.
-
-David Wolever, who refactored the extension API and made other improvements
-as he helped to integrate Markdown into Dr.Project.
-
-Other Contributors
-==================
-
-The incomplete list of individuals below have provided patches or otherwise 
-contributed to the project in various ways. We would like to thank everyone 
-who has contributed to the progect in any way.
-
-Eric Abrahamsen
-Jeff Balogh
-Sergej Chodarev
-Chris Clark
-Tiago Cogumbreiro
-Kjell Magne Fauske
-G. Clark Haynes
-Daniel Krech
-Steward Midwinter
-Jack Miller
-Neale Pickett
-Paul Stansifer
-John Szakmeister
-Malcolm Tredinnick
-Ben Wilson
-and many others who helped by reporting bugs
diff --git a/docs/authors.txt b/docs/authors.txt
new file mode 100644
index 0000000..a7ad4cd
--- /dev/null
+++ b/docs/authors.txt
@@ -0,0 +1,60 @@
+title:      Authors
+prev_title: Release Notes for v2.0
+prev_url:   release-2.0.html
+next_title: Summary
+next_url:   index.html
+
+Primary Authors
+===============
+
+[Yuri Takteyev](http://freewisdom.org/)
+
+: Yuri has written much of the current code while procrastingating his Ph.D.
+
+[Waylan Limberg](http://achinghead.com/)
+
+: Waylan is the current maintainer of the code and has written much the current 
+  code base, included a complete refactor of the core.  He started out by 
+  authoring mmany of the available extensions and later was asked to join Yuri, 
+  where he began fixing nummrious bugs, adding documentation and making general 
+  improvements to the existing codebase.
+
+Artem Yunusov
+
+: Artem, who as part of a 2008 GSoC project, refactored inline patterns, 
+  replaced the NanoDOM with ElementTree support and made various other 
+  improvements.
+
+[Manfed Stienstra](http://www.dwerg.net/)
+
+: Manfed wrote the original version of the script and is responsible for 
+  various parts of the existing codebase.
+
+David Wolever
+
+: David refactored the extension API and made other improvements
+  as he helped to integrate Markdown into Dr.Project.
+
+Other Contributors
+==================
+
+The incomplete list of individuals below have provided patches or otherwise 
+contributed to the project in various ways. We would like to thank everyone 
+who has contributed to the progect in any way.
+
+* Eric Abrahamsen
+* Jeff Balogh
+* Sergej Chodarev
+* Chris Clark
+* Tiago Cogumbreiro
+* Kjell Magne Fauske
+* G. Clark Haynes
+* Daniel Krech
+* Steward Midwinter
+* Jack Miller
+* Neale Pickett
+* Paul Stansifer
+* John Szakmeister
+* Malcolm Tredinnick
+* Ben Wilson
+* and many others who helped by reporting bugs
diff --git a/docs/CHANGE_LOG b/docs/change_log.txt
index 750c9d7..6dce2de 100644
--- a/docs/CHANGE_LOG
+++ b/docs/change_log.txt
@@ -1,15 +1,23 @@
-PYTHON MARKDOWN CHANGELOG
+title:      Change Log
+prev_title: Test Suite
+prev_url:   test_suite.html
+next_title: Release Notes for v2.1.1
+next_url:   release-2.1.1.html
+
+Python-Markdown Changelog
 =========================
 
-Nov 24, 2011: Released version 2.1.0-Final.
+Jan 22, 2012: Released version 2.1.1 ([Notes](release-2.1.1.html)).
+
+Nov 24, 2011: Released version 2.1.0 ([Notes](release-2.1.0.html)).
 
-Oct 7, 2009: Released version 2.0.3-Final.
+Oct 7, 2009: Released version 2.0.3.
 
-Sept 28, 2009: Released version 2.0.2-Final.
+Sept 28, 2009: Released version 2.0.2 ([Notes](release-2.0.2.html)).
 
-May 20, 2009: Released version 2.0.1-Final.
+May 20, 2009: Released version 2.0.1 ([Notes](release-2.0.1.html)).
 
-Mar 30, 2009: Released version 2.0-Final.
+Mar 30, 2009: Released version 2.0 ([Notes](release-2.0.html)).
 
 Mar 8, 2009: Release Candidate 2.0-rc-1.
 
@@ -57,7 +65,7 @@ Feb 13, 2008: A little code cleanup and better documentation
 and inheritance for pre/post proccessors.
 
 Feb 9, 2008: Doublequotes no longer html escaped and rawhtml
-honors <?foo>, <@foo>, and <%foo> for those who run markdown on
+honors `<?foo>`, `<@foo>`, and `<%foo>` for those who run markdown on
 template syntax.
 
 Dec 12, 2007: Updated docs. Removed encoding arg from Markdown
@@ -67,7 +75,7 @@ Nov 29, 2007: Added support for images inside links. Also fixed
 a few bugs in the footnote extension.
 
 Nov 19, 2007: `message` now uses python's logging module. Also removed 
-limit imposed by recursion in _process_section(). You can now parse as 
+limit imposed by recursion in `_process_section()`. You can now parse as 
 long of a document as your memory can handle.
 
 Nov 5, 2007: Moved safe_mode code to a textPostprocessor and added 
@@ -104,7 +112,7 @@ with ampersand normalization and html blocks.
 July 10, 2006: Switched to using optparse.  Added proper support for
 unicode.
 
-July 9, 2006: Fixed the <!--@address.com> problem (Tracker #1501354).  
+July 9, 2006: Fixed the `<!--@address.com>` problem (Tracker #1501354).  
 
 May 18, 2006: Stopped catching unquoted titles in reference links.
 Stopped creating blank headers.
@@ -126,17 +134,17 @@ Midwinter. (Version 1.3)
 
 Feb. 24, 2006: Fixed a bug with the last line of the list appearing
 again as a separate paragraph.  Incorporated Chris Clark's "mailto"
-patch.  Added support for <br /> at the end of lines ending in two or
+patch.  Added support for `<br />` at the end of lines ending in two or
 more spaces.  Fixed a crashing bug when using ImageReferencePattern.
 Added several utility methods to Nanodom.  (Version 1.2)
 
-Jan. 31, 2006: Added "hr" and "hr/" to BLOCK_LEVEL_ELEMENTS and
-changed <hr/> to <hr />.  (Thanks to Sergej Chodarev.)
+Jan. 31, 2006: Added `hr` and `hr/` to BLOCK_LEVEL_ELEMENTS and
+changed `<hr/>` to `<hr />`.  (Thanks to Sergej Chodarev.)
 
 Nov. 26, 2005: Fixed a bug with certain tabbed lines inside lists
-getting wrapped in <pre><code>.  (v. 1.1)
+getting wrapped in `<pre><code>`.  (v. 1.1)
 
-Nov. 19, 2005: Made "<!...", "<?...", etc. behave like block-level
+Nov. 19, 2005: Made `<!...`, `<?...`, etc. behave like block-level
 HTML tags.
 
 Nov. 14, 2005: Added entity code and email autolink fix by Tiago
@@ -180,5 +188,5 @@ escape, emphasis in the beginning of the paragraph.
 Nov. 2004: Added links, blockquotes, html blocks to Manfred
 Stienstra's code
 
-Apr. 2004: Manfred's version at http://www.dwerg.net/projects/markdown/
+Apr. 2004: Manfred's version at <http://www.dwerg.net/projects/markdown/>
 
diff --git a/docs/index.txt b/docs/index.txt
index 570f36b..35c7876 100644
--- a/docs/index.txt
+++ b/docs/index.txt
@@ -1,5 +1,7 @@
 next_url:   install.html
 next_title: Installation
+prev_title: Authors
+prev_url:   authors.html
 
 Python-Markdown
 ===============
diff --git a/docs/release-2.0.1.txt b/docs/release-2.0.1.txt
index e5946b2..c40b471 100644
--- a/docs/release-2.0.1.txt
+++ b/docs/release-2.0.1.txt
@@ -1,3 +1,9 @@
+title:      Release Notes for v2.0.1
+prev_title: Release Notes for v2.0.2
+prev_url:   release-2.0.2.html
+next_title: Release Notes for v2.0
+next_url:   release-2.0.html
+
 Python-Markdown 2.0.1 Release Notes
 ===================================
 
diff --git a/docs/release-2.0.2.txt b/docs/release-2.0.2.txt
index 8ae9a3d..5315c80 100644
--- a/docs/release-2.0.2.txt
+++ b/docs/release-2.0.2.txt
@@ -1,3 +1,9 @@
+title:      Release Notes for v2.0.2
+prev_title: Release Notes for v2.1.0
+prev_url:   release-2.1.0.html
+next_title: Release Notes for v2.0.1
+next_url:   release-2.0.1.html
+
 Python-Markdown 2.0.2 Release Notes
 ===================================
 
diff --git a/docs/release-2.0.txt b/docs/release-2.0.txt
index b1f71ad..ec11522 100644
--- a/docs/release-2.0.txt
+++ b/docs/release-2.0.txt
@@ -1,3 +1,9 @@
+title:      Release Notes for v2.0
+prev_title: Release Notes for v2.0.1
+prev_url:   release-2.0.1.html
+next_title: Authors
+next_url:   authors.html
+
 Python-Markdown 2.0 Release Notes
 =================================
 
@@ -20,8 +26,8 @@ extensions, then you should not need to make any changes to your code.
 However, you may want to ensure that any third party extensions you are using
 are compatible with the new API.
 
-The new extension API is fully documented in [[writing_extensions]]. Below is a
-summary of the significant changes:
+The new extension API is fully [documented](extensions/api.html) in the docs. 
+Below is a summary of the significant changes:
 
 * The old home-grown NanoDOM has been replaced with ElementTree. Therefore all
   extensions must use ElementTree rather than the old NanoDOM.
@@ -61,7 +67,7 @@ accepts either the extension names as strings or instances of extensions. This
 makes it possible to include multiple extensions in a single module.
 
 Numerous extensions are included in the distribution by default. See
-[[available_extensions]] for a complete list.
+[available_extensions](extensions/index.html) for a complete list.
 
-See the [[change_log]] for a full list of changes.
+See the [Change Log](change_log.html) for a full list of changes.
 
diff --git a/docs/release-2.1.0.txt b/docs/release-2.1.0.txt
index f6c203b..606bad2 100644
--- a/docs/release-2.1.0.txt
+++ b/docs/release-2.1.0.txt
@@ -1,3 +1,9 @@
+title:      Release Notes for v2.1.0
+prev_title: Release Notes for v2.1.1
+prev_url:   release-2.1.1.html
+next_title: Release Notes for v2.0.2
+next_url:   release-2.0.2.html
+
 Python-Markdown 2.1.0 Release Notes
 ===================================
 
@@ -29,7 +35,7 @@ is suggested you manually use Python 3.1's 2to3 tool to do a conversion.
 wrapper methods. It now expects keyword arguments. Currently, the positional
 arguments should continue to work, but the solution feels hacky and may be 
 removed in a future version. All users are encouraged to use keyword arguments 
-as documented in [Using Markdown as a Python Library](using_as_module.html).
+as documented in the [Library Reference](reference.html).
 
 * Past versions of Python-Markdown provided module level Global variables which
 controlled the behavior of a few different aspects of the parser. Those global
@@ -37,9 +43,8 @@ variables have been replaced with attributes on the Markdown class.
 Additionally, those attributes are settable as keyword arguments when 
 initializing a class instance. Therefore, if you were editing the global 
 variables (either by editing the source or by overriding them in your code), 
-you should now set them on the class. See 
-[Using Markdown as a Python Library](using_as_module.html) for the options 
-available.
+you should now set them on the class. See the 
+[Library Reference](reference.html) for the options available.
 
 * If you have been using the [HeaderID](extensions/header_id.html) extension 
 to define custom ids on headers, you will want to switch to using the new 
diff --git a/docs/release-2.1.1.txt b/docs/release-2.1.1.txt
index 9e1bcab..32f406f 100644
--- a/docs/release-2.1.1.txt
+++ b/docs/release-2.1.1.txt
@@ -1,3 +1,9 @@
+title:      Release Notes for v2.1.1
+prev_title: Change Log
+prev_url:   change_log.html
+next_title: Release Notes for v2.1.0
+next_url:   release-2.1.0.html
+
 Python-Markdown 2.1.1 Release Notes
 ===================================
 
diff --git a/docs/test_suite.txt b/docs/test_suite.txt
index cf9353c..eb0c4a7 100644
--- a/docs/test_suite.txt
+++ b/docs/test_suite.txt
@@ -1,6 +1,8 @@
 title:      Test Suite
 prev_title: Extension API
 prev_url:   extensions/api.html
+next_title: Change Log
+next_url:   change_log.html
 
 # Test Suite