docs: update documentation for merge()

Steve Canny · Steve Canny · commit dbba25003ae7 · 2014-11-28T21:45:44.000-05:00
diff --git a/docs/api/table.rst b/docs/api/table.rst
@@ -15,6 +15,7 @@ Table objects are constructed using the ``add_table()`` method on |Document|.
 
 .. autoclass:: Table
    :members:
+   :exclude-members: table
 
 
 |_Cell| objects
diff --git a/docs/conf.py b/docs/conf.py
@@ -89,6 +89,8 @@
 
 .. |InlineShapes| replace:: :class:`.InlineShapes`
 
+.. |InvalidSpanError| replace:: :class:`.InvalidSpanError`
+
 .. |int| replace:: :class:`int`
 
 .. |Length| replace:: :class:`.Length`
diff --git a/docx/table.py b/docx/table.py
@@ -182,9 +182,8 @@ def add_table(self, rows, cols):
     def merge(self, other_cell):
         """
         Return a merged cell created by spanning the rectangular region
-        demarcated by using the extents of this cell and *other_cell* as
-        diagonal corners. Raises |InvalidSpanError| if the cells do not
-        define a rectangular region.
+        having this cell and *other_cell* as diagonal corners. Raises
+        |InvalidSpanError| if the cells do not define a rectangular region.
         """
         tc, tc_2 = self._tc, other_cell._tc
         merged_tc = tc.merge(tc_2)
