[Swift-commit] r4658 - trunk/docs/tutorial

[ketan at ci.uchicago.edu]

Author: ketan
Date: 2011-06-23 10:37:37 -0500 (Thu, 23 Jun 2011)
New Revision: 4658

Modified:
   trunk/docs/tutorial/abstract
   trunk/docs/tutorial/introduction
   trunk/docs/tutorial/language_features
   trunk/docs/tutorial/tutorial.txt
Log:
Some spruce up of the tutorial

Modified: trunk/docs/tutorial/abstract
===================================================================
--- trunk/docs/tutorial/abstract	2011-06-23 03:45:35 UTC (rev 4657)
+++ trunk/docs/tutorial/abstract	2011-06-23 15:37:37 UTC (rev 4658)
@@ -3,3 +3,5 @@
 --------
 This is an introductory tutorial on the use of Swift and its programming
 language SwiftScript.
+
+note: merge with intro?

Modified: trunk/docs/tutorial/introduction
===================================================================
--- trunk/docs/tutorial/introduction	2011-06-23 03:45:35 UTC (rev 4657)
+++ trunk/docs/tutorial/introduction	2011-06-23 15:37:37 UTC (rev 4658)
@@ -1,15 +1,15 @@
 Introduction
 ------------
-This tutorial is intended to introduce new users to the basics of Swift.
+This is an introductory tutorial describing the use of Swift and its programming
+language SwiftScript. It is intended to introduce new users to the basics of Swift.
 It is structured as a series of simple exercises/examples which you can
 try for yourself as you read along. After the first 'hello world'
 example, there are two tracks - the language track (which introduces the SwiftScript language) and the runtime track (which introduces features of the Swift runtime environment, such as running
 jobs on different computational 'sites').
 
 For information on getting an installation of Swift running, consult the
-Swift Quickstart Guide <http://www.ci.uchicago.edu/swift/guides/quickstartguide.php>, and
-return to this document when you have successfully run the test
-SwiftScript program mentioned there. _suggest_ _which_ _version_. 
+Swift Quickstart Guide <http://www.ci.uchicago.edu/swift/guides/quickstartguide.php>. We advise you to install the latest stable release of Swift. 
+Return to this document when you have successfully run the test SwiftScript program mentioned there. 
 
 There is also a Swift User's Guide
 <http://www.ci.uchicago.edu/swift/guides/userguide.php> which contains

Modified: trunk/docs/tutorial/language_features
===================================================================
--- trunk/docs/tutorial/language_features	2011-06-23 03:45:35 UTC (rev 4657)
+++ trunk/docs/tutorial/language_features	2011-06-23 15:37:37 UTC (rev 4658)
@@ -80,9 +80,9 @@
 ToDo: What is transformation catalog? One line explanation.
 
 First we need to modify the transformation catalog to define a logical
-transformation for the tr utility. The transformation catalog can be
-found in etc/tc.data. There are already several entries specifying
-where programs can be found. Add a new line to the file, specifying
+transformation for the tr utility. A transformation catalog lists where executables are located on computational sites. 
+The transformation catalog can be found in etc/tc.data. There are already several entries specifying
+where executables can be found. Add a new line to the file, specifying
 where *tr* can be found (usually in /usr/bin/tr but it may differ on
 your system), like this:
 
@@ -330,8 +330,6 @@
 ~~
 Decisions can be made using 'if', like this:
 
-TODO: More examples of if required.
- 
 ----
 if(morning) {  
   outfile = greeting("good morning");  
@@ -378,9 +376,14 @@
 ----
 
 Install the above wcl script somewhere and add a transformation catalog
-(tc) entry for it. Then run the example program like this:
+(tc) entry for it (see an example below, note that you will need to change the path in third column to the path where wcl is located on your localhost).
 
-TODO: Show the tc entry.
+----
+localhost wcl /home/ketan/bin/wcl  INSTALLED  INTEL32::LINUX  null
+----
+
+Then run the example program like this:
+
  
 ----
 $ swift iterate.swift

Modified: trunk/docs/tutorial/tutorial.txt
===================================================================
--- trunk/docs/tutorial/tutorial.txt	2011-06-23 03:45:35 UTC (rev 4657)
+++ trunk/docs/tutorial/tutorial.txt	2011-06-23 15:37:37 UTC (rev 4658)
@@ -6,8 +6,6 @@
 :website: http://www.ci.uchicago.edu/swift/guides/tutorial.php
 :numbered:
 
-include::abstract[]
-
 include::introduction[]
 
 include::hello_world[]