Merge branch 'master' of github.com:lifo/docrails

1 files changed, 6 insertions, 6 deletions

diff --git a/guides/source/getting_started.textile b/guides/source/getting_started.textile
index 1799d55a7a..f25e0c0200 100644
--- a/guides/source/getting_started.textile
+++ b/guides/source/getting_started.textile
@@ -75,7 +75,7 @@ By following along with this guide, you'll create a Rails project called
 (very) simple weblog. Before you can start building the application, you need to
 make sure that you have Rails itself installed.
 
-TIP: The examples below use # and $ to denote terminal prompts. If you are using Windows, your prompt will look something like c:\source_code>
+TIP: The examples below use # and $ to denote superuser and regular user terminal prompts respectively in a UNIX-like OS. If you are using Windows, your prompt will look something like c:\source_code>
 
 h4. Installing Rails
 
@@ -108,7 +108,7 @@ To use this generator, open a terminal, navigate to a directory where you have r
 $ rails new blog
 </shell>
 
-This will create a Rails application called Blog in a directory called blog.
+This will create a Rails application called Blog in a directory called blog and install the gem dependencies that are already mentioned in +Gemfile+ using +bundle install+.
 
 TIP: You can see all of the command line options that the Rails
 application builder accepts by running +rails new -h+.
@@ -138,7 +138,7 @@ application. Most of the work in this tutorial will happen in the +app/+ folder,
 |README.rdoc|This is a brief instruction manual for your application. You should edit this file to tell others what your application does, how to set it up, and so on.|
 |script/|Contains the rails script that starts your app and can contain other scripts you use to deploy or run your application.|
 |test/|Unit tests, fixtures, and other test apparatus. These are covered in "Testing Rails Applications":testing.html|
-|tmp/|Temporary files|
+|tmp/|Temporary files (like cache, pid and session files)|
 |vendor/|A place for all third-party code. In a typical Rails application, this includes Ruby Gems and the Rails source code (if you optionally install it into your project).|
 
 h3. Hello, Rails!
@@ -530,7 +530,7 @@ database columns. In the first line we do just that (remember that
 +params[:post]+ contains the attributes we're interested in). Then,
 +@post.save+ is responsible for saving the model in the database.
 Finally, we redirect the user to the +show+ action,
-wich we'll define later.
+which we'll define later.
 
 TIP: As we'll see later, +@post.save+ returns a boolean indicating
 wherever the model was saved or not.
@@ -640,7 +640,7 @@ The +link_to+ method is one of Rails' built-in view helpers. It creates a
 hyperlink based on text to display and where to go - in this case, to the path
 for posts.
 
-Let's add links to the other views as well, starting with adding this "New Post" link to +app/views/posts/index.html.erb+, placing it above the +<table>+ tag:
+Let's add links to the other views as well, starting with adding this "New Post" link to +app/views/posts/index.html.erb+, placing it above the +&lt;table&gt;+ tag:
 
 <erb>
 <%= link_to 'New post', :action => :new %>
@@ -1159,7 +1159,7 @@ together.
 Here we're using +link_to+ in a different way. We wrap the
 +:action+ and +:id+ attributes in a hash so that we can pass those two keys in
 first as one argument, and then the final two keys as another argument. The +:method+ and +:confirm+
-options are used as html5 attributes so that when the click is linked,
+options are used as HTML5 attributes so that when the link is clicked,
 Rails will first show a confirm dialog to the user, and then submit the
 link with method +delete+. This is done via the JavaScript file +jquery_ujs+
 which is automatically included into your application's layout