Merge branch 'sublime-to-atom' of https://github.com/camillevilla/docs

Author: tjgrathwell

sites/en/frontend/frontend.step

@@ -30,8 +30,8 @@ We're going to be working with:
 * [Chrome](https://www.google.com/chrome)
   (If you're experienced with the developer tools in another browser, that may work too.);
 * The code editor of your choice.
-    * [Sublime Text](http://www.sublimetext.com/) is popular with many Ruby and Rails users. You can use it free for evaluation, then must pay to continue using it.
     * [Atom](https://atom.io/) is a free, open-source editor that can be customized with HTML, CSS, and JavaScript. A download is available for OS X 10.8+, Windows 7/8, and Ubuntu/RedHat linux.
+    * [or install a different editor](/installfest/editors)
 
 Optional tools if you're deploying to GitHub: 
 

sites/en/frontend/get_a_sticker.step

@@ -10,7 +10,7 @@ end
 
 verify "you can open a local webpage in a browser" do
   message <<-MESSAGE
-Create a new file called `sticker.html` by opening it in Sublime Text 2 or your preferred editor.
+Create a new file called `sticker.html` by opening it in Atom or your preferred editor.
 Make a note of where you save it, you'll need to know in a second.
 
 Fill it with the following contents:

sites/en/frontend/tool_installation.step

@@ -46,10 +46,9 @@ steps do
       end
 
       step "Install a text editor" do
-        a "Download and install Sublime Text 2", :href => "http://www.sublimetext.com/2"
-        message "Install Sublime Text 2 by double clicking the file you downloaded, then dragging the Sublime Text 2 icon into the Applications folder. Finish up by clicking the eject icon for Sublime Text 2 in your finder window."
+        a "Download and install Atom", :href => "https://atom.io/"
+        message "Install Atom by double clicking the file you downloaded, then dragging the Atom icon into the Applications folder. Finish up by clicking the eject icon for Atom in your finder window."
         a "or install a different editor", :href => "/installfest/editors"
-        message "FYI: Sublime Text 2 is a paid program that you can download and try out for free. If you keep using Sublime Text 2 after the workshop, you'll need to buy a license. There are other editors available you can find on [our editors page](/installfest/editors)."
       end
     end
   end

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

@@ -8,7 +8,7 @@ step "Edit the Gemfile" do
 
   message "Heroku will run our application slightly differently than our development computer does, which requires us to make a small change to our `Gemfile`."
 
-  message "Open the file called `Gemfile` in Sublime Text, or your preferred editor, and find the line containing:"
+  message "Open the file called `Gemfile` in Atom, or your preferred editor, and find the line containing:"
 
   source_code :ruby, <<-RUBY
 gem 'sqlite3'

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

@@ -60,13 +60,13 @@ Open the suggestotron folder as a project in your text editor.
   tip "Close any files that are already open. They might be from yesterday's `test_app`, and we want to make sure that we're editing files in today's `suggestotron` app."
 
   message <<-MARKDOWN
-In **Sublime Text 2**, you can use the `Project > Add Folder to Project...` menu option:
+In **Atom**, you can use the `Project > Add Project Folder...` menu option:
 
-![Sublime Text Project menu screenshot](img/sublime_add_folder_to_project.png)
+![Atom Project menu screenshot](img/atom_add_folder_to_project.png)
 
-Select your `suggestotron` folder from the file picker that opens. If everything works out Sublime should show the directories of your app in a tree structure on the left:
+Select your `suggestotron` folder from the file picker that opens. If everything works out Atom should show the directories of your app in a tree structure on the left:
 
-![Screenshot of Suggestotron project folder tree in Sublime Text](img/sublime_project_as_folder.png)
+![Screenshot of Suggestotron project folder tree in Atom](img/atom_project_as_folder.png)
     MARKDOWN
   end
 

sites/en/intro-to-rails/img/atom_add_folder_to_project.png

@@ -14,7 +14,7 @@ goals {
 steps {
 
   step "Add a root route" do
-    message "Open the file `config/routes.rb` in an editor (In the InstallFest yesterday, we suggested that you install and use **Sublime Text** as your editor)."
+    message "Open the file `config/routes.rb` in an editor (In the InstallFest yesterday, we suggested that you install and use **Atom** as your editor)."
 
     message "Look for the line `Rails.application.routes.draw` at the beginning of the file, and add the line `root 'topics#index'` after it. When you are done the start of the file should look like this:"