Revision: 4279
Author: jussi.ao.malinen
Date: Tue Nov 9 01:32:37 2010
Log: Fixed links that had been expanded to two lines
http://code.google.com/p/robotframework/source/detail?r=4279
Modified:
/wiki/Installation.wiki
=======================================
--- /wiki/Installation.wiki Thu Sep 2 10:26:35 2010
+++ /wiki/Installation.wiki Tue Nov 9 01:32:37 2010
@@ -7,7 +7,9 @@
These instructions cover the basic procedure for getting Robot Framework
installed. See the [UserGuide User Guide] for more detailed installation
instructions, as well as for information where files are installed, how to
install the framework manually without Python, etc.
-Robot Framework can be installed from [#Installing_from_source source] or
using [#Using_Windows_installer Windows installer] or [#Using_Easy_Install
Easy Install]. Before using any of these methods, you need to make sure
that needed [#Preconditions preconditions] are installed. Windows users can
use [#Using_One_Click_Installer One Click Installer] to install
[#Preconditions preconditions] and Robot Framework itself in one go.
+Robot Framework can be installed from [#Installing_from_source source] or
using [#Using_Windows_installer Windows installer] or [#Using_Easy_Install
Easy Install]. Before using any of these methods, you need to make sure
that needed [#Preconditions preconditions] are installed. Windows users can
use
+[#Using_One_Click_Installer One Click Installer] to install
+[#Preconditions preconditions] and Robot Framework itself in one go.
After a successful installation you should be able to execute following
commands on the command prompt:
@@ -88,9 +90,9 @@
= Using One Click Installer =
-If you are using Windows XP (32 bit) and do not have [#Preconditions
-preconditions] installed, you can use [OneClickInstaller One Click
-Installer] to both install everything and to set needed environment
+If you are using Windows XP (32 bit) and do not have
+[#Preconditions preconditions] installed, you can use
+[OneClickInstaller One Click Installer] to both install everything and to
set needed environment
variables. To use One Click Installer, you need to download also Robot
Framework, Python and Jython (optional) installers separately. For
more details, see [OneClickInstaller One Click Installer's wiki page].
