passenger 4.0.14 → 4.0.16

data/doc/Users guide Nginx.idmap.txt

@@ -30,43 +30,45 @@
 
 2.5. Installing or upgrading on Red Hat, Fedora, CentOS or ScientificLinux	=>	installing-or-upgrading-on-red-hat-fedora-centos-or-scientificlinux-1uus5a1
 
-2.6. Upgrading from open source to Enterprise	=>	upgrading-from-open-source-to-enterprise-1a58c2b
+2.6. Installing or upgrading on Mac OS X with Homebrew	=>	installing-or-upgrading-on-mac-os-x-with-homebrew-13ovvy9
 
-2.7. Cryptographic verification of installation files	=>	cryptographic-verification-of-installation-files-2goray
+2.7. Upgrading from open source to Enterprise	=>	upgrading-from-open-source-to-enterprise-1a58c2b
 
-2.7.1. Synopsis	=>	synopsis-4fv6zw
+2.8. Cryptographic verification of installation files	=>	cryptographic-verification-of-installation-files-2goray
 
-2.7.2. Importing the Phusion Software Signing key	=>	importing-the-phusion-software-signing-key-1qfpaj4
+2.8.1. Synopsis	=>	synopsis-4fv6zw
 
-2.7.3. Verifying the Phusion Software Signing key	=>	verifying-the-phusion-software-signing-key-i7f1vj
+2.8.2. Importing the Phusion Software Signing key	=>	importing-the-phusion-software-signing-key-1qfpaj4
 
-2.7.4. Verifying the gem and tarball	=>	verifying-the-gem-and-tarball-dr9466
+2.8.3. Verifying the Phusion Software Signing key	=>	verifying-the-phusion-software-signing-key-i7f1vj
 
-2.7.5. Verifying Git signatures	=>	verifying-git-signatures-dyo4fk
+2.8.4. Verifying the gem and tarball	=>	verifying-the-gem-and-tarball-dr9466
 
-2.7.6. Verifying DEB and RPM packages	=>	verifying-deb-and-rpm-packages-1ed36d5
+2.8.5. Verifying Git signatures	=>	verifying-git-signatures-dyo4fk
 
-2.7.7. Revocation	=>	revocation-xwvhea
+2.8.6. Verifying DEB and RPM packages	=>	verifying-deb-and-rpm-packages-1ed36d5
 
-2.8. Non-interactive, automatic, headless installs or upgrades	=>	non-interactive-automatic-headless-installs-or-upgrades-834ymv
+2.8.7. Revocation	=>	revocation-xwvhea
 
-2.9. Customizing the compilation process	=>	customizing-the-compilation-process-u4cdcf
+2.9. Non-interactive, automatic, headless installs or upgrades	=>	non-interactive-automatic-headless-installs-or-upgrades-834ymv
 
-2.9.1. Setting the compiler	=>	setting-the-compiler-1l6dpe1
+2.10. Customizing the compilation process	=>	customizing-the-compilation-process-u4cdcf
 
-2.9.2. Adding additional compiler or linker flags	=>	adding-additional-compiler-or-linker-flags-1jehjon
+2.10.1. Setting the compiler	=>	setting-the-compiler-1l6dpe1
 
-2.9.3. Forcing location of command line tools and dependencies	=>	forcing-location-of-certain-command-line-tools-1j93cki
+2.10.2. Adding additional compiler or linker flags	=>	adding-additional-compiler-or-linker-flags-1jehjon
 
-2.10. Installing as a normal Nginx module without using the installer	=>	installing-as-a-normal-nginx-module-without-using-the-installer-1kkpes5
+2.10.3. Forcing location of command line tools and dependencies	=>	forcing-location-of-certain-command-line-tools-1j93cki
 
-2.11. Creating an Nginx init script	=>	creating-an-nginx-init-script-1kd8zg5
+2.11. Installing as a normal Nginx module without using the installer	=>	installing-as-a-normal-nginx-module-without-using-the-installer-1kkpes5
 
-2.12. Disabling without uninstalling	=>	disabling-without-uninstalling-1t5tqan
+2.12. Creating an Nginx init script	=>	creating-an-nginx-init-script-1kd8zg5
 
-2.13. Uninstalling	=>	uninstalling-phusion-passenger-wuycvb
+2.13. Disabling without uninstalling	=>	disabling-without-uninstalling-1t5tqan
 
-2.14. Moving to a different directory	=>	moving-to-a-different-directory-gif3wo
+2.14. Uninstalling	=>	uninstalling-phusion-passenger-wuycvb
+
+2.15. Moving to a different directory	=>	moving-to-a-different-directory-gif3wo
 
 3. Deploying a Ruby on Rails 1.x or 2.x (but NOT Rails >= 3) application	=>	deploying-a-ruby-on-rails-1-x-or-2-x-but-not-rails-3-application-b69gqa
 
@@ -154,6 +156,12 @@
 
 6.11.7. passenger_busy_buffer_size	=>	passenger-busy-buffer-size-124sj61
 
+6.11.8. passenger_intercept_errors <on|off>	=>	passenger-intercept-errors-1uvcb9x
+
+6.11.9. passenger_max_request_queue_size <number>	=>	passenger-max-request-queue-size-number--i0te1b
+
+6.11.10. passenger_request_queue_overflow_status_code <code>	=>	passenger-request-queue-overflow-status-code-code--1wcwuxl
+
 6.12. Security options	=>	security-options-1bv93g4
 
 6.12.1. passenger_user_switching <on|off>	=>	passenger-user-switching-on-off--1p37u3l
@@ -184,17 +192,19 @@
 
 6.13.6. passenger_max_preloader_idle_time <integer>	=>	rails-app-spawner-idle-time-integer--1xjqe4b
 
-6.13.7. passenger_concurrency_model <process|thread>	=>	passenger-concurrency-model-process-thread--brcvkk
+6.13.7. passenger_start_timeout <seconds>	=>	passenger-start-timeout-seconds--8xn504
+
+6.13.8. passenger_concurrency_model <process|thread>	=>	passenger-concurrency-model-process-thread--brcvkk
 
-6.13.8. passenger_thread_count <number>	=>	passenger-thread-count-number--1kd6ffy
+6.13.9. passenger_thread_count <number>	=>	passenger-thread-count-number--1kd6ffy
 
-6.13.9. passenger_max_requests <integer>	=>	passenger-max-requests-integer--sgzint
+6.13.10. passenger_max_requests <integer>	=>	passenger-max-requests-integer--sgzint
 
-6.13.10. passenger_max_request_time <seconds>	=>	passenger-max-request-time-seconds--1htog2g
+6.13.11. passenger_max_request_time <seconds>	=>	passenger-max-request-time-seconds--1htog2g
 
-6.13.11. passenger_memory_limit <integer>	=>	passenger-memory-limit-integer--1ry7dwx
+6.13.12. passenger_memory_limit <integer>	=>	passenger-memory-limit-integer--1ry7dwx
 
-6.13.12. passenger_pre_start <url>	=>	passenger-pre-start-url--npldeb
+6.13.13. passenger_pre_start <url>	=>	passenger-pre-start-url--npldeb
 
 6.14. Logging and debugging options	=>	logging-and-debugging-options-14e91ni
 
@@ -254,7 +264,7 @@
 
 8.7. 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
 
-8.8. Out-of-Band Garbage Work and Out-of-Band Garbage Collection	=>	out-of-band-garbage-work-and-out-of-band-garbage-collection-v89lu2
+8.8. Out-of-Band Work and Out-of-Band Garbage Collection	=>	out-of-band-work-and-out-of-band-garbage-collection-v89lu2
 
 8.9. Flying Passenger	=>	flying-passenger-137qg5e
 
@@ -266,13 +276,21 @@
 
 8.9.4. Managing the Flying Passenger daemon	=>	managing-the-flying-passenger-daemon-vjmzdh
 
-8.9.5. Caveats and limitations	=>	caveats-and-limitations-15wakf
+8.9.5. Using Flying Passenger with MRI 1.8 or JRuby	=>	using-flying-passenger-with-mri-1-8-or-jruby-pxho35
+
+8.9.6. Caveats and limitations	=>	caveats-and-limitations-15wakf
 
 9. Under the hood	=>	under-the-hood-8uney
 
 9.1. Page caching support	=>	page-caching-support-nafhf6
 
-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
+9.2. Phusion Passenger and its relationship with Ruby	=>	phusion-passenger-and-its-relationship-with-ruby-1hub1pa
+
+9.2.1. How Ruby is used	=>	how-ruby-is-used-j7g2a4
+
+9.2.2. When the system has multiple Ruby interpreters	=>	when-the-system-has-multiple-ruby-interpreters-fwn3t
+
+9.3. 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
 
 10. Appendix A: About this document	=>	appendix-a-about-this-document-zfvixm
 

data/doc/Users guide Nginx.txt

@@ -342,6 +342,7 @@ touch /webapps/rackapp/tmp/restart.txt
 include::users_guide_snippets/rackup_specifications.txt[]
 
 
+[[deploying_a_wsgi_app]]
 == 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:
@@ -475,7 +476,9 @@ Since version 4.0.0, the `passenger_python` option was added. Also, Phusion Pass
  * In a 'location' configuration block.
  * In an 'if' configuration scope.
 
-The `passenger_ruby` in the `http` block - that is, the one that `passenger-install-nginx-module` outputs - is used for invoking certain Phusion Passenger tools that are written in Ruby, e.g. the internal helper script used by <<PassengerPreStart,passenger_pre_start>>. It is also used as the default Ruby interpreter for Ruby web apps. You don't *have* to specify a `passenger_ruby` in the `http` block though, because the default is to use the first `ruby` command found in `$PATH`.
+The `passenger_ruby` in the `http` block - that is, the one that `passenger-install-nginx-module` outputs - is used for invoking certain Phusion Passenger tools that are written in Ruby, e.g. the internal helper script used by <<PassengerPreStart,passenger_pre_start>>. It is okay if the value refers to a different Ruby interpreter than the one you originally installed Phusion Passenger with. You can learn more about all this in <<relationship_with_ruby,Phusion Passenger and its relationship with Ruby>>.
+
+The `passenger_ruby` directive in the `http` block is also used as the default Ruby interpreter for Ruby web apps. You don't *have* to specify a `passenger_ruby` in the `http` block though, because the default is to use the first `ruby` command found in `$PATH`.
 
 The `passenger_python` option works in a similar manner, but applies to Python instead.
 
@@ -574,7 +577,7 @@ This subsection attempts to describe spawn methods, but it's okay if you don't (
 understand it, as it's mostly a technical detail. You can basically follow this rule of thumb:
 
 ************************************************
-If your application works on Mongrel, but not on Phusion Passenger, then set
+If your application works on Mongrel or Thin, but not on Phusion Passenger, then set
 `passenger_spawn_method` to 'direct'. Otherwise, leave it at 'smart' (the default).
 ************************************************
 
@@ -710,15 +713,31 @@ for that server or that location.
 
 Phusion Passenger is disabled by default, so you must explicitly enable
 it for server blocks that you wish to serve through Phusion Passenger.
-Please see <<deploying_a_ror_app,Deploying a Ruby on Rails application>>
-and <<deploying_a_rack_app,Deploying a Rack-based Ruby application>>
+Please see <<deploying_a_rack_app,Deploying a Rack-based Ruby application>>
+and <<deploying_a_wsgi_app,Deploying a WSGI (Python) application>>
 for examples.
 
+When using `location` blocks, you must re-specify `passenger_enabled` in each `location` block that you want to enable Phusion Passenger. This is because each `location` block has `passenger_enabled` turned off by default. For example:
+
+----------------------------
+server {
+    listen 80;
+    server_name www.foo.com;
+    root /webapps/foo/public;
+    passenger_enabled on;
+
+    location /attachments {
+        # Re-specify passenger_enabled here!
+        passenger_enabled on;
+    }
+}
+----------------------------
+
 [[PassengerBaseURI]]
 ==== passenger_base_uri <uri> ====
 Used to specify that the given URI is an distinct application that should
 be served by Phusion Passenger. This option can be used for both Rails and
-Rack applications. See <<deploying_rails_to_sub_uri,Deploying Rails to a sub URI>>
+Rack applications. See <<deploying_rack_to_sub_uri,Deploying Rack to a sub URI>>
 for an example.
 
 It is allowed to specify this option multiple times. Do this to deploy multiple
@@ -884,6 +903,65 @@ In each place, it may be specified at most once. The default value is 'off'.
 These options have the same effect as proxy_module's similarly named options.
 They can be used to modify the maximum allowed HTTP header size.
 
+[[passenger_intercept_errors]]
+==== passenger_intercept_errors <on|off> ====
+:version: 4.0.15
+include::users_guide_snippets/since_version.txt[]
+
+Decides if Nginx will intercept responses with HTTP status codes of 400 and higher.
+
+By default, all responses are sent as-is from the application or from the Phusion Passenger core. If you turn this option on then Nginx will be able to handle such responses using the Nginx `error_page` option. Responses with status codes that do not match an `error_page` option are sent as-is.
+
+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 'off'.
+
+[[passenger_max_request_queue_size]]
+==== passenger_max_request_queue_size <number> ====
+:version: 4.0.15
+include::users_guide_snippets/since_version.txt[]
+
+When all application processes are already handling their maximum number of concurrent requests, Phusion Passenger will queue all incoming requests. This option specifies the maximum size for that queue. If the queue is already at this specified limit, then Phusion Passenger will immediately send a "503 Service Unavailable" error to any incoming requests. You may use <<passenger_request_queue_overflow_status_code,passenger_request_queue_overflow_status_code>> to customize the response status.
+
+A value of 0 means that the queue is unbounded.
+
+You may combine this with <<passenger_intercept_errors,passenger_intercept_errors>> and `error_page` to set a custom error page whenever the queue is full. In the following example, Nginx will serve /error503.html whenever the queue is full:
+
+---------------------------------
+passenger_intercept_errors on;
+error_page 503 /error503.html;
+---------------------------------
+
+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 '100'.
+
+[[passenger_request_queue_overflow_status_code]]
+==== passenger_request_queue_overflow_status_code <code> ====
+:version: 4.0.15
+include::users_guide_snippets/since_version.txt[]
+
+This option allows you to customize the HTTP status code that is sent back when the request queue is full. See <<passenger_max_request_queue_size,passenger_max_request_queue_size>> for more information.
+
+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 '503'.
+
 === Security options ===
 [[PassengerUserSwitching]]
 ==== passenger_user_switching <on|off> ====
@@ -1069,6 +1147,7 @@ The passenger_min_instances option may occur in the following places:
 
 In each place, it may be specified at most once. The default value is '1'.
 
+[[PassengerMaxInstances]]
 ==== passenger_max_instances <integer> ====
 :version: 3.0.0
 include::users_guide_snippets/enterprise_only.txt[]
@@ -1173,6 +1252,21 @@ In each place, it may be specified at most once. The default value is '300' (5 m
 :option: `--max-preloader-idle-time`
 include::users_guide_snippets/alternative_for_flying_passenger.txt[]
 
+==== passenger_start_timeout <seconds> ====
+:version: 4.0.15
+include::users_guide_snippets/since_version.txt[]
+
+Specifies a timeout for the startup of application processes. If an application process fails to start within the timeout period then it will be forcefully killed with SIGKILL, and the error will be logged.
+
+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 '90'.
+
 [[PassengerConcurrencyModel]]
 ==== passenger_concurrency_model <process|thread> ====
 :version: 4.0.0
@@ -1290,12 +1384,6 @@ fix the problem in your application rather than relying on these directives as a
 measure to avoid freezing applications.
 =====================================================
 
-[NOTE]
-=====================================================
-This option is currently only available for Ruby apps. It is not yet available
-for Python and Node.js.
-=====================================================
-
 [[PassengerMemoryLimit]]
 ==== passenger_memory_limit <integer> ====
 :version: 3.0.0
@@ -1641,8 +1729,8 @@ Phusion Passenger hides a lot of complexity for the end user (i.e. the web serve
 system administrator), but sometimes it is desirable to know what is going on.
 This section describes a few things that Phusion Passenger does under the hood.
 
-=== Page caching support ===
 include::users_guide_snippets/under_the_hood/page_caching_support.txt[]
+include::users_guide_snippets/under_the_hood/relationship_with_ruby.txt[]
 
 [[application_detection]]
 === How Phusion Passenger detects whether a virtual host is a web application ===

data/doc/users_guide_snippets/installation.txt

@@ -15,7 +15,7 @@ The steps for upgrading or downgrading Phusion Passenger is almost the same as t
 [[rubygems_generic_install]]
 === Generic installation, upgrade and downgrade method: via RubyGems
 
-RubyGems is only used as a method to obtain the Phusion Passenger files, so in case you have multiple Ruby versions it does not matter which Ruby's RubyGems you use for installation. Once installed, Phusion Passenger can work with all other Ruby versions on your system.
+RubyGems is only used as a method to obtain the Phusion Passenger files, so in case you have multiple Ruby versions it does not matter which Ruby's RubyGems you use for installation. Once installed, Phusion Passenger can work with all other Ruby versions on your system. This is explained in <<relationship_with_ruby,Phusion Passenger and its relationship with Ruby>>.
 
 [[is_ruby_home_or_system_wide_installed]]
 [float]
@@ -68,36 +68,42 @@ gem install passenger --version 3.9.1.beta --pre
 
 .Enterprise
 
-The `gem install` command only installs the open source version of Phusion Passenger. link:https://www.phusionpassenger.com/enterprise[Phusion Passenger Enterprise] customers should obtain the gem from the link:https://www.phusionpassenger.com/orders[Customer Area] instead. Login with your order reference and password. The Customer Area will show you a list of files.
+First, download the *license key* from the link:phusionpassenger.com/orders[Customer Area] and save it as '/etc/passenger-enterprise-license'.
 
-First, download the *license key* and save it as '/etc/passenger-enterprise-license'.
+Next, add the Phusion Passenger Enterprise gem server to your RubyGems source list:
 
-Next, download the *gem file* for the version you want (`passenger-enterprise-server-x.x.x.gem`) and install it with:
+------------------------------------------
+gem source --add https://YOUR_ORDER_REFERENCE:YOUR_PASSWORD@www.phusionpassenger.com/enterprise_gems
+------------------------------------------
 
--------------------------------------------------------
-gem install passenger-enterprise-server-x.x.x.gem
--------------------------------------------------------
+Substitute 'YOUR_ORDER_REFERENCE' and 'YOUR_PASSWORD' with your link:phusionpassenger.com/orders[Customer Area] login credentials.
 
-[[add_rubygems_bin_dir_to_path]]
-[float]
-==== Step 3: add the RubyGems bin directory to your $PATH
+Finally, install the latest gem to obtain the files for the latest stable version of the open source Phusion Passenger:
 
-If all of the following are applicable to you:
+----------------------
+gem install passenger-enterprise-server
+----------------------
+
+Sometimes you will want to obtain the latest beta version of Phusion Passenger Enterprise. Beta versions are not normally selected by `gem install`, so to opt-in for beta versions you have to add the `--pre` argument:
+
+-----------------------------------
+gem install passenger-enterprise-server --pre
+-----------------------------------
 
-- You are on Debian or Ubuntu,
-- and you installed RubyGems through APT,
-- and your Ruby interpreter is installed system-wide,
+If you want to obtain a specific version of Phusion Passenger Enterprise, e.g. because you are downgrading, then specify the version number with `--version`:
 
-...then you must ensure that the RubyGems bin directory is in your $PATH, which is the environment variable that dictates where your command prompt will look for commands. If any of the above conditions do not apply to you, then you can skip this step.
+-----------------------------------
+gem install passenger-enterprise-server --version 3.0.0
+-----------------------------------
 
-Open '/etc/bash.bashrc' or '/etc/bashrc' (whichever is available) and add the following to the end of the file. Also run this command in your terminal.
+If you want to obtain a specific *beta* version of Phusion Passenger then you must also pass `--pre`:
 
------------------------------------------------------------------
-export PATH=$PATH:/var/lib/gems/1.8/bin:/var/lib/gems/1.9/bin
------------------------------------------------------------------
+----------------------------------------------------
+gem install passenger-enterprise-server --version 3.9.1.beta --pre
+----------------------------------------------------
 
 [float]
-==== Step 4: loosen permissions
+==== Step 3: loosen permissions
 
 If in step 1 you determined that your Ruby interpreter is installed in your home directory, then you need to make sure that the Phusion Passenger gem directory is accessible by your web server. To do that, you must ensure that the Phusion Passenger gem directory, as well as all parent directories, have the world-executable permission.
 
@@ -120,7 +126,7 @@ chmod o+x /home/phusion
 
 [[run_passenger_installer]]
 [float]
-==== Step 5: run the Phusion Passenger installer
+==== Step 4: run the Phusion Passenger installer
 
 ifdef::apache[]
 The Phusion Passenger gem only contains source files. In this step we will use the installer to compile the Phusion Passenger binaries, which include the various Phusion Passenger agent executables and the Phusion Passenger Apache module.
@@ -168,7 +174,7 @@ At some point it will ask you which prefix to install Nginx to. If you're upgrad
 endif::[]
 
 [float]
-==== Step 6: Restarting the Flying Passenger daemon
+==== Step 5: Restarting the Flying Passenger daemon
 
 If you are using <<flying_passenger,Flying Passenger>> then you must restart the Flying Passenger daemon by sending it the SIGTERM signal:
 
@@ -185,7 +191,7 @@ kill PID_OF_FLYING_PASSENGER
 
 [[verify_passenger_running]]
 [float]
-==== Step 7: Verifying that Phusion Passenger is running
+==== Step 6: Verifying that Phusion Passenger is running
 
 Restart your web server and run:
 
@@ -240,7 +246,7 @@ chmod o+x /opt
 
 Phusion Passenger supports multiple languages and its core is written in C++, but its installer and administration tools are written in Ruby, so you must install that.
 
-Even though Ruby is required, Ruby will not be loaded during normal operation unless you deploy a Ruby web application on Phusion Passenger.
+Even though Ruby is required, Ruby will normally not be loaded during normal operation unless you deploy a Ruby web application on Phusion Passenger. Phusion Passenger's dependency on Ruby is very minimal. See <<relationship_with_ruby,Phusion Passenger and its relationship with Ruby>> for details.
 
 Run `ruby --version` and `rake --version` to find out whether both commands are already installed and recent enough. Phusion Passenger requires Ruby >= 1.8.6. Any Rake version will do.
 
@@ -248,15 +254,10 @@ Run `ruby --version` and `rake --version` to find out whether both commands are
 
 We recommend you to use link:http://wiki.brightbox.co.uk/docs:phusion-passenger[the Brightbox Ruby packages]. They provide more up-to-date versions of Ruby than Debian's official repositories provide. Their Ubuntu Lucid repository is compatible with Debian 6. If you do not want to use the Brightbox repository, then follow the instructions for Debian 5.
 
-Create '/etc/apt/sources.list.d/brightbox-source.list':
-
------------------------------
-deb  http://ppa.launchpad.net/brightbox/ruby-ng/ubuntu  lucid main
------------------------------
-
-Install the Brightbox APT public key:
+Add the Brightbox repository and install the Bright APT public key:
 
 -----------------------------
+echo deb http://ppa.launchpad.net/brightbox/ruby-ng/ubuntu lucid main | sudo tee /etc/apt/sources.list.d/brightbox-source.list
 sudo apt-key adv --keyserver keyserver.ubuntu.com --recv-keys C3173AA6
 -----------------------------
 
@@ -281,19 +282,19 @@ Then <<add_rubygems_bin_dir_to_path,add the RubyGems bin directory to your $PATH
 
 .Ubuntu
 
-We recommend you to use link:http://wiki.brightbox.co.uk/docs:phusion-passenger[the Brightbox Ruby packages]. They provide more up-to-date versions of Ruby than Ubuntu's official repositories provide.
+We recommend you to use link:http://wiki.brightbox.co.uk/docs:phusion-passenger[the Brightbox Ruby packages]. They provide more up-to-date versions of Ruby than Ubuntu's official repositories provide. Add the Brightbox repository as follows:
 
 -----------------------------
 sudo apt-add-repository ppa:brightbox/passenger
 sudo apt-get update
 -----------------------------
 
-If you're on the older Ubuntu 8.04 Hardy release, the `apt-add-repository` command isn't available so you have to install the repository and the key by hand:
+Then install Ruby and Rake:
 
 -----------------------------
-sudo sh -c 'echo "deb http://ppa.launchpad.net/brightbox/passenger/ubuntu hardy main" > /etc/apt/sources.list.d/brightbox-passenger.list'
-sudo apt-key adv --keyserver keyserver.ubuntu.com --recv-keys C3173AA6
 sudo apt-get update
+sudo apt-get install ruby1.9.3
+sudo gem install rake
 -----------------------------
 
 .Other operating systems
@@ -351,32 +352,22 @@ If you use these packages to install Phusion Passenger then you do not need to r
 
 .Apache
 
-On Ubuntu versions newer than 8.04 Hardy, register the Brightbox Apache PPA as follows:
+First register the Brightbox Apache PPA. Run this on Ubuntu:
 
 -----------------------------
 sudo apt-add-repository ppa:brightbox/passenger-experimental
 sudo apt-get update
 -----------------------------
 
-On Ubuntu 8.04 Hardy and on Debian, the `apt-add-repository` command isn't available so you have to install the repository and the key by hand.
-
-Debian 6:
+On Debian, the `apt-add-repository` command isn't available so you have to install the repository and the key by hand:
 
 -----------------------------
-sudo sh -c 'echo "deb http://ppa.launchpad.net/brightbox/passenger-experimental/ubuntu lucid main" > /etc/apt/sources.list.d/brightbox-passenger.list'
+echo deb http://ppa.launchpad.net/brightbox/passenger-experimental/ubuntu lucid main | sudo tee /etc/apt/sources.list.d/brightbox-passenger.list
 sudo apt-key adv --keyserver keyserver.ubuntu.com --recv-keys C3173AA6
 sudo apt-get update
 -----------------------------
 
-Ubuntu 8.04 Hardy:
-
------------------------------
-sudo sh -c 'echo "deb http://ppa.launchpad.net/brightbox/passenger-experimental/ubuntu hardy main" > /etc/apt/sources.list.d/brightbox-passenger.list'
-sudo apt-key adv --keyserver keyserver.ubuntu.com --recv-keys C3173AA6
-sudo apt-get update
------------------------------
-
-You can proceed with installing Phusion Passenger by running:
+Once the PPA is added, you can proceed with installing Phusion Passenger for Apache by running:
 
 ---------------------------------------------
 sudo apt-get install libapache2-mod-passenger
@@ -386,32 +377,22 @@ The Apache package provides configuration snippets for you, so you don't need to
 
 .Nginx
 
-On Ubuntu versions newer than 8.04 Hardy, register the Brightbox Apache PPA as follows:
+First register the Brightbox Apache PPA. Run this on Ubuntu:
 
 -----------------------------
 sudo apt-add-repository ppa:brightbox/passenger-experimental
 sudo apt-get update
 -----------------------------
 
-On Ubuntu 8.04 Hardy and on Debian, the `apt-add-repository` command isn't available so you have to install the repository and the key by hand.
-
-Debian 6:
+On Debian, the `apt-add-repository` command isn't available so you have to install the repository and the key by hand:
 
 -----------------------------
-sudo sh -c 'echo "deb http://ppa.launchpad.net/brightbox/passenger-experimental/ubuntu lucid main" > /etc/apt/sources.list.d/brightbox-passenger-nginx.list'
+echo deb http://ppa.launchpad.net/brightbox/passenger-experimental/ubuntu lucid main | sudo tee /etc/apt/sources.list.d/brightbox-passenger-nginx.list
 sudo apt-key adv --keyserver keyserver.ubuntu.com --recv-keys C3173AA6
 sudo apt-get update
 -----------------------------
 
-Ubuntu 8.04 Hardy:
-
------------------------------
-sudo sh -c 'echo "deb http://ppa.launchpad.net/brightbox/passenger-experimental/ubuntu hardy main" > /etc/apt/sources.list.d/brightbox-passenger-nginx.list'
-sudo apt-key adv --keyserver keyserver.ubuntu.com --recv-keys C3173AA6
-sudo apt-get update
------------------------------
-
-Then:
+Once the PPA is added, you can proceed with installing Phusion Passenger for Nginx by running:
 
 ---------------------------------------------
 sudo apt-get install nginx-full
@@ -420,7 +401,7 @@ sudo apt-get install nginx-full
 You'll then need to enable the Phusion Passenger module in Nginx by creating the following configuration file:
 
 -----------------------------------------------
-sudo sh -c 'echo "passenger_root /usr/lib/ruby/vendor_ruby/phusion_passenger/locations.ini;" > /etc/nginx/conf.d/passenger.conf'
+echo "passenger_root /usr/lib/ruby/vendor_ruby/phusion_passenger/locations.ini;" | sudo tee /etc/nginx/conf.d/passenger.conf
 -----------------------------------------------
 
 Then restart Nginx to apply the changes:
@@ -431,7 +412,33 @@ sudo /etc/init.d/nginx restart
 
 .Standalone
 
-Unfortunately, no packages are provided for Phusion Passenger Standalone.
+First register the Brightbox Apache PPA. Run this on Ubuntu:
+
+-----------------------------
+sudo apt-add-repository ppa:brightbox/passenger-experimental
+sudo apt-get update
+-----------------------------
+
+On Debian, the `apt-add-repository` command isn't available so you have to install the repository and the key by hand:
+
+-----------------------------
+echo deb http://ppa.launchpad.net/brightbox/passenger-experimental/ubuntu lucid main | sudo tee /etc/apt/sources.list.d/brightbox-passenger.list
+sudo apt-key adv --keyserver keyserver.ubuntu.com --recv-keys C3173AA6
+sudo apt-get update
+-----------------------------
+
+Once the PPA is added, you can proceed with installing Phusion Passenger for Apache by running:
+
+---------------------------------------------
+sudo apt-get install ruby-passenger
+---------------------------------------------
+
+You can then proceed with starting Phusion Passenger Standalone:
+
+---------------------------------------------
+cd /path-to-your-app
+passenger start
+---------------------------------------------
 
 
 === Installing or upgrading on Red Hat, Fedora, CentOS or ScientificLinux
@@ -508,7 +515,38 @@ yum install passenger-standalone
 [float]
 ==== Building your own packages
 
-There are instructions for building your own packages and Yum repositories in the link:https://github.com/FooBarWidget/passenger/tree/master/rpm#readme[rpm directory ReadMe] within the link:https://github.com/FooBarWidget/passenger[GitHub repository].
+There are instructions for building your own packages and Yum repositories in the link:https://github.com/phusion/passenger/tree/master/rpm#readme[rpm directory ReadMe] within the link:https://github.com/phusion/passenger[GitHub repository].
+
+
+=== Installing or upgrading on Mac OS X with Homebrew
+
+.Open source
+
+Every time we release a new Phusion Passenger version, we make it available through Homebrew. Please note that the Homebrew maintainers have to merge our pull requests manually, so it may take a day or two before a new version shows up in the official Homebrew repository.
+
+ 1. Update the Homebrew recipes:
++
+---------------------------
+brew update
+---------------------------
+ 2. Run the following command and follow the instructions. This will give you access to link:Users%20guide%20Apache.html[Phusion Passenger for Apache] and link:Users%20guide%20Standalone.html[Phusion Passenger Standalone].
++
+---------------------------
+brew install passenger
+-OR-
+brew upgrade passenger
+---------------------------
+ 3. (Optional) If you want to use link:Users%20guide%20Nginx.html[Phusion Passenger for Nginx], run:
++
+---------------------------
+brew install nginx --with-passenger
+-OR-
+brew upgrade nginx --wtih-passenger
+---------------------------
+
+.Enterprise
+
+link:https://www.phusionpassenger.com/enterprise[Phusion Passenger Enterprise] is currently not available through Homebrew. Please try one of the other installation methods insteads.
 
 
 === Upgrading from open source to Enterprise
@@ -659,6 +697,8 @@ On some systems, C/C++ libraries and headers that Phusion Passenger requires may
 	These flags are injected into all C/C++ compiler invocations that involve linking. This includes compiler invocations that compile *and* link. The flags are injected at the beginning of the command string, but after `EXTRA_PRE_CFLAGS` and `EXTRA_PRE_CXXFLAGS`.
 `EXTRA_LDFLAGS`::
 	Similar to `EXTRA_PRE_LDFLAGS`, but injected at the very end of the command string, even after `EXTRA_CFLAGS` and `EXTRA_CXXFLAGS`.
+`PASSENGER_THREAD_LOCAL_STORAGE`::
+	Setting this to 1 will enable the `PASSENGER_THREAD_LOCAL_STORAGE` macro, which forcefully disables the use of thread-local storage inside the Phusion Passenger codebase. Setting this environment variable is useful on systems that have broken support for thread-local storage, despite passing our build system's check for proper thread-local storage support. At the time of writing, one user has reported that Ubuntu 12.04 32-bit has broken thread-local storage report although neither the reporter nor us were able to reproduce the problem on any other systems running Ubuntu 12.04 32-bit. Note that this flag has no effect on non-Phusion Passenger code.
 
 NOTE: If you run the installer with `sudo` then environment variables may not be passed properly. Learn more at <<env_vars_and_sudo,Environment variables and sudo>>.
 
@@ -879,6 +919,7 @@ done this, you need to remove the Phusion Passenger files.
   in which you placed the extracted Phusion Passenger files. This directory is the
   same as the one pointed to the by `PassengerRoot`/`passenger_root` configuration directive.
 - If you installed Phusion Passenger through APT or YUM, then use them to uninstall Phusion Passenger.
+- If you installed Phusion Passenger through Homebrew, then run `brew uninstall passenger`.
 
 ifdef::nginx[]
 Nginx does not have to be recompiled. Altough it contains Phusion Passenger code, it will not do anything when all Phusion Passenger configuration directives are removed.