fixes to function/property formatting

diff --git a/doc/build/components/formatting.myt b/doc/build/components/formatting.myt
index 18ad347b2c457203e2505bd2fc068793ef50e61b..8b7c85957a81afcd13a6f9f799f11cad61f415d3 100644 (file)
--- a/doc/build/components/formatting.myt
+++ b/doc/build/components/formatting.myt
@@ -218,13 +218,14 @@
 <%method member_doc>
        <%args>
                name = ""
+               link = ""
                type = None
        </%args>
        <tr>
        <td>
            <div class="darkcell">
-           <A name="<% m.comp('doclib.myt:current').path %>_<% name %>"></a>
-           <b><% name %></b></td>
+           <A name="<% m.comp('doclib.myt:current').path %>_<% link %>"></a>
+           <b><% name %></b>
            <div class="docstring"><% m.content() %></div>
            </div>
        </td>
@@ -235,6 +236,7 @@
 <%method function_doc>
     <%args>
         name = ""
+        link = ""
         alt = None
         arglist = []
         rettype = None
@@ -242,7 +244,7 @@
     <tr>
     <td>
         <div class="darkcell">
-        <A name="<% m.comp('doclib.myt:current').path %>_<% name %>"></a>
+        <A name="<% m.comp('doclib.myt:current').path %>_<% link %>"></a>
         <b><% name %>(<% string.join(map(lambda k: "<i>%s</i>" % k, arglist), ", ")%>)</b>
         <div class="docstring"><% m.content() %></div>
         </div>

diff --git a/doc/build/components/pydoc.myt b/doc/build/components/pydoc.myt
index 76a67c61f998871061ac6999637bb9c4bcc574b2..442403513ad88e547f6c8258d1b369bd2beacef2 100644 (file)
--- a/doc/build/components/pydoc.myt
+++ b/doc/build/components/pydoc.myt
@@ -123,7 +123,7 @@
            argstrings.append("**%s" % varkw)
     </%init>
     
-    <&| formatting.myt:function_doc, name="def " + func.__name__, arglist=argstrings &>
+    <&|formatting.myt:function_doc, name="def " + func.__name__, link=func.__name__, arglist=argstrings &>
     <&|formatting.myt:formatplain&><% format_paragraphs(func.__doc__) %></&>
     </&>
 </%method>
@@ -134,7 +134,7 @@
         name
         prop
     </%args>
-    <&| formatting.myt:member_doc, name=name + " = property()" &>
+    <&|formatting.myt:member_doc, name=name + " = property()", link=name &>
     <&|formatting.myt:formatplain&><% format_paragraphs(prop.__doc__) %></&>
     </&>    
 </%method>
\ No newline at end of file

diff --git a/doc/build/content/docstrings.myt b/doc/build/content/docstrings.myt
index 91513fcb97de4e96fdb7147d55ca3da1f7cd9251..83b66548fc6c918b099ef1cbe5e5da96a475aee1 100644 (file)
--- a/doc/build/content/docstrings.myt
+++ b/doc/build/content/docstrings.myt
@@ -13,11 +13,11 @@
 
 
 <& pydoc.myt:obj_doc, obj=schema &>
-<& pydoc.myt:obj_doc, obj=engine, classes=[engine.SQLEngine, engine.ResultProxy, engine.RowProxy] &>
+<& pydoc.myt:obj_doc, obj=engine, classes=[engine.SQLSession, engine.SQLEngine, engine.ResultProxy, engine.RowProxy] &>
 <& pydoc.myt:obj_doc, obj=sql, classes=[sql.ClauseParameters, sql.Compiled, sql.ClauseElement, sql.TableClause, sql.ColumnClause] &>
 <& pydoc.myt:obj_doc, obj=pool, classes=[pool.DBProxy, pool.Pool, pool.QueuePool, pool.SingletonThreadPool] &>
 <& pydoc.myt:obj_doc, obj=mapping &>
-<& pydoc.myt:obj_doc, obj=mapping.objectstore, classes=[mapping.objectstore.Session, mapping.objectstore.Session.SessionTrans, mapping.objectstore.UnitOfWork] &>
+<& pydoc.myt:obj_doc, obj=mapping.objectstore, classes=[mapping.objectstore.Session, mapping.objectstore.Session.SessionTrans] &>
 <& pydoc.myt:obj_doc, obj=exceptions &>
 <& pydoc.myt:obj_doc, obj=proxy &>