r21151 - in /branches/relax_disp: ./ pipe_control/mol_res_spin.py pipe_control/spectrum.py -- October 17, 2013 - 09:06

Author: bugman
Date: Thu Oct 17 09:06:21 2013
New Revision: 21151

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

........
  r21150 | bugman | 2013-10-17 09:05:49 +0200 (Thu, 17 Oct 2013) | 3 lines
  
  Epydoc docstring formatting fixes.
........

Modified:
    branches/relax_disp/   (props changed)
    branches/relax_disp/pipe_control/mol_res_spin.py
    branches/relax_disp/pipe_control/spectrum.py

Propchange: branches/relax_disp/
------------------------------------------------------------------------------
--- svnmerge-integrated (original)
+++ svnmerge-integrated Thu Oct 17 09:06:21 2013
@@ -1,1 +1,1 @@
-/trunk:1-21111
+/trunk:1-21150

Modified: branches/relax_disp/pipe_control/mol_res_spin.py
URL: 
http://svn.gna.org/viewcvs/relax/branches/relax_disp/pipe_control/mol_res_spin.py?rev=21151&r1=21150&r2=21151&view=diff
==============================================================================
--- branches/relax_disp/pipe_control/mol_res_spin.py (original)
+++ branches/relax_disp/pipe_control/mol_res_spin.py Thu Oct 17 09:06:21 2013
@@ -185,7 +185,7 @@
 def check_mol_res_spin_data():
     """Check for the presence of molecule, residue, and spin data.
 
-    @raises:    RelaxNoSequenceError if no data is present.
+    @raises RelaxNoSequenceError:   If no data is present.
     """
 
     # Check that the spectrum ID structure exists.

Modified: branches/relax_disp/pipe_control/spectrum.py
URL: 
http://svn.gna.org/viewcvs/relax/branches/relax_disp/pipe_control/spectrum.py?rev=21151&r1=21150&r2=21151&view=diff
==============================================================================
--- branches/relax_disp/pipe_control/spectrum.py (original)
+++ branches/relax_disp/pipe_control/spectrum.py Thu Oct 17 09:06:21 2013
@@ -282,9 +282,9 @@
 def check_spectrum_id(id):
     """Check that the give spectrum ID exists.
 
-    @param id:  The spectrum ID to check for.
-    @type id:   str
-    @raises:    RelaxNoSpectraError if the ID does not exist.
+    @param id:                      The spectrum ID to check for.
+    @type id:                       str
+    @raises RelaxNoSpectraError:    If the ID does not exist.
     """
 
     # Check that the spectrum ID structure exists.