[Swift-commit] r4404 - www/cookbook

[ketan at ci.uchicago.edu]

Author: ketan
Date: 2011-04-24 22:42:59 -0500 (Sun, 24 Apr 2011)
New Revision: 4404

Modified:
   www/cookbook/cookbook-asciidoc.txt
Log:
 

Modified: www/cookbook/cookbook-asciidoc.txt
===================================================================
--- www/cookbook/cookbook-asciidoc.txt	2011-04-23 16:50:29 UTC (rev 4403)
+++ www/cookbook/cookbook-asciidoc.txt	2011-04-25 03:42:59 UTC (rev 4404)
@@ -34,16 +34,18 @@
 Installation
 ~~~~~~~~~~~~
 
-Installation instructions
+This section takes you through the installation of the Swift system on your
+computer. We will start with the prerequisites as explained in the subsequent
+section.
 
-prerequisites
+Prerequisites
 ^^^^^^^^^^^^^^
-Check your Java
-Swift is a Java application. Make sure you're running Java 5 or higher. You
-can make sure you have Java in your $HOME/.soft file and the softenv system
-(http://www.ci.uchicago.edu/wiki/bin/view/Resources/Softenv) will set it up
-for you. To run Java 6:
+.Check your Java
+Swift is a Java application. Make sure you are running Java version 5 or higher. You
+can make sure you have Java in your $PATH (or $HOME/.soft file depending upon your environment) 
 
+Following are the possible ways to detect and run Java:
+
 ----
 $ grep java $HOME/.soft
 #+java-sun # Gives you Java 5
@@ -55,11 +57,11 @@
 Java(TM) SE Runtime Environment (build 1.6.0_11-b03)
 Java HotSpot(TM) 64-Bit Server VM (build 11.0-b16, mixed mode)
 ----
-Setting up to run Swift
-This is simple. We'll be using a version of the Swift stable SVN branch,
-compiled for this class.  Make sure you have a suitable Java set up. The examples were tested with
-Java version 1.6 Make sure you don't already have Swift in your PATH. If you do, remove it,
-or remove any +swift or @swift lines from your $HOME/.soft file. Then do: PATH=$PATH:/home/wilde/bigdata/swift/bin
+
+.Setting up to run Swift
+This is simple. We will be using a pre-compiled version of Swift that can be downloaded from the following location: http://www.ci.uchicago.edu/swift/packages/swift-0.92.1.tar.gz
+. The examples were tested with Java version 1.6 Make sure you don't already have Swift in your PATH. If you do, remove it,
+or remove any +swift or @swift lines from your $HOME/.soft or $HOME/.bash_profile file. Then do: PATH=$PATH:/home/wilde/bigdata/swift/bin
  Do NOT set SWIFT_HOME or CLASSPATH in your environment unless you fully
 understand how these will affect Swift's execution