more function adjustments

the inherited-members feature works very poorly
and inconsistently in sphinx.  just dont use it here as it
refuses to exclude ColumnOperators methods

Change-Id: Ic50865c9901e7225a99ff7f33454da15ff91b12f
(cherry picked from commit 25fa4c0250730958c39676007cc39df7b0ee2124)

diff --git a/doc/build/core/functions.rst b/doc/build/core/functions.rst
index 00e384679cc4c21a0e810712d177e89a2531c9d1..efa7c78d33f3e5c817f5178b112cfb6666f3782e 100644 (file)
--- a/doc/build/core/functions.rst
+++ b/doc/build/core/functions.rst
@@ -25,9 +25,6 @@ namespace as well as classes that may be used for extensibility.
    :exclude-members: inherit_cache, __new__
 
 .. autoclass:: Function
-   :members:
-   :inherited-members: ColumnElement
-   :exclude-members: inherit_cache, __new__
 
 .. autoclass:: FunctionElement
    :members:

diff --git a/lib/sqlalchemy/sql/functions.py b/lib/sqlalchemy/sql/functions.py
index 29f41223d352fa42f8d51b4120ae8fe6538670a7..2b264e5bf96668512ab7ab3e25c773db43eea045 100644 (file)
--- a/lib/sqlalchemy/sql/functions.py
+++ b/lib/sqlalchemy/sql/functions.py
@@ -528,7 +528,7 @@ class FunctionElement(Executable, ColumnElement, FromClause, Generative):
         in the columns or where clause, for a backend such as PostgreSQL.
 
         For a full table-valued expression, use the
-        :meth:`_function.FunctionElement.table_valued` method first to
+        :meth:`_functions.FunctionElement.table_valued` method first to
         establish named columns.
 
         e.g.::