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

tjgrathwell · tjgrathwell · commit 320df1b47e60 · 2017-03-17T22:27:27.000-07:00
diff --git a/sites/en/frontend/frontend.step b/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: 
 
diff --git a/sites/en/frontend/get_a_sticker.step b/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:
diff --git a/sites/en/frontend/tool_installation.step b/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
diff --git a/sites/en/intro-to-rails/_deploying_to_heroku.step b/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'
diff --git a/sites/en/intro-to-rails/getting_started.step b/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
 
diff --git a/sites/en/intro-to-rails/img/atom_add_folder_to_project.png b/sites/en/intro-to-rails/img/atom_add_folder_to_project.png
diff --git a/sites/en/intro-to-rails/img/atom_project_as_folder.png b/sites/en/intro-to-rails/img/atom_project_as_folder.png
diff --git a/sites/en/intro-to-rails/img/sublime_add_folder_to_project.png b/sites/en/intro-to-rails/img/sublime_add_folder_to_project.png
diff --git a/sites/en/intro-to-rails/img/sublime_project_as_folder.png b/sites/en/intro-to-rails/img/sublime_project_as_folder.png
diff --git a/sites/en/intro-to-rails/setting_the_default_page.step b/sites/en/intro-to-rails/setting_the_default_page.step
@@ -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:"
 
diff --git a/sites/en/javascript-snake-game/lesson-1.step b/sites/en/javascript-snake-game/lesson-1.step
@@ -23,8 +23,7 @@ steps do
       When programming, you'll generally want these tools on hand:
 
       * Your browser to see the code running (I recommend Chrome)
-      * A text editor to change the code (I recommend <a
-      href="http://www.sublimetext.com/">Sublime</a>)
+      * A text editor to change the code (Railsbridge recommends <a href="https://atom.io/"> Atom, but you can <a href="/installfest/editors">try a different editor</a>)
       * A javascript console so you can experiment and print out debugging
       messages. This is built into your browser.
 
diff --git a/sites/en/javascript-to-do-list-with-react/javascript-to-do-list-with-react.step b/sites/en/javascript-to-do-list-with-react/javascript-to-do-list-with-react.step
@@ -40,8 +40,7 @@ When programming, you'll generally want these tools on hand:
 
   * An internet connection. We're going to be communicating with other websites using JavaScript.
   * Your browser to see the code running (I recommend Chrome, but any will do!)
-  * A text editor to change the code (I recommend <a
-    href="http://www.sublimetext.com/">Sublime</a>)
+  * A text editor to change the code (Railsbridge recommends <a href="https://atom.io/"> Atom, but you can <a href="/installfest/editors">try a different editor</a>)
   * A javascript console so you can experiment and print out debugging
   messages. This is built into your browser.
 
diff --git a/sites/en/javascript-to-do-list/javascript-to-do-list.step b/sites/en/javascript-to-do-list/javascript-to-do-list.step
@@ -38,8 +38,7 @@ When programming, you'll generally want these tools on hand:
 
   * An internet connection. We're going to be communicating with other websites using JavaScript.
   * Your browser to see the code running (I recommend Chrome, but any will do!)
-  * A text editor to change the code (I recommend <a
-    href="http://www.sublimetext.com/">Sublime</a>)
+  * A text editor to change the code (Railsbridge recommends <a href="https://atom.io/"> Atom, but you can <a href="/installfest/editors">try a different editor</a>)
   * A Javascript console so you can experiment and print out debugging
   messages. This is built into your browser.
 
diff --git a/sites/en/job-board/add_a_new_job_form.step b/sites/en/job-board/add_a_new_job_form.step
@@ -78,6 +78,6 @@ RUBY
 
 message "Now we should see our mostly unstyled form!"
 
-discussion_box "Form HTML", "What HTML did the form helpers produce? Using the web inspector, look through the form code and compare it to the file you've been working on in Sublime."
+discussion_box "Form HTML", "What HTML did the form helpers produce? Using the web inspector, look through the form code and compare it to the file you've been working on in Atom."
 
 next_step "make_the_form_work"
diff --git a/sites/en/job-board/create_a_rails_app.step b/sites/en/job-board/create_a_rails_app.step
@@ -27,15 +27,15 @@ message <<-MARKDOWN
 
   Watch all the files that are created! Wow!
 
-  # Open the project in Sublime Text
+  # Open the project in Atom
 MARKDOWN
 
 console_with_message "Move into the directory for your new Rails app:", "cd job_board"
 
 message <<-MARKDOWN
-  And open the project in Sublime:
+  And open the project in Atom:
 
-  * Open Sublime
+  * Open Atom
   * Under Project, choose "Add Folder to Project"
 
   (You must have at least one window open, so if that option is greyed out, open a window with cmd+n (Mac) or ctl+n (PC))
diff --git a/sites/en/job-board/make_a_jobs_home_page.step b/sites/en/job-board/make_a_jobs_home_page.step
@@ -21,13 +21,13 @@ message <<-MARKDOWN
 
   So it's looking for a route, but can't find one. Let's add one!
 
-  Open up the routes file. It's in the config directory, called `routes.rb`. If you're using Sublime Text 2, you can open it using keyboard shortcuts:
+  Open up the routes file. It's in the config directory, called `routes.rb`. If you're using Atom, you can open it using keyboard shortcuts:
 
    * Hitting cmd + p (on Mac) or ctl + p (on PC)
    * typing in `route`
    * hitting enter
 
-  Magic! (Sublime is using fuzzy search, so you can use the entire file path, or just part of the filename to go to files.)
+  Magic! (Atom is using fuzzy search, so you can use the entire file path, or just part of the filename to go to files.)
 MARKDOWN
 
 source_code_with_message "We're going to need a resource route, which will create EIGHT different routes for us. Add this to line two:", :ruby, "resources :jobs"
diff --git a/sites/en/learn-to-code/learn-to-code.md b/sites/en/learn-to-code/learn-to-code.md
@@ -70,8 +70,7 @@ Follow along at http://docs.railsbridge.org/learn-to-code
   * Ruby version 2.3 preferred, but 1.9+ is fine too
     * run `ruby -v` to check
 * a text editor
-  * e.g. Sublime Text 2
-  * http://www.sublimetext.com/2
+  * we recommend [Atom](https://atom.io/), but you can try a [different editor](/installfest/editors)
 
 * If you do not have both of these things, RAISE YOUR HAND
   * visit http://installfest.railsbridge.org for more instructions
diff --git a/sites/en/learn-to-code/the_command_line.md b/sites/en/learn-to-code/the_command_line.md
@@ -76,8 +76,8 @@
 * a text editor is a program that edits a text file
 * a text editor is *like* a word processor
 * but a text editor is **not** a word processor
-* You probably have *Sublime Text* 
-  * others include *TextMate*, *Notepad++*
+* You probably have *Atom* 
+  * or [another text editor](/installfest/editors)
   * but **NOT** *TextEdit* or *Notepad* or *Microsoft Word*
 
 # Source File
diff --git a/sites/en/ruby/running_programs_from_a_file.step b/sites/en/ruby/running_programs_from_a_file.step
@@ -10,7 +10,7 @@ A text editor is a word processor that saves in plain text format.  This is
 unlike Word, which saves files in a special format that only Word can read.
 
 We may have recommended a particular text editor during the Installfest, such as
-SublimeText.  You can use any editor you like so long as it saves plain text.
+Atom.  You can use any editor you like so long as it saves plain text. 
 
 It'll helpful to keep your text editor running, since you'll be coming back to
 it often.
