[gnue] r9966 - trunk/gnue-common/src/base

Author: reinhard
Date: 2009-10-13 14:01:25 -0500 (Tue, 13 Oct 2009)
New Revision: 9966

Modified:
   trunk/gnue-common/src/base/tree.py
   trunk/gnue-common/src/base/version.py
Log:
Epydoc fixes.


Modified: trunk/gnue-common/src/base/tree.py
===================================================================
--- trunk/gnue-common/src/base/tree.py	2009-10-13 18:57:57 UTC (rev 9965)
+++ trunk/gnue-common/src/base/tree.py	2009-10-13 19:01:25 UTC (rev 9966)
@@ -984,11 +984,12 @@
         """
         Merge another object tree into this tree.
 
-        All attributes and child nodes from the other object are merged into this
-        object.  If any child node exists in both objects with the same name,
-        the merge is done recursively.
+        All attributes and child nodes from the other object are merged into
+        this object.  If any child node exists in both objects with the same
+        name, the merge is done recursively.
 
-        @param other: L{ParserObj} tree to be merged into this object tree
+        @param other: Tree to be merged into this object tree.
+        @type other: AttribNode
         """
 
         # First copy all explicitly set attributes from the other object.

Modified: trunk/gnue-common/src/base/version.py
===================================================================
--- trunk/gnue-common/src/base/version.py	2009-10-13 18:57:57 UTC (rev 9965)
+++ trunk/gnue-common/src/base/version.py	2009-10-13 19:01:25 UTC (rev 9966)
@@ -82,8 +82,8 @@
 The above example supports a file "svnrev.py" which defines the Subversion
 snapshot.  This makes it possible to show the full version number of a snapshot
 even if the snapshot was installed from a tarball, if the tarball contains this
-file.  The L{gnue.common.base.setup} infrastructure automatically builds this
-file when necessary.
+file.  The infrastructure provided in the setup module automatically builds
+this file when necessary.
 """
 
 import os