From: Mike Bayer <mike_mp@zzzcomputing.com>
Date: Mon, 15 Dec 2008 21:25:17 +0000 (+0000)
Subject: corrections
X-Git-Tag: rel_0_5_0~102
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=d91219520f5468336b0c600d269e2b5531b30115;p=thirdparty%2Fsqlalchemy%2Fsqlalchemy.git

corrections
---

diff --git a/CHANGES b/CHANGES
index a166416b6e..14b58b41a2 100644
--- a/CHANGES
+++ b/CHANGES
@@ -7,7 +7,7 @@ CHANGES
 0.5.0rc5
 ========
 - new features
-- orm
+- general
     - Documentation has been converted to Sphinx.
       In particular, the generated API documentation
       has been constructed into a full blown 
@@ -18,7 +18,14 @@ CHANGES
       a javascript-powered search feature is
       provided, and a full index of all
       classes, functions and members is provided.
-      
+
+    - setup.py now imports setuptools only optionally.
+      If not present, distutils is used.
+      The new "pip" installer is recommended over
+      easy_install as it installs in a more simplified
+      way.
+
+- orm
     - Query.with_polymorphic() now accepts a third
       argument "discriminator" which will replace
       the value of mapper.polymorphic_on for that
@@ -34,12 +41,6 @@ CHANGES
       
 - bugfixes, behavioral changes
 - general
-    - setup.py no imports setuptools only optionally.
-      If not present, distutils is used.
-      The new "pip" installer is recommended over
-      easy_install as it installs in a more simplified
-      way.
-      
 - orm
     - Corrected problem with Query.delete() and
       Query.update() not working properly with bind