diff --git a/lib/devise.rb b/lib/devise.rb index 379ca048..e5e3f9ed 100644 --- a/lib/devise.rb +++ b/lib/devise.rb @@ -236,12 +236,12 @@ module Devise @@parent_mailer = "ActionMailer::Base" # The router Devise should use to generate routes. Defaults - # to :main_app. Should be overriden by engines in order + # to :main_app. Should be overridden by engines in order # to provide custom routes. mattr_accessor :router_name @@router_name = nil - # Set the omniauth path prefix so it can be overriden when + # Set the omniauth path prefix so it can be overridden when # Devise is used in a mountable engine mattr_accessor :omniauth_path_prefix @@omniauth_path_prefix = nil diff --git a/lib/devise/models/authenticatable.rb b/lib/devise/models/authenticatable.rb index 06a48035..b3dc5a95 100644 --- a/lib/devise/models/authenticatable.rb +++ b/lib/devise/models/authenticatable.rb @@ -127,7 +127,7 @@ module Devise end # This is an internal method called every time Devise needs - # to send a notification/mail. This can be overriden if you + # to send a notification/mail. This can be overridden if you # need to customize the e-mail delivery logic. For instance, # if you are using a queue to deliver e-mails (delayed job, # sidekiq, resque, etc), you must add the delivery to the queue diff --git a/lib/devise/models/confirmable.rb b/lib/devise/models/confirmable.rb index 141cf35e..4a66b578 100644 --- a/lib/devise/models/confirmable.rb +++ b/lib/devise/models/confirmable.rb @@ -152,7 +152,7 @@ module Devise protected # A callback method used to deliver confirmation - # instructions on creation. This can be overriden + # instructions on creation. This can be overridden # in models to map to a nice sign up e-mail. def send_on_create_confirmation_instructions send_confirmation_instructions diff --git a/lib/devise/models/timeoutable.rb b/lib/devise/models/timeoutable.rb index 0ad2825d..bdc2abc5 100644 --- a/lib/devise/models/timeoutable.rb +++ b/lib/devise/models/timeoutable.rb @@ -2,7 +2,7 @@ require 'devise/hooks/timeoutable' module Devise module Models - # Timeoutable takes care of verifyng whether a user session has already + # Timeoutable takes care of verifying whether a user session has already # expired or not. When a session expires after the configured time, the user # will be asked for credentials again, it means, they will be redirected # to the sign in page.