- convert __init__ and :members: to be compatible with autoclass_content='both'

4 files changed, 8 insertions, 41 deletions

diff --git a/doc/build/conf.py b/doc/build/conf.py
index da6d8d663..c9f56f96e 100644
--- a/doc/build/conf.py
+++ b/doc/build/conf.py
@@ -16,8 +16,8 @@ import sys, os
 # If your extensions are in another directory, add it here. If the directory
 # is relative to the documentation root, use os.path.abspath to make it
 # absolute, like shown here.
-sys.path.append(os.path.abspath('.'))
-sys.path.append(os.path.abspath('../../lib'))
+sys.path.insert(0, os.path.abspath('../../lib'))
+sys.path.insert(0, os.path.abspath('.'))
 
 import sqlalchemy
 
diff --git a/doc/build/reference/sqlalchemy/connections.rst b/doc/build/reference/sqlalchemy/connections.rst
index 1136ae654..877b73231 100644
--- a/doc/build/reference/sqlalchemy/connections.rst
+++ b/doc/build/reference/sqlalchemy/connections.rst
@@ -24,6 +24,7 @@ Connectables
 
 .. autoclass:: Connectable
    :members:
+   :undoc-members:
 
 Result Objects
 --------------
diff --git a/doc/build/reference/sqlalchemy/pooling.rst b/doc/build/reference/sqlalchemy/pooling.rst
index dbd483d59..5bc2d04ea 100644
--- a/doc/build/reference/sqlalchemy/pooling.rst
+++ b/doc/build/reference/sqlalchemy/pooling.rst
@@ -74,11 +74,11 @@ Builtin Pool Implementations
 ----------------------------
 
 .. autoclass:: AssertionPool
-   :members: __init__
+   :members:
    :show-inheritance:
 
 .. autoclass:: NullPool
-   :members: __init__
+   :members:
    :show-inheritance:
 
 .. autoclass:: sqlalchemy.pool.Pool
@@ -87,18 +87,16 @@ Builtin Pool Implementations
    :undoc-members:
    :inherited-members:
 
-   .. automethod:: __init__
-
 .. autoclass:: sqlalchemy.pool.QueuePool
-   :members: __init__
+   :members:
    :show-inheritance:
 
 .. autoclass:: SingletonThreadPool
-   :members: __init__
+   :members:
    :show-inheritance:
 
 .. autoclass:: StaticPool
-   :members: __init__
+   :members:
    :show-inheritance:
 
 
diff --git a/doc/build/reference/sqlalchemy/types.rst b/doc/build/reference/sqlalchemy/types.rst
index fd9f06e47..00a78edf0 100644
--- a/doc/build/reference/sqlalchemy/types.rst
+++ b/doc/build/reference/sqlalchemy/types.rst
@@ -39,63 +39,48 @@ type is emitted in ``CREATE TABLE``, such as ``VARCHAR`` see `SQL
 Standard Types`_ and the other sections of this chapter.
 
 .. autoclass:: String
-   :members: __init__
    :show-inheritance:
 
 .. autoclass:: Unicode
-   :members: __init__
    :show-inheritance:
 
 .. autoclass:: Text
-   :members: __init__
    :show-inheritance:
 
 .. autoclass:: UnicodeText
-   :members: __init__
    :show-inheritance:
 
 .. autoclass:: Integer
-   :members: __init__
    :show-inheritance:
 
 .. autoclass:: SmallInteger
-   :members: __init__
    :show-inheritance:
 
 .. autoclass:: Numeric
-   :members: __init__
    :show-inheritance:
 
 .. autoclass:: Float
-   :members: __init__
    :show-inheritance:
 
 .. autoclass:: DateTime
-   :members: __init__
    :show-inheritance:
 
 .. autoclass:: Date
-   :members: __init__
    :show-inheritance:
 
 .. autoclass:: Time
-   :members: __init__
    :show-inheritance:
 
 .. autoclass:: Interval
-   :members: __init__
    :show-inheritance:
 
 .. autoclass:: Boolean
-   :members: __init__
    :show-inheritance:
 
 .. autoclass:: Binary
-   :members: __init__
    :show-inheritance:
 
 .. autoclass:: PickleType
-   :members: __init__
    :show-inheritance:
 
 
@@ -107,71 +92,54 @@ name when ``CREATE TABLE`` is issued.  Some types may not be supported
 on all databases.
 
 .. autoclass:: INT
-   :members: __init__
    :show-inheritance:
 
 .. autoclass:: sqlalchemy.types.INTEGER
-   :members: __init__
    :show-inheritance:
 
 .. autoclass:: CHAR
-   :members: __init__
    :show-inheritance:
 
 .. autoclass:: VARCHAR
-   :members: __init__
    :show-inheritance:
 
 .. autoclass:: NCHAR
-   :members: __init__
    :show-inheritance:
 
 .. autoclass:: TEXT
-   :members: __init__
    :show-inheritance:
 
 .. autoclass:: FLOAT
-   :members: __init__
    :show-inheritance:
 
 .. autoclass:: NUMERIC
-   :members: __init__
    :show-inheritance:
 
 .. autoclass:: DECIMAL
-   :members: __init__
    :show-inheritance:
 
 .. autoclass:: TIMESTAMP
-   :members: __init__
    :show-inheritance:
 
 .. autoclass:: DATETIME
-   :members: __init__
    :show-inheritance:
 
 .. autoclass:: CLOB
-   :members: __init__
    :show-inheritance:
 
 .. autoclass:: BLOB
-   :members: __init__
    :show-inheritance:
 
 .. autoclass:: BOOLEAN
-   :members: __init__
    :show-inheritance:
 
 .. autoclass:: SMALLINT
-   :members: __init__
    :show-inheritance:
 
 .. autoclass:: DATE
-   :members: __init__
    :show-inheritance:
 
 .. autoclass:: TIME
-   :members: __init__
    :show-inheritance: