passenger 3.0.21 → 3.9.1.beta

data/doc/Users guide Nginx.idmap.txt

@@ -18,6 +18,51 @@
 
 1.2. Where to get support	=>	where-to-get-support-2s9na5
 
+# fuzzy
+10. Appendix A: About this document	=>	appendix-a-about-this-document-zfvixm
+
+# fuzzy
+11. Appendix B: Terminology	=>	appendix-b-terminology-wzv5ro
+
+# fuzzy
+11.1. Application root	=>	application-root-1fd6bqv
+
+# fuzzy
+11.2. Idle process	=>	idle-process-13byfw9
+
+# fuzzy
+11.3. Inactive process	=>	inactive-process-1d2h0po
+
+# fuzzy
+12. Appendix C: Spawning methods explained	=>	appendix-c-spawning-methods-explained-tcp8e6
+
+# fuzzy
+12.1. The most straightforward and traditional way: direct spawning	=>	the-most-straightforward-and-traditional-way-conservative-spawning-civ29z
+
+# fuzzy
+12.2. The smart spawning method	=>	the-smart-spawning-method-7nhgtj
+
+# fuzzy
+12.2.1. How it works	=>	how-it-works-f9umga
+
+# fuzzy
+12.2.2. Summary of benefits	=>	summary-of-benefits-qovyvk
+
+# fuzzy
+12.3. Smart spawning gotcha #1: unintentional file descriptor sharing	=>	smart-spawning-gotcha-1-unintentional-file-descriptor-sharing-cebw6q
+
+# fuzzy
+12.3.1. Example 1: Memcached connection sharing (harmful)	=>	example-1-memcached-connection-sharing-harmful--1wfs3ad
+
+# fuzzy
+12.3.2. Example 2: Log file sharing (not harmful)	=>	example-2-log-file-sharing-not-harmful--ox4yfy
+
+# fuzzy
+12.4. Smart spawning gotcha #2: the need to revive threads	=>	smart-spawning-gotcha-2-the-need-to-revive-threads-1ey176o
+
+# fuzzy
+12.5. Smart spawning gotcha #3: code load order	=>	smart-spawning-gotcha-3-code-load-order-12ydsn8
+
 2. Installing Phusion Passenger	=>	installing-phusion-passenger-hn03ac
 
 2.1. Overview	=>	overview-kvhzi4
@@ -74,163 +119,206 @@
 
 4.5.6. Sinatra	=>	sinatra-a7u9ag
 
-5. Configuring Phusion Passenger	=>	configuring-phusion-passenger-1g1svey
-
-5.1. passenger_root <directory>	=>	passenger-root-directory--bqvhhz
-
-5.2. passenger_ruby <filename>	=>	passenger-ruby-filename--1gnok5k
-
-5.3. passenger_spawn_method <string>	=>	passenger-spawn-method-string--1sc6njl
-
-5.4. passenger_rolling_restarts <on|off>	=>	passenger-rolling-restarts
-
-5.5. passenger_resist_deployment_errors <on|off>	=>	passenger-resist-deployment-errors-on-off--k9yf1
-
-5.6. Important deployment options	=>	important-deployment-options-av567
-
-5.6.1. passenger_enabled <on|off>	=>	passenger-enabled-on-off--1rpb2t7
-
-5.6.2. passenger_base_uri <uri>	=>	passenger-base-uri-uri--1xtuo50
-
-5.7. Connection handling options	=>	connection-handling-options-8jgq90
-
-5.7.1. passenger_use_global_queue <on|off>	=>	passenger-use-global-queue-on-off--14h9n22
-
-5.7.2. passenger_ignore_client_abort <on|off>	=>	passenger-ignore-client-abort
+5. Deploying a WSGI (Python) application	=>	deploying-a-wsgi-python-application-1or2efo
 
-5.7.3. passenger_set_cgi_param <CGI environment name> <value>	=>	passenger-set-cgi-param-cgi-environment-name-value--rx9gc0
+5.1. Tutorial/example: writing and deploying a Hello World WSGI application	=>	tutorial-example-writing-and-deploying-a-hello-world-wsgi-application-k5ron2
 
-5.7.4. passenger_pass_header <header name>	=>	passenger-pass-header-header-name--1cg31je
+5.2. Deploying to a virtual host’s root	=>	deploying-to-a-virtual-host-s-root-1chcpbj
 
-5.7.5. passenger_buffer_response <on|off>	=>	passenger-buffer-response
+5.3. Redeploying (restarting the WSGI application)	=>	redeploying-restarting-the-wsgi-application--10zdh2k
 
-5.7.6. passenger_buffer_size	=>	passenger-buffer-size-1jfkq87
+# fuzzy
+6. Configuring Phusion Passenger	=>	configuring-phusion-passenger-1g1svey
 
-5.7.7. passenger_buffers	=>	passenger-busy-buffers
+# fuzzy
+6.1. passenger_root <directory>	=>	passenger-root-directory--bqvhhz
 
-5.7.8. passenger_busy_buffer_size	=>	passenger-busy-buffer-size-124sj61
+# fuzzy
+6.10. Logging and debugging options	=>	logging-and-debugging-options-14e91ni
 
-5.8. Security options	=>	security-options-1bv93g4
+# fuzzy
+6.10.1. passenger_log_level <integer>	=>	passenger-log-level-integer--17snhon
 
-5.8.1. passenger_user_switching <on|off>	=>	passenger-user-switching-on-off--1p37u3l
+# fuzzy
+6.10.2. passenger_debug_log_file <filename>	=>	passenger-debug-log-file-filename--21ubaj
 
-5.8.2. passenger_user <username>	=>	passenger-user-username--b06ur7
+# fuzzy
+6.10.3. passenger_debugger <on|off>	=>	passenger-debugger-on-off--1wkuq85
 
-5.8.3. passenger_group <group name>	=>	passenger-user-group-name--1fco4j7
+# fuzzy
+6.11. Ruby on Rails-specific options	=>	ruby-on-rails-specific-options-12vfokt
 
-5.8.4. passenger_default_user <username>	=>	passenger-default-user-username--1h6cdmf
+# fuzzy
+6.11.1. rails_env <string>	=>	rails-env-string--jlh7v9
 
-5.8.5. Passenger_default_group <group name>	=>	passenger-default-group-group-name--1qxn2qa
+# fuzzy
+6.12. Rack and Rails >= 3 specific options	=>	rack-specific-options-13yvdxs
 
-5.8.6. passenger_friendly_error_pages <on|off>	=>	passenger-friendly-error-pages-on-off--1ti1a0e
+# fuzzy
+6.12.1. rack_env <string>	=>	rack-env-string--tqmrt0
 
-5.9. Resource control and optimization options	=>	resource-control-and-optimization-options-xd7evs
+# fuzzy
+6.13. Deprecated options	=>	deprecated-options-1dtzo0g
 
-5.9.1. passenger_max_pool_size <integer>	=>	passenger-max-pool-size-integer--3jzefs
+# fuzzy
+6.13.1. rails_spawn_method	=>	rails-spawn-method-17vdnpt
 
-5.9.2. passenger_min_instances <integer>	=>	passenger-min-instances-integer--uclykt
+# fuzzy
+6.2. passenger_ruby <filename>	=>	passenger-ruby-filename--1gnok5k
 
-5.9.3. passenger_max_instances <integer>	=>	passenger-max-instances
+# fuzzy
+6.3. passenger_spawn_method <string>	=>	passenger-spawn-method-string--1sc6njl
 
-5.9.4. passenger_max_instances_per_app <integer>	=>	passenger-max-instances-per-app-integer--1xhbbne
+# fuzzy
+6.4. passenger_rolling_restarts <on|off>	=>	passenger-rolling-restarts
 
-5.9.5. passenger_pool_idle_time <integer>	=>	passenger-pool-idle-time-integer--xcw65o
+# fuzzy
+6.5. passenger_resist_deployment_errors <on|off>	=>	passenger-resist-deployment-errors-on-off--k9yf1
 
-5.9.6. passenger_max_requests <integer>	=>	passenger-max-requests
+# fuzzy
+6.6. Important deployment options	=>	important-deployment-options-av567
 
-5.9.7. passenger_max_request_time <seconds>	=>	passenger-max-request-time-seconds--1qod9kg
+# fuzzy
+6.6.1. passenger_enabled <on|off>	=>	passenger-enabled-on-off--1rpb2t7
 
-5.9.8. passenger_memory_limit <integer>	=>	passenger-memory-limit-integer--1ry7dwx
+# fuzzy
+6.6.2. passenger_base_uri <uri>	=>	passenger-base-uri-uri--1xtuo50
 
-5.9.9. passenger_pre_start <url>	=>	passenger-pre-start-url--1f2phk7
+# fuzzy
+6.7. Connection handling options	=>	connection-handling-options-8jgq90
 
-5.10. Logging and debugging options	=>	logging-and-debugging-options-14e91ni
+# fuzzy
+6.7.1. passenger_ignore_client_abort <on|off>	=>	passenger-ignore-client-abort
 
-5.10.1. passenger_log_level <integer>	=>	passenger-log-level-integer--17snhon
+# fuzzy
+6.7.2. passenger_set_cgi_param <CGI environment name> <value>	=>	passenger-set-cgi-param-cgi-environment-name-value--rx9gc0
 
-5.10.2. passenger_debug_log_file <filename>	=>	passenger-debug-log-file-filename--21ubaj
+# fuzzy
+6.7.3. passenger_pass_header <header name>	=>	passenger-pass-header-header-name--1cg31je
 
-5.10.3. passenger_debugger <on|off>	=>	passenger-debugger-on-off--1wkuq85
+# fuzzy
+6.7.4. passenger_buffer_response <on|off>	=>	passenger-buffer-response
 
-5.11. Ruby on Rails-specific options	=>	ruby-on-rails-specific-options-12vfokt
+# fuzzy
+6.7.5. passenger_buffer_size	=>	passenger-buffer-size-1jfkq87
 
-5.11.1. rails_env <string>	=>	rails-env-string--jlh7v9
+# fuzzy
+6.7.6. passenger_buffers	=>	passenger-busy-buffers
 
-5.11.2. rails_framework_spawner_idle_time <integer>	=>	rails-framework-spawner-idle-time-integer--q5ljd5
+# fuzzy
+6.7.7. passenger_busy_buffer_size	=>	passenger-busy-buffer-size-124sj61
 
-5.11.3. rails_app_spawner_idle_time <integer>	=>	rails-app-spawner-idle-time-integer--1xjqe4b
+# fuzzy
+6.8. Security options	=>	security-options-1bv93g4
 
-5.12. Rack and Rails >= 3 specific options	=>	rack-specific-options-13yvdxs
+# fuzzy
+6.8.1. passenger_user_switching <on|off>	=>	passenger-user-switching-on-off--1p37u3l
 
-5.12.1. rack_env <string>	=>	rack-env-string--tqmrt0
+# fuzzy
+6.8.2. passenger_user <username>	=>	passenger-user-username--b06ur7
 
-5.13. Deprecated options	=>	deprecated-options-1dtzo0g
+# fuzzy
+6.8.3. passenger_group <group name>	=>	passenger-user-group-name--1fco4j7
 
-5.13.1. rails_spawn_method	=>	rails-spawn-method-17vdnpt
+# fuzzy
+6.8.4. passenger_default_user <username>	=>	passenger-default-user-username--1h6cdmf
 
-6. Analysis and system maintenance	=>	analysis-and-system-maintenance-1nnlnj8
+# fuzzy
+6.8.5. Passenger_default_group <group name>	=>	passenger-default-group-group-name--1qxn2qa
 
-6.1. Inspecting memory usage	=>	inspecting-memory-usage-1k6y8v0
+# fuzzy
+6.8.6. passenger_friendly_error_pages <on|off>	=>	passenger-friendly-error-pages-on-off--1ti1a0e
 
-6.2. Inspecting Phusion Passenger’s internal status	=>	inspecting-phusion-passenger-s-internal-status-v36wbc
+# fuzzy
+6.9. Resource control and optimization options	=>	resource-control-and-optimization-options-xd7evs
 
-6.3. Debugging frozen applications	=>	debugging-frozen-applications-qoctl8
+# fuzzy
+6.9.1. passenger_max_pool_size <integer>	=>	passenger-max-pool-size-integer--3jzefs
 
-6.4. Accessing individual application processes	=>	accessing-individual-application-processes-1qe4fqk
+# fuzzy
+6.9.10. passenger_max_request_time <seconds>	=>	passenger-pre-start-url--1f2phk7
 
-6.5. Attaching an IRB console to an application process	=>	attaching-an-irb-console-to-an-application-process-d36enw
+# fuzzy
+6.9.11. passenger_memory_limit <integer>	=>	passenger-memory-limit-integer--1ry7dwx
 
-7. Tips	=>	tips-n4c22d
+# fuzzy
+6.9.12. passenger_pre_start <url>	=>	passenger-pre-start-url--npldeb
 
-7.1. User switching (security)	=>	user-switching-security--zmsy9o
+# fuzzy
+6.9.2. passenger_min_instances <integer>	=>	passenger-min-instances-integer--uclykt
 
-7.2. Reducing memory consumption of Ruby on Rails applications by 33%	=>	reducing-memory-consumption-of-ruby-on-rails-applications-by-33--1o3z66q
+# fuzzy
+6.9.3. passenger_max_instances <integer>	=>	passenger-max-instances
 
-7.3. Capistrano recipe	=>	capistrano-recipe-pfn4qu
+# fuzzy
+6.9.4. passenger_max_instances_per_app <integer>	=>	passenger-max-instances-per-app-integer--1xhbbne
 
-7.4. Bundler support	=>	bundler-support-19v1h43
+# fuzzy
+6.9.5. passenger_pool_idle_time <integer>	=>	passenger-pool-idle-time-integer--xcw65o
 
-7.5. Moving Phusion Passenger to a different directory	=>	moving-phusion-passenger-to-a-different-directory-1hel5cp
+# fuzzy
+6.9.6. passenger_max_preloader_idle_time <integer>	=>	rails-app-spawner-idle-time-integer--1xjqe4b
 
-7.6. Installing multiple Ruby on Rails versions	=>	installing-multiple-ruby-on-rails-versions-1bp1fff
+# fuzzy
+6.9.7. passenger_concurrency_model <process|thread>	=>	passenger-max-requests
 
-7.7. Making the application restart after each request	=>	making-the-application-restart-after-each-request-vimy48
+# fuzzy
+6.9.8. passenger_thread_count <number>	=>	passenger-max-request-time-seconds--1qod9kg
 
-7.8. How to fix broken images/CSS/JavaScript URIs in sub-URI deployments	=>	how-to-fix-broken-images-css-javascript-uris-in-sub-uri-deployments-11mzwt6
+# fuzzy
+6.9.9. passenger_max_requests <integer>	=>	passenger-max-requests-integer--sgzint
 
-8. Under the hood	=>	under-the-hood-8uney
+# fuzzy
+7. Analysis and system maintenance	=>	analysis-and-system-maintenance-1nnlnj8
 
-8.1. Page caching support	=>	page-caching-support-nafhf6
+# fuzzy
+7.1. Inspecting memory usage	=>	inspecting-memory-usage-1k6y8v0
 
-8.2. How Phusion Passenger detects whether a virtual host is a web application	=>	how-phusion-passenger-detects-whether-a-virtual-host-is-a-web-application-13qbmhn
+# fuzzy
+7.2. Inspecting Phusion Passenger’s internal status	=>	inspecting-phusion-passenger-s-internal-status-v36wbc
 
-9. Appendix A: About this document	=>	appendix-a-about-this-document-zfvixm
+# fuzzy
+7.3. Debugging frozen applications	=>	debugging-frozen-applications-qoctl8
 
-10. Appendix B: Terminology	=>	appendix-b-terminology-wzv5ro
+# fuzzy
+7.4. Accessing individual application processes	=>	accessing-individual-application-processes-1qe4fqk
 
-10.1. Application root	=>	application-root-1fd6bqv
+# fuzzy
+7.5. Attaching an IRB console to an application process	=>	attaching-an-irb-console-to-an-application-process-d36enw
 
-10.2. Idle process	=>	idle-process-13byfw9
+# fuzzy
+8. Tips	=>	tips-n4c22d
 
-10.3. Inactive process	=>	inactive-process-1d2h0po
+# fuzzy
+8.1. User switching (security)	=>	user-switching-security--zmsy9o
 
-11. Appendix C: Spawning methods explained	=>	appendix-c-spawning-methods-explained-tcp8e6
+# fuzzy
+8.2. Reducing memory consumption of Ruby on Rails applications by 33%	=>	reducing-memory-consumption-of-ruby-on-rails-applications-by-33--1o3z66q
 
-11.1. The most straightforward and traditional way: conservative spawning	=>	the-most-straightforward-and-traditional-way-conservative-spawning-civ29z
+# fuzzy
+8.3. Capistrano recipe	=>	capistrano-recipe-pfn4qu
 
-11.2. The smart spawning method	=>	the-smart-spawning-method-7nhgtj
+# fuzzy
+8.4. Bundler support	=>	bundler-support-19v1h43
 
-11.2.1. How it works	=>	how-it-works-f9umga
+# fuzzy
+8.5. Moving Phusion Passenger to a different directory	=>	moving-phusion-passenger-to-a-different-directory-1hel5cp
 
-11.2.2. Summary of benefits	=>	summary-of-benefits-qovyvk
+# fuzzy
+8.6. Installing multiple Ruby on Rails versions	=>	installing-multiple-ruby-on-rails-versions-1bp1fff
 
-11.3. Smart spawning gotcha #1: unintentional file descriptor sharing	=>	smart-spawning-gotcha-1-unintentional-file-descriptor-sharing-cebw6q
+# fuzzy
+8.7. Making the application restart after each request	=>	making-the-application-restart-after-each-request-vimy48
 
-11.3.1. Example 1: Memcached connection sharing (harmful)	=>	example-1-memcached-connection-sharing-harmful--1wfs3ad
+# fuzzy
+8.8. How to fix broken images/CSS/JavaScript URIs in sub-URI deployments	=>	how-to-fix-broken-images-css-javascript-uris-in-sub-uri-deployments-11mzwt6
 
-11.3.2. Example 2: Log file sharing (not harmful)	=>	example-2-log-file-sharing-not-harmful--ox4yfy
+# fuzzy
+9. Under the hood	=>	under-the-hood-8uney
 
-11.4. Smart spawning gotcha #2: the need to revive threads	=>	smart-spawning-gotcha-2-the-need-to-revive-threads-1ey176o
+# fuzzy
+9.1. Page caching support	=>	page-caching-support-nafhf6
 
-11.5. Smart spawning gotcha #3: code load order	=>	smart-spawning-gotcha-3-code-load-order-12ydsn8
+# fuzzy
+9.2. How Phusion Passenger detects whether a virtual host is a web application	=>	how-phusion-passenger-detects-whether-a-virtual-host-is-a-web-application-13qbmhn
 

data/doc/Users guide Nginx.txt

@@ -2,45 +2,24 @@
 
 image:images/phusion_banner.png[link="http://www.phusion.nl/"]
 
-Phusion Passenger is an Nginx module, which makes deploying Ruby and Ruby on
-Rails applications on Nginx a breeze. It follows the usual Ruby on Rails
-conventions, such as "Don't-Repeat-Yourself" and ease of setup, while at the
-same time providing enough flexibility.
+Phusion Passenger is an application server which can directly integrate into Nginx. It is designed to be easy to use, fast, stable and reliable and is used by link:http://trends.builtwith.com/Web-Server/Phusion-Passenger[hundreds of thousands of websites] all over the world.
+
+Phusion Passenger is a so-called polyglot application server because it supports applications written in multiple programming languages. At this time, Ruby and Python are supported.
 
 This users guide will teach you:
 
 - How to install Nginx with Phusion Passenger support.
 - How to configure Phusion Passenger.
-- How to deploy a Ruby on Rails application.
-- How to deploy a link:http://rack.rubyforge.org/[Rack]-based Ruby application.
+- How to deploy Ruby and Python applications.
 - How to solve common problems.
 
 This guide assumes that the reader is somewhat familiar with Nginx and with
-using the commandline.
+using the command line.
 
 
 == Support information ==
 
-=== Supported operating systems ===
-
-Phusion Passenger works on any POSIX-compliant operating system. In other
-words: practically any operating system on earth, except Microsoft Windows.
-
-Phusion Passenger is confirmed on a large number of operating systems and Linux
-distributions, including, but not limited to, Ubuntu, Debian, CentOS/Fedora/RHEL,
-Gentoo, Mac OS X, FreeBSD and Solaris. Both 32-bit and 64-bit platforms are supported.
-Please
-link:http://code.google.com/p/phusion-passenger/issues/list[report a bug]
-or
-link:http://groups.google.com/group/phusion-passenger[join our discussion forum]
-if it doesn't work on your POSIX-compliant operating system.
-
-=== Where to get support ===
-
-* link:http://code.google.com/p/phusion-passenger/issues/list[Issue tracker] - report
-  bugs here.
-* link:http://groups.google.com/group/phusion-passenger[Discussion forum] - post a
-  message here if you're experiencing problems.
+include::users_guide_snippets/support_information.txt[]
 
 
 == Installing Phusion Passenger ==
@@ -221,15 +200,14 @@ http {
     passenger_root /somewhere/passenger-x.x.x;
     passenger_ruby /usr/bin/ruby;
     passenger_max_pool_size 10;
-    
+
     gzip on;
-    
+
     server {
         server_name www.foo.com;
         listen 80;
         root /webapps/foo/public;
         passenger_enabled on;
-        passenger_use_global_queue on;
     }
 }
 -----------------------------------
@@ -243,9 +221,9 @@ http {
     # passenger_root /somewhere/passenger-x.x.x;
     # passenger_ruby /usr/bin/ruby;
     # passenger_max_pool_size 10;
-    
+
     gzip on;
-    
+
     server {
         server_name www.foo.com;
         listen 80;
@@ -299,14 +277,14 @@ For example:
 -------------------------------------------
 http {
     ...
-    
+
     server {
         listen 80;
         server_name www.mycook.com;
         root /webapps/mycook/public;
         passenger_enabled on;
     }
-    
+
     ...
 }
 -------------------------------------------
@@ -320,13 +298,13 @@ Suppose that you already have a 'server' virtual host entry:
 -------------------------------------------
 http {
     ...
-    
+
     server {
         listen 80;
         server_name www.phusion.nl;
         root /websites/phusion;
     }
-    
+
     ...
 }
 -------------------------------------------
@@ -345,7 +323,7 @@ option to the 'server' block:
 -------------------------------------------
 http {
     ...
-    
+
     server {
         listen 80;
         server_name www.phusion.nl;
@@ -353,7 +331,7 @@ http {
         passenger_enabled on;        # <--- These lines have
         passenger_base_uri /rails;   # <--- been added.
     }
-    
+
     ...
 }
 -------------------------------------------
@@ -515,14 +493,14 @@ Suppose that you already have a virtual host:
 -------------------------------------------
 http {
     ...
-    
+
     server {
         listen 80;
         server_name www.phusion.nl;
         root /websites/phusion;
         passenger_enabled on;
     }
-    
+
     ...
 }
 -------------------------------------------
@@ -541,7 +519,7 @@ option to the 'server' block:
 -------------------------------------------
 http {
     ...
-    
+
     server {
         listen 80;
         server_name www.phusion.nl;
@@ -549,7 +527,7 @@ http {
         passenger_enabled on;        # <--- These lines have
         passenger_base_uri /rack;    # <--- been added.
     }
-    
+
     ...
 }
 -------------------------------------------
@@ -591,6 +569,106 @@ touch /webapps/rackapp/tmp/restart.txt
 include::users_guide_snippets/rackup_specifications.txt[]
 
 
+== Deploying a WSGI (Python) application
+
+Phusion Passenger supports all WSGI-compliant Python web applications. Suppose that you have a WSGI application in '/webapps/wsgiapp'. Then that folder must contain at least three entries:
+
+- 'passenger_wsgi.py', which Phusion Passenger will use as the main entry point for your application. This file must export a WSGI object called `application`.
+- 'public/', a folder containing public static web assets, like images and stylesheets.
+- 'tmp/', used for 'restart.txt' (our application restart mechanism). This will be explained in a following subsection.
+
+So '/webapps/wsgiapp' must, at minimum, look like this:
+----------------------
+/webapps/wsgiapp
+  |
+  +-- config.ru
+  |
+  +-- public/
+  |
+  +-- tmp/
+----------------------
+
+=== Tutorial/example: writing and deploying a Hello World WSGI application ===
+
+First we create a Phusion Passenger-compliant WSGI directory structure:
+
+-------------------------------------------
+$ mkdir /webapps/wsgi_example
+$ mkdir /webapps/wsgi_example/public
+$ mkdir /webapps/wsgi_example/tmp
+-------------------------------------------
+
+Next, we write a minimal "hello world" WSGI application:
+
+-------------------------------------------
+$ cd /webapps/wsgi_example
+$ some_awesome_editor passenger_wsgi.py
+...type in some source code...
+$ cat passenger_wsgi.py
+def application(environ, start_response):
+  start_response(200, [('Content-Type', 'text/plain')])
+  return ["hello world!\n"]
+-------------------------------------------
+
+Finally, we deploy it by adding the following configuration options to
+the Nginx configuration file:
+
+-------------------------------------------
+http {
+    ...
+    server {
+        listen 80;
+        server_name www.wsgiexample.com;
+        root /webapps/wsgi_example/public;
+        passenger_enabled on;
+    }
+    ...
+}
+-------------------------------------------
+
+And we're done! After an Nginx restart, the above WSGI application will be available
+under the URL 'http://www.wsgiexample.com/'.
+
+=== Deploying to a virtual host's root ===
+
+Add a 'server' virtual host entry to your Nginx configuration file. The virtual host's
+root must point to your WSGI application's 'public' folder. You must also set
+'passenger_enabled on' in the 'server' block.
+
+For example:
+-------------------------------------------
+http {
+    ...
+    server {
+        listen 80;
+        server_name www.wsgiapp.com;
+        root /webapps/wsgiapp/public;
+        passenger_enabled on;
+    }
+    ...
+}
+-------------------------------------------
+Then restart Nginx. The application has now been deployed.
+
+=== Redeploying (restarting the WSGI application) ===
+
+Deploying a new version of a WSGI application is as simple as
+re-uploading the application files, and restarting the application.
+
+There are two ways to restart the application:
+
+1. By restarting Nginx.
+2. By creating or modifying the file 'tmp/restart.txt' in the WSGI
+   application's <<application_root,root folder>>. Phusion Passenger will
+   automatically restart the application.
+
+For example, to restart our example application, we type this in the
+command line:
+-------------------------------------------
+touch /webapps/wsgiapp/tmp/restart.txt
+-------------------------------------------
+
+
 == Configuring Phusion Passenger ==
 
 After installation, Phusion Passenger does not need any further configurations.
@@ -612,8 +690,12 @@ This required option may only occur once, in the 'http' configuration block.
 === passenger_ruby <filename> ===
 This option allows one to specify the Ruby interpreter to use.
 
-This option may only occur once, in the 'http' configuration block.
-The default is 'ruby'.
+* In the 'http' configuration block.
+ * In a 'server' configuration block.
+ * In a 'location' configuration block.
+ * In an 'if' configuration scope.
+
+In each place, it may be specified at most once. The default value is 'ruby', meaning that the Ruby interpreter will be looked up according to the `PATH` environment variable.
 
 [[PassengerSpawnMethod]]
 === passenger_spawn_method <string> ===
@@ -625,11 +707,11 @@ understand it, as it's mostly a technical detail. You can basically follow this
 
 ************************************************
 If your application works on Mongrel, but not on Phusion Passenger, then set
-`passenger_spawn_method` to 'conservative'. Otherwise, leave it at 'smart-lv2' (the default).
+`passenger_spawn_method` to 'direct'. Otherwise, leave it at 'smart' (the default).
 ************************************************
 
-However, we do recommend you to try to understand it. The 'smart' and 'smart-lv2' spawn
-methods bring many benefits.
+However, we do recommend you to try to understand it. The 'smart' spawn
+method brings many benefits.
 =========================================================
 
 include::users_guide_snippets/passenger_spawn_method.txt[]
@@ -641,7 +723,7 @@ This option may occur in the following places:
  * In a 'location' configuration block.
  * In an 'if' configuration scope.
 
-In each place, it may be specified at most once. The default value is 'smart-lv2'.
+In each place, it may be specified at most once. The default value is 'smart'.
 
 [[PassengerRollingRestarts]]
 === passenger_rolling_restarts <on|off> ===
@@ -743,23 +825,6 @@ This option may occur in the following places:
 
 === Connection handling options ===
 
-[[PassengerUseGlobalQueue]]
-==== passenger_use_global_queue <on|off> ====
-Turns the use of global queuing on or off.
-
-This option may occur in the following places:
-
- * In the 'http' configuration block.
- * In a 'server' configuration block.
- * In a 'location' configuration block.
- * In an 'if' configuration scope.
-
-In each place, it may be specified at most once. The default value is 'on'.
-
-'This feature is sponsored by http://www.37signals.com/[37signals].'
-
-include::users_guide_snippets/global_queueing_explained.txt[]
-
 ==== passenger_ignore_client_abort <on|off> ====
 Normally, when the HTTP client aborts the connection (e.g. when the user clicked on "Stop"
 in the browser), the connection with the application process will be closed too. If the
@@ -1031,7 +1096,7 @@ http {
     ...
     passenger_max_pool_size 15;
     passenger_pool_idle_time 10;
-    
+
     server {
         listen 80;
         server_name foobar.com;
@@ -1133,6 +1198,67 @@ applications, each which must be available at all times.
 This option may only occur once, in the 'http' configuration block.
 The default value is '300'.
 
+==== passenger_max_preloader_idle_time <integer> ====
+The ApplicationSpawner server (explained in <<spawning_methods_explained,Spawning
+methods explained>>) has an idle timeout, just like the backend processes spawned by
+Phusion Passenger do. That is, it will automatically shutdown if it hasn't done
+anything for a given period.
+
+This option allows you to set the ApplicationSpawner server's idle timeout, in
+seconds. A value of '0' means that it should never idle timeout.
+
+Setting a higher value will mean that the ApplicationSpawner server is kept around
+longer, which may slightly increase memory usage. But as long as the
+ApplicationSpawner server is running, the time to spawn a Ruby on Rails backend
+process only takes about 10% of the time that is normally needed, assuming that
+you're using the 'smart' or 'smart-lv2' <<RailsSpawnMethod,spawning method>>. So if your
+system has enough memory, is it recommended that you set this option to a high
+value or to '0'.
+
+This option may occur in the following places:
+
+ * In the 'http' configuration block.
+ * In a 'server' configuration block.
+ * In a 'location' configuration block.
+ * In an 'if' configuration scope.
+
+In each place, it may be specified at most once. The default value is '300' (5 minutes).
+
+[[PassengerConcurrencyModel]]
+==== passenger_concurrency_model <process|thread> ====
+:version: 4.0.0
+include::users_guide_snippets/enterprise_only.txt[]
+
+Specifies the I/O concurrency model that should be used for application processes. Phusion Passenger supports two concurrency models:
+
+ * 'process' - single-threaded, multi-processed I/O concurrency. Each application process only has a single thread and can only handle 1 request at a time. This is the concurrency model that Ruby applications traditionally used. It has excellent compatiblity (can work with applications that are not designed to be thread-safe) but is unsuitable workloads in which the application has to wait for a lot of external I/O (e.g. HTTP API calls), and uses more memory because each process has a large memory overhead.
+ * 'thread' - multi-threaded, multi-processed I/O concurrency. Each application process has multiple threads (customizable via <<PassengerThreadCount,passenger_thread_count>>). This model provides much better I/O concurrency and uses less memory because threads share memory with each other within the same process. However, using this model may cause compatibility problems if the application is not designed to be thread-safe.
+
+This option may occur in the following places:
+
+ * In the 'http' configuration block.
+ * In a 'server' configuration block.
+ * In a 'location' configuration block.
+ * In an 'if' configuration scope.
+
+In each place, it may be specified at most once. The default value is 'process'.
+
+[[PassengerThreadCount]]
+==== passenger_thread_count <number> ====
+:version: 4.0.0
+include::users_guide_snippets/enterprise_only.txt[]
+
+Specifies the number of threads that Phusion Passenger should spawn per application process. This option only has effect if <<PassengerConcurrencyModel,passenger_concurrency_model>> is 'thread'.
+
+This option may occur in the following places:
+
+ * In the 'http' configuration block.
+ * In a 'server' configuration block.
+ * In a 'location' configuration block.
+ * In an 'if' configuration scope.
+
+In each place, it may be specified at most once. The default value is '1'.
+
 [[PassengerMaxRequests]]
 ==== passenger_max_requests <integer> ====
 The maximum number of requests an application process will process. After
@@ -1531,58 +1657,6 @@ This option may occur in the following places:
 
 In each place, it may be specified at most once. The default value is 'production'.
 
-==== rails_framework_spawner_idle_time <integer> ====
-The FrameworkSpawner server (explained in <<spawning_methods_explained,Spawning
-methods explained>>) has an idle timeout, just like the backend processes spawned by
-Phusion Passenger do. That is, it will automatically shutdown if it hasn't done
-anything for a given period.
-
-This option allows you to set the FrameworkSpawner server's idle timeout, in
-seconds. A value of '0' means that it should never idle timeout.
-
-Setting a higher value will mean that the FrameworkSpawner server is kept around
-longer, which may slightly increase memory usage. But as long as the
-FrameworkSpawner server is running, the time to spawn a Ruby on Rails backend
-process only takes about 40% of the time that is normally needed, assuming that
-you're using the 'smart' <<RailsSpawnMethod,spawning method>>. So if your
-system has enough memory, is it recommended that you set this option to a high
-value or to '0'.
-
-This option may occur in the following places:
-
- * In the 'http' configuration block.
- * In a 'server' configuration block.
- * In a 'location' configuration block.
- * In an 'if' configuration scope.
-
-In each place, it may be specified at most once. The default value is '1800' (30 minutes).
-
-==== rails_app_spawner_idle_time <integer> ====
-The ApplicationSpawner server (explained in <<spawning_methods_explained,Spawning
-methods explained>>) has an idle timeout, just like the backend processes spawned by
-Phusion Passenger do. That is, it will automatically shutdown if it hasn't done
-anything for a given period.
-
-This option allows you to set the ApplicationSpawner server's idle timeout, in
-seconds. A value of '0' means that it should never idle timeout.
-
-Setting a higher value will mean that the ApplicationSpawner server is kept around
-longer, which may slightly increase memory usage. But as long as the
-ApplicationSpawner server is running, the time to spawn a Ruby on Rails backend
-process only takes about 10% of the time that is normally needed, assuming that
-you're using the 'smart' or 'smart-lv2' <<RailsSpawnMethod,spawning method>>. So if your
-system has enough memory, is it recommended that you set this option to a high
-value or to '0'.
-
-This option may occur in the following places:
-
- * In the 'http' configuration block.
- * In a 'server' configuration block.
- * In a 'location' configuration block.
- * In an 'if' configuration scope.
-
-In each place, it may be specified at most once. The default value is '600' (10 minutes).
-
 === Rack and Rails >= 3 specific options ===
 [[RackEnv]]
 ==== rack_env <string> ====