aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--railties/doc/guides/source/association_basics.txt8
-rw-r--r--railties/doc/guides/source/getting_started_with_rails.txt8
2 files changed, 8 insertions, 8 deletions
diff --git a/railties/doc/guides/source/association_basics.txt b/railties/doc/guides/source/association_basics.txt
index e0c9ee35d3..39d92be2d2 100644
--- a/railties/doc/guides/source/association_basics.txt
+++ b/railties/doc/guides/source/association_basics.txt
@@ -354,8 +354,8 @@ In designing a data model, you will sometimes find a model that should have a re
[source, ruby]
-------------------------------------------------------
class Employee < ActiveRecord::Base
- has_many :subordinates, :class_name => "User", :foreign_key => "manager_id"
- belongs_to :manager, :class_name => "User"
+ has_many :subordinates, :class_name => "Employee", :foreign_key => "manager_id"
+ belongs_to :manager, :class_name => "Employee"
end
-------------------------------------------------------
@@ -1336,7 +1336,7 @@ end
===== +:offset+
-The +:offset+ option lets you specify the starting offset for fetching objects via an association. For example, if you set +:offset => 11+, it will skip the first 10 records.
+The +:offset+ option lets you specify the starting offset for fetching objects via an association. For example, if you set +:offset => 11+, it will skip the first 11 records.
===== +:order+
@@ -1704,7 +1704,7 @@ end
===== +:offset+
-The +:offset+ option lets you specify the starting offset for fetching objects via an association. For example, if you set +:offset => 11+, it will skip the first 10 records.
+The +:offset+ option lets you specify the starting offset for fetching objects via an association. For example, if you set +:offset => 11+, it will skip the first 11 records.
===== +:order+
diff --git a/railties/doc/guides/source/getting_started_with_rails.txt b/railties/doc/guides/source/getting_started_with_rails.txt
index 00c6d52eef..9adcc729a3 100644
--- a/railties/doc/guides/source/getting_started_with_rails.txt
+++ b/railties/doc/guides/source/getting_started_with_rails.txt
@@ -1021,7 +1021,7 @@ class CommentsController < ApplicationController
def show
@post = Post.find(params[:post_id])
- @comment = Comment.find(params[:id])
+ @comment = @post.comments.find(params[:id])
end
def new
@@ -1033,7 +1033,7 @@ class CommentsController < ApplicationController
@post = Post.find(params[:post_id])
@comment = @post.comments.build(params[:comment])
if @comment.save
- redirect_to post_comment_path(@post, @comment)
+ redirect_to post_comment_url(@post, @comment)
else
render :action => "new"
end
@@ -1041,14 +1041,14 @@ class CommentsController < ApplicationController
def edit
@post = Post.find(params[:post_id])
- @comment = Comment.find(params[:id])
+ @comment = @post.comments.find(params[:id])
end
def update
@post = Post.find(params[:post_id])
@comment = Comment.find(params[:id])
if @comment.update_attributes(params[:comment])
- redirect_to post_comment_path(@post, @comment)
+ redirect_to post_comment_url(@post, @comment)
else
render :action => "edit"
end