aboutsummaryrefslogtreecommitdiffstats
path: root/railties/lib
diff options
context:
space:
mode:
Diffstat (limited to 'railties/lib')
-rw-r--r--railties/lib/rails.rb2
-rw-r--r--railties/lib/rails/log_subscriber.rb2
-rw-r--r--railties/lib/rails/log_subscriber/test_helper.rb2
-rw-r--r--railties/lib/rails/railtie.rb2
-rw-r--r--railties/lib/rails/test_unit/testing.rake2
5 files changed, 5 insertions, 5 deletions
diff --git a/railties/lib/rails.rb b/railties/lib/rails.rb
index 7d476574e1..ed66f493e6 100644
--- a/railties/lib/rails.rb
+++ b/railties/lib/rails.rb
@@ -67,7 +67,7 @@ module Rails
def backtrace_cleaner
@@backtrace_cleaner ||= begin
- # Relies on ActiveSupport, so we have to lazy load to postpone definition until AS has been loaded
+ # Relies on Active Support, so we have to lazy load to postpone definition until AS has been loaded
require 'rails/backtrace_cleaner'
Rails::BacktraceCleaner.new
end
diff --git a/railties/lib/rails/log_subscriber.rb b/railties/lib/rails/log_subscriber.rb
index 9a74fee745..a30701d4d5 100644
--- a/railties/lib/rails/log_subscriber.rb
+++ b/railties/lib/rails/log_subscriber.rb
@@ -6,7 +6,7 @@ module Rails
# on initialization with solely purpose of logging. The log subscriber dispatches
# notifications to a regirested object based on its given namespace.
#
- # An example would be ActiveRecord log subscriber responsible for logging queries:
+ # An example would be Active Record log subscriber responsible for logging queries:
#
# module ActiveRecord
# class Railtie
diff --git a/railties/lib/rails/log_subscriber/test_helper.rb b/railties/lib/rails/log_subscriber/test_helper.rb
index 02f5079462..9b7b0738cd 100644
--- a/railties/lib/rails/log_subscriber/test_helper.rb
+++ b/railties/lib/rails/log_subscriber/test_helper.rb
@@ -3,7 +3,7 @@ require 'rails/log_subscriber'
module Rails
class LogSubscriber
# Provides some helpers to deal with testing log subscribers by setting up
- # notifications. Take for instance ActiveRecord subscriber tests:
+ # notifications. Take for instance Active Record subscriber tests:
#
# class SyncLogSubscriberTest < ActiveSupport::TestCase
# include Rails::LogSubscriber::TestHelper
diff --git a/railties/lib/rails/railtie.rb b/railties/lib/rails/railtie.rb
index 1dba6e1538..ad776933f2 100644
--- a/railties/lib/rails/railtie.rb
+++ b/railties/lib/rails/railtie.rb
@@ -10,7 +10,7 @@ module Rails
# Every major component of Rails (Action Mailer, Action Controller,
# Action View, Active Record and Active Resource) are all Railties, so each of
# them is responsible to set their own initialization. This makes, for example,
- # Rails absent of any ActiveRecord hook, allowing any other ORM framework to hook in.
+ # Rails absent of any Active Record hook, allowing any other ORM framework to hook in.
#
# Developing a Rails extension does _not_ require any implementation of
# Railtie, but if you need to interact with the Rails framework during
diff --git a/railties/lib/rails/test_unit/testing.rake b/railties/lib/rails/test_unit/testing.rake
index 4bddf7600a..ecd513c2c8 100644
--- a/railties/lib/rails/test_unit/testing.rake
+++ b/railties/lib/rails/test_unit/testing.rake
@@ -58,7 +58,7 @@ def recent_tests(source_pattern, test_path, touched_since = 10.minutes.ago)
end
-# Recreated here from ActiveSupport because :uncommitted needs it before Rails is available
+# Recreated here from Active Support because :uncommitted needs it before Rails is available
module Kernel
def silence_stderr
old_stderr = STDERR.dup