Upped version to 2.5-dev and started release notes.

5 files changed, 51 insertions, 4 deletions

diff --git a/docs/change_log.txt b/docs/change_log.txt
index 599f219..59f625d 100644
--- a/docs/change_log.txt
+++ b/docs/change_log.txt
@@ -1,12 +1,14 @@
 title:      Change Log
 prev_title: Test Suite
 prev_url:   test_suite.html
-next_title: Release Notes for v2.4
-next_url:   release-2.4.html
+next_title: Release Notes for v2.5
+next_url:   release-2.5.html
 
 Python-Markdown Changelog
 =========================
 
+[TBD]: Released version 2.5.0 ([Notes](release-2.5.html))
+
 Feb 16, 2014: Released version 2.4.0 ([Notes](release-2.4.html))
 
 Mar 22, 2013: Released version 2.3.1 (a bugfix release).
diff --git a/docs/release-2.4.txt b/docs/release-2.4.txt
index 437864a..4f3043f 100644
--- a/docs/release-2.4.txt
+++ b/docs/release-2.4.txt
@@ -1,5 +1,5 @@
 title:      Release Notes for v2.4
-prev_title: Change Log
+prev_title: release-2.4.html
 prev_url:   change_log.html
 next_title: Release Notes for v2.3
 next_url:   release-2.3.html
diff --git a/docs/release-2.5.txt b/docs/release-2.5.txt
new file mode 100644
index 0000000..1ff0eff
--- /dev/null
+++ b/docs/release-2.5.txt
@@ -0,0 +1,44 @@
+title:      Release Notes for v2.5
+prev_title: Change Log
+prev_url:   change_log.html
+next_title: Release Notes for v2.4
+next_url:   release-2.4.html
+
+Python-Markdown 2.5 Release Notes
+=================================
+
+We are pleased to release Python-Markdown 2.5 which adds a few new features
+and fixes various bugs. See the list of changes below for details.
+
+Python-Markdown supports Python versions 2.6, 2.7, 3.2, 3.3, and 3.4.
+
+Backwards-incompatible Changes
+------------------------------
+
+* [TBD]
+
+What's New in Python-Markdown 2.5
+---------------------------------
+
+* The Extension Configuration code has been refactord to make it a little easier 
+for extension authors to work with config settings. As a result, the 
+[extension_configs] keyword now accepts a dictionary rather than requiring 
+a list of tuples. A list of tuples is still supported so no one needs to change 
+their existing code. This should simplify the learning curve for new users.
+
+[extension_configs]: reference.html#extension_configs
+
+* The [Smarty Extension] has had a number of additional configuration settings
+added, which allows one to define their own sustitutions to better support
+languages other than English. Thanks to [Martin Altmayer] for implementing this feature.
+
+[Smarty Extension]: extensions/smarty.html
+[Martin Altmayer]:https://github.com/MartinAltmayer
+
+There have been various refactors of the testing framework. While those changes
+will not directly effect end users, the code is being better tested whuch will 
+benefit everyone.
+
+* Various bug fixes have been made.  See the
+[commit log](https://github.com/waylan/Python-Markdown/commits/master)
+for a complete history of the changes.
diff --git a/docs/siteindex.txt b/docs/siteindex.txt
index 806af1e..d692a18 100644
--- a/docs/siteindex.txt
+++ b/docs/siteindex.txt
@@ -67,6 +67,7 @@ Table of Contents
     * [Unit Tests](test_suite.html#unit-tests)
     * [Doc Tests](test_suite.html#doc-tests)
 * [Change Log](change_log.html)
+    * [Release Notes for v.2.5](release-2.5.html)
     * [Release Notes for v.2.4](release-2.4.html)
     * [Release Notes for v.2.3](release-2.3.html)
     * [Release Notes for v.2.2.1](release-2.1.1.html)
diff --git a/markdown/__version__.py b/markdown/__version__.py
index 2132ce6..6453772 100644
--- a/markdown/__version__.py
+++ b/markdown/__version__.py
@@ -5,7 +5,7 @@
 # (major, minor, micro, alpha/beta/rc/final, #)
 # (1, 1, 2, 'alpha', 0) => "1.1.2.dev"
 # (1, 2, 0, 'beta', 2) => "1.2b2"
-version_info = (2, 4, 1, 'final', 0)
+version_info = (2, 5, 0, 'alpha', 0)
 
 def _get_version():
     " Returns a PEP 386-compliant version number from version_info. "