From d0a0f806a4bb8072c532ea7b35ad8b7643ac8645 Mon Sep 17 00:00:00 2001
From: Luke Shumaker <shumakl@purdue.edu>
Date: Wed, 23 Apr 2014 15:42:12 -0400
Subject: tidy up the directions in generate.sh

---
 generate.sh | 30 +++++++++++++++---------------
 1 file changed, 15 insertions(+), 15 deletions(-)

diff --git a/generate.sh b/generate.sh
index 7c8f8af..5fe3c74 100755
--- a/generate.sh
+++ b/generate.sh
@@ -4,21 +4,21 @@
 # .rb files to run the website
 
 # To modify it and update the app do the following:
-# 1. take care of uncommitted files
-# 2. `git checkout clean2`
-# 3. `git pull`
-# 4. `git checkout master generate.sh`
-# 5. `git commit -m 'get changes to generate.sh from master`
-# ./generate.sh
-# *6. `./generate.sh`
-# 7. `git commit -m 'run ./generate.sh'`
-# 8. `git checkout master`
-# 9. `git merge clean2`
-# 10. resolve any merge conflicts
-# 11. git push origin clean2
-# 12. `git push origin master`
-# 13. ...?
-# 14. Profit
+#  1. Take care of uncommitted files
+#  2. Run `git checkout clean2`
+#  3. Run `git pull`
+#  4. Make any changes to `generate.sh`, and commit them.
+#     If you have committed the desired changes to 'master', you can do
+#     this simply with:
+#         git checkout master generate.sh
+#         git commit -m 'Get changes to generate.sh from master
+#  5. Run `./generate.sh`
+#  6. Run `git commit -m 'run ./generate.sh'`
+#  7. Run `git checkout master`
+#  8. Run `git merge clean2`
+#  9. Resolve any merge conflicts.
+# 10. Run `git push origin clean2`
+# 11. Run `git push origin master`
 
 set -xe
 
-- 
cgit v1.1-4-g5e80