Author: bugman
Date: Wed Jul 31 17:20:26 2013
New Revision: 20496
URL: http://svn.gna.org/viewcvs/relax?rev=20496&view=rev
Log:
Merged revisions 20474,20495 via svnmerge from
svn+ssh://bugman@xxxxxxxxxxx/svn/relax/trunk
........
r20474 | bugman | 2013-07-25 08:28:40 +0200 (Thu, 25 Jul 2013) | 1 line
Some small edits to the intro chapter of the relax user manual.
........
r20495 | bugman | 2013-07-31 16:57:23 +0200 (Wed, 31 Jul 2013) | 4 lines
Fix for the relax version file for the relax user manual construction.
This was causing 'scons user_manual_pdf' and related targets to fail when a
local git repository is
used (via git-svn).
........
Modified:
branches/relax_disp/ (props changed)
branches/relax_disp/docs/latex/intro.tex
branches/relax_disp/scons/manuals.py
Propchange: branches/relax_disp/
------------------------------------------------------------------------------
--- svnmerge-integrated (original)
+++ svnmerge-integrated Wed Jul 31 17:20:26 2013
@@ -1,1 +1,1 @@
-/trunk:1-20447
+/trunk:1-20495
Modified: branches/relax_disp/docs/latex/intro.tex
URL:
http://svn.gna.org/viewcvs/relax/branches/relax_disp/docs/latex/intro.tex?rev=20496&r1=20495&r2=20496&view=diff
==============================================================================
--- branches/relax_disp/docs/latex/intro.tex (original)
+++ branches/relax_disp/docs/latex/intro.tex Wed Jul 31 17:20:26 2013
@@ -526,7 +526,7 @@
\caption[GUI screenshot -- Model-free analysis]{Screenshot of the relax GUI
interface -- the automated model-free analysis. The analysis is fully
automated via a new model-free protocol as described in detail in
Chapter~\ref{ch: model-free}. Clicking on the \guibutton{About} button in
the bottom left hand corner will give a full description of the protocol.
For using this interface or any of the modern-day model-free protocols, data
from at least two magnetic field strengths must be without question
collected.}\label{fig: screenshot: model-free analysis}
\end{figure}
-The GUI is currently and interface to the automatic analyses, providing an
easy way to perform quick analyses. The interface consists of a tab for each
analysis. By clicking on the \guimenuitemtwo{File}{New analysis} menu entry
or the \guibutton{New analysis} toolbar button, the analysis wizard will
appear (see Figure~\ref{fig: screenshot: analysis wizard}). The following
analyses can be set up using this wizard:
+The GUI is currently an interface to the automated analyses, providing an
easy way to perform quick analyses. The interface consists of a tab for each
analysis. By clicking on the \guimenuitemtwo{File}{New analysis} menu entry
or the \guibutton{New analysis} toolbar button, the analysis wizard will
appear (see Figure~\ref{fig: screenshot: analysis wizard}). The following
analyses can be set up using this wizard:
\begin{description}
\item[Steady-state NOE:] this provides access to the steady-state NOE
calculation with pseudo Monte Carlo simulations for error analysis (this
falls back to bootstrapping as this is a calculation rather than
optimisation). See Figure~\ref{fig: screenshot: NOE analysis} on
page~\pageref{fig: screenshot: NOE analysis}.
@@ -582,7 +582,7 @@
\subsection{Access to the internals of relax}
-To enable advanced Python\index{Python} scripting and control many parts of
relax have been designed in an object oriented fashion. If you would like to
play with internals of the program the entirety of relax is accessible by
importation. For example all data is contained within the object called the
relax data store which, to be able to access it, needs be imported by typing:
+To enable advanced Python\index{Python} scripting and control, many parts of
relax have been designed in an object oriented fashion. If you would like to
play with internals of the program the entirety of relax is accessible by
importation. For example all data is contained within the object called the
relax data store which, to be able to access it, needs be imported by typing:
\begin{lstlisting}[numbers=none]
relax> from data_store import Relax_data_store; ds = Relax_data_store()
Modified: branches/relax_disp/scons/manuals.py
URL:
http://svn.gna.org/viewcvs/relax/branches/relax_disp/scons/manuals.py?rev=20496&r1=20495&r2=20496&view=diff
==============================================================================
--- branches/relax_disp/scons/manuals.py (original)
+++ branches/relax_disp/scons/manuals.py Wed Jul 31 17:20:26 2013
@@ -499,7 +499,7 @@
# Add the repository revision if not a normal release.
text = version.version
if text == 'repository checkout':
- text += ' r' + version.revision()
+ text += ' r%s' % version.revision()
# Place the program version number into a LaTeX file.
file = open(env['LATEX_DIR'] + sep + 'relax_version.tex', 'w')
r20496 - in /branches/relax_disp: ./ docs/latex/intro.tex scons/manuals.py