aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRyuta Kamizono <kamipo@gmail.com>2018-04-03 11:58:53 +0900
committerGitHub <noreply@github.com>2018-04-03 11:58:53 +0900
commit41e9a671d6fbb7ed7f98ef1b6b46ee4ac3db27a9 (patch)
treef335b4e15a01681e76c6beee5ab4adf70c6ea654
parent7313f89218ac0977f29862c41d078e59ebdc3870 (diff)
parent0ef8221910da7552ffff72969de7a720b0e28ddf (diff)
downloadrails-41e9a671d6fbb7ed7f98ef1b6b46ee4ac3db27a9.tar.gz
rails-41e9a671d6fbb7ed7f98ef1b6b46ee4ac3db27a9.tar.bz2
rails-41e9a671d6fbb7ed7f98ef1b6b46ee4ac3db27a9.zip
Merge pull request #32427 from tjschuck/small_doc_fixes
Small doc fixes [ci skip]
-rw-r--r--actionmailer/lib/action_mailer/test_helper.rb2
-rw-r--r--actionpack/lib/action_dispatch/routing/url_for.rb2
-rw-r--r--actionview/lib/action_view/helpers/asset_tag_helper.rb2
-rw-r--r--activesupport/lib/active_support/test_case.rb8
4 files changed, 7 insertions, 7 deletions
diff --git a/actionmailer/lib/action_mailer/test_helper.rb b/actionmailer/lib/action_mailer/test_helper.rb
index 3b52a08723..6906472660 100644
--- a/actionmailer/lib/action_mailer/test_helper.rb
+++ b/actionmailer/lib/action_mailer/test_helper.rb
@@ -115,7 +115,7 @@ module ActionMailer
# end
# end
#
- # If `args` is provided as a Hash, a parameterized email is matched.
+ # If +args+ is provided as a Hash, a parameterized email is matched.
#
# def test_parameterized_email
# assert_enqueued_email_with ContactMailer, :welcome,
diff --git a/actionpack/lib/action_dispatch/routing/url_for.rb b/actionpack/lib/action_dispatch/routing/url_for.rb
index 865d10f886..1a31c7dbb8 100644
--- a/actionpack/lib/action_dispatch/routing/url_for.rb
+++ b/actionpack/lib/action_dispatch/routing/url_for.rb
@@ -204,7 +204,7 @@ module ActionDispatch
# end
#
# This maintains the context of the original caller on
- # whether to return a path or full url, e.g:
+ # whether to return a path or full URL, e.g:
#
# threadable_path(threadable) # => "/buckets/1"
# threadable_url(threadable) # => "http://example.com/buckets/1"
diff --git a/actionview/lib/action_view/helpers/asset_tag_helper.rb b/actionview/lib/action_view/helpers/asset_tag_helper.rb
index 76b1c3fb6e..06fa1875fc 100644
--- a/actionview/lib/action_view/helpers/asset_tag_helper.rb
+++ b/actionview/lib/action_view/helpers/asset_tag_helper.rb
@@ -105,7 +105,7 @@ module ActionView
# to "screen", so you must explicitly set it to "all" for the stylesheet(s) to
# apply to all media types.
#
- # If the server supports Early Hints header links for these assets will be
+ # If the server supports Early Hints header links for these assets will be
# automatically pushed.
#
# stylesheet_link_tag "style"
diff --git a/activesupport/lib/active_support/test_case.rb b/activesupport/lib/active_support/test_case.rb
index a698b4e61e..4e42db4500 100644
--- a/activesupport/lib/active_support/test_case.rb
+++ b/activesupport/lib/active_support/test_case.rb
@@ -43,23 +43,23 @@ module ActiveSupport
# Parallelizes the test suite.
#
- # Takes a `workers` argument that controls how many times the process
+ # Takes a +workers+ argument that controls how many times the process
# is forked. For each process a new database will be created suffixed
# with the worker number.
#
# test-database-0
# test-database-1
#
- # If `ENV["PARALLEL_WORKERS"]` is set the workers argument will be ignored
+ # If <tt>ENV["PARALLEL_WORKERS"]</tt> is set the workers argument will be ignored
# and the environment variable will be used instead. This is useful for CI
# environments, or other environments where you may need more workers than
# you do for local testing.
#
- # If the number of workers is set to `1` or fewer, the tests will not be
+ # If the number of workers is set to +1+ or fewer, the tests will not be
# parallelized.
#
# The default parallelization method is to fork processes. If you'd like to
- # use threads instead you can pass `with: :threads` to the `parallelize`
+ # use threads instead you can pass <tt>with: :threads</tt> to the +parallelize+
# method. Note the threaded parallelization does not create multiple
# database and will not work with system tests at this time.
#