r8437 - in /branches/relax_disp: ./ docs/latex/fetch_docstrings.py specific_fns/relax_fit.py -- January 13, 2009 - 20:25

Author: semor
Date: Tue Jan 13 20:25:39 2009
New Revision: 8437

URL: http://svn.gna.org/viewcvs/relax?rev=8437&view=rev
Log:
Merged revisions 8356,8436 via svnmerge from 
svn+ssh://semor@xxxxxxxxxxx/svn/relax/1.3

........
  r8356 | semor | 2009-01-09 20:28:29 -0500 (Fri, 09 Jan 2009) | 3 lines
  
  Corrected a typo found while coding in the 'relax_disp' branch.
........
  r8436 | semor | 2009-01-13 14:23:13 -0500 (Tue, 13 Jan 2009) | 7 lines
  
  Corrected a typo.
  
  This was discussed in a thread starting at:
  https://mail.gna.org/public/relax-devel/2009-01/msg00087.html
  (Message-id: <496CD419.9020908@xxxxxxxxx>)
........

Modified:
    branches/relax_disp/   (props changed)
    branches/relax_disp/docs/latex/fetch_docstrings.py
    branches/relax_disp/specific_fns/relax_fit.py

Propchange: branches/relax_disp/
------------------------------------------------------------------------------
--- svnmerge-integrated (original)
+++ svnmerge-integrated Tue Jan 13 20:25:39 2009
@@ -1,1 +1,1 @@
-/1.3:1-8319
+/1.3:1-8436

Modified: branches/relax_disp/docs/latex/fetch_docstrings.py
URL: 
http://svn.gna.org/viewcvs/relax/branches/relax_disp/docs/latex/fetch_docstrings.py?rev=8437&r1=8436&r2=8437&view=diff
==============================================================================
--- branches/relax_disp/docs/latex/fetch_docstrings.py (original)
+++ branches/relax_disp/docs/latex/fetch_docstrings.py Tue Jan 13 20:25:39 
2009
@@ -367,7 +367,7 @@
 
         # R1 and R2.
         string = self.safe_replacement(string, 'R1', 'R$_1$')
-        string = self.safe_replacement(string, 'R2', 'R$_1$')
+        string = self.safe_replacement(string, 'R2', 'R$_2$')
 
 
         # Model-free parameters.

Modified: branches/relax_disp/specific_fns/relax_fit.py
URL: 
http://svn.gna.org/viewcvs/relax/branches/relax_disp/specific_fns/relax_fit.py?rev=8437&r1=8436&r2=8437&view=diff
==============================================================================
--- branches/relax_disp/specific_fns/relax_fit.py (original)
+++ branches/relax_disp/specific_fns/relax_fit.py Tue Jan 13 20:25:39 2009
@@ -954,7 +954,7 @@
         elif object_name == 'iinf':
             grace_string = '\\qI\\sinf\\Q'
 
-        # Intensity at infinity.
+        # Relaxation period times (series).
         elif object_name == 'relax_times':
             grace_string = '\\qRelaxation time period (s)\\Q'