[Swift-commit] r5481 - in branches/release-0.93: docs docs/siteguide docs/siteguide/.cache docs/userguide/.cache etc libexec tests/sites/mcs

[davidk at ci.uchicago.edu]

Author: davidk
Date: 2012-01-03 16:02:39 -0600 (Tue, 03 Jan 2012)
New Revision: 5481

Modified:
   branches/release-0.93/docs/build_docs.sh
   branches/release-0.93/docs/siteguide/.cache/siteguide.txt
   branches/release-0.93/docs/siteguide/siteguide.txt
   branches/release-0.93/docs/userguide/.cache/userguide.txt
   branches/release-0.93/etc/coaster-service.conf
   branches/release-0.93/libexec/release.txt
   branches/release-0.93/tests/sites/mcs/coaster-service.conf
Log:
Various doc updates


Modified: branches/release-0.93/docs/build_docs.sh
===================================================================
--- branches/release-0.93/docs/build_docs.sh	2012-01-03 16:42:59 UTC (rev 5480)
+++ branches/release-0.93/docs/build_docs.sh	2012-01-03 22:02:39 UTC (rev 5481)
@@ -40,7 +40,7 @@
 do
    pushd $directory > /dev/null 2>&1
    FILES=`ls -1 *.txt 2>/dev/null`
-   CONTENTFILES=`/bin/ls -l | grep ^- | awk '{print $9}' | grep -v "\."`
+   CONTENTFILES=`find . -maxdepth 1 -type f ! -iname *.pdf`
    
    for file in $FILES
    do
@@ -53,11 +53,6 @@
           doflag=1
          fi
        done
-      #diff $file .cache/$file >/dev/null 2>/dev/null
-      #if [ $? -ne 0 ]
-      #then
-      # echo "updating cache"
-      # cp $file .cache
        if [ $doflag -eq 1 ]
        then
         echo "updating cache"

Modified: branches/release-0.93/docs/siteguide/.cache/siteguide.txt
===================================================================
--- branches/release-0.93/docs/siteguide/.cache/siteguide.txt	2012-01-03 16:42:59 UTC (rev 5480)
+++ branches/release-0.93/docs/siteguide/.cache/siteguide.txt	2012-01-03 22:02:39 UTC (rev 5481)
@@ -8,14 +8,17 @@
 
 include::prereqs[]
 
-include::pads[]
+include::bag_of_workstations[]
 
+include::beagle[]
+
 include::fusion[]
 
-include::beagle[]
-
 include::futuregrid[]
 
+include::intrepid[]
+
 include::mcs[]
 
-include::intrepid[]
+include::pads[]
+

Modified: branches/release-0.93/docs/siteguide/siteguide.txt
===================================================================
--- branches/release-0.93/docs/siteguide/siteguide.txt	2012-01-03 16:42:59 UTC (rev 5480)
+++ branches/release-0.93/docs/siteguide/siteguide.txt	2012-01-03 22:02:39 UTC (rev 5481)
@@ -8,14 +8,17 @@
 
 include::prereqs[]
 
-include::pads[]
+include::bag_of_workstations[]
 
+include::beagle[]
+
 include::fusion[]
 
-include::beagle[]
-
 include::futuregrid[]
 
+include::intrepid[]
+
 include::mcs[]
 
-include::intrepid[]
+include::pads[]
+

Modified: branches/release-0.93/docs/userguide/.cache/userguide.txt
===================================================================
--- branches/release-0.93/docs/userguide/.cache/userguide.txt	2012-01-03 16:42:59 UTC (rev 5480)
+++ branches/release-0.93/docs/userguide/.cache/userguide.txt	2012-01-03 22:02:39 UTC (rev 5481)
@@ -39,3 +39,5 @@
 include::cdm[]
 
 include::log-processing[]
+
+include::troubleshooting[]

Modified: branches/release-0.93/etc/coaster-service.conf
===================================================================
--- branches/release-0.93/etc/coaster-service.conf	2012-01-03 16:42:59 UTC (rev 5480)
+++ branches/release-0.93/etc/coaster-service.conf	2012-01-03 22:02:39 UTC (rev 5481)
@@ -1,6 +1,3 @@
-# Keep all interesting settings in one place
-# User should modify this to fit environment
-
 # Location of SWIFT. If empty, PATH is searched
 export SWIFT=
 
@@ -31,7 +28,7 @@
 
 # This is the IP address to which the workers will connect
 # If not given, start-coaster-service tries to automatically detect
-#   the IP address of this system via ifconfig
+# the IP address of this system via ifconfig
 # Specify this if you have multiple network interfaces
 export IPADDR=
 
@@ -40,6 +37,3 @@
 
 # Swift information for creating sites.xml
 export WORK=$HOME/swiftwork
-export QUEUE=prod-devel
-export MAXTIME=20
-export NODE=64

Modified: branches/release-0.93/libexec/release.txt
===================================================================
--- branches/release-0.93/libexec/release.txt	2012-01-03 16:42:59 UTC (rev 5480)
+++ branches/release-0.93/libexec/release.txt	2012-01-03 22:02:39 UTC (rev 5481)
@@ -1 +1 @@
-0.93RC5
+0.93RC6

Modified: branches/release-0.93/tests/sites/mcs/coaster-service.conf
===================================================================
--- branches/release-0.93/tests/sites/mcs/coaster-service.conf	2012-01-03 16:42:59 UTC (rev 5480)
+++ branches/release-0.93/tests/sites/mcs/coaster-service.conf	2012-01-03 22:02:39 UTC (rev 5481)
@@ -28,9 +28,3 @@
 # start-coaster-service tries to automatically detect IP address. 
 # Specify here if auto detection is not working correctly
 export IPADDR=
-
-# Below are various settings to give information about how to create sites.xml
-export work=$HOME/work
-export queue=prod-devel
-export maxtime=20
-export nodes=64