r19692 - in /branches/relax_disp: ./ compat.py -- May 15, 2013 - 18:23

Author: bugman
Date: Wed May 15 18:23:11 2013
New Revision: 19692

URL: http://svn.gna.org/viewcvs/relax?rev=19692&view=rev
Log:
Merged revisions 19691 via svnmerge from 
svn+ssh://bugman@xxxxxxxxxxx/svn/relax/trunk

........
  r19691 | bugman | 2013-05-15 18:19:46 +0200 (Wed, 15 May 2013) | 3 lines
  
  Epydoc docstring fixes for the compat module.
........

Modified:
    branches/relax_disp/   (props changed)
    branches/relax_disp/compat.py

Propchange: branches/relax_disp/
------------------------------------------------------------------------------
--- svnmerge-integrated (original)
+++ svnmerge-integrated Wed May 15 18:23:11 2013
@@ -1,1 +1,1 @@
-/trunk:1-19688
+/trunk:1-19691

Modified: branches/relax_disp/compat.py
URL: 
http://svn.gna.org/viewcvs/relax/branches/relax_disp/compat.py?rev=19692&r1=19691&r2=19692&view=diff
==============================================================================
--- branches/relax_disp/compat.py (original)
+++ branches/relax_disp/compat.py Wed May 15 18:23:11 2013
@@ -107,7 +107,7 @@
     @param file:    The file path to open.
     @type file:     str
     @keyword mode:  The mode to open the file with.  Only the values of 'r' 
and 'w' for reading and writing respectively are supported.
-    @type model:    str
+    @type mode:     str
     @return:        The bzip2 file object.
     @rtype:         file object
     """
@@ -161,7 +161,7 @@
     @param file:    The file path to open.
     @type file:     str
     @keyword mode:  The mode to open the file with.  Only the values of 'r' 
and 'w' for reading and writing respectively are supported.
-    @type model:    str
+    @type mode:     str
     @return:        The gzipped file object.
     @rtype:         file object
     """