r26186 - in /branches/frame_order_cleanup: ./ test_suite/system_tests/relax_disp.py -- October 07, 2014 - 14:34

Author: bugman
Date: Tue Oct  7 14:34:11 2014
New Revision: 26186

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

........
  r26175 | tlinnet | 2014-10-06 18:11:05 +0200 (Mon, 06 Oct 2014) | 1 line
  
  Fix for epydoc in systemtest Relax_disp.test_dx_map_clustered.
........

Modified:
    branches/frame_order_cleanup/   (props changed)
    branches/frame_order_cleanup/test_suite/system_tests/relax_disp.py

Propchange: branches/frame_order_cleanup/
------------------------------------------------------------------------------
--- svnmerge-integrated (original)
+++ svnmerge-integrated Tue Oct  7 14:34:11 2014
@@ -1 +1 @@
-/trunk:1-26139,26142-26174
+/trunk:1-26139,26142-26175

Modified: branches/frame_order_cleanup/test_suite/system_tests/relax_disp.py
URL: 
http://svn.gna.org/viewcvs/relax/branches/frame_order_cleanup/test_suite/system_tests/relax_disp.py?rev=26186&r1=26185&r2=26186&view=diff
==============================================================================
--- branches/frame_order_cleanup/test_suite/system_tests/relax_disp.py  
(original)
+++ branches/frame_order_cleanup/test_suite/system_tests/relax_disp.py  Tue 
Oct  7 14:34:11 2014
@@ -2990,10 +2990,9 @@
         """Test making dx_map for residues under clustered calculation.
 
         This uses CPMG data from:
-
-            Webb H, Tynan-Connolly BM, Lee GM, Farrell D, O'Meara F, 
Soendergaard CR, Teilum K, Hewage C, McIntosh LP, Nielsen JE
-            Remeasuring HEWL pK(a) values by NMR spectroscopy: methods, 
analysis, accuracy, and implications for theoretical pK(a) calculations.
-            (2011), Proteins: Struct, Funct, Bioinf 79(3):685-702, DOI 
10.1002/prot.22886
+            - Webb H, Tynan-Connolly BM, Lee GM, Farrell D, O'Meara F, 
Soendergaard CR, Teilum K, Hewage C, McIntosh LP, Nielsen JE
+            - Remeasuring HEWL pK(a) values by NMR spectroscopy: methods, 
analysis, accuracy, and implications for theoretical pK(a) calculations.
+            - (2011), Proteins: Struct, Funct, Bioinf 79(3):685-702, U{DOI 
10.1002/prot.22886<http://dx.doi.org/10.1002/prot.22886>}
         """
 
         # Define path to data