From b52b36e680713b04a541c4bf989a692975099e6c Mon Sep 17 00:00:00 2001
From: James Miller <james@jk-tech.com>
Date: Tue, 6 Apr 2010 16:52:39 -0700
Subject: More on the new ERB syntax in the guides

---
 railties/guides/source/getting_started.textile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(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 17279146a7..2bbb4dc252 100644
--- a/railties/guides/source/getting_started.textile
+++ b/railties/guides/source/getting_started.textile
@@ -974,7 +974,7 @@ Once we have made the new comment, we send the user back to the +post_path(@post
 <% end %>
 
 <h2>Add a comment:</h2>
-<% form_for([@post, @post.comments.build]) do |f| %>
+<%= form_for([@post, @post.comments.build]) do |f| %>
   <%= f.error_messages %>
 
   <div class="field">
-- 
cgit v1.2.3


From c7e2b6413df8b1c5609f6e5434a2557f2e178cd7 Mon Sep 17 00:00:00 2001
From: Rohit Arondekar <rohit.arondekar@gmail.com>
Date: Sat, 10 Apr 2010 18:28:57 -0700
Subject: Fixed indentation of database.yml examples.

---
 railties/guides/source/getting_started.textile | 26 +++++++++++++-------------
 1 file changed, 13 insertions(+), 13 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 2bbb4dc252..cbace177f9 100644
--- a/railties/guides/source/getting_started.textile
+++ b/railties/guides/source/getting_started.textile
@@ -232,13 +232,13 @@ If you choose to use MySQL instead of the shipped Sqlite3 database, your +config
 
 <yaml>
 development:
-adapter: mysql
-encoding: utf8
-database: blog_development
-pool: 5
-username: root
-password:
-socket: /tmp/mysql.sock
+  adapter: mysql
+  encoding: utf8
+  database: blog_development
+  pool: 5
+  username: root
+  password:
+  socket: /tmp/mysql.sock
 </yaml>
 
 If your development computer's MySQL installation includes a root user with an empty password, this configuration should work for you. Otherwise, change the username and password in the +development+ section as appropriate.
@@ -249,12 +249,12 @@ Finally if you choose to use PostgreSQL, your +config/database.yml+ will be cust
 
 <yaml>
 development:
-adapter: postgresql
-encoding: unicode
-database: blog_development
-pool: 5
-username: blog
-password:
+  adapter: postgresql
+  encoding: unicode
+  database: blog_development
+  pool: 5
+  username: blog
+  password:
 </yaml>
 
 Change the username and password in the +development+ section as appropriate.
-- 
cgit v1.2.3

