Author: bugman
Date: Tue May 27 11:48:58 2014
New Revision: 23454
URL: http://svn.gna.org/viewcvs/relax?rev=23454&view=rev
Log:
Merged revisions 23408,23453 via svnmerge from
svn+ssh://bugman@xxxxxxxxxxx/svn/relax/trunk
........
r23408 | bugman | 2014-05-26 09:52:52 +0200 (Mon, 26 May 2014) | 6 lines
Updated all the API documentation links in the dispersion chapter of the
manual.
These were pointing to http://www.nmr-relax.com/api/3.1/ whereas they
should now be point to
http://www.nmr-relax.com/api/3.2/.
........
r23453 | bugman | 2014-05-27 10:33:20 +0200 (Tue, 27 May 2014) | 5 lines
Modified a printout in the 'devel_scripts/code_validator' script.
This is to clarify that the first method of a class does not need two
preceding empty lines.
........
Modified:
branches/frame_order_cleanup/ (props changed)
branches/frame_order_cleanup/devel_scripts/code_validator
branches/frame_order_cleanup/docs/latex/dispersion.tex
Propchange: branches/frame_order_cleanup/
------------------------------------------------------------------------------
--- svnmerge-integrated (original)
+++ svnmerge-integrated Tue May 27 11:48:58 2014
@@ -1 +1 @@
-/trunk:1-23392
+/trunk:1-23453
Modified: branches/frame_order_cleanup/devel_scripts/code_validator
URL:
http://svn.gna.org/viewcvs/relax/branches/frame_order_cleanup/devel_scripts/code_validator?rev=23454&r1=23453&r2=23454&view=diff
==============================================================================
--- branches/frame_order_cleanup/devel_scripts/code_validator (original)
+++ branches/frame_order_cleanup/devel_scripts/code_validator Tue May 27
11:48:58 2014
@@ -558,7 +558,7 @@
"""Test for proper function spacing."""
# Heading.
- sys.stdout.write(self.indent + "Function spacing (2 preceding empty
lines).\n")
+ sys.stdout.write(self.indent + "Function spacing (2 preceding empty
lines). Ignore for the first method in a class.\n")
# Flags.
ok = 1
Modified: branches/frame_order_cleanup/docs/latex/dispersion.tex
URL:
http://svn.gna.org/viewcvs/relax/branches/frame_order_cleanup/docs/latex/dispersion.tex?rev=23454&r1=23453&r2=23454&view=diff
==============================================================================
--- branches/frame_order_cleanup/docs/latex/dispersion.tex (original)
+++ branches/frame_order_cleanup/docs/latex/dispersion.tex Tue May 27
11:48:58 2014
@@ -276,8 +276,8 @@
More information about the R2eff model is available from:
\begin{itemize}
\item the relax wiki at \url{http://wiki.nmr-relax.com/R2eff},
- \item the API documentation (for exponential curves) at
\url{http://www.nmr-relax.com/api/3.1/specific\_analyses.relax\_disp.optimisation-module.html#back\_calc\_r2eff},
- \item the API documentation (for the 2-point fit) at
\url{http://www.nmr-relax.com/api/3.1/lib.dispersion.two\_point-module.html#calc\_two\_point\_r2eff},
+ \item the API documentation (for exponential curves) at
\url{http://www.nmr-relax.com/api/3.2/specific\_analyses.relax\_disp.optimisation-module.html#back\_calc\_r2eff},
+ \item the API documentation (for the 2-point fit) at
\url{http://www.nmr-relax.com/api/3.2/lib.dispersion.two\_point-module.html#calc\_two\_point\_r2eff},
\item the relaxation dispersion page of the relax website at
\url{http://www.nmr-relax.com/analyses/relaxation\_dispersion.html#R2eff}.
\end{itemize}
@@ -297,7 +297,7 @@
More information about the No Rex model is available from the:
\begin{itemize}
\item the relax wiki at \url{http://wiki.nmr-relax.com/No\_Rex},
- \item the API documentation at
\url{http://www.nmr-relax.com/api/3.1/target\_functions.relax\_disp.Dispersion-class.html#func\_NOREX},
+ \item the API documentation at
\url{http://www.nmr-relax.com/api/3.2/target\_functions.relax\_disp.Dispersion-class.html#func\_NOREX},
\item the relaxation dispersion page of the relax website at
\url{http://www.nmr-relax.com/analyses/relaxation\_dispersion.html#No\_Rex}.
\end{itemize}
@@ -351,7 +351,7 @@
More information about the LM63 model is available from:
\begin{itemize}
\item the relax wiki at \url{http://wiki.nmr-relax.com/LM63},
- \item the API documentation at
\url{http://www.nmr-relax.com/api/3.1/lib.dispersion.lm63-module.html},
+ \item the API documentation at
\url{http://www.nmr-relax.com/api/3.2/lib.dispersion.lm63-module.html},
\item the relaxation dispersion page of the relax website at
\url{http://www.nmr-relax.com/analyses/relaxation\_dispersion.html#LM63}.
\end{itemize}
@@ -410,7 +410,7 @@
More information about the LM63 3-site model is available from:
\begin{itemize}
\item the relax wiki at \url{http://wiki.nmr-relax.com/LM63\_3-site},
- \item the API documentation at
\url{http://www.nmr-relax.com/api/3.1/lib.dispersion.lm63\_3site-module.html},
+ \item the API documentation at
\url{http://www.nmr-relax.com/api/3.2/lib.dispersion.lm63\_3site-module.html},
\item the relaxation dispersion page of the relax website at
\url{http://www.nmr-relax.com/analyses/relaxation\_dispersion.html#LM63\_3-site}.
\end{itemize}
@@ -450,7 +450,7 @@
More information about the CR72 full model is available from:
\begin{itemize}
\item the relax wiki at \url{http://wiki.nmr-relax.com/CR72\_full},
- \item the API documentation at
\url{http://www.nmr-relax.com/api/3.1/lib.dispersion.cr72-module.html},
+ \item the API documentation at
\url{http://www.nmr-relax.com/api/3.2/lib.dispersion.cr72-module.html},
\item the relaxation dispersion page of the relax website at
\url{http://www.nmr-relax.com/analyses/relaxation\_dispersion.html#CR72\_full}.
\end{itemize}
@@ -482,7 +482,7 @@
More information about the CR72 model is available from:
\begin{itemize}
\item the relax wiki at \url{http://wiki.nmr-relax.com/CR72},
- \item the API documentation at
\url{http://www.nmr-relax.com/api/3.1/lib.dispersion.cr72-module.html},
+ \item the API documentation at
\url{http://www.nmr-relax.com/api/3.2/lib.dispersion.cr72-module.html},
\item the relaxation dispersion page of the relax website at
\url{http://www.nmr-relax.com/analyses/relaxation\_dispersion.html#CR72}.
\end{itemize}
@@ -521,7 +521,7 @@
More information about the IT99 model is available from:
\begin{itemize}
\item the relax wiki at \url{http://wiki.nmr-relax.com/IT99},
- \item the API documentation at
\url{http://www.nmr-relax.com/api/3.1/lib.dispersion.it99-module.html},
+ \item the API documentation at
\url{http://www.nmr-relax.com/api/3.2/lib.dispersion.it99-module.html},
\item the relaxation dispersion page of the relax website at
\url{http://www.nmr-relax.com/analyses/relaxation\_dispersion.html#IT99}.
\end{itemize}
@@ -550,7 +550,7 @@
More information about the TSMFK01 model is available from:
\begin{itemize}
\item the relax wiki at \url{http://wiki.nmr-relax.com/TSMFK01},
- \item the API documentation at
\url{http://www.nmr-relax.com/api/3.1/lib.dispersion.tsmfk01-module.html},
+ \item the API documentation at
\url{http://www.nmr-relax.com/api/3.2/lib.dispersion.tsmfk01-module.html},
\item the relaxation dispersion page of the relax website at
\url{http://www.nmr-relax.com/analyses/relaxation\_dispersion.html#TSMFK01}.
\end{itemize}
@@ -653,7 +653,7 @@
More information about the B14 full model is available from:
\begin{itemize}
\item the relax wiki at \url{http://wiki.nmr-relax.com/B14\_full},
- \item the API documentation at
\url{http://www.nmr-relax.com/api/3.1/lib.dispersion.B14-module.html},
+ \item the API documentation at
\url{http://www.nmr-relax.com/api/3.2/lib.dispersion.B14-module.html},
\item the relaxation dispersion page of the relax website at
\url{http://www.nmr-relax.com/analyses/relaxation\_dispersion.html#B14\_full}.
\end{itemize}
@@ -672,7 +672,7 @@
More information about the B14 model is available from:
\begin{itemize}
\item the relax wiki at \url{http://wiki.nmr-relax.com/B14},
- \item the API documentation at
\url{http://www.nmr-relax.com/api/3.1/lib.dispersion.B14-module.html},
+ \item the API documentation at
\url{http://www.nmr-relax.com/api/3.2/lib.dispersion.B14-module.html},
\item the relaxation dispersion page of the relax website at
\url{http://www.nmr-relax.com/analyses/relaxation\_dispersion.html#B14}.
\end{itemize}
@@ -789,7 +789,7 @@
More information about the NS CPMG 2-site expanded model is available from:
\begin{itemize}
\item the relax wiki at
\url{http://wiki.nmr-relax.com/NS\_CPMG\_2-site\_expanded},
- \item the API documentation at
\url{http://www.nmr-relax.com/api/3.1/lib.dispersion.ns\_cpmg\_2site\_expanded-module.html},
+ \item the API documentation at
\url{http://www.nmr-relax.com/api/3.2/lib.dispersion.ns\_cpmg\_2site\_expanded-module.html},
\item the relaxation dispersion page of the relax website at
\url{http://www.nmr-relax.com/analyses/relaxation\_dispersion.html#NS\_CPMG\_2-site\_expanded}.
\end{itemize}
@@ -808,7 +808,7 @@
More information about the NS CPMG 2-site 3D full model is available from:
\begin{itemize}
\item the relax wiki at
\url{http://wiki.nmr-relax.com/NS\_CPMG\_2-site\_3D\_full},
- \item the API documentation at
\url{http://www.nmr-relax.com/api/3.1/lib.dispersion.ns\_cpmg\_2site\_3d-module.html},
+ \item the API documentation at
\url{http://www.nmr-relax.com/api/3.2/lib.dispersion.ns\_cpmg\_2site\_3d-module.html},
\item the relaxation dispersion page of the relax website at
\url{http://www.nmr-relax.com/analyses/relaxation\_dispersion.html#NS\_CPMG\_2-site\_3D\_full}.
\end{itemize}
@@ -827,7 +827,7 @@
More information about the NS CPMG 2-site 3D model is available from:
\begin{itemize}
\item the relax wiki at
\url{http://wiki.nmr-relax.com/NS\_CPMG\_2-site\_3D},
- \item the API documentation at
\url{http://www.nmr-relax.com/api/3.1/lib.dispersion.ns\_cpmg\_2site\_3d-module.html},
+ \item the API documentation at
\url{http://www.nmr-relax.com/api/3.2/lib.dispersion.ns\_cpmg\_2site\_3d-module.html},
\item the relaxation dispersion page of the relax website at
\url{http://www.nmr-relax.com/analyses/relaxation\_dispersion.html#NS\_CPMG\_2-site\_3D}.
\end{itemize}
@@ -846,7 +846,7 @@
More information about the NS CPMG 2-site star full model is available from:
\begin{itemize}
\item the relax wiki at
\url{http://wiki.nmr-relax.com/NS\_CPMG\_2-site\_star\_full},
- \item the API documentation at
\url{http://www.nmr-relax.com/api/3.1/lib.dispersion.ns\_cpmg\_2site\_star-module.html},
+ \item the API documentation at
\url{http://www.nmr-relax.com/api/3.2/lib.dispersion.ns\_cpmg\_2site\_star-module.html},
\item the relaxation dispersion page of the relax website at
\url{http://www.nmr-relax.com/analyses/relaxation\_dispersion.html#NS\_CPMG\_2-site\_star\_full}.
\end{itemize}
@@ -865,7 +865,7 @@
More information about the NS CPMG 2-site star model is available from:
\begin{itemize}
\item the relax wiki at
\url{http://wiki.nmr-relax.com/NS\_CPMG\_2-site\_star},
- \item the API documentation at
\url{http://www.nmr-relax.com/api/3.1/lib.dispersion.ns\_cpmg\_2site\_star-module.html},
+ \item the API documentation at
\url{http://www.nmr-relax.com/api/3.2/lib.dispersion.ns\_cpmg\_2site\_star-module.html},
\item the relaxation dispersion page of the relax website at
\url{http://www.nmr-relax.com/analyses/relaxation\_dispersion.html#NS\_CPMG\_2-site\_star}.
\end{itemize}
@@ -938,7 +938,7 @@
More information about the MMQ CR72 model is available from:
\begin{itemize}
\item the relax wiki at \url{http://wiki.nmr-relax.com/MMQ\_CR72},
- \item the API documentation at
\url{http://www.nmr-relax.com/api/3.1/lib.dispersion.mmq\_cr72-module.html},
+ \item the API documentation at
\url{http://www.nmr-relax.com/api/3.2/lib.dispersion.mmq\_cr72-module.html},
\item the relaxation dispersion page of the relax website at
\url{http://www.nmr-relax.com/analyses/relaxation\_dispersion.html#MMQ\_CR72}.
\end{itemize}
@@ -1071,7 +1071,7 @@
More information about the NS MMQ 2-site model is available from:
\begin{itemize}
\item the relax wiki at \url{http://wiki.nmr-relax.com/NS\_MMQ\_2-site},
- \item the API documentation at
\url{http://www.nmr-relax.com/api/3.1/lib.dispersion.ns\_mmq\_2site-module.html},
+ \item the API documentation at
\url{http://www.nmr-relax.com/api/3.2/lib.dispersion.ns\_mmq\_2site-module.html},
\item the relaxation dispersion page of the relax website at
\url{http://www.nmr-relax.com/analyses/relaxation\_dispersion.html#NS\_MMQ\_2-site}.
\end{itemize}
@@ -1154,7 +1154,7 @@
More information about the NS MMQ 3-site linear model is available from:
\begin{itemize}
\item the relax wiki at
\url{http://wiki.nmr-relax.com/NS\_MMQ\_3-site\_linear},
- \item the API documentation at
\url{http://www.nmr-relax.com/api/3.1/lib.dispersion.ns\_mmq\_3site-module.html},
+ \item the API documentation at
\url{http://www.nmr-relax.com/api/3.2/lib.dispersion.ns\_mmq\_3site-module.html},
\item the relaxation dispersion page of the relax website at
\url{http://www.nmr-relax.com/analyses/relaxation\_dispersion.html#NS\_MMQ\_3-site\_linear}.
\end{itemize}
@@ -1226,7 +1226,7 @@
More information about the NS MMQ 3-site model is available from:
\begin{itemize}
\item the relax wiki at \url{http://wiki.nmr-relax.com/NS\_MMQ\_3-site},
- \item the API documentation at
\url{http://www.nmr-relax.com/api/3.1/lib.dispersion.ns\_mmq\_3site-module.html},
+ \item the API documentation at
\url{http://www.nmr-relax.com/api/3.2/lib.dispersion.ns\_mmq\_3site-module.html},
\item the relaxation dispersion page of the relax website at
\url{http://www.nmr-relax.com/analyses/relaxation\_dispersion.html#NS\_MMQ\_3-site}.
\end{itemize}
@@ -1264,7 +1264,7 @@
More information about the M61 model is available from:
\begin{itemize}
\item the relax wiki at \url{http://wiki.nmr-relax.com/M61},
- \item the API documentation at
\url{http://www.nmr-relax.com/api/3.1/lib.dispersion.m61-module.html},
+ \item the API documentation at
\url{http://www.nmr-relax.com/api/3.2/lib.dispersion.m61-module.html},
\item the relaxation dispersion page of the relax website at
\url{http://www.nmr-relax.com/analyses/relaxation\_dispersion.html#M61}.
\end{itemize}
@@ -1289,7 +1289,7 @@
More information about the M61 skew model is available from:
\begin{itemize}
\item the relax wiki at \url{http://wiki.nmr-relax.com/M61\_skew},
- \item the API documentation at
\url{http://www.nmr-relax.com/api/3.1/lib.dispersion.m61b-module.html},
+ \item the API documentation at
\url{http://www.nmr-relax.com/api/3.2/lib.dispersion.m61b-module.html},
\item the relaxation dispersion page of the relax website at
\url{http://www.nmr-relax.com/analyses/relaxation\_dispersion.html#M61\_skew}.
\end{itemize}
@@ -1319,7 +1319,7 @@
More information about the DPL94 model is available from:
\begin{itemize}
\item the relax wiki at \url{http://wiki.nmr-relax.com/DPL94},
- \item the API documentation at
\url{http://www.nmr-relax.com/api/3.1/lib.dispersion.dpl94-module.html},
+ \item the API documentation at
\url{http://www.nmr-relax.com/api/3.2/lib.dispersion.dpl94-module.html},
\item the relaxation dispersion page of the relax website at
\url{http://www.nmr-relax.com/analyses/relaxation\_dispersion.html#DPL94}.
\end{itemize}
@@ -1363,7 +1363,7 @@
More information about the TP02 model is available from:
\begin{itemize}
\item the relax wiki at \url{http://wiki.nmr-relax.com/TP02},
- \item the API documentation at
\url{http://www.nmr-relax.com/api/3.1/lib.dispersion.tp02-module.html},
+ \item the API documentation at
\url{http://www.nmr-relax.com/api/3.2/lib.dispersion.tp02-module.html},
\item the relaxation dispersion page of the relax website at
\url{http://www.nmr-relax.com/analyses/relaxation\_dispersion.html#TP02}.
\end{itemize}
@@ -1406,7 +1406,7 @@
More information about the TAP03 model is available from:
\begin{itemize}
\item the relax wiki at \url{http://wiki.nmr-relax.com/TAP03},
- \item the API documentation at
\url{http://www.nmr-relax.com/api/3.1/lib.dispersion.tap03-module.html},
+ \item the API documentation at
\url{http://www.nmr-relax.com/api/3.2/lib.dispersion.tap03-module.html},
\item the relaxation dispersion page of the relax website at
\url{http://www.nmr-relax.com/analyses/relaxation\_dispersion.html#TAP03}.
\end{itemize}
@@ -1438,7 +1438,7 @@
More information about the MP05 model is available from:
\begin{itemize}
\item the relax wiki at \url{http://wiki.nmr-relax.com/MP05},
- \item the API documentation at
\url{http://www.nmr-relax.com/api/3.1/lib.dispersion.mp05-module.html},
+ \item the API documentation at
\url{http://www.nmr-relax.com/api/3.2/lib.dispersion.mp05-module.html},
\item the relaxation dispersion page of the relax website at
\url{http://www.nmr-relax.com/analyses/relaxation\_dispersion.html#MP05}.
\end{itemize}
@@ -1494,7 +1494,7 @@
More information about the NS R1rho 2-site model is available from:
\begin{itemize}
\item the relax wiki at \url{http://wiki.nmr-relax.com/NS\_R1rho\_2-site},
- \item the API documentation at
\url{http://www.nmr-relax.com/api/3.1/lib.dispersion.ns\_r1rho\_2site-module.html},
+ \item the API documentation at
\url{http://www.nmr-relax.com/api/3.2/lib.dispersion.ns\_r1rho\_2site-module.html},
\item the relaxation dispersion page of the relax website at
\url{http://www.nmr-relax.com/analyses/relaxation\_dispersion.html#NS\_R1rho\_2-site}.
\end{itemize}
@@ -1580,7 +1580,7 @@
More information about the NS R1rho 3-site model is available from:
\begin{itemize}
\item the relax wiki at \url{http://wiki.nmr-relax.com/NS\_R1rho\_3-site},
- \item the API documentation at
\url{http://www.nmr-relax.com/api/3.1/lib.dispersion.ns\_r1rho\_3site-module.html},
+ \item the API documentation at
\url{http://www.nmr-relax.com/api/3.2/lib.dispersion.ns\_r1rho\_3site-module.html},
\item the relaxation dispersion page of the relax website at
\url{http://www.nmr-relax.com/analyses/relaxation\_dispersion.html#NS\_R1rho\_3-site}.
\end{itemize}
@@ -1645,7 +1645,7 @@
More information about the NS R1rho 3-site linear model is available from:
\begin{itemize}
\item the relax wiki at
\url{http://wiki.nmr-relax.com/NS\_R1rho\_3-site\_linear},
- \item the API documentation at
\url{http://www.nmr-relax.com/api/3.1/lib.dispersion.ns\_r1rho\_3site-module.html},
+ \item the API documentation at
\url{http://www.nmr-relax.com/api/3.2/lib.dispersion.ns\_r1rho\_3site-module.html},
\item the relaxation dispersion page of the relax website at
\url{http://www.nmr-relax.com/analyses/relaxation\_dispersion.html#NS\_R1rho\_3-site\_linear}.
\end{itemize}
r23454 - in /branches/frame_order_cleanup: ./ devel_scripts/code_validator docs/latex/dispersion.tex