Upped version to 2.0-rc12.0-rc1

5 files changed, 32 insertions, 11 deletions

diff --git a/docs/AUTHORS b/docs/AUTHORS
index 0b4cd6e..cfe2b34 100644
--- a/docs/AUTHORS
+++ b/docs/AUTHORS
@@ -6,7 +6,8 @@ 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.
+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 
@@ -21,10 +22,11 @@ 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.
+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
@@ -38,4 +40,4 @@ Neale Pickett
 John Szakmeister
 Malcolm Tredinnick
 Ben Wilson
-and many others to helped by reporting bugs
+and many others who helped by reporting bugs
diff --git a/docs/CHANGE_LOG b/docs/CHANGE_LOG
index d040789..1b4af45 100644
--- a/docs/CHANGE_LOG
+++ b/docs/CHANGE_LOG
@@ -1,6 +1,24 @@
 PYTHON MARKDOWN CHANGELOG
 =========================
 
+Mar 8, 2009: Release Candidate 2.0-rc-1.
+
+Feb 2009: Added support for multi-level lists to new Blockprocessors.
+
+Jan 2009: Added HTML 4 output as an option (thanks Eric Abrahamsen)
+
+Nov 2008: Added Definistion List ext. Replaced old core with BlockProcessors.
+Broken up into multiple files.
+
+Oct 2008: Changed logging behavior to work better with other systems. 
+Refactored tree tarversing. Added treap implementation, then replaced with 
+OrderedDEict. Renamed various processors to better reflect what they actually
+do. Refactored footnote ext to match php Extra's output.
+
+Sept 2008: Moved prettifyTree to a Postprocessor, replaced wikilink ext
+with wikilinks (note the s) ext (uses bracketed links instead of CamelCase)
+and various bug fixes.
+
 August 18 2008: Reorganized directory structure. Added a 'docs' dir
 and moved all extensions into a 'markdown-extensions' package.
 Added additional documentation and a few bug fixes. (v2.0-beta)
diff --git a/docs/INSTALL b/docs/INSTALL
index cdc7dd4..d8feade 100644
--- a/docs/INSTALL
+++ b/docs/INSTALL
@@ -53,8 +53,8 @@ Installing on *nix Systems
 
 From the command line do the following:
 
-    wget http://pypi.python.org/packages/source/M/Markdown/markdown-2.0.tar.gz
-    tar xvzf markdown-2.0.tar.gz
+    wget http://pypi.python.org/packages/source/M/Markdown/Markdown-2.0.tar.gz
+    tar xvzf Markdown-2.0.tar.gz
     cd markdown-2.0/
     sudo python setup.py install
 
diff --git a/markdown/__init__.py b/markdown/__init__.py
index 4db94f2..4c5f993 100644
--- a/markdown/__init__.py
+++ b/markdown/__init__.py
@@ -39,8 +39,8 @@ Copyright 2004 Manfred Stienstra (the original version)
 License: BSD (see docs/LICENSE for details).
 """
 
-version = "2.0-beta-2"
-version_info = (2,0,0, "beta-2")
+version = "2.0-rc1"
+version_info = (2,0,0, "rc1")
 
 import re
 import codecs
diff --git a/setup.py b/setup.py
index 078a535..b4a0cbd 100755
--- a/setup.py
+++ b/setup.py
@@ -1,12 +1,13 @@
 #!/usr/bin/env python
 
 from distutils.core import setup
+from markdown import version
 
 setup(
     name = 'Markdown',
-    version = '2.0-beta-2',
+    version = version,
     url = 'http://www.freewisdom.org/projects/python-markdown',
-    download_url = 'http://pypi.python.org/packages/source/M/Markdown/markdown-1.7.tar.gz',
+    download_url = 'http://pypi.python.org/packages/source/M/Markdown/Markdown-2.0.tar.gz',
     description = "Python implementation of Markdown.",
     author = "Manfred Stienstra and Yuri takhteyev",
     author_email = "yuri [at] freewisdom.org",