r19228 - /branches/relax_disp/specific_analyses/relax_disp.py -- March 27, 2013 - 15:04

Author: bugman
Date: Wed Mar 27 15:04:40 2013
New Revision: 19228

URL: http://svn.gna.org/viewcvs/relax?rev=19228&view=rev
Log:
Ported r8491 from the old relax_disp branch into the new branch.

The command used was:
svn merge -r8490:8491 
svn+ssh://bugman@xxxxxxxxxxx/svn/relax/branches/relax_disp/specific_fns/@r18123
 specific_analyses

.....
  r8491 | semor | 2009-01-15 20:08:40 +0100 (Thu, 15 Jan 2009) | 3 lines
  Changed paths:
     M /branches/relax_disp/specific_fns/relax_disp.py
  
  Corrected mistakes in English.
.....


Modified:
    branches/relax_disp/specific_analyses/relax_disp.py

Modified: branches/relax_disp/specific_analyses/relax_disp.py
URL: 
http://svn.gna.org/viewcvs/relax/branches/relax_disp/specific_analyses/relax_disp.py?rev=19228&r1=19227&r2=19228&view=diff
==============================================================================
--- branches/relax_disp/specific_analyses/relax_disp.py (original)
+++ branches/relax_disp/specific_analyses/relax_disp.py Wed Mar 27 15:04:40 
2013
@@ -856,10 +856,10 @@
         @type min_algor:            str
         @keyword min_options:       An array of options to be used by the 
minimisation algorithm.
         @type min_options:          array of str
-        @keyword func_tol:          The function tolerence which, when 
reached, terminates optimisation.
+        @keyword func_tol:          The function tolerance which, when 
reached, terminates optimisation.
                                     Setting this to None turns of the check.
         @type func_tol:             None or float
-        @keyword grad_tol:          The gradient tolerence which, when 
reached, terminates optimisation.
+        @keyword grad_tol:          The gradient tolerance which, when 
reached, terminates optimisation.
                                     Setting this to None turns of the check.
         @type grad_tol:             None or float
         @keyword max_iterations:    The maximum number of iterations for the 
algorithm.