diff options
| author | Xavier Noria <fxn@hashref.com> | 2010-08-05 01:09:09 +0200 |
|---|---|---|
| committer | Xavier Noria <fxn@hashref.com> | 2010-08-05 01:09:09 +0200 |
| commit | d191db76e04f065e1b0cff3766c818f9b8e2f43a (patch) | |
| tree | 55988f97c6fb4291ce2d93aa51a11d9c103cf6a3 /railties/guides/source | |
| parent | 589e6977d72b232b6e1af5ef508beddffbcd5f4c (diff) | |
| download | rails-d191db76e04f065e1b0cff3766c818f9b8e2f43a.tar.gz rails-d191db76e04f065e1b0cff3766c818f9b8e2f43a.tar.bz2 rails-d191db76e04f065e1b0cff3766c818f9b8e2f43a.zip | |
standarizes the use of the article "an" for "SQL" and "SQLite"
Diffstat (limited to 'railties/guides/source')
| -rw-r--r-- | railties/guides/source/api_documentation_guidelines.textile | 2 | ||||
| -rw-r--r-- | railties/guides/source/getting_started.textile | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/railties/guides/source/api_documentation_guidelines.textile b/railties/guides/source/api_documentation_guidelines.textile index d9a0d39d9d..9f201de49b 100644 --- a/railties/guides/source/api_documentation_guidelines.textile +++ b/railties/guides/source/api_documentation_guidelines.textile @@ -29,7 +29,7 @@ Documentation has to be concise but comprehensive. Explore and document edge cas The proper names of Rails components have a space in between the words, like "Active Support". +ActiveRecord+ is a Ruby module, whereas Active Record is an ORM. Historically there has been lack of consistency regarding this, but we checked with David when docrails started. All Rails documentation consistently refer to Rails components by their proper name, and if in your next blog post or presentation you remember this tidbit and take it into account that'd be fenomenal :). -Spell names correctly: HTML, MySQL, JavaScript, ERb. +Spell names correctly: HTML, MySQL, JavaScript, ERb. Use the article "an" for "SQL", as in "an SQL statement". Also "an SQLite database". h3. Example Code diff --git a/railties/guides/source/getting_started.textile b/railties/guides/source/getting_started.textile index 12f2bb146b..ffb0310816 100644 --- a/railties/guides/source/getting_started.textile +++ b/railties/guides/source/getting_started.textile @@ -213,9 +213,9 @@ If you open this file in a new Rails application, you'll see a default database * The +test+ environment is used to run automated tests * The +production+ environment is used when you deploy your application for the world to use. -h5. Configuring a SQLite3 Database +h5. Configuring an SQLite3 Database -Rails comes with built-in support for "SQLite3":http://www.sqlite.org, which is a lightweight serverless database application. While a busy production environment may overload SQLite, it works well for development and testing. Rails defaults to using a SQLite database when creating a new project, but you can always change it later. +Rails comes with built-in support for "SQLite3":http://www.sqlite.org, which is a lightweight serverless database application. While a busy production environment may overload SQLite, it works well for development and testing. Rails defaults to using an SQLite database when creating a new project, but you can always change it later. Here's the section of the default configuration file (<tt>config/database.yml</tt>) with connection information for the development environment: |