Merge branch 'master' of github.com:jruby/warbler

README.rdoc

@@ -138,13 +138,10 @@ found in the +Gemfile+ and will refuse to include it in the archive.
 Rails applications are detected automatically and configured appropriately.
 The following items are set up for you:
 
-* Your application runs in the +production+ environment by default.
-Change it in <tt>config/warble.rb</tt> (see below).
+* Your application runs in the +production+ environment by default. Change it in <tt>config/warble.rb</tt> (see below).
 * The Rails gem is packaged if you haven't vendored Rails (Rails <= 2.x).
-* Other gems configured in Rails.configuration.gems are packaged
-(Rails 2.1 - 2.3)
-* Multi-thread-safe execution (as introduced in Rails 2.2) is detected
-and runtime pooling is disabled.
+* Other gems configured in Rails.configuration.gems are packaged (Rails 2.1 - 2.3)
+* Multi-thread-safe execution (as introduced in Rails 2.2) is detected and runtime pooling is disabled.
 
 === Merb applications
 

warble.rb

@@ -134,6 +134,8 @@
   # Control the pool of Rails runtimes. Leaving unspecified means
   # the pool will grow as needed to service requests. It is recommended
   # that you fix these values when running a production server!
+  # If you're using threadsafe! mode, you probably don't want to set these values,
+  # since 1 runtime(default for threadsafe mode) will be enough.
   # config.webxml.jruby.min.runtimes = 2
   # config.webxml.jruby.max.runtimes = 4