diff options
| author | Xavier Noria <fxn@hashref.com> | 2011-03-07 22:11:47 +0100 |
|---|---|---|
| committer | Xavier Noria <fxn@hashref.com> | 2011-03-07 22:11:47 +0100 |
| commit | 89ecc0a5dc1d06a6bbd2a59edd57187c6eedf8af (patch) | |
| tree | 762f7860f65b7e058016707ef6771b1ff2feb7cb /actionpack | |
| parent | 5968d7a65886d3450698889f685eccaf54749f43 (diff) | |
| parent | f99db5a6a8295b463325accaefe53ab6c89c9982 (diff) | |
| download | rails-89ecc0a5dc1d06a6bbd2a59edd57187c6eedf8af.tar.gz rails-89ecc0a5dc1d06a6bbd2a59edd57187c6eedf8af.tar.bz2 rails-89ecc0a5dc1d06a6bbd2a59edd57187c6eedf8af.zip | |
Merge branch 'master' of git://github.com/lifo/docrails
Diffstat (limited to 'actionpack')
| -rw-r--r-- | actionpack/README.rdoc | 2 | ||||
| -rw-r--r-- | actionpack/lib/action_view/helpers/form_helper.rb | 4 | ||||
| -rw-r--r-- | actionpack/lib/action_view/helpers/prototype_helper.rb | 2 |
3 files changed, 4 insertions, 4 deletions
diff --git a/actionpack/README.rdoc b/actionpack/README.rdoc index a28d78f688..3661d27d51 100644 --- a/actionpack/README.rdoc +++ b/actionpack/README.rdoc @@ -323,7 +323,7 @@ The latest version of Action Pack can be installed with Rubygems: Source code can be downloaded as part of the Rails project on GitHub -* http://github.com/rails/rails/tree/master/actionpack/ +* https://github.com/rails/rails/tree/master/actionpack/ == License diff --git a/actionpack/lib/action_view/helpers/form_helper.rb b/actionpack/lib/action_view/helpers/form_helper.rb index 6df86ae65a..48abf119f1 100644 --- a/actionpack/lib/action_view/helpers/form_helper.rb +++ b/actionpack/lib/action_view/helpers/form_helper.rb @@ -266,8 +266,8 @@ module ActionView # === Removing hidden model id's # # The form_for method automatically includes the model id as a hidden field in the form. - # This is used to maintain the correlation between the form data and it's associated model. - # Some ORM systems do not use id's on nested models so in this case you want to be able + # This is used to maintain the correlation between the form data and its associated model. + # Some ORM systems do not use IDs on nested models so in this case you want to be able # to disable the hidden id. # # In the following example the Post model has many Comments stored within it in a NoSQL database, diff --git a/actionpack/lib/action_view/helpers/prototype_helper.rb b/actionpack/lib/action_view/helpers/prototype_helper.rb index f3a429fcce..b93a072abb 100644 --- a/actionpack/lib/action_view/helpers/prototype_helper.rb +++ b/actionpack/lib/action_view/helpers/prototype_helper.rb @@ -103,7 +103,7 @@ module ActionView :form, :with, :update, :script, :type ]).merge(CALLBACKS) # Returns the JavaScript needed for a remote function. - # See the link_to_remote documentation at http://github.com/rails/prototype_legacy_helper as it takes the same arguments. + # See the link_to_remote documentation at https://github.com/rails/prototype_legacy_helper as it takes the same arguments. # # Example: # # Generates: <select id="options" onchange="new Ajax.Updater('options', |