From 00b4756790b04272da3e1ce821a35cc5a9ab1c77 Mon Sep 17 00:00:00 2001
From: Vijay Dev <vijaydev.cse@gmail.com>
Date: Sun, 12 Jun 2011 16:17:34 +0530
Subject: assets are in app now and not in public

---
 railties/guides/source/getting_started.textile | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

(limited to 'railties/guides/source/getting_started.textile')

diff --git a/railties/guides/source/getting_started.textile b/railties/guides/source/getting_started.textile
index 670979c3c2..7ae3da560e 100644
--- a/railties/guides/source/getting_started.textile
+++ b/railties/guides/source/getting_started.textile
@@ -177,14 +177,14 @@ In any case, Rails will create a folder in your working directory called <tt>blo
 |Gemfile|This file allows you to specify what gem dependencies are needed for your Rails application.|
 |README|This is a brief instruction manual for your application. Use it to tell others what your application does, how to set it up, and so on.|
 |Rakefile|This file contains batch jobs that can be run from the terminal.|
-|app/|Contains the controllers, models, and views for your application. You'll focus on this folder for the remainder of this guide.|
+|app/|Contains the controllers, models, views and assets for your application. You'll focus on this folder for the remainder of this guide.|
 |config/|Configure your application's runtime rules, routes, database, and more.|
 |config.ru|Rack configuration for Rack based servers used to start the application.|
 |db/|Shows your current database schema, as well as the database migrations. You'll learn about migrations shortly.|
 |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 files, stylesheets (CSS), and other static files go.|
+|public/|The only folder seen to the world as-is. Contains the static files and compiled assets.|
 |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|
@@ -290,7 +290,7 @@ This will fire up an instance of the WEBrick web server by default (Rails can al
 
 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.
 
-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.
+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.
 
 h4. Say "Hello", Rails
 
@@ -364,11 +364,11 @@ The scaffold generator will build 15 files in your application, along with some
 |app/views/posts/new.html.erb                 |A view to create a new post|
 |app/views/posts/_form.html.erb               |A partial to control the overall look and feel of the form used in edit and new views|
 |app/helpers/posts_helper.rb                  |Helper functions to be used from the post views|
+|app/assets/stylesheets/scaffold.css.scss     |Cascading style sheet to make the scaffolded views look better|
 |test/unit/post_test.rb                       |Unit testing harness for the posts model|
 |test/functional/posts_controller_test.rb     |Functional testing harness for the posts controller|
 |test/unit/helpers/posts_helper_test.rb       |Unit testing harness for the posts helper|
 |config/routes.rb                             |Edited to include routing information for posts|
-|app/assets/stylesheets/scaffold.css.scss     |Cascading style sheet to make the scaffolded views look better|
 
 h4. Running a Migration
 
-- 
cgit v1.2.3


From d5b1cf592b5e9e4363ff6ee87e33850ae7e9c929 Mon Sep 17 00:00:00 2001
From: Arun Agrawal <arun@fromjaipur.com>
Date: Wed, 15 Jun 2011 07:36:04 +0530
Subject: Adding doc for Sqlite3 database for Jruby platform #jruby

---
 railties/guides/source/getting_started.textile | 10 ++++++++++
 1 file changed, 10 insertions(+)

(limited to 'railties/guides/source/getting_started.textile')

diff --git a/railties/guides/source/getting_started.textile b/railties/guides/source/getting_started.textile
index 7ae3da560e..a3d8178eac 100644
--- a/railties/guides/source/getting_started.textile
+++ b/railties/guides/source/getting_started.textile
@@ -258,6 +258,16 @@ development:
 
 Change the username and password in the +development+ section as appropriate.
 
+h5. Configuring an SQLite3 Database for Jruby Platform
+
+If you choose to use SQLite3 and using Jruby, your +config/database.yml+ will look a little different. Here's the development section:
+
+<yaml>
+development:
+  adapter: jdbcsqlite3
+  database: db/development.sqlite3
+</yaml>
+
 TIP: You don't have to update the database configurations manually. If you had a look at the options of application generator, you have seen that one of them is named <tt>--database</tt>. It lets you choose an adapter for couple of most used relational databases. You can even run the generator repeatedly: <tt>cd .. && rails new blog --database=mysql</tt>. When you confirm the overwriting of the +config/database.yml+ file, your application will be configured for MySQL instead of SQLite.
 
 h4. Creating the Database
-- 
cgit v1.2.3


From aed85375caad9bbbb3a97aa49cec22c5771d5f8b Mon Sep 17 00:00:00 2001
From: Arun Agrawal <arun@fromjaipur.com>
Date: Wed, 15 Jun 2011 07:36:52 +0530
Subject: Added doc for Mysql database with Jruby platform #jruby

---
 railties/guides/source/getting_started.textile | 12 ++++++++++++
 1 file changed, 12 insertions(+)

(limited to 'railties/guides/source/getting_started.textile')

diff --git a/railties/guides/source/getting_started.textile b/railties/guides/source/getting_started.textile
index a3d8178eac..3549dd89ab 100644
--- a/railties/guides/source/getting_started.textile
+++ b/railties/guides/source/getting_started.textile
@@ -268,6 +268,18 @@ development:
   database: db/development.sqlite3
 </yaml>
 
+h5. Configuring an Mysql Database for Jruby Platform
+
+If you choose to use Mysql and using Jruby, your +config/database.yml+ will look a little different. Here's the development section:
+
+<yaml>
+development:
+  adapter: jdbcmysql
+  database: blog_development
+  username: root
+  password:
+</yaml>
+
 TIP: You don't have to update the database configurations manually. If you had a look at the options of application generator, you have seen that one of them is named <tt>--database</tt>. It lets you choose an adapter for couple of most used relational databases. You can even run the generator repeatedly: <tt>cd .. && rails new blog --database=mysql</tt>. When you confirm the overwriting of the +config/database.yml+ file, your application will be configured for MySQL instead of SQLite.
 
 h4. Creating the Database
-- 
cgit v1.2.3


From 900dbca96536f6036a3621bd01b5c5a94386d51e Mon Sep 17 00:00:00 2001
From: Arun Agrawal <arun@fromjaipur.com>
Date: Wed, 15 Jun 2011 07:38:08 +0530
Subject: Added Doc for Postgresql database with Jruby Platform. #jruby

---
 railties/guides/source/getting_started.textile | 13 +++++++++++++
 1 file changed, 13 insertions(+)

(limited to 'railties/guides/source/getting_started.textile')

diff --git a/railties/guides/source/getting_started.textile b/railties/guides/source/getting_started.textile
index 3549dd89ab..459063ad4b 100644
--- a/railties/guides/source/getting_started.textile
+++ b/railties/guides/source/getting_started.textile
@@ -280,6 +280,19 @@ development:
   password:
 </yaml>
 
+h5. Configuring an PostgreSQL Database for Jruby Platform
+
+If you choose to use PostgreSQL and using Jruby, your +config/database.yml+ will look a little different. Here's the development section:
+
+<yaml>
+development:
+  adapter: jdbcpostgresql
+  encoding: unicode
+  database: blog_development
+  username: blog
+  password:
+<yaml>
+
 TIP: You don't have to update the database configurations manually. If you had a look at the options of application generator, you have seen that one of them is named <tt>--database</tt>. It lets you choose an adapter for couple of most used relational databases. You can even run the generator repeatedly: <tt>cd .. && rails new blog --database=mysql</tt>. When you confirm the overwriting of the +config/database.yml+ file, your application will be configured for MySQL instead of SQLite.
 
 h4. Creating the Database
-- 
cgit v1.2.3


From 8f05a2f7aeae0d1185417882d1939c9c0aba1379 Mon Sep 17 00:00:00 2001
From: Arun Agrawal <arun@fromjaipur.com>
Date: Wed, 15 Jun 2011 07:39:24 +0530
Subject: Using "Finally" at the end of database section.

---
 railties/guides/source/getting_started.textile | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'railties/guides/source/getting_started.textile')

diff --git a/railties/guides/source/getting_started.textile b/railties/guides/source/getting_started.textile
index 459063ad4b..a6396c029a 100644
--- a/railties/guides/source/getting_started.textile
+++ b/railties/guides/source/getting_started.textile
@@ -244,7 +244,7 @@ If your development computer's MySQL installation includes a root user with an e
 
 h5. Configuring a PostgreSQL Database
 
-Finally if you choose to use PostgreSQL, your +config/database.yml+ will be customized to use PostgreSQL databases:
+If you choose to use PostgreSQL, your +config/database.yml+ will be customized to use PostgreSQL databases:
 
 <yaml>
 development:
@@ -282,7 +282,7 @@ development:
 
 h5. Configuring an PostgreSQL Database for Jruby Platform
 
-If you choose to use PostgreSQL and using Jruby, your +config/database.yml+ will look a little different. Here's the development section:
+Finally if you choose to use PostgreSQL and using Jruby, your +config/database.yml+ will look a little different. Here's the development section:
 
 <yaml>
 development:
-- 
cgit v1.2.3


From 57ace9868aa076ab2dc9763c0ef1892af0501fc3 Mon Sep 17 00:00:00 2001
From: Arun Agrawal <arun@fromjaipur.com>
Date: Wed, 15 Jun 2011 07:40:49 +0530
Subject: Moving hint down. As required after all database examples.

---
 railties/guides/source/getting_started.textile | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'railties/guides/source/getting_started.textile')

diff --git a/railties/guides/source/getting_started.textile b/railties/guides/source/getting_started.textile
index a6396c029a..7bd300c188 100644
--- a/railties/guides/source/getting_started.textile
+++ b/railties/guides/source/getting_started.textile
@@ -256,8 +256,6 @@ development:
   password:
 </yaml>
 
-Change the username and password in the +development+ section as appropriate.
-
 h5. Configuring an SQLite3 Database for Jruby Platform
 
 If you choose to use SQLite3 and using Jruby, your +config/database.yml+ will look a little different. Here's the development section:
@@ -293,6 +291,8 @@ development:
   password:
 <yaml>
 
+Change the username and password in the +development+ section as appropriate.
+
 TIP: You don't have to update the database configurations manually. If you had a look at the options of application generator, you have seen that one of them is named <tt>--database</tt>. It lets you choose an adapter for couple of most used relational databases. You can even run the generator repeatedly: <tt>cd .. && rails new blog --database=mysql</tt>. When you confirm the overwriting of the +config/database.yml+ file, your application will be configured for MySQL instead of SQLite.
 
 h4. Creating the Database
-- 
cgit v1.2.3


From 0bdeddb97e61dbfde01e928cf577c7bf7cfd0592 Mon Sep 17 00:00:00 2001
From: Arun Agrawal <arun@fromjaipur.com>
Date: Wed, 15 Jun 2011 10:45:05 +0530
Subject: Jruby => JRuby, Mysql => MySQL

---
 railties/guides/source/getting_started.textile | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

(limited to 'railties/guides/source/getting_started.textile')

diff --git a/railties/guides/source/getting_started.textile b/railties/guides/source/getting_started.textile
index 7bd300c188..5e9d37df85 100644
--- a/railties/guides/source/getting_started.textile
+++ b/railties/guides/source/getting_started.textile
@@ -256,9 +256,9 @@ development:
   password:
 </yaml>
 
-h5. Configuring an SQLite3 Database for Jruby Platform
+h5. Configuring an SQLite3 Database for JRuby Platform
 
-If you choose to use SQLite3 and using Jruby, your +config/database.yml+ will look a little different. Here's the development section:
+If you choose to use SQLite3 and using JRuby, your +config/database.yml+ will look a little different. Here's the development section:
 
 <yaml>
 development:
@@ -266,9 +266,9 @@ development:
   database: db/development.sqlite3
 </yaml>
 
-h5. Configuring an Mysql Database for Jruby Platform
+h5. Configuring an MySQL Database for JRuby Platform
 
-If you choose to use Mysql and using Jruby, your +config/database.yml+ will look a little different. Here's the development section:
+If you choose to use MySQL and using JRuby, your +config/database.yml+ will look a little different. Here's the development section:
 
 <yaml>
 development:
@@ -278,9 +278,9 @@ development:
   password:
 </yaml>
 
-h5. Configuring an PostgreSQL Database for Jruby Platform
+h5. Configuring an PostgreSQL Database for JRuby Platform
 
-Finally if you choose to use PostgreSQL and using Jruby, your +config/database.yml+ will look a little different. Here's the development section:
+Finally if you choose to use PostgreSQL and using JRuby, your +config/database.yml+ will look a little different. Here's the development section:
 
 <yaml>
 development:
-- 
cgit v1.2.3


From 045d9d2baeb0e733edcd7b1815132ac2a48b2d5a Mon Sep 17 00:00:00 2001
From: Vijay Dev <vijaydev.cse@gmail.com>
Date: Wed, 15 Jun 2011 11:44:31 +0530
Subject: minor copy edit 0bdeddb

---
 railties/guides/source/getting_started.textile | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'railties/guides/source/getting_started.textile')

diff --git a/railties/guides/source/getting_started.textile b/railties/guides/source/getting_started.textile
index 5e9d37df85..3011f7136b 100644
--- a/railties/guides/source/getting_started.textile
+++ b/railties/guides/source/getting_started.textile
@@ -266,7 +266,7 @@ development:
   database: db/development.sqlite3
 </yaml>
 
-h5. Configuring an MySQL Database for JRuby Platform
+h5. Configuring a MySQL Database for JRuby Platform
 
 If you choose to use MySQL and using JRuby, your +config/database.yml+ will look a little different. Here's the development section:
 
@@ -278,7 +278,7 @@ development:
   password:
 </yaml>
 
-h5. Configuring an PostgreSQL Database for JRuby Platform
+h5. Configuring a PostgreSQL Database for JRuby Platform
 
 Finally if you choose to use PostgreSQL and using JRuby, your +config/database.yml+ will look a little different. Here's the development section:
 
-- 
cgit v1.2.3

