r23711 - in /branches/frame_order_cleanup: ./ docs/latex/install.tex -- June 06, 2014 - 18:04

Author: bugman
Date: Fri Jun  6 18:04:48 2014
New Revision: 23711

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

........
  r23694 | bugman | 2014-06-06 14:26:05 +0200 (Fri, 06 Jun 2014) | 5 lines
  
  Fix for the wxPython link in the installation chapter of the manual.
  
  This was pointing to the scipy website for some reason.
........
  r23695 | bugman | 2014-06-06 14:28:58 +0200 (Fri, 06 Jun 2014) | 5 lines
  
  Changed the Python readline link for MS Windows in the installation chapter 
of the manual.
  
  This now points to https://pypi.python.org/pypi/pyreadline as the iPython 
link is broken.
........

Modified:
    branches/frame_order_cleanup/   (props changed)
    branches/frame_order_cleanup/docs/latex/install.tex

Propchange: branches/frame_order_cleanup/
------------------------------------------------------------------------------
--- svnmerge-integrated (original)
+++ svnmerge-integrated Fri Jun  6 18:04:48 2014
@@ -1 +1 @@
-/trunk:1-23688,23693
+/trunk:1-23688,23693-23695

Modified: branches/frame_order_cleanup/docs/latex/install.tex
URL: 
http://svn.gna.org/viewcvs/relax/branches/frame_order_cleanup/docs/latex/install.tex?rev=23711&r1=23710&r2=23711&view=diff
==============================================================================
--- branches/frame_order_cleanup/docs/latex/install.tex (original)
+++ branches/frame_order_cleanup/docs/latex/install.tex Fri Jun  6 18:04:48 
2014
@@ -14,7 +14,7 @@
   \item[\href{http://python.org/}{Python}\index{Python}:]  Version 2.5 or 
higher.
   \item[\href{http://numpy.scipy.org/}{NumPy}\index{NumPy}:]  Version 1.0.4 
or higher.
     This package is used for most of the numerical calculations within relax.
-  \item[\href{http://www.scipy.org/}{wxPython}\index{wxPython}:]  Version 
2.8 or higher.
+  \item[\href{http://wxpython.org/}{wxPython}\index{wxPython}:]  Version 2.8 
or higher.
     This package is also optional.
     It is required for the operation of the graphical user interface 
(GUI)\index{User interface!GUI}.
   \item[\href{http://mpi4py.scipy.org/}{mpi4py}\index{MPI!mpi4py}:]  Version 
1.2 or higher.
@@ -95,7 +95,7 @@
 In addition to the above dependencies, running relax on MS Windows requires 
a number of additional programs.
 These include:
 \begin{description}
-  
\item[\href{http://projects.scipy.org/ipython/ipython/wiki/PyReadline/Intro}{pyreadline}\index{pyreadline}:]
  Version 1.3 or higher.
+  
\item[\href{https://pypi.python.org/pypi/pyreadline}{pyreadline}\index{pyreadline}:]
  Any version.
   
\item[\href{http://starship.python.net/crew/theller/ctypes/}{ctypes}\index{ctypes}:]
  The pyreadline package requires ctypes.
 \end{description}