behaviour --> behavior

http://edgeguides.rubyonrails.org/api_documentation_guidelines.html#english
rails · May 28, 2016 · 3b1b957 · 3b1b957
1 parent 1c03057
commit 3b1b957
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/activesupport/lib/active_support/deprecation/behaviors.rb b/activesupport/lib/active_support/deprecation/behaviors.rb
@@ -2,7 +2,7 @@
 
 module ActiveSupport
   # Raised when <tt>ActiveSupport::Deprecation::Behavior#behavior</tt> is set with <tt>:raise</tt>.
-  # You would set <tt>:raise</tt>, as a behaviour to raise errors and proactively report exceptions from deprecations.
+  # You would set <tt>:raise</tt>, as a behavior to raise errors and proactively report exceptions from deprecations.
   class DeprecationException < StandardError
   end
 

diff --git a/railties/lib/rails/application/finisher.rb b/railties/lib/rails/application/finisher.rb
@@ -95,7 +95,7 @@ def self.complete(_state)
 
         elsif config.allow_concurrency == :unsafe
           # Do nothing, even if we know this is dangerous. This is the
-          # historical behaviour for true.
+          # historical behavior for true.
 
         else
           # Default concurrency setting: enabled, but safe