From 51d6a59329264bcae979a71a6ef37362bc347687 Mon Sep 17 00:00:00 2001
From: Mohit Natoo <mohitnatoo@gmail.com>
Date: Thu, 21 Apr 2016 00:04:05 +0530
Subject: - [ci skip] `regardless` is usually followed by `of` and not by `if
 .. or not`.

---
 activemodel/lib/active_model/conversion.rb | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/activemodel/lib/active_model/conversion.rb b/activemodel/lib/active_model/conversion.rb
index 9de6ea65be..a932ada45c 100644
--- a/activemodel/lib/active_model/conversion.rb
+++ b/activemodel/lib/active_model/conversion.rb
@@ -40,8 +40,8 @@ module ActiveModel
       self
     end
 
-    # Returns an Array of all key attributes if any is set, regardless if
-    # the object is persisted or not. Returns +nil+ if there are no key attributes.
+    # Returns an Array of all key attributes if any of the attributes is set, whether or not
+    # the object is persisted. Returns +nil+ if there are no key attributes.
     #
     #   class Person
     #     include ActiveModel::Conversion
-- 
cgit v1.2.3