Merge pull request railsbridge#495 from RailsBridge-CapeTown/more-friendly-less-scary

More friendly less scary

Author: tjgrathwell

sites/en/installfest/create_a_rails_app.step

@@ -32,9 +32,7 @@ step "Create a new Rails app" do
   tip "Shortcut: Just type 'rails s'" do
     message <<-MARKDOWN
       Throughout your Rails programming career you're going to type `rails server` a
-      lot.  In fact, you'll type this so much that DHH and the Rails Core team
-      decided to save you 5 keystrokes per server restart.  Simply typing `rails s`
-      is the same as `rails server`.
+      lot.  Simply typing `rails s` is the same as `rails server`.
     MARKDOWN
   end
 

sites/en/installfest/installfest.step

@@ -1,5 +1,7 @@
 message "This is a set of step-by-step instructions for installing Ruby, Rails, and other important tools on Mac, Windows, or Linux computers. Originally developed for the [Railsbridge Workshops](http://railsbridge.org), it is a community-supported open-source documentation project. If you want to contribute, click the [git] link at the top-right corner of any page and submit your change on GitHub."
 
+message  "**You'll repeat all these steps tomorrow, but more slowly so you can better understand what's going on under the hood.** Today we just want to check that everything's set up and ready for tomorrow."
+
 step "Prepare for the Installfest" do
   message <<-MARKDOWN
 

sites/en/installfest/osx_rvm.step

@@ -1,5 +1,5 @@
 step "Open Terminal" do
-  message "Look for **Terminal.app** inside Applications -> Utilities."
+  message "Look for **Terminal.app** inside Applications -> Utilities, or use Spotlight search (Command + Space Bar) to find it."
 
   message "Add it to your dock; you'll be using it a lot. (To add it to the dock, click and hold the dock icon once Terminal is open. Select options -> keep in dock.)"
 

sites/en/intro-to-rails/_working_effectively_and_efficiently.md

@@ -9,10 +9,10 @@ We highly recommend you do the following:
   * Bring up one window with two tabs
     * One for this content
     * One for interacting with your app.
-* Open your text editor and _do not ever close it_. We're not quitters.
-* Hide all extra applications. Turn off Twitter, IM, and all other distractions.
+* Open your text editor and don't close it.
+* Hide all extra applications. Turn off Twitter, Facebook, IM, and all other distractions.
 
 By minimizing the number of things you interact with, you reduce the
 amount of time spent switching between them and the context lost as
 you work through the lessons. Having 50 tabs open in your web
-browser gets confusing and wastes time.
+browser gets confusing.

sites/en/intro-to-rails/credits_and_next_steps.step

@@ -3,6 +3,8 @@ Guess what?  _**You're done!!!**_ Congratulations, you just \"finished\" your fi
 
 (They're never _really_ ever finished... have fun tweaking it!)
 
+You get another sticker! :)
+
 # Extra Credit
 
 If you got all the way through Suggestotron with some time to spare, here's some extra stuff you can try:

sites/en/intro-to-rails/getting_started.step

@@ -7,12 +7,12 @@ end
 
 steps do
 
-  tip "If you have _any_ problems, contact a TA immediately."
+  tip "If you have any problems, call over a TA."
 
   step do
     insert 'switch_to_home_directory'
   end
-  
+
   step do
     console "mkdir railsbridge"
     message "This command creates a new directory for us to store our project in."

sites/en/intro-to-rails/intro-to-rails.step

@@ -23,7 +23,7 @@ application online you should understand:
 * How to try your Ruby code (IRB)
 * How to go from requirements to a new working Rails application
 * How to get your application online
-* The basic tools a RoR developer uses (source control, editor, console, local server)
+* The basic tools a RoR (Ruby on Rails) developer uses (source control, editor, console, local server)
 
 ### Schedule
 
@@ -76,7 +76,7 @@ Each lesson will look like this:
   <div class="goals">
     <h1>Goal:</h1>
     <p>Description of the current step.
-    <p>Red because big goals are scary.
+    <p>Red because big goals it's important.
   </div>
   <div class="steps">
     <h1>Steps:</h1>
@@ -87,11 +87,11 @@ def code_to_write
   1 + 1
 end</pre>
     </div>
-    <p>Yellow because we've gotten it done, but we have no clue what's going on.
+    <p>Yellow because we've gotten it done, but we're not sure yet what's going on.
   </div>
   <div class="explanation">
     <h1>Explanation</h1>
-    <p>Details of what the steps actually did... spell out the cause and effect.
+    <p>Details of what the steps actually did, explaining the cause and effect.
     <p>Green because we can tie everything together now.
   </div>
 </div>