Commit 7e34f7fc authored by Rémy Coutable's avatar Rémy Coutable

Merge branch 'master' into 'master'

Fix typos and grammar errors

See the general Documentation guidelines http://docs.gitlab.com/ce/development/doc_styleguide.html

See merge request !7451
parents 39ec62ea 123b3ec4
...@@ -44,7 +44,7 @@ listen "127.0.0.1:8080", :tcp_nopush => true ...@@ -44,7 +44,7 @@ listen "127.0.0.1:8080", :tcp_nopush => true
# nuke workers after 30 seconds instead of 60 seconds (the default) # nuke workers after 30 seconds instead of 60 seconds (the default)
# #
# NOTICE: git push over http depends on this value. # NOTICE: git push over http depends on this value.
# If you want be able to push huge amount of data to git repository over http # If you want to be able to push huge amount of data to git repository over http
# you will have to increase this value too. # you will have to increase this value too.
# #
# Example of output if you try to push 1GB repo to GitLab over http. # Example of output if you try to push 1GB repo to GitLab over http.
...@@ -82,7 +82,7 @@ GC.respond_to?(:copy_on_write_friendly=) and ...@@ -82,7 +82,7 @@ GC.respond_to?(:copy_on_write_friendly=) and
check_client_connection false check_client_connection false
before_fork do |server, worker| before_fork do |server, worker|
# the following is highly recomended for Rails + "preload_app true" # the following is highly recommended for Rails + "preload_app true"
# as there's no need for the master process to hold a connection # as there's no need for the master process to hold a connection
defined?(ActiveRecord::Base) and defined?(ActiveRecord::Base) and
ActiveRecord::Base.connection.disconnect! ActiveRecord::Base.connection.disconnect!
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment