Merge branch 'rel_0_9'

7 files changed, 35 insertions, 34 deletions

diff --git a/README.py3k b/README.py3k
deleted file mode 100644
index 2afaeb688..000000000
--- a/README.py3k
+++ /dev/null
@@ -1,6 +0,0 @@
-=================
-PYTHON 3 SUPPORT
-=================
-
-As of SQLAlchemy 0.9, SQLAlchemy installs and runs with
-Python 3 directly, with no code changes.
diff --git a/doc/build/changelog/changelog_08.rst b/doc/build/changelog/changelog_08.rst
index d80a97de4..7066916fa 100644
--- a/doc/build/changelog/changelog_08.rst
+++ b/doc/build/changelog/changelog_08.rst
@@ -9,6 +9,7 @@
 
 .. changelog::
     :version: 0.8.3
+    :released: October 26, 2013
 
     .. change::
         :tags: bug, oracle
diff --git a/doc/build/changelog/changelog_09.rst b/doc/build/changelog/changelog_09.rst
index bf9497788..591a36692 100644
--- a/doc/build/changelog/changelog_09.rst
+++ b/doc/build/changelog/changelog_09.rst
@@ -11,6 +11,7 @@
 
 .. changelog::
     :version: 0.9.0b1
+    :released: October 26, 2013
 
     .. change::
         :tags: feature, orm
@@ -585,4 +586,4 @@
 
         .. seealso::
 
-            :ref:`migration_2736`
\ No newline at end of file
+            :ref:`migration_2736`
diff --git a/doc/build/conf.py b/doc/build/conf.py
index f3975a548..274480a70 100644
--- a/doc/build/conf.py
+++ b/doc/build/conf.py
@@ -85,7 +85,7 @@ version = "0.9"
 # The full version, including alpha/beta/rc tags.
 release = "0.9.0b1"
 
-release_date = "(not released)"
+release_date = "October 26, 2013"
 
 site_base = "http://www.sqlalchemy.org"
 
diff --git a/doc/build/core/tutorial.rst b/doc/build/core/tutorial.rst
index b130f4d72..aa8ba2f2a 100644
--- a/doc/build/core/tutorial.rst
+++ b/doc/build/core/tutorial.rst
@@ -50,13 +50,13 @@ Version Check
 =============
 
 
-A quick check to verify that we are on at least **version 0.8** of SQLAlchemy:
+A quick check to verify that we are on at least **version 0.9** of SQLAlchemy:
 
 .. sourcecode:: pycon+sql
 
     >>> import sqlalchemy
     >>> sqlalchemy.__version__ # doctest:+SKIP
-    0.8.0
+    0.9.0
 
 Connecting
 ==========
diff --git a/doc/build/intro.rst b/doc/build/intro.rst
index c5e7f7425..588701ce2 100644
--- a/doc/build/intro.rst
+++ b/doc/build/intro.rst
@@ -74,13 +74,12 @@ Supported Platforms
 
 SQLAlchemy has been tested against the following platforms:
 
-* cPython since version 2.5, through the 2.xx series
+* cPython since version 2.6, through the 2.xx series
 * cPython version 3, throughout all 3.xx series
-* `Jython <http://www.jython.org/>`_ 2.5 or greater
-* `Pypy <http://pypy.org/>`_ 1.5 or greater
+* `Pypy <http://pypy.org/>`_ 2.1 or greater
 
-.. versionchanged:: 0.8
-   Python 2.5 is now the minimum Python version supported.
+.. versionchanged:: 0.9
+   Python 2.6 is now the minimum Python version supported.
 
 Supported Installation Methods
 -------------------------------
@@ -91,13 +90,9 @@ SQLAlchemy supports installation using standard Python "distutils" or
 * **Plain Python Distutils** - SQLAlchemy can be installed with a clean
   Python install using the services provided via `Python Distutils <http://docs.python.org/distutils/>`_,
   using the ``setup.py`` script. The C extensions as well as Python 3 builds are supported.
-* **Standard Setuptools** - When using `setuptools <http://pypi.python.org/pypi/setuptools/>`_,
+* **Setuptools or Distribute** - When using `setuptools <http://pypi.python.org/pypi/setuptools/>`_,
   SQLAlchemy can be installed via ``setup.py`` or ``easy_install``, and the C
-  extensions are supported.  setuptools is not supported on Python 3 at the time
-  of this writing.
-* **Distribute** - With `distribute <http://pypi.python.org/pypi/distribute/>`_,
-  SQLAlchemy can be installed via ``setup.py`` or ``easy_install``, and the C
-  extensions as well as Python 3 builds are supported.
+  extensions are supported.  
 * **pip** - `pip <http://pypi.python.org/pypi/pip/>`_ is an installer that
   rides on top of ``setuptools`` or ``distribute``, replacing the usage
   of ``easy_install``.  It is often preferred for its simpler mode of usage.
@@ -117,6 +112,11 @@ Or with pip::
 This command will download the latest version of SQLAlchemy from the `Python
 Cheese Shop <http://pypi.python.org/pypi/SQLAlchemy>`_ and install it to your system.
 
+.. note::
+	
+    Beta releases of SQLAlchemy may not be present on Pypi, and may instead
+    require a direct download first.
+
 Installing using setup.py
 ----------------------------------
 
@@ -128,8 +128,12 @@ Installing the C Extensions
 ----------------------------------
 
 SQLAlchemy includes C extensions which provide an extra speed boost for
-dealing with result sets. Currently, the extensions are only supported on the
-2.xx series of cPython, not Python 3 or Pypy.
+dealing with result sets.   The extensions are supported on both the 2.xx
+and 3.xx series of cPython.
+
+.. versionchanged:: 0.9.0
+
+    The C extensions now compile on Python 3 as well as Python 2.
 
 setup.py will automatically build the extensions if an appropriate platform is
 detected. If the build of the C extensions fails, due to missing compiler or
@@ -155,11 +159,12 @@ Or with pip::
 Installing on Python 3
 ----------------------------------
 
-SQLAlchemy ships as Python 2 code. For Python 3 usage, the ``setup.py`` script
-will invoke the Python ``2to3`` tool on the build, plugging in an extra
-"preprocessor" as well. The 2to3 step works with Python distutils
-(part of the standard Python install) and Distribute - it will **not**
-work with a non-Distribute setuptools installation.
+SQLAlchemy runs directly on Python 2 or Python 3, and can be installed in
+either environment without any adjustments or code conversion.
+
+.. versionchanged:: 0.9.0 Python 3 is now supported in place with no 2to3 step
+   required.
+
 
 Installing a Database API
 ----------------------------------
@@ -172,7 +177,7 @@ the available DBAPIs for each database, including external links.
 Checking the Installed SQLAlchemy Version
 ------------------------------------------
 
-This documentation covers SQLAlchemy version 0.8. If you're working on a
+This documentation covers SQLAlchemy version 0.9. If you're working on a
 system that already has SQLAlchemy installed, check the version from your
 Python prompt like this:
 
@@ -180,11 +185,11 @@ Python prompt like this:
 
      >>> import sqlalchemy
      >>> sqlalchemy.__version__ # doctest: +SKIP
-     0.8.0
+     0.9.0
 
 .. _migration:
 
-0.7 to 0.8 Migration
+0.8 to 0.9 Migration
 =====================
 
-Notes on what's changed from 0.7 to 0.8 is available here at :doc:`changelog/migration_08`.
+Notes on what's changed from 0.8 to 0.9 is available here at :doc:`changelog/migration_09`.
diff --git a/doc/build/orm/tutorial.rst b/doc/build/orm/tutorial.rst
index 466e3075b..737961bac 100644
--- a/doc/build/orm/tutorial.rst
+++ b/doc/build/orm/tutorial.rst
@@ -42,11 +42,11 @@ following text represents the expected return value.
 Version Check
 =============
 
-A quick check to verify that we are on at least **version 0.8** of SQLAlchemy::
+A quick check to verify that we are on at least **version 0.9** of SQLAlchemy::
 
     >>> import sqlalchemy
     >>> sqlalchemy.__version__ # doctest:+SKIP
-    0.8.0
+    0.9.0
 
 Connecting
 ==========