[Swift-commit] r7464 - trunk/docs/userguide

[davidk at ci.uchicago.edu]

Author: davidk
Date: 2014-01-09 11:44:17 -0600 (Thu, 09 Jan 2014)
New Revision: 7464

Modified:
   trunk/docs/userguide/configuration
Log:
Wording


Modified: trunk/docs/userguide/configuration
===================================================================
--- trunk/docs/userguide/configuration	2014-01-08 22:13:41 UTC (rev 7463)
+++ trunk/docs/userguide/configuration	2014-01-09 17:44:17 UTC (rev 7464)
@@ -33,11 +33,9 @@
 -----
 
 The details of this file will be explained more later. Let's first look 
-at an example of running Swift with this new file.
+at an example of running Swift. Using the swift.properties the new Swift 
+command a user would run is:
 
-Using the swift.properties file above, the new Swift command a user would run
-is:
-
 -----
 $ swift script.swift
 -----
@@ -123,9 +121,8 @@
 
 Using site templates
 ~~~~~~~~~~~~~~~~~~~~
-This new configuration mechanism should make it easier to use site templates.
-To use this, set the environment variable $SWIFT_SITE_CONF to a directory 
-containing a swift.properties file. This swift.properties can contain multiple 
+Swift recognizes an environmnet variable called $SWIFT_SITE_CONF, which points to
+a directory containing a swift.properties file. This swift.properties can contain multiple 
 site definitions for the various queues available on the cluster you are using.
 
 Your local swift.properties then does not need to define the entire site. It 
@@ -145,8 +142,10 @@
 Site definitions
 ^^^^^^^^^^^^^^^^
 Site definitions in the swift.properties files begin with "site".
+
 The second word is the name of the site you are defining. In these examples we
 will define a site called westmere.
+
 The third word is the property.
 
 For example:
@@ -253,7 +252,7 @@
 site.westmere.workdir=/scratch/midway/davidkelly999
 -----
 
-However, it is also simplify this by grouping these properties together with
+However, you can also simplify this by grouping site properties together with
 curly brackets.
 
 ------
@@ -287,8 +286,7 @@
 
 General Swift properties
 ~~~~~~~~~~~~~~~~~~~~~~~~
-Various aspects of the behavior of Swift can be configured through general 
-Swift properties. Below is a list of properties:
+Swift behavior can be configured through general Swift properties. Below is a list of properties:
 
 [options="header"]
 |================