Merge branch 'recommend-atom' of https://github.com/wassimk/docs

Author: tjgrathwell

sites/en/installfest/_install_atom_for_mac.step

@@ -0,0 +1,21 @@
+message "We'll be using the Atom text editor during the workshop, though you are free to use a different editor if you prefer. It must be a plain-text editor, such as vi or TextMate."
+
+important <<-MARKDOWN
+  Microsoft Word and other word processing programs, including TextEdit and Notepad, will not work.
+
+  When in doubt, use Atom.
+  MARKDOWN
+
+step "Download Atom" do
+  message "Download the [Atom installer](https://atom.io/download/mac)."
+end
+
+step 'Save the file to your desktop, if prompted, or go to the Downloads folder' do
+  message "Auto-saved, without a prompt, to downloads should be the default."
+end
+
+step "Drag Atom into your Applications folder." do
+  message "From your save location (default is Downloads). Drag Atom into your Applications folder."
+
+  img src: 'img/install_atom_mac.gif', alt: 'Contents of the downloaded file'
+end

sites/en/installfest/_install_sublime_text_2_for_mac.step

@@ -1,6 +1,6 @@
 message <<-MARKDOWN
 
-Sublime Text 2 isn't compatible with versions of OS X lower than 10.6 so we'll use Textmate (which is still widely used by Rails developers), you are free to use a different editor if you prefer. It must be a plain-text editor.
+Atom isn't compatible with versions of OS X lower than 10.6 so we'll use Textmate (which is still widely used by Rails developers), you are free to use a different editor if you prefer. It must be a plain-text editor.
 
 MARKDOWN
 

sites/en/installfest/_install_textmate.step

@@ -1,12 +1,12 @@
 message <<-MARKDOWN
 
-There are a number of different editors designed for programming. You may already have a favorite editor; if so you can continue using that editor. If you have never used a programming editor, there are a number of good editors available, several of them free of charge. Most Railsbridge instructors use the Sublime editor, so you may want to install Sublime; if you end up asking for help during your class it may be easier for an instructor or TA to help you if you are using Sublime. Here is a list of some of the more widely used editors:
+There are a number of different editors designed for programming. You may already have a favorite editor; if so you can continue using that editor. If you have never used a programming editor, there are a number of good editors available, several of them free of charge. Many RailsBridge instructors use the Atom editor, so you may want to install Atom; if you end up asking for help during your class it may be easier for an instructor or TA to help you if you are using Atom. Here is a list of some of the more widely used editors:
 
+* <a href="https://atom.io/" target="_blank">Atom</a> is a free, open-source editor that can be customized to your liking using its rich ecosystem of add-on packages. A download is available for OS X 10.8+, Windows 7/8, and Ubuntu/RedHat linux.
 * <a href="http://www.sublimetext.com/" target="_blank">Sublime Text</a> is popular with many Ruby and Rails users. You can use it free for evaluation, then must pay to continue using it.
 * <a href="http://komodoide.com/download/" target="_blank">Komodo</a> is a very good free programming editor, that is not used as widely as in the past. It is relatively easy to use.
 * <a href="http://macromates.com/" target="_blank">TextMate</a> is very popular in the Ruby and Rails community. It is not free.
-* <a href="https://atom.io/" target="_blank">Atom</a> 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.
-* <a href="http://aptana.com/products/studio3/download.html" target="_blank">Aptana Studio</a> is a free, full-featured, development IDE (Integrated Development Environment) for Ruby and Rails. It has many powerful features to assist you while you develop your code. You can install Aptana as either a stand-along program or as an <a href="https://www.eclipse.org/downloads/" target="_blank">Eclipse</a> plugin.
+* <a href="http://www.aptana.com/products/studio3/download.html" target="_blank">Aptana Studio</a> is a free, full-featured, development IDE (Integrated Development Environment) for Ruby and Rails. It has many powerful features to assist you while you develop your code. You can install Aptana as either a stand-along program or as an <a href="https://www.eclipse.org/downloads/" target="_blank">Eclipse</a> plugin.
 * <a href="http://www.jetbrains.com/ruby/" target="_blank">RubyMine</a> is used by many companies for their Ruby and Rails software development. Is is also a full-featured IDE, very similar to Aptana. RubyMine is not free, but has a 30-day evaluation period.
 
 There are other programming editors available, but these are among the most popular. Some people use simple non-programming editors, such as NotePad (or WordPad or TextEdit in "plain text" mode). It is fine to use a simple editor, though at some point you should look into using an editor designed for programming as using a programming editor or IDE will improve your programming productivity.

sites/en/installfest/editors.step

@@ -45,7 +45,7 @@ Here's a list of tools you'll be installing. As you go through the workshop, we'
 * **Git**. A revision or source control system. It creates a repository, which is a complete history of your programming changes, so you can undo changes and roll back to previous versions of your work if something has gone wrong.
 * **GitHub**. (optional)
 * **Heroku**. An application server, which hosts your application during development. This allows you to get your application online and interact with it from any browser, instead of just on your local machine.
-* **Sublime Text 2** (or [some other editor](editors)). To write programs in Ruby, you need a text editor to create, edit and save Ruby files.
+* **Atom** (or [some other editor](editors)). To write programs in Ruby, you need a text editor to create, edit and save Ruby files.
 * Various useful "**Ruby gems**". Ruby gems are useful bits of Ruby code that someone has created for reuse, so you don't have to write it yourself. Including...
   * bundler
   * sqlite

sites/en/installfest/img/install_atom_mac.gif

@@ -77,12 +77,12 @@ step "Install Rails" do
   console "gem install rails"
 end
 
-step "Sublime Text 2" do
+step "Atom" do
   message <<-MARKDOWN
 
-If you don't have a preferred code editor, you can install Sublime Text 2. It's available for [32-bit machines](http://c758482.r82.cf2.rackcdn.com/Sublime%20Text%202.0.1.tar.bz2) and [64-bit machines](http://c758482.r82.cf2.rackcdn.com/Sublime%20Text%202.0.1%20x64.tar.bz2)
+If you don't have a preferred code editor, you can install Atom. It's available for 32-bit and 64-bit machines.
 
-Check <http://www.sublimetext.com/2> for the latest version.
+Checkout this section of the [Atom manual](http://flight-manual.atom.io/getting-started/sections/installing-atom/#platform-linux) for the latest instructions.
 MARKDOWN
 
   tip "How many bits?" do

sites/en/installfest/img/install_sublime_text.png

@@ -53,8 +53,8 @@ step "Install Rails" do
   end
 end
 
-step "Install Sublime Text 2" do
-  insert "install_sublime_text_2_for_mac"
+step "Install Atom" do
+  insert "install_atom_for_mac"
 end
 
 verify "successful installation" do

sites/en/installfest/installfest.step

@@ -178,11 +178,11 @@ step "Install a Text Editor" do
 
   message "Notepad is not a good programming editor, but it will work in a pinch."
 
-  important "**When in doubt, use Sublime Text 2.**"
+  important "**When in doubt, use Atom.**"
 
-  message "[Sublime Text 2](http://www.sublimetext.com/2) is a good option, if you don't have one yet."
+  message "[Atom](https://atom.io) is a good option, if you don't have one yet."
 
-  message "Download Sublime Text 2 here: <http://www.sublimetext.com/2>"
+  message "Download Atom here: <https://atom.io/download/windows>"
 end
 
 next_step "create_a_heroku_account"