Skip to content

Commit

Permalink
Fix Typos (#1859)
Browse files Browse the repository at this point in the history
  • Loading branch information
Kitten King authored and nateberkopec committed Jul 22, 2019
1 parent 099a447 commit f89f194
Show file tree
Hide file tree
Showing 4 changed files with 6 additions and 6 deletions.
4 changes: 2 additions & 2 deletions lib/puma/configuration.rb
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ module ConfigDefault
# In this class any "user" specified options take precedence over any
# "file" specified options, take precedence over any "default" options.
#
# User input is prefered over "defaults":
# User input is preferred over "defaults":
# user_options = { foo: "bar" }
# default_options = { foo: "zoo" }
# options = UserFileDefaultOptions.new(user_options, default_options)
Expand All @@ -32,7 +32,7 @@ module ConfigDefault
# puts options.all_of(:foo)
# # => ["bar", "zoo"]
#
# A "file" option can be set. This config will be prefered over "default" options
# A "file" option can be set. This config will be preferred over "default" options
# but will defer to any available "user" specified options.
#
# user_options = { foo: "bar" }
Expand Down
2 changes: 1 addition & 1 deletion lib/puma/reactor.rb
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ module Puma
# A connection comes into a `Puma::Server` instance, it is then passed to a `Puma::Reactor` instance,
# which stores it in an array and waits for any of the connections to be ready for reading.
#
# The waiting/wake up is performed with nio4r, which will use the apropriate backend (libev, Java NIO or
# The waiting/wake up is performed with nio4r, which will use the appropriate backend (libev, Java NIO or
# just plain IO#select). The call to `NIO::Selector#select` will "wake up" and
# return the references to any objects that caused it to "wake". The reactor
# then loops through each of these request objects, and sees if they're complete. If they
Expand Down
4 changes: 2 additions & 2 deletions test/test_integration.rb
Original file line number Diff line number Diff line change
Expand Up @@ -210,7 +210,7 @@ def test_kill_unknown_via_pumactl
skip_on :jruby

# we run ls to get a 'safe' pid to pass off as puma in cli stop
# do not want to accidently kill a valid other process
# do not want to accidentally kill a valid other process
io = IO.popen(windows? ? "dir" : "ls")
safe_pid = io.pid
Process.wait safe_pid
Expand Down Expand Up @@ -276,7 +276,7 @@ def test_sigterm_closes_listeners_on_forked_servers
rescue Errno::ECONNREFUSED
# connection was was never accepted
# it can therefore be re-tried before the
# client receives an empty reponse
# client receives an empty response
next_replies << :connection_refused
end
end
Expand Down
2 changes: 1 addition & 1 deletion tools/jungle/init.d/puma
Original file line number Diff line number Diff line change
Expand Up @@ -398,7 +398,7 @@ case "$1" in
;;
remove)
if [ "$#" -lt 2 ]; then
echo "Please, specifiy the app's directory to remove."
echo "Please, specify the app's directory to remove."
exit 1
else
do_remove $2
Expand Down

0 comments on commit f89f194

Please sign in to comment.