aboutsummaryrefslogtreecommitdiffstats
path: root/activerecord/lib/active_record
diff options
context:
space:
mode:
authorYves Senn <yves.senn@gmail.com>2015-01-10 13:49:34 +0100
committerYves Senn <yves.senn@gmail.com>2015-01-10 13:49:34 +0100
commite47d6a31a57ae4f5ca1ce0fdfe1e18e7ac069e43 (patch)
tree4dacf28e3df026865fa9f125922229011b9ba0f8 /activerecord/lib/active_record
parenta7621d7d530e47a783f4a9652c20dae9eaf70d66 (diff)
parenta4139a167421e2c8ca3b84a333d337006282e928 (diff)
downloadrails-e47d6a31a57ae4f5ca1ce0fdfe1e18e7ac069e43.tar.gz
rails-e47d6a31a57ae4f5ca1ce0fdfe1e18e7ac069e43.tar.bz2
rails-e47d6a31a57ae4f5ca1ce0fdfe1e18e7ac069e43.zip
Merge pull request #18433 from koraktor/patch-1
Fix typo in PostresSQLAdapter's documentation [ci skip]
Diffstat (limited to 'activerecord/lib/active_record')
-rw-r--r--activerecord/lib/active_record/connection_adapters/postgresql_adapter.rb2
1 files changed, 1 insertions, 1 deletions
diff --git a/activerecord/lib/active_record/connection_adapters/postgresql_adapter.rb b/activerecord/lib/active_record/connection_adapters/postgresql_adapter.rb
index 5b070cae4f..f4f9747359 100644
--- a/activerecord/lib/active_record/connection_adapters/postgresql_adapter.rb
+++ b/activerecord/lib/active_record/connection_adapters/postgresql_adapter.rb
@@ -64,7 +64,7 @@ module ActiveRecord
# <tt>SET client_min_messages TO <min_messages></tt> call on the connection.
# * <tt>:variables</tt> - An optional hash of additional parameters that
# will be used in <tt>SET SESSION key = val</tt> calls on the connection.
- # * <tt>:insert_returning</tt> - An optional boolean to control the use or <tt>RETURNING</tt> for <tt>INSERT</tt> statements
+ # * <tt>:insert_returning</tt> - An optional boolean to control the use of <tt>RETURNING</tt> for <tt>INSERT</tt> statements
# defaults to true.
#
# Any further options are used as connection parameters to libpq. See