aboutsummaryrefslogtreecommitdiffstats
path: root/railties/guides
diff options
context:
space:
mode:
authorAditya Chadha <aditya@sublucid.com>2009-04-27 22:01:36 -0400
committerAditya Chadha <aditya@sublucid.com>2009-04-27 22:01:36 -0400
commit57f031cba2740fd8afc867960220e28a1c333dc5 (patch)
tree4cfa07346a6e134c9e7331960ba3f91d0d962859 /railties/guides
parenteeb12d6ad5c24e65f63029f517e23fc5e02a617c (diff)
parent4df9680a6fe6608e8a82924f52e51a028a8575e5 (diff)
downloadrails-57f031cba2740fd8afc867960220e28a1c333dc5.tar.gz
rails-57f031cba2740fd8afc867960220e28a1c333dc5.tar.bz2
rails-57f031cba2740fd8afc867960220e28a1c333dc5.zip
Merge branch 'master' of git@github.com:lifo/docrails
Diffstat (limited to 'railties/guides')
-rw-r--r--railties/guides/source/caching_with_rails.textile8
-rw-r--r--railties/guides/source/i18n.textile2
-rw-r--r--railties/guides/source/security.textile2
3 files changed, 6 insertions, 6 deletions
diff --git a/railties/guides/source/caching_with_rails.textile b/railties/guides/source/caching_with_rails.textile
index 08377f2456..9658927a36 100644
--- a/railties/guides/source/caching_with_rails.textile
+++ b/railties/guides/source/caching_with_rails.textile
@@ -44,9 +44,9 @@ the products
<ruby>
class ProductsController < ActionController
- caches_page :list
+ caches_page :index
- def list
+ def index
@products = Products.all
end
@@ -76,9 +76,9 @@ example controller like this:
<ruby>
class ProductsController < ActionController
- caches_page :list
+ caches_page :index
- def list
+ def index
@products = Products.all
end
diff --git a/railties/guides/source/i18n.textile b/railties/guides/source/i18n.textile
index c4f178faa0..aa5982af5d 100644
--- a/railties/guides/source/i18n.textile
+++ b/railties/guides/source/i18n.textile
@@ -686,7 +686,7 @@ en:
# will translate User attribute "login" as "Handle"
</ruby>
-Then +User.human_name+ will return "Dude" and +User.human_attribute_name(:login)+ will return "Handle".
+Then +User.human_name+ will return "Dude" and +User.human_attribute_name("login")+ will return "Handle".
h5. Error Message Scopes
diff --git a/railties/guides/source/security.textile b/railties/guides/source/security.textile
index 1b64cc1be7..7b93fa7561 100644
--- a/railties/guides/source/security.textile
+++ b/railties/guides/source/security.textile
@@ -497,7 +497,7 @@ Depending on your web application, there may be more ways to hijack the user's a
h4. CAPTCHAs
--- _A CAPTCHA is a challenge-response test to determine that the response is not generated by a computer. It is often used to protect comment forms from automatic spam bots by asking the user to type the letters of a distorted image. The idea of a negative CAPTCHA is not to ask a user to proof that he is human, but reveal that a robot is a robot._
+-- _A CAPTCHA is a challenge-response test to determine that the response is not generated by a computer. It is often used to protect comment forms from automatic spam bots by asking the user to type the letters of a distorted image. The idea of a negative CAPTCHA is not for a user to prove that he is human, but reveal that a robot is a robot._
But not only spam robots (bots) are a problem, but also automatic login bots. A popular CAPTCHA API is "reCAPTCHA":http://recaptcha.net/ which displays two distorted images of words from old books. It also adds an angled line, rather than a distorted background and high levels of warping on the text as earlier CAPTCHAs did, because the latter were broken. As a bonus, using reCAPTCHA helps to digitize old books. "ReCAPTCHA":http://ambethia.com/recaptcha/ is also a Rails plug-in with the same name as the API.