diff options
author | Sean Griffin <sean@seantheprogrammer.com> | 2016-01-09 18:30:05 -0700 |
---|---|---|
committer | Sean Griffin <sean@seantheprogrammer.com> | 2016-01-09 18:30:05 -0700 |
commit | d8f535eeacde4a8104f113648823122b0475206a (patch) | |
tree | 60b0a0703becc9e0e83ab7b386687eb35f2a3d97 | |
parent | 492d20398681f7d38adac5dc1d3cfb77079e8bcf (diff) | |
parent | 1a43e4c5228c1e0104b307feaaf527205c8a205e (diff) | |
download | rails-d8f535eeacde4a8104f113648823122b0475206a.tar.gz rails-d8f535eeacde4a8104f113648823122b0475206a.tar.bz2 rails-d8f535eeacde4a8104f113648823122b0475206a.zip |
Merge pull request #22992 from akshay-vishnoi/fix-docs
[ci skip] fix typo
-rw-r--r-- | actionview/lib/action_view/helpers/atom_feed_helper.rb | 2 | ||||
-rw-r--r-- | activerecord/lib/active_record/internal_metadata.rb | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/actionview/lib/action_view/helpers/atom_feed_helper.rb b/actionview/lib/action_view/helpers/atom_feed_helper.rb index bb1cdd0f8d..dba70e284e 100644 --- a/actionview/lib/action_view/helpers/atom_feed_helper.rb +++ b/actionview/lib/action_view/helpers/atom_feed_helper.rb @@ -51,7 +51,7 @@ module ActionView # * <tt>:language</tt>: Defaults to "en-US". # * <tt>:root_url</tt>: The HTML alternative that this feed is doubling for. Defaults to / on the current host. # * <tt>:url</tt>: The URL for this feed. Defaults to the current URL. - # * <tt>:id</tt>: The id for this feed. Defaults to "tag:localhost,2005:/posts", in this case. + # * <tt>:id</tt>: The id for this feed. Defaults to "tag:localhost,2005:/posts", in this case. # * <tt>:schema_date</tt>: The date at which the tag scheme for the feed was first used. A good default is the year you # created the feed. See http://feedvalidator.org/docs/error/InvalidTAG.html for more information. If not specified, # 2005 is used (as an "I don't care" value). diff --git a/activerecord/lib/active_record/internal_metadata.rb b/activerecord/lib/active_record/internal_metadata.rb index 7bd66028b6..2e962f4218 100644 --- a/activerecord/lib/active_record/internal_metadata.rb +++ b/activerecord/lib/active_record/internal_metadata.rb @@ -30,7 +30,7 @@ module ActiveRecord ActiveSupport::Deprecation.silence { connection.table_exists?(table_name) } end - # Creates a internal metadata table with columns +key+ and +value+ + # Creates an internal metadata table with columns +key+ and +value+ def create_table unless table_exists? connection.create_table(table_name, primary_key: :key, id: false ) do |t| |