Revision: 3202
Author: janne.t.harkonen
Date: Wed May 5 22:56:20 2010
Log: regen
http://code.google.com/p/robotframework/source/detail?r=3202
Modified:
/trunk/doc/userguide/RobotFrameworkUserGuide.html
=======================================
--- /trunk/doc/userguide/RobotFrameworkUserGuide.html Wed May 5 05:31:32
2010
+++ /trunk/doc/userguide/RobotFrameworkUserGuide.html Wed May 5 22:56:20
2010
@@ -757,9 +757,9 @@
</div>
<div class="section" id="preconditions">
<h3><a class="toc-backref"
href="#id254">1.3.2 Preconditions</a></h3>
-<p>Robot Framework runs both on <a class="reference external"
href="http://www.python.org/";>Python</a> and <a class="reference external"
href="http://www.jython.org/";>Jython</a>, and you need to have
-at least one of them to be able to use it. However, the provided installers
-only work with Python, so installing it is always recommended.</p>
+<p>Robot Framework runs both on <a class="reference external"
href="http://www.python.org/";>Python</a> and <a class="reference external"
href="http://www.jython.org/";>Jython</a>, and you need to have at least
+one of them to be able to use it. However, some of the provided installers
only
+work with Python, so installing it is always recommended.</p>
<div class="section" id="python-installation">
<h4><a class="toc-backref" href="#id255">Python installation</a></h4>
<p>Starting from Robot Framework 2.5, Python 2.5 is the minimum supported
Python
@@ -799,34 +799,40 @@
need to run as <span class="cli">java -jar
jython_installer-<version>.jar</span>. Depending on
your system, the installer runs either in the graphical or the textual
mode,
but in both cases, the actual installation procedure is very easy.</p>
-<p>With Jython 2.5, it is possible to install Robot Framework without
having
-Python available by <a class="reference internal"
href="#installing-from-source">installing from source</a>. Jython 2.2 does
not have
-Python's <span class="code">distutils</span> module, which is required for
automatically
-installing Robot Framework and thus the only way to install without Python
is
-<a class="reference internal" href="#manual-installation">manual
installation</a>.</p>
-<p>With all supported Jython versions, it is possible to install Robot
Framework
+<p>There are three ways to install Robot Framework so that it can be run
with Jython.</p>
+<ol class="arabic">
+<li><p class="first">With all supported Jython versions, it is possible to
install Robot Framework
using Python and still start execution using Jython. When installing Robot
Framework with Python, its installer tries to find the Jython executable
on the
system to create the <span class="prog">jybot</span> runner script
correctly. Jython is found if:</p>
-<ol class="arabic">
+<ul>
<li><p class="first">Jython can be executed in the system directly (i.e.
it is in the <span class="var">PATH</span>).</p>
</li>
<li><p class="first">An environment variable <span
class="var">JYTHON_HOME</span> is set and it points to
the Jython installation directory.</p>
</li>
<li><p class="first">The installer finds the Jython installation directory
from the system. On
-Windows, it is searched
-from the <span class="path">C:\</span> and <span class="path">D:\</span>
drives, and on other systems from
-the <span class="path">/usr/local</span> and <span
class="path">/opt</span> directories. The directory is found
-if it is under the searched directories mentioned above, or one level
-deeper. For example, the following Jython installation directories
-would be found by the installer:</p>
+Windows, it is searched from the <span class="path">C:\</span> and <span
class="path">D:\</span> drives,
+and on other systems from the <span class="path">/usr/local</span> and
<span class="path">/opt</span>
+directories. The directory is found if it is under the searched
+directories mentioned above, or one level deeper. For example, the
+following Jython installation directories would be found by the
+installer:</p>
<pre class="literal-block">
C:\APPS\Jython2.2
D:\Jython22
/usr/local/jython2.2
/opt/whatever/Jython22
</pre>
+</li>
+</ul>
+</li>
+<li><p class="first">With Jython 2.5, it is possible to install Robot
Framework without having
+Python available by <a class="reference internal"
href="#installing-from-source">installing from source</a>.</p>
+</li>
+<li><p class="first">Jython 2.2 does not have Python's <span
class="code">distutils</span> module, which is
+required for automatically installing Robot Framework and thus the only way
+to install without Python is <a class="reference internal"
href="#manual-installation">manual installation</a>.</p>
</li>
</ol>
</div>
@@ -12757,7 +12763,7 @@
<div class="footer">
<hr class="footer" />
<p>Generated by <a class="reference external"
href="http://docutils.sourceforge.net/rst.html";>reStructuredText</a>.
Syntax highlighting by <a class="reference external"
href="http://pygments.org/";>Pygments</a>.</p>
-<p>Generated on: 2010-05-05 12:30 UTC.
+<p>Generated on: 2010-05-06 05:51 UTC.
</p>
</div>
