aboutsummaryrefslogtreecommitdiffstats
path: root/guides/source/getting_started.textile
diff options
context:
space:
mode:
authorVijay Dev <vijaydev.cse@gmail.com>2012-04-04 12:42:22 +0530
committerVijay Dev <vijaydev.cse@gmail.com>2012-04-04 12:42:22 +0530
commit02b9c22df8053d71782ae11900d0194f217afc3c (patch)
tree8a581720153199868492fb6ebec7be54573a1861 /guides/source/getting_started.textile
parente25eeed5b873f05f9614ecf6720c0eb636d52b63 (diff)
parentf89f74896b711d5b073289c9e485e3357c032cc8 (diff)
downloadrails-02b9c22df8053d71782ae11900d0194f217afc3c.tar.gz
rails-02b9c22df8053d71782ae11900d0194f217afc3c.tar.bz2
rails-02b9c22df8053d71782ae11900d0194f217afc3c.zip
Merge branch 'master' of github.com:lifo/docrails
Conflicts: guides/source/engines.textile
Diffstat (limited to 'guides/source/getting_started.textile')
-rw-r--r--guides/source/getting_started.textile4
1 files changed, 2 insertions, 2 deletions
diff --git a/guides/source/getting_started.textile b/guides/source/getting_started.textile
index 0a85c84155..d12606c5de 100644
--- a/guides/source/getting_started.textile
+++ b/guides/source/getting_started.textile
@@ -152,11 +152,11 @@ $ rails server
TIP: Compiling CoffeeScript to JavaScript requires a JavaScript runtime and the absence of a runtime will give you an +execjs+ error. Usually Mac OS X and Windows come with a JavaScript runtime installed. Rails adds the +therubyracer+ gem to Gemfile in a commented line for new apps and you can uncomment if you need it. +therubyrhino+ is the recommended runtime for JRuby users and is added by default to Gemfile in apps generated under JRuby. You can investigate about all the supported runtimes at "ExecJS":https://github.com/sstephenson/execjs#readme.
-This will fire up an instance of a webserver built into Ruby called WEBrick by default. To see your application in action, open a browser window and navigate to "http://localhost:3000":http://localhost:3000. You should see Rails' default information page:
+This will fire up an instance of a webserver built into Ruby called WEBrick by default. To see your application in action, open a browser window and navigate to "http://localhost:3000":http://localhost:3000. You should see the Rails default information page:
!images/rails_welcome.png(Welcome Aboard screenshot)!
-TIP: To stop the web server, hit Ctrl+C in the terminal window where it's running. In development mode, Rails does not generally require you to stop the server; changes you make in files will be automatically picked up by the server.
+TIP: To stop the web server, hit Ctrl+C in the terminal window where it's running. In development mode, Rails does not generally require you to restart the server; changes you make in files will be automatically picked up by the server.
The "Welcome Aboard" page is the _smoke test_ for a new Rails application: it makes sure that you have your software configured correctly enough to serve a page. You can also click on the _About your application’s environment_ link to see a summary of your application's environment.