Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix typos at couple of places. #947

Merged
merged 1 commit into from Apr 7, 2016
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
8 changes: 4 additions & 4 deletions History.txt
Expand Up @@ -980,7 +980,7 @@ be added back in a future date when a java Puma::MiniSSL is added.

=== 1.5.0 / 2012-07-19

* 7 contributers to this release:
* 7 contributors to this release:
* Christian Mayer
* Darío Javier Cravero
* Dirkjan Bussink
Expand Down Expand Up @@ -1028,7 +1028,7 @@ be added back in a future date when a java Puma::MiniSSL is added.
* Only stop the status server if it's started. Fixes #84
* Set RACK_ENV early in cli also. Fixes #78

* 1 new contributer:
* 1 new contributor:
* Jesse Cooke

=== 1.2.2 / 2012-04-28
Expand Down Expand Up @@ -1064,9 +1064,9 @@ be added back in a future date when a java Puma::MiniSSL is added.
* Fix reporting https only on a true SSL connection
* Set the default content type to 'text/plain'. Fixes #63
* Use REUSEADDR. Fixes #60
* Shutdown gracefull on SIGTERM. Fixes #53
* Shutdown gracefully on SIGTERM. Fixes #53

2 new contributers:
2 new contributors:

* Seamus Abshere
* Steve Richert
Expand Down
2 changes: 1 addition & 1 deletion README.md
Expand Up @@ -299,7 +299,7 @@ Because of various platforms not being able to implement certain things, the fol

Process monitors or supervisors will at minimum provide start of Puma
on system boot. Modern process monitors like systemd or upstart
further provide continous monitoring and restarts for increased
further provide continuous monitoring and restarts for increased
reliability in production environments:

* [tools/jungle](https://github.com/puma/puma/tree/master/tools/jungle) for sysvinit (init.d) and upstart
Expand Down
4 changes: 2 additions & 2 deletions docs/nginx.md
Expand Up @@ -34,7 +34,7 @@ server {
proxy_set_header Host $http_host;

# If the file exists as a static file serve it directly without
# running all the other rewite tests on it
# running all the other rewrite tests on it
if (-f $request_filename) {
break;
}
Expand All @@ -50,7 +50,7 @@ server {
# this is the meat of the rack page caching config
# it adds .html to the end of the url and then checks
# the filesystem for that file. If it exists, then we
# rewite the url to have explicit .html on the end
# rewrite the url to have explicit .html on the end
# and then send it on its way to the next config rule.
# if there is no file on the fs then it sets all the
# necessary headers and proxies to our upstream pumas
Expand Down
4 changes: 2 additions & 2 deletions lib/puma/binder.rb
Expand Up @@ -23,7 +23,7 @@ def initialize(events)
"SCRIPT_NAME".freeze => ENV['SCRIPT_NAME'] || "",

# I'd like to set a default CONTENT_TYPE here but some things
# depend on their not being a default set and infering
# depend on their not being a default set and inferring
# it from the content. And so if i set it here, it won't
# infer properly.

Expand Down Expand Up @@ -230,7 +230,7 @@ def parse(binds, logger)
end
end

# Also close any unsued activated sockets
# Also close any unused activated sockets
@activated_sockets.each do |key, sock|
logger.log "* Closing unused activated socket: #{key.join ':'}"
begin
Expand Down
2 changes: 1 addition & 1 deletion lib/puma/launcher.rb
Expand Up @@ -12,7 +12,7 @@
require 'puma/commonlogger'

module Puma
# Puam::Launcher is the single entry point for starting a Puma server based on user
# Puma::Launcher is the single entry point for starting a Puma server based on user
# configuration. It is responsible for taking user supplied arguments and resolving them
# with configuration in `config/puma.rb` or `config/puma/<env>.rb`.
#
Expand Down
2 changes: 1 addition & 1 deletion lib/puma/server.rb
Expand Up @@ -733,7 +733,7 @@ def fetch_status_code(status)
end
private :fetch_status_code

# Given the requset +env+ from +client+ and the partial body +body+
# Given the request +env+ from +client+ and the partial body +body+
# plus a potential Content-Length value +cl+, finish reading
# the body and return it.
#
Expand Down
2 changes: 1 addition & 1 deletion tools/jungle/init.d/puma
Expand Up @@ -357,7 +357,7 @@ case "$1" in
;;
add)
if [ "$#" -lt 3 ]; then
echo "Please, specifiy the app's directory and the user that will run it at least."
echo "Please, specify the app's directory and the user that will run it at least."
echo " Usage: $SCRIPTNAME add /path/to/app user /path/to/app/config/puma.rb /path/to/app/config/log/puma.log"
echo " config and log are optionals."
exit 1
Expand Down