aboutsummaryrefslogtreecommitdiffstats
path: root/railties
diff options
context:
space:
mode:
authorbrchristian <brchristian@gmail.com>2016-12-05 16:48:25 -0800
committerGitHub <noreply@github.com>2016-12-05 16:48:25 -0800
commitb6e49a4c0cf20fdd1b74bd0b489f87e90ddd6ad9 (patch)
treef40b5397421c8a65a3b7819cb64003f8a47ea178 /railties
parent5ff0d828f1f39b894a4b6752bddc5b3b96a61ec1 (diff)
downloadrails-b6e49a4c0cf20fdd1b74bd0b489f87e90ddd6ad9.tar.gz
rails-b6e49a4c0cf20fdd1b74bd0b489f87e90ddd6ad9.tar.bz2
rails-b6e49a4c0cf20fdd1b74bd0b489f87e90ddd6ad9.zip
Update puma.rb
Clarifying some of the language/punctuation and removing a couple comma splices.
Diffstat (limited to 'railties')
-rw-r--r--railties/lib/rails/generators/rails/app/templates/config/puma.rb12
1 files changed, 6 insertions, 6 deletions
diff --git a/railties/lib/rails/generators/rails/app/templates/config/puma.rb b/railties/lib/rails/generators/rails/app/templates/config/puma.rb
index 7ee948002e..1e19380dcb 100644
--- a/railties/lib/rails/generators/rails/app/templates/config/puma.rb
+++ b/railties/lib/rails/generators/rails/app/templates/config/puma.rb
@@ -1,13 +1,13 @@
# Puma can serve each request in a thread from an internal thread pool.
-# The `threads` method setting takes two numbers a minimum and maximum.
+# The `threads` method setting takes two numbers: a minimum and maximum.
# Any libraries that use thread pools should be configured to match
# the maximum value specified for Puma. Default is set to 5 threads for minimum
-# and maximum, this matches the default thread size of Active Record.
+# and maximum; this matches the default thread size of Active Record.
#
threads_count = ENV.fetch("RAILS_MAX_THREADS") { 5 }
threads threads_count, threads_count
-# Specifies the `port` that Puma will listen on to receive requests, default is 3000.
+# Specifies the `port` that Puma will listen on to receive requests; default is 3000.
#
port ENV.fetch("PORT") { 3000 }
@@ -42,9 +42,9 @@ environment ENV.fetch("RAILS_ENV") { "development" }
# The code in the `on_worker_boot` will be called if you are using
# clustered mode by specifying a number of `workers`. After each worker
-# process is booted this block will be run, if you are using `preload_app!`
-# option you will want to use this block to reconnect to any threads
-# or connections that may have been created at application boot, Ruby
+# process is booted, this block will be run. If you are using the `preload_app!`
+# option, you will want to use this block to reconnect to any threads
+# or connections that may have been created at application boot, as Ruby
# cannot share connections between processes.
#
# on_worker_boot do