Blog

From 59198ecb657763b4fbaee84b47a74ebb99b3e54c Mon Sep 17 00:00:00 2001 From: Vijay Dev Date: Thu, 8 Sep 2011 18:25:43 +0530 Subject: some copy-edits --- railties/guides/source/asset_pipeline.textile | 4 ++-- railties/guides/source/getting_started.textile | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/railties/guides/source/asset_pipeline.textile b/railties/guides/source/asset_pipeline.textile index bad1c08747..ba48a2196b 100644 --- a/railties/guides/source/asset_pipeline.textile +++ b/railties/guides/source/asset_pipeline.textile @@ -415,12 +415,12 @@ For Apache: RewriteCond %{REQUEST_FILENAME}.gz -s RewriteRule ^(.+) $1.gz [L] - + # without these, Content-Type will be "application/x-gzip" ForceType text/css - + ForceType text/javascript diff --git a/railties/guides/source/getting_started.textile b/railties/guides/source/getting_started.textile index f4a61482c6..acd665983a 100644 --- a/railties/guides/source/getting_started.textile +++ b/railties/guides/source/getting_started.textile @@ -549,9 +549,9 @@ folders, and edit config/routes.rb. Here's a quick overview of what it |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/scaffolds.css.scss |Cascading style sheet to make the scaffolded views look better| -|app/assets/stylesheets/posts.css.scss |Cascading style sheet for the posts controller| -|app/assets/javascripts/posts.js.coffee |CoffeeScript for the posts controller| +|app/assets/stylesheets/scaffolds.css.scss |Cascading style sheet to make the scaffolded views look better| +|app/assets/stylesheets/posts.css.scss |Cascading style sheet for the posts controller| +|app/assets/javascripts/posts.js.coffee |CoffeeScript for the posts controller| |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| -- cgit v1.2.3 From 37f1cf0a8b9ce1bc9c25dc2bec99e3edcdb8b254 Mon Sep 17 00:00:00 2001 From: Jeff Dutil Date: Thu, 8 Sep 2011 22:53:38 -0400 Subject: Travis-ci build image should link to the rails travis ci build page rather than to the image. --- README.rdoc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.rdoc b/README.rdoc index ac43962d97..0def4e5d12 100644 --- a/README.rdoc +++ b/README.rdoc @@ -67,7 +67,7 @@ We encourage you to contribute to Ruby on Rails! Please check out the {Contribut guide}[http://edgeguides.rubyonrails.org/contributing_to_ruby_on_rails.html] for guidelines about how to proceed. {Join us}[http://contributors.rubyonrails.org]! -== Travis Build Status {

}[https://secure.travis-ci.org/rails/rails.png] +== Travis Build Status {

}[http://travis-ci.org/rails/rails] == License -- cgit v1.2.3 From 8a0876478d1f0875a5a295bbce6b7925907dc60e Mon Sep 17 00:00:00 2001 From: Michael P Laing Date: Sat, 10 Sep 2011 16:38:50 +0200 Subject: Update to conform to rails 3.1 generated caode --- railties/guides/source/getting_started.textile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/railties/guides/source/getting_started.textile b/railties/guides/source/getting_started.textile index acd665983a..1587b20c18 100644 --- a/railties/guides/source/getting_started.textile +++ b/railties/guides/source/getting_started.textile @@ -821,8 +821,8 @@ this layout in your editor and modify the +body+ tag: Blog - <%= stylesheet_link_tag :all %> - <%= javascript_include_tag :defaults %> + <%= stylesheet_link_tag "application" %> + <%= javascript_include_tag "application" %> <%= csrf_meta_tags %> -- cgit v1.2.3 From 465752ba6bf2cc124dc78f4a9eb7a1d74dd8c868 Mon Sep 17 00:00:00 2001 From: Erik Ostrom Date: Sat, 10 Sep 2011 13:39:25 -0500 Subject: Fixed syntax error in "block setting of attributes" example. --- activerecord/CHANGELOG | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/activerecord/CHANGELOG b/activerecord/CHANGELOG index 143de81925..acdb40592f 100644 --- a/activerecord/CHANGELOG +++ b/activerecord/CHANGELOG @@ -62,7 +62,7 @@ a URI that specifies the connection configuration. For example: has_one :account end - user.build_account{ |a| a.credit_limit => 100.0 } + user.build_account{ |a| a.credit_limit = 100.0 } The block is called after the instance has been initialized. [Andrew White] -- cgit v1.2.3 From 41d179b7d67f01234b28fd6e4f6dc9cf8ef2c8db Mon Sep 17 00:00:00 2001 From: Ray Baxter Date: Sat, 10 Sep 2011 13:50:33 -0700 Subject: Revert "Fixed syntax error in "block setting of attributes" example." Code and CHANGELOGS can't be edited in docrails. You'll need to make this change in rails/rails. This reverts commit 465752ba6bf2cc124dc78f4a9eb7a1d74dd8c868. --- activerecord/CHANGELOG | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/activerecord/CHANGELOG b/activerecord/CHANGELOG index acdb40592f..143de81925 100644 --- a/activerecord/CHANGELOG +++ b/activerecord/CHANGELOG @@ -62,7 +62,7 @@ a URI that specifies the connection configuration. For example: has_one :account end - user.build_account{ |a| a.credit_limit = 100.0 } + user.build_account{ |a| a.credit_limit => 100.0 } The block is called after the instance has been initialized. [Andrew White] -- cgit v1.2.3 From 28e32598b9a99a2e5794e1ee8882ca42746ae513 Mon Sep 17 00:00:00 2001 From: Andy Lindeman Date: Sat, 10 Sep 2011 21:49:13 -0400 Subject: Fix for :instance_reader => false code example --- railties/guides/source/active_support_core_extensions.textile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/railties/guides/source/active_support_core_extensions.textile b/railties/guides/source/active_support_core_extensions.textile index b2436a2e68..9e2fe2c694 100644 --- a/railties/guides/source/active_support_core_extensions.textile +++ b/railties/guides/source/active_support_core_extensions.textile @@ -1020,7 +1020,7 @@ class A class_attribute :x, :instance_reader => false end -A.x = 1 # NoMethodError +A.new.x = 1 # NoMethodError For convenience +class_attribute+ also defines an instance predicate which is the double negation of what the instance reader returns. In the examples above it would be called +x?+. -- cgit v1.2.3 From 22a4f7e8bd3c70067824945881a61820aad7aff6 Mon Sep 17 00:00:00 2001 From: Emin Hasanov Date: Sun, 11 Sep 2011 14:18:07 +0600 Subject: Fix typo in "must-revalidate" header name --- railties/guides/source/asset_pipeline.textile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/railties/guides/source/asset_pipeline.textile b/railties/guides/source/asset_pipeline.textile index ba48a2196b..211b02b94b 100644 --- a/railties/guides/source/asset_pipeline.textile +++ b/railties/guides/source/asset_pipeline.textile @@ -282,7 +282,7 @@ When debug mode is off Sprockets will concatenate and run the necessary preproce -Assets are compiled and cached on the first request after the server is started. Sprockets sets a +must-validate+ Cache-Control HTTP header to reduce request overhead on subsequent requests -- on these the browser gets a 304 (not-modified) response. +Assets are compiled and cached on the first request after the server is started. Sprockets sets a +must-revalidate+ Cache-Control HTTP header to reduce request overhead on subsequent requests -- on these the browser gets a 304 (not-modified) response. If any of the files in the manifest have changed between requests, the server responds with a new compiled file. -- cgit v1.2.3