diff options
| author | Xavier Noria <fxn@hashref.com> | 2010-12-24 01:55:12 +0100 |
|---|---|---|
| committer | Xavier Noria <fxn@hashref.com> | 2010-12-24 01:55:12 +0100 |
| commit | 3822673151cd0f53e0e4e671988e35603bf2901c (patch) | |
| tree | f1d54c60d3dfdfc6a1b854dedff649eb39fe4287 /railties/guides/source/getting_started.textile | |
| parent | 0b5222fa45ff8da340ca4f086d735e97b7fb7326 (diff) | |
| parent | d1e95e12b4d56fac58ee680fd2d8d5cdac57b2ac (diff) | |
| download | rails-3822673151cd0f53e0e4e671988e35603bf2901c.tar.gz rails-3822673151cd0f53e0e4e671988e35603bf2901c.tar.bz2 rails-3822673151cd0f53e0e4e671988e35603bf2901c.zip | |
Merge branch 'master' of git://github.com/lifo/docrails
Diffstat (limited to 'railties/guides/source/getting_started.textile')
| -rw-r--r-- | railties/guides/source/getting_started.textile | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/railties/guides/source/getting_started.textile b/railties/guides/source/getting_started.textile index e371632d87..4466c291bb 100644 --- a/railties/guides/source/getting_started.textile +++ b/railties/guides/source/getting_started.textile @@ -184,7 +184,7 @@ In any case, Rails will create a folder in your working directory called <tt>blo |doc/|In-depth documentation for your application.| |lib/|Extended modules for your application (not covered in this guide).| |log/|Application log files.| -|public/|The only folder seen to the world as-is. This is where your images, javascript, stylesheets (CSS), and other static files go.| +|public/|The only folder seen to the world as-is. This is where your images, JavaScript files, stylesheets (CSS), and other static files go.| |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| @@ -227,7 +227,7 @@ NOTE: In this guide we are using an SQLite3 database for data storage, because i h5. Configuring a MySQL Database -If you choose to use MySQL instead of the shipped Sqlite3 database, your +config/database.yml+ will look a little different. Here's the development section: +If you choose to use MySQL instead of the shipped SQLite3 database, your +config/database.yml+ will look a little different. Here's the development section: <yaml> development: |