Revision: 5a32182b0a36
Author:   anssi.syrjasalo <anssi.syrjas...@eficode.com>
Date:     Mon Sep 30 10:19:39 2013 UTC
Log: Edited wiki page InstallationInstructions through web user interface.
http://code.google.com/p/robotframework-sshlibrary/source/detail?r=5a32182b0a36&repo=wiki

Modified:
 /InstallationInstructions.wiki

=======================================
--- /InstallationInstructions.wiki      Mon Sep 30 09:20:10 2013 UTC
+++ /InstallationInstructions.wiki      Mon Sep 30 10:19:39 2013 UTC
@@ -10,13 +10,13 @@

 == Python ==

-To use SSHLibrary with Python, a module named [http://www.lag.net/paramiko Paramiko] is required and Paramiko requires [http://www.pycrypto.org PyCrypto] module as a dependency. +To use SSHLibrary with Python, a module named [http://www.lag.net/paramiko Paramiko] is required, and additionally Paramiko requires [http://www.pycrypto.org PyCrypto] module as its dependency.

 === Linux ===

Depending on the [#Installation installation approaches] discussed further below, Paramiko and !PyCrypto may be installed automatically by SSHLibrary.

-If you need to install them manually, you may use your distribution's package manager. For example on Debian variants, running `sudo apt-get install python-paramiko` should install them. +If not automatically installed, you may use your distribution's package manager. For example on Debian variants, running `sudo apt-get install python-paramiko` should install them.

Alternatively, you can always install them using the source distributions from PyPI:
   * !PyCrypto: https://pypi.python.org/pypi/pycrypto
@@ -24,7 +24,7 @@

 === Windows ===

-On Windows you should always install !PyCrypto using the [http://www.voidspace.org.uk/python/modules.shtml#pycrypto binary installer] *before* installing Paramiko. This is because installing !PyCrypto automatically would require a C compiler. Make sure you pick the correct Paramiko installer depending on your Python version and CPU architecture. +On Windows, you should always install !PyCrypto using the [http://www.voidspace.org.uk/python/modules.shtml#pycrypto binary installer] *before* installing Paramiko. This is because installing !PyCrypto automatically would require a C compiler. Make sure you pick the correct Paramiko installer depending on your Python version and CPU architecture.

Like on Linux, Paramiko may be installed automatically by SSHLibrary, but you can also install it yourself using the [https://pypi.python.org/pypi/paramiko source distribution].

@@ -37,7 +37,9 @@

 = Installation =

-The easiest way to install SSHLibrary is using [http://www.pip-installer.org pip package manager]. If you do not want to install pip, or are using Jython which does not support it, you can always install SSHLibrary using the source distribution. +The easiest way to install SSHLibrary is using [http://www.pip-installer.org pip package manager].
+
+If you do not want to install pip, or are using Jython which does not support it, you can always install SSHLibrary using the source distribution.

 == Using pip ==

@@ -46,12 +48,11 @@
 pip install robotframework-sshlibrary
 }}}

-The benefit of using `pip` is that it should install the required [#Dependencies dependencies] automatically. However, on Windows you need to first install !PyCrypto binaries before using `pip`. +The benefit of using `pip` is that it should install the required [#Dependencies dependencies] automatically. However, on Windows you still need to first install !PyCrypto binaries before using `pip`.

 == Using source distribution ==

-SSHLibrary can be installed from the source as following:
-
+SSHLibrary can be installed from source as following:
# Download the source tar.gz at https://code.google.com/p/robotframework-sshlibrary/downloads
   # Extract the package to a temporary location
   # Open a terminal / command prompt
@@ -61,14 +62,12 @@

 = Verifying the installation =

-To test that the installation of SSHLibrary and its dependencies was successful, run one of the following commands in a terminal / command prompt. +To test that the installation of SSHLibrary and its dependencies was successful, you may run in a terminal / command prompt:

-When using Python:
 {{{
     python -c "import SSHlibrary"
 }}}
-
-When using Jython:
+or
 {{{
     jython -c "import SSHlibrary"
 }}}

--

--- You received this message because you are subscribed to the Google Groups "robotframework-commit" group.
To unsubscribe from this group and stop receiving emails from it, send an email 
to robotframework-commit+unsubscr...@googlegroups.com.
For more options, visit https://groups.google.com/groups/opt_out.

Reply via email to