Skip to content

Commit

Permalink
Merge pull request #22 from neeklamy/fix-punctuation
Browse files Browse the repository at this point in the history
Fix punctuation
  • Loading branch information
mattangriffel committed Dec 8, 2015
2 parents 4712135 + ff54d88 commit b5fc167
Show file tree
Hide file tree
Showing 11 changed files with 33 additions and 35 deletions.
2 changes: 1 addition & 1 deletion app/views/install_steps/choose_os_version.html.erb
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
<h1>What version of Mac OS do you have?</h1>
<ol>
<li>
<p>Click on the &#63743; <strong>Apple</strong> logo (at the top left of your screen)<br>and select '<strong>About This Mac</strong>'</p>
<p>Click on the &#63743; <strong>Apple</strong> logo (at the top left of your screen)<br>and select <strong>About This Mac</strong></p>
<div class="text-center"><%= image_tag "mac_steps/select_about_this_mac.png" %></div>
<p><small>Your version number is shown under <strong>OS X</strong></small></p>
<div class="text-center"><%= image_tag "mac_steps/about_this_mac.png" %></div>
Expand Down
2 changes: 1 addition & 1 deletion app/views/install_steps/configure_git.html.erb
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@
Git is version control software. You will use Git to track and manage your coding history as well as get into the programming community as a whole.
</p>
<p>
To put it another way, Git will allow you to make revisions of your work as well as others... this way you can feel assured that if you make an awful mistake to fix or have a solution for someone else, Git will be the best way to do it!
To put it another way, Git will allow you to make revisions of your work as well as others this way you can feel assured that if you make an awful mistake to fix or have a solution for someone else, Git will be the best way to do it!
</p>

<div class="row">
Expand Down
18 changes: 9 additions & 9 deletions app/views/install_steps/create_your_first_app.html.erb
Original file line number Diff line number Diff line change
Expand Up @@ -15,12 +15,12 @@
</li>

<div class="row">
<div class="col-sm-6 note">NOTE: We do this so that when we create a new application, we'll be able to see it in our desktop and access it more easily.</div>
<div class="col-sm-6 note">NOTE: We do this so that when we create a new application, well be able to see it in our desktop and access it more easily.</div>
<div class="col-sm-6"><%= image_tag "sam.png" %></div>
</div>

<li>
You can doublecheck that you did this correctly with the command <strong>pwd</strong> <i>(print working directory)</i>, which will tell you what folder you're currently in.
You can double check that you did this correctly with the command <strong>pwd</strong> <i>(print working directory)</i>, which will tell you what folder youre currently in.
<pre><code>$ pwd</code></pre>
</li>

Expand All @@ -30,32 +30,32 @@
</li>

<li>
Now we're going to run a command that will create a new rails application
Now were going to run a command that will create a new rails application
<pre><code>$ rails new sample_app</code></pre>
</li>

<li>We just created a new app! Let's see it live.</li>
<li>We just created a new app! Lets see it live.</li>
</ol>
</section>

<%= render 'layouts/step_navigation' %>

<div id="trouble" class="collapse out note">
<h4>#1 - My error is about "Uglifier"</h4>
<p>If your error resembles something like...</p>
<h4>#1 - My error is about Uglifier</h4>
<p>If your error resembles something like</p>
<pre><code>#ERROR MESSAGE:
Could not find gem 'uglifier <>=1.0.3> x85-mingw32' in the gems available on this machine
Run 'bundle install' to install missing gems</code></pre>
<p>Try running...</p>
<p>Try running</p>
<pre><code>$ gem install uglifier</code></pre>
<hr>

<h4>#2 - My error is about "sdoc"</h4>
<p>If your error resembles something like...</p>
<p>If your error resembles something like</p>
<pre><code>#ERROR MESSAGE:
Could not find gem 'sdoc (>= 0) ruby' in the gems available on this machine
Run 'bundle install' to install missing gems.</code></pre>
<p>Try running...</p>
<p>Try running</p>
<pre><code>$ gem install sdoc</code></pre>

<hr><br>
Expand Down
18 changes: 9 additions & 9 deletions app/views/install_steps/find_the_command_line.html.erb
Original file line number Diff line number Diff line change
@@ -1,37 +1,37 @@
<section class="instructions">
<div class="text-center">
<small>Now we're going to explore something called:</small>
<small>Now were going to explore something called:</small>
<h1>The Command Line</h1>
</div>

<p>The command line is a place on your computer where you can type in executable code <i>(You will see in a moment)</i></p>
<p>After you type them in, you'll hit <strong>Enter</strong> to run the commands</p>
<p>After you type them in, youll hit <strong>Enter</strong> to run the commands</p>
<p style="text-align: center; color: rgb(154, 155, 160);">This is where magic happens</p>
<hr>

<ol>
<li>
<p>On a Mac, we can find the Terminal by opening Spotlight and type '<strong>Terminal</strong>' <i><br>(the little <i class="icon-search"></i> icon on the top right corner of your Mac)</i></p>
<p>On a Mac, we can find the Terminal by opening Spotlight and type <strong>Terminal</strong> <i><br>(the little <i class="icon-search"></i> icon on the top right corner of your Mac)</i></p>
<div class="text-center"><%= image_tag "mac_steps/spotlight_search_for_terminal.png" %></div>
</li>

<li>
<p>Alternatively, you could look in your '<strong>Applications</strong>' folder
<br />It's under '<strong>Applications -> Utilities -> Terminal</strong>')</p>
<p>Alternatively, you could look in your <strong>Applications</strong> folder
<br>Its under <strong>Applications Utilities Terminal</strong>)</p>
<div class="text-center"><%= image_tag "mac_steps/applications_utilities_terminal.png" %></div>
</li>

<li>
<p>Once you open it, your Terminal should look something like this <i>(don't freak out)</i>:</p>
<p>Once you open it, your Terminal should look something like this <i>(dont freak out)</i>:</p>
<div class="text-center"><%= image_tag "mac_steps/terminal.png" %></div>
</li>

<div class="row">
<div class="col-sm-6 note text-center">
PRO TIP:
Add Terminal to your dock; you'll be using it a lot.
Add Terminal to your Dock; youll be using it a lot.
Click &amp; Hold the Terminal dock icon and select
'<strong>Options > Keep in Dock</strong>'
<strong>Options > Keep in Dock</strong>
</div>

<div class="col-sm-6">
Expand All @@ -40,7 +40,7 @@
</div>

<li>
<p>Now try typing the following command and hitting '<strong>Enter</strong>'</p>
<p>Now try typing the following command and hitting <strong>Enter</strong></p>

<pre><code>$ jot - 1 25</code></pre>

Expand Down
4 changes: 2 additions & 2 deletions app/views/install_steps/install_git.html.erb
Original file line number Diff line number Diff line change
Expand Up @@ -4,13 +4,13 @@
<li>
In your terminal type
</li>
<pre><code>brew install git </code></pre>
<pre><code>brew install git</code></pre>
<li>
To verify your installation, in your terminal type
</li>
<pre><code>git --version</code></pre>
<p>Approximate expected result</p>
<pre><code>git version 1.8.x.x</code></pre>
<pre><code>git version 2.x.x</code></pre>
</ol>
</section>

Expand Down
6 changes: 3 additions & 3 deletions app/views/install_steps/install_homebrew.html.erb
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@

<div class="row">
<div class="col-sm-12 note">
<b>Note:</b> If this doesn’t work, <%= link_to "go here", "https://github.com/mxcl/homebrew/wiki/installation" %> and follow the instructions
<b>Note:</b> If this doesn’t work, <%= link_to "go here", "https://github.com/Homebrew/homebrew/blob/master/share/doc/homebrew/Installation.md" %> and follow the instructions
</div>
</div>
<li>
Expand All @@ -25,11 +25,11 @@
<div class="row">
<div class="col-sm-12 note">
<p>
If it returns: <br /><span style="color: black;">“No such file or directory - /usr/local/Cellar”</span><br />You should type and enter:
If it returns:<br><span style="color: black;">“No such file or directory - /usr/local/Cellar”</span><br>You should type and enter:
</p>
<pre style="margin-bottom: 3em"><code>cd
sudo mkdir /usr/local/Cellar</code></pre>
<p>Enter your login password and press enter <i>(you won't be able to see it)</i></p>
<p>Enter your login password and press enter <i>(you wont be able to see it)</i></p>
</div>
</div>
</ol>
Expand Down
4 changes: 2 additions & 2 deletions app/views/install_steps/install_xcode.html.erb
Original file line number Diff line number Diff line change
Expand Up @@ -14,10 +14,10 @@
</div>
</li>

<li>Open Xcode. In the menu bar click on "Xcode" then select "Preferences"
<li>Open Xcode. In the menu bar click on Xcode then select Preferences
<%= image_tag "xcode_preferences.png", class: "list-image" %>
</li>
<li> Click the "Locations” tab and verify your version below <small>
<li> Click the Locations” tab and verify your version below <small>
<%= image_tag "xcode_command_line_tool.png", class: "list-image" %>
</li>
</ol>
Expand Down
6 changes: 3 additions & 3 deletions app/views/install_steps/see_it_live.html.erb
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
<pre><code>$ cd ~/Desktop/sample_app</code></pre>
</li>
<li>
We're going to start a little server so we can see the application in a browser
Were going to start a little server so we can see the application in a browser
<pre><code>$ rails server</code></pre>
</li>
<li>
Expand All @@ -29,7 +29,7 @@

<div class="row">
<div class="col-sm-6 note">
PRO TIP: <br>Whenever you run <pre><code>$ rails server</pre></code> ...you'll no longer be able to type anything in that command line window (because that window is now busy running your site). <br><br>Leaving us with two options: <br>1) When you're coding: let this window run the server, and open another command line window to write new commands<br>2) When you're finished: close the server by hitting '<strong>Control + C</strong>' and give yourself a pat on the back for being awesome.
PRO TIP:<br>Whenever you run <pre><code>$ rails server</pre></code> youll no longer be able to type anything in that command line window (because that window is now busy running your site).<br><br>Leaving us with two options:<br>1) When youre coding: let this window run the server, and open another command line window to write new commands<br>2) When youre finished: close the server by hitting <strong>Control + C</strong> and give yourself a pat on the back for being awesome.
</div>
<div class="col-sm-6">
<%= image_tag "sam.png", class: 'sam' %>
Expand All @@ -41,7 +41,7 @@
<%= render 'layouts/step_navigation' %>

<div id="trouble" class="collapse out note">
<h4>#1 - My error is about: "node.js", "therubyrhino", "therubyracer" or a Java Runtime Error</h4>
<h4>#1 - My error is about: node.js”, “therubyrhino”, “therubyracer or a Java Runtime Error</h4>
<p>a) If your error resembles any of those words you may need to <a href="http://nodejs.org/download/" target="_blank" class="btn btn-info">DOWNLOAD NODE.JS</a></p>
<p>b) Restart your computer after you install Node.js</p>
<hr><br>
Expand Down
2 changes: 1 addition & 1 deletion app/views/install_steps/sublime_text.html.erb
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<section class="instructions">
<h1>Install Sublime Text</h1>
<p>As a developer, you’ll be using your text editor quite often. A text editor is a simple program that lets you write text <i>(and by text we mean... code)</i>. Our preferred text editor is <strong>Sublime Text</strong>.</p>
<p>As a developer, you’ll be using your text editor quite often. A text editor is a simple program that lets you write text <i>(and by text we mean code)</i>. Our preferred text editor is <strong>Sublime Text</strong>.</p>
<hr>

<ol>
Expand Down
4 changes: 1 addition & 3 deletions app/views/main/congratulations.html.erb
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
<h1>Congratulations!</h1>
<div class="text-center"><%= image_tag "mac_steps/congrats_sam.png", class: "congrats-sam", style: 'display:inline;' %></div>

<h2>What's next?</h2>
<h2>Whats next?</h2>
<ol>
<li>
<%= image_tag "omr_logo.png", style: 'display:inline; padding: 0;' %> <strong><%= link_to "One Month Rails", "http://onemonthrails.com/?utm_source=installrails", target: "_blank" %></strong> helps you build your first app in less than one month!
Expand All @@ -17,8 +17,6 @@

<strong><h3>Other Resources We Love for Learning Ruby and Rails:</h3></strong>



<div class="row">
<div class="col-sm-6">
<ul>
Expand Down
2 changes: 1 addition & 1 deletion app/views/main/index.html.erb
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
<div class="col-lg-12">

<div class="header-description">
<h1>Install Rails:<br /><span style="font-size: 45px;"> A step-by-step guide</span></h1>
<h1>Install Rails:<br><span style="font-size: 45px;"> A step-by-step guide</span></h1>
<%= link_to "Start now", install_steps_path, class: "header-btn" %>
</div><!-- /header-description -->

Expand Down

0 comments on commit b5fc167

Please sign in to comment.