passenger 4.0.42 → 4.0.43

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    ZTk2YzkwYzQ3MzQwMjFmMTYwMWNlY2NmYmZkYzE2NjU2OWU0OGJhMQ==
+    YWY0MDg5NjYxOTVmODI3N2RhNTFlZjlhMTc0NWFhN2U4N2FjYWUwOQ==
   data.tar.gz: !binary |-
-    MzJiMDU1ZmM0NDU3YjYwNzlkMDBiNjhmNjA3Y2ZhNDIzNTVjYjRmMQ==
+    MDVkZTY5YmIzZWEwZDk5Y2E1ODlhNTQ1YWVlZWE5NDI4ZDJmN2EzNA==
 SHA512:
   metadata.gz: !binary |-
-    MDdlZmY0M2Y3MGJmZTI2OWE1ZWIxNWY3NDIxMjlkNDQxNWQ0NWY3ZWQ5ODRm
-    Yjg1ODJlYzcxMDA4ZThlNzM0MjM2OTM0MzI2ZTdjYjlmN2NhOTkyY2MxMTY1
-    YjQ0NmRlZDQ0OWI3ODgwMTU2MjM5N2FjNjEwNGE3ODU4ZDRlMTc=
+    M2FiMWE4OWRmZTJjZmY2YmMwZmE1ZjFkYzk2YTM4ZDhiOGFmNzlhNmI5YzAx
+    MGU1YWVlY2IwYmFhNGE0MzQ1Y2ExMWIzOWQ1NzFkZDc5MTQ0NzE4NzQ0ZjY0
+    Y2U2ZmFiOTVlOWIwYzUyZDU2NzFiMGU0MGQ2MmIwOGRmNTY0NWY=
   data.tar.gz: !binary |-
-    ZjAzMzFlN2E2YTE3YTNkOTQ0MTJlNTBlNDgwZmNmOTE4MjE3NDIwM2U2YThl
-    YWY4NzMzNDE4Y2MyZmM5NmVjMDE5NGMwNzU0YjI5N2YyYWNlOTkyY2M3MWZi
-    ZGM1YWY3ZDI3ZGY4YmZiODA5MWU5YWZlMmU4MGRiNDg5ZjY4MGM=
+    MGQ4OTUwZjA1MGU4OWU3YjU4YmZjYjYwZmZhNDlmMmE2YzRhNzk0OWRkOTlj
+    NjlkZjU1MTBkNGFmNzc1NTdmNmU0MTQxODFmMzU4ZmRkNDAyNzQ3NDNiZGZk
+    ZjZhNjQ1Mjk2NzFkN2UwZDBlNjM3ZmJmM2Q1MWYzYjE5NGM2NTM=

checksums.yaml.gz.asc

@@ -2,11 +2,11 @@
 Version: GnuPG/MacGPG2 v2.0.17 (Darwin)
 Comment: GPGTools - http://gpgtools.org
 
-iQEcBAABAgAGBQJTagHhAAoJECrHRaUKISqM3JgH/iO5ytwG5HOsJtQIysPKlA1i
-D2rnfAPBxs40pvf1ga8qLFvpcUyxtZayP6JU5xNNM/5Z31fJt9gQGsLoA6K6SuLq
-qvEq7C25Hiub2PWIhz1Ejl+uMQAFBO8bZiAWutkKTSyg3FbBxz8QqUyExvl6KjWm
-Izw60V1sgyBZfKxm2gKC6GC3yCBJXPfyWSFOV+1QgZOHDLMH+ehELCAXzYmKj/Lg
-sA+l+4W1gcDv6aDuf1mKMRytU6F6fe1KXeShiGVvE80R4sXz3YnKNU+RADbTcSLA
-f6eBkPTOjiuXGgYzQQFhcrVy3c4OnxSqBt4pf99pMqCbbExmX4pjKUsyGpMftDY=
-=Qmot
+iQEcBAABAgAGBQJThfVWAAoJECrHRaUKISqM6JcIAItnZwCnNA1rlB+ok8htu4bv
+ZihNlJWmnzihxH7ZAD7qt02XegS63gcjGQ/Y2hxDBbKXaQ6WnqBtmAcOxT3T7YYy
+MeaeLTLcXn7LJvGrrJm1CNWnUpce3zPVecRvuyGBD2yYEpdmtnBS1Mb9j8unZ5cs
+S/WGpIw9rkntrisM8g/dFMJgsJ51LPTkZzb9QkpWG8GfBG7b/Rpzyz3W7f92YSnZ
+feWN3tvFo8UB+CeUCN6XOS0VcGCsKdVJSb5D837AGtymrRhSJ9nJvcz1uQZJX48U
+WEW76te2BwzDchBn1RgvJirLVjx5t2jfC9UWNcLcnopxlzjniRozySdrNDDLQWc=
+=I4xQ
 -----END PGP SIGNATURE-----

data.tar.gz.asc

@@ -2,11 +2,11 @@
 Version: GnuPG/MacGPG2 v2.0.17 (Darwin)
 Comment: GPGTools - http://gpgtools.org
 
-iQEcBAABAgAGBQJTagHhAAoJECrHRaUKISqM4/gH/jWZegkrdqOsXBTGp5zXL5iY
-Gx2+AkGOsbYEZ1CIeNn7VlUDqNTAHX4vcSulnP6Tefhs3bJHf6okgv6Bx2NGPtU6
-8H9ju7z/+ZfJDkD2nymwZpApRppUGJKy47VFDjVQX2soHNA1VFdcqnv9bjcWEWSO
-DXFLoUYVNVp/9y3Q9uKmP0Uz5Mr/lqzm2VfkUjZjAJVcpSUkGysWC0+8UwAMfuVd
-SBlEZ0G9RoJ5e6vMhsdBv0L7jFSt9yGRTCCi5gqgLtoRzUSw7GVUZj36e28KYLzg
-H900Ze8sqOczw4VFN8Fw6UXYV778YPpcx+r5Lf0BCLgTs5Tw/K0S9Emk0IiYOBM=
-=7RXc
+iQEcBAABAgAGBQJThfVWAAoJECrHRaUKISqMAJsIAKvyWvcg58WQGdss/ZSDAFw5
+fgb4b8YAZyCJuwhOya+Rb4cR5QJ2Yz8o/PqJ4yfqU+hkRJcBCsvW/OPkFr/IDIDW
+ep74AyiQcL7gXxoyZtK1vSKefuCN0RTguXY9sYzZB7VwJ1UDykMB+fqcO8kTQy48
+e9mBiwNHY+GHFLULyJN3hsNiwgzxx9yNMSHtt2TE8I9aK5aFSXOOG7boyI8jseRr
+kI3NXj4HI6hH6c4klf0nPj+9BLVUI77MGQ/0OiOjrdkTxNdM7fJkgy1b/+p5gT+P
+gjsHpxdGR76ppHnW6LpyiBfMLEPpniq/Dx/I037cwqLltw+qJeBawgbXE8Yr9iM=
+=/Ohk
 -----END PGP SIGNATURE-----

data/CHANGELOG

@@ -1,3 +1,16 @@
+Release 4.0.43
+--------------
+
+ * Introduced a new command `passenger-config list-instances`, which prints all
+   running Phusion Passenger instances.
+ * Introduced a new command `passenger-config system-metrics, which displays
+   metrics about the system such as the total CPU and memory usage.
+ * Fixed some compilation problems caused by the compiler capability autodetector.
+ * System metrics such as total CPU usage and memory usage, are now sent to
+   [Union Station](https://www.unionstationapp.com) in preparation for future
+   features.
+
+
 Release 4.0.42
 --------------
 

data/CONTRIBUTING.md

@@ -280,23 +280,6 @@ The usual Ruby coding style applies, with some exceptions:
  * Use 4-space tabs for indentation.
  * Return values explicitly with `return`.
 
-### Prefer shared_ptrs
+## Further reading
 
-You should prefer `shared_ptr`s over raw pointers because they make memory leaks and memory errors less likely. There are only very limited cases in which raw pointers are justified, e.g. optimizations in very hot code paths.
-
-### Event loop callbacks
-
-Be careful with event loop callbacks, they are more tricky than one would expect.
-
- * If your event loop callback ever calls user-defined functions, either explicitly or implicitly, you should obtain a `shared_ptr` to your `this` object. This is because the user-defined function could call something that would free your object. Your class should derive from `boost::enable_shared_from_this` to make it easy for you to obtain a `shared_ptr` to yourself.
-
-        void callback(ev::io &io, int revents) {
-            shared_ptr<Foo> self = shared_from_this();
-            ...
-        }
-
- * Event loop callbacks should catch expected exceptions. Letting an exception pass will crash the program. When system call failure simulation is turned on, the code can throw arbitrary SystemExceptions, so beware of those.
-
-### Thread interruption and RAII destructors
-
-When using thread interruption, make sure that RAII destructors are non-interruptable. If your code is interrupted and then a `thread_interrupted` is thrown, make sure that RAII destructors don't check for the interruption flag and then throw `thread_interrupted` again. This not only fails to clean things up properly, but also confuses the exception system, resulting in strange errors such as "terminate called without an active exception".
+Please read "doc/CodingTipsAndPitfalls.md".

data/build/agents.rb

@@ -60,6 +60,7 @@ dependencies = [
 	'ext/common/agents/HelperAgent/RequestHandler.h',
 	'ext/common/agents/HelperAgent/RequestHandler.cpp',
 	'ext/common/agents/HelperAgent/ScgiRequestParser.h',
+	'ext/common/agents/HelperAgent/SystemMetricsTool.cpp',
 	'ext/common/Constants.h',
 	'ext/common/StaticString.h',
 	'ext/common/Account.h',
@@ -69,6 +70,7 @@ dependencies = [
 	'ext/common/Logging.h',
 	'ext/common/ResourceLocator.h',
 	'ext/common/Utils/ProcessMetricsCollector.h',
+	'ext/common/Utils/SystemMetricsCollector.h',
 	'ext/common/Utils/VariantMap.h',
 	'ext/common/ApplicationPool2/Pool.h',
 	'ext/common/ApplicationPool2/Common.h',
@@ -150,7 +152,8 @@ file AGENT_OUTPUT_DIR + 'PassengerLoggingAgent' => dependencies do
 		"#{EXTRA_CXX_LDFLAGS}")
 end
 
-spawn_preparer_libs = COMMON_LIBRARY.only('Utils/Base64.o')
+spawn_preparer_libs = COMMON_LIBRARY.only('Utils/Base64.o', 'Utils/SystemTime.o',
+	'Utils/StrIntUtils.o', 'Utils/IOUtils.o')
 dependencies = [
 	'ext/common/agents/SpawnPreparer.cpp',
 	spawn_preparer_libs.link_objects,

data/build/cxx_tests.rb

@@ -115,7 +115,9 @@ TEST_CXX_OBJECTS = {
 		ext/common/agents/LoggingAgent/RemoteSender.h
 		ext/common/agents/LoggingAgent/DataStoreId.h
 		ext/common/agents/LoggingAgent/FilterSupport.h
-		ext/common/UnionStation.h
+		ext/common/UnionStation/Connection.h
+		ext/common/UnionStation/Core.h
+		ext/common/UnionStation/Transaction.h
 		ext/common/Utils.h
 		ext/common/EventedServer.h
 		ext/common/EventedClient.h
@@ -144,7 +146,10 @@ TEST_CXX_OBJECTS = {
 		ext/common/agents/HelperAgent/FileBackedPipe.h
 		ext/common/agents/HelperAgent/ScgiRequestParser.h
 		ext/common/agents/HelperAgent/AgentOptions.h
-		ext/common/UnionStation.h
+		ext/common/UnionStation/Connection.h
+		ext/common/UnionStation/Core.h
+		ext/common/UnionStation/Transaction.h
+		ext/common/UnionStation/ScopeLog.h
 		ext/common/ApplicationPool2/Pool.h
 		ext/common/ApplicationPool2/SuperGroup.h
 		ext/common/ApplicationPool2/Group.h

data/build/debian.rb

@@ -166,7 +166,7 @@ def create_debian_binary_package_task(distribution, arch)
 		command = "cd #{PKG_DIR}/official && " +
 			"pbuilder-dist #{distribution} #{arch} build #{base_name}.dsc " +
 			"2>&1 | awk '{ print strftime(\"%Y-%m-%d %H:%M:%S -- \"), $0; fflush(); }'" +
-			" | tee #{logfile}"
+			" | tee #{logfile}; test ${PIPESTATUS[0]} -eq 0"
 		sh "bash -c #{Shellwords.escape(command)}"
 		sh "echo Done >> #{logfile}"
 	end

data/debian.template/control.template

@@ -38,7 +38,6 @@ Depends: ${shlibs:Depends}, ${misc:Depends},
  ruby-daemon-controller (>= 1.2.0)
 Recommends: passenger-doc (= ${binary:Version}), passenger-dev (= ${binary:Version}),
  crash-watch
-Suggests: python
 Breaks: libapache2-mod-passenger (<< <%= DEBIAN_EPOCH %>:<%= PACKAGE_VERSION %>), passenger-common,
  passenger-common1.8, passenger-common1.9.1, ruby-passenger
 Replaces: libapache2-mod-passenger (<< <%= DEBIAN_EPOCH %>:<%= PACKAGE_VERSION %>), passenger-common,
@@ -54,7 +53,6 @@ Architecture: any
 Depends: ${shlibs:Depends}, ${misc:Depends},
  ruby2.2 | ruby2.1 | ruby2.0 | ruby1.9.1 | ruby1.8 | ruby-interpreter,
  passenger (= ${binary:Version})
-Suggests: python
 Replaces: ruby-passenger-dev
 Conflicts: ruby-passenger-dev
 Provides: ruby-passenger-dev

data/doc/CodingTipsAndPitfalls.md

@@ -0,0 +1,56 @@
+# Coding tips and common coding pitfalls
+
+## Prefer shared_ptrs
+
+You should prefer `shared_ptr`s over raw pointers because they make memory leaks and memory errors less likely. There are only very limited cases in which raw pointers are justified, e.g. optimizations in very hot code paths.
+
+### Unexpected shared_ptr invalidation
+
+Suppose you have a function which takes a reference to a shared_ptr, like this:
+
+    void foo(const shared_ptr<Client> &client) {
+        performNetworking();
+        log(client->getAddress());
+    }
+
+You might think that `client` is never going to be destroyed during the scope of the function, right? Wrong. If `client` came from a non-local variable, and your function calls another function (perhaps indirectly) which resets that variable, then `client` is going to be invalidated. Consider a contrived example like this:
+
+    static shared_ptr<Client> client;
+
+    void performNetworking() {
+        if (write(...) == -1) {
+            // An error occurred, disconnect client.
+            client.reset();
+        }
+    }
+
+More realistically, this kind of bug is likely to occur if `foo()` calls some function which invokes a user-defined callback, which unreferences the original object under some conditions. Thus, if your code might call an arbitrary user-defined function, you should increase the reference count locally:
+
+    void foo(const shared_ptr<Client> &client) {
+        shared_ptr<Client> extraReference = client;
+        performNetworking();
+        log(client->getAddress());
+    }
+
+A variant of this pitfall is documented under "Event loop callbacks".
+
+## Event loop callbacks
+
+### Obtain extra shared_ptr reference on `this`
+
+If your event loop callback ever calls user-defined functions, either explicitly or implicitly, you should obtain a `shared_ptr` to your `this` object. This is because the user-defined function could call something that would free your object. The problem is documented in detail in "Unexpected shared_ptr invalidation".
+
+Your class should derive from `boost::enable_shared_from_this` to make it easy for you to obtain a `shared_ptr` to yourself.
+
+        void callback(ev::io &io, int revents) {
+            shared_ptr<Foo> extraReference = shared_from_this();
+            ...
+        }
+
+### Exceptions
+
+Event loop callbacks should catch expected exceptions. Letting an exception pass will crash the program. When system call failure simulation is turned on, the code can throw arbitrary SystemExceptions, so beware of those.
+
+## Thread interruption and RAII destructors
+
+When using thread interruption, make sure that RAII destructors are non-interruptable. If your code is interrupted and then a `thread_interrupted` is thrown, make sure that RAII destructors don't check for the interruption flag and then throw `thread_interrupted` again. This not only fails to clean things up properly, but also confuses the exception system, resulting in strange errors such as "terminate called without an active exception".

data/doc/Users guide Apache.idmap.txt

@@ -14,7 +14,7 @@
 
 1. Support information	=>	support-information-zkewk3
 
-1.1. Supported operating systems	=>	supported-operating-systems-rhbg35
+1.1. Supported operating systems and languages	=>	supported-operating-systems-rhbg35
 
 1.2. Where to get support	=>	where-to-get-support-f3pbrb
 
@@ -264,31 +264,33 @@
 
 9.2. Why does the first request take a long time?	=>	why-does-the-first-request-take-a-long-time--12mg452
 
-9.3. OS X: The installer cannot locate MAMP’s Apache	=>	macos-x-the-installer-cannot-locate-mamp-s-apache-or908n
+9.3. I get "command not found" when running a Phusion Passenger command through sudo	=>	i-get-command-not-found-when-running-a-phusion-passenger-command-through-sudo-v9z223
 
-9.4. Apache reports a "403 Forbidden" error	=>	apache-reports-a-403-forbidden-error-140tb4p
+9.4. OS X: The installer cannot locate MAMP’s Apache	=>	macos-x-the-installer-cannot-locate-mamp-s-apache-or908n
 
-9.5. Static assets such as images and stylesheets aren’t being displayed	=>	static-assets-such-as-images-and-stylesheets-aren-t-being-displayed-uaptpi
+9.5. Apache reports a "403 Forbidden" error	=>	apache-reports-a-403-forbidden-error-140tb4p
 
-9.6. The Apache error log says that the spawn manager script does not exist, or that it does not have permission to execute it	=>	the-apache-error-log-says-that-the-spawn-manager-script-does-not-exist-or-that-it-does-not-have-permission-to-execute-it-1fmoozk
+9.6. Static assets such as images and stylesheets aren’t being displayed	=>	static-assets-such-as-images-and-stylesheets-aren-t-being-displayed-uaptpi
 
-9.7. The application thinks its not on SSL even though it is	=>	the-application-thinks-its-not-on-ssl-even-though-it-is-u9fcp1
+9.7. The Apache error log says that the spawn manager script does not exist, or that it does not have permission to execute it	=>	the-apache-error-log-says-that-the-spawn-manager-script-does-not-exist-or-that-it-does-not-have-permission-to-execute-it-1fmoozk
 
-9.8. Ruby on Rails-specific troubleshooting	=>	ruby-on-rails-specific-problems-6umss5
+9.8. The application thinks its not on SSL even though it is	=>	the-application-thinks-its-not-on-ssl-even-though-it-is-u9fcp1
 
-9.8.1. The "About your application’s environment" link does not work	=>	the-about-your-application-s-environment-link-does-not-work-7k4tlm
+9.9. Ruby on Rails-specific troubleshooting	=>	ruby-on-rails-specific-problems-6umss5
 
-9.8.2. The Rails application reports that it’s unable to start because of a permission error	=>	the-rails-application-reports-that-it-s-unable-to-start-because-of-a-permission-error-v53i6s
+9.9.1. The "About your application’s environment" link does not work	=>	the-about-your-application-s-environment-link-does-not-work-7k4tlm
 
-9.8.3. The Rails application’s log file is not being written to	=>	my-rails-application-s-log-file-is-not-being-written-to-3i747l
+9.9.2. The Rails application reports that it’s unable to start because of a permission error	=>	the-rails-application-reports-that-it-s-unable-to-start-because-of-a-permission-error-v53i6s
 
-9.9. Conflicting Apache modules	=>	conflicting-apache-modules-1uwpixk
+9.9.3. The Rails application’s log file is not being written to	=>	my-rails-application-s-log-file-is-not-being-written-to-3i747l
 
-9.9.1. mod_userdir	=>	mod-userdir-x5e2te
+9.10. Conflicting Apache modules	=>	conflicting-apache-modules-1uwpixk
 
-9.9.2. MultiViews (mod_negotiation)	=>	multiviews-mod-negotiation--zchfg0
+9.10.1. mod_userdir	=>	mod-userdir-x5e2te
 
-9.9.3. VirtualDocumentRoot	=>	virtualdocumentroot-14cwd7l
+9.10.2. MultiViews (mod_negotiation)	=>	multiviews-mod-negotiation--zchfg0
+
+9.10.3. VirtualDocumentRoot	=>	virtualdocumentroot-14cwd7l
 
 10. Analysis and system maintenance	=>	analysis-and-system-maintenance-qvkwzr
 

data/doc/Users guide Nginx.idmap.txt

@@ -14,7 +14,7 @@
 
 1. Support information	=>	support-information-nl5gdn
 
-1.1. Supported operating systems	=>	supported-operating-systems-a5n2x4
+1.1. Supported operating systems and languages	=>	supported-operating-systems-a5n2x4
 
 1.2. Where to get support	=>	where-to-get-support-2s9na5
 
@@ -250,15 +250,17 @@
 
 9.3. Upon accessing the web app, Nginx reports a "Permission denied" error	=>	upon-accessing-the-web-app-nginx-reports-a-permission-denied-error-1wgatlk
 
-9.4. The application thinks its not on SSL even though it is	=>	the-application-thinks-its-not-on-ssl-even-though-it-is-1e2m21h
+9.4. I get "command not found" when running a Phusion Passenger command through sudo	=>	i-get-command-not-found-when-running-a-phusion-passenger-command-through-sudo-10fzwno
 
-9.5. Ruby on Rails-specific troubleshooting	=>	ruby-on-rails-specific-troubleshooting-n8u5u1
+9.5. The application thinks its not on SSL even though it is	=>	the-application-thinks-its-not-on-ssl-even-though-it-is-1e2m21h
 
-9.5.1. The "About your application’s environment" link does not work	=>	the-about-your-application-s-environment-link-does-not-work-9p7b2g
+9.6. Ruby on Rails-specific troubleshooting	=>	ruby-on-rails-specific-troubleshooting-n8u5u1
 
-9.5.2. The Rails application reports that it’s unable to start because of a permission error	=>	the-rails-application-reports-that-it-s-unable-to-start-because-of-a-permission-error-58ww8s
+9.6.1. The "About your application’s environment" link does not work	=>	the-about-your-application-s-environment-link-does-not-work-9p7b2g
 
-9.5.3. The Rails application’s log file is not being written to	=>	the-rails-application-s-log-file-is-not-being-written-to-9m2i5h
+9.6.2. The Rails application reports that it’s unable to start because of a permission error	=>	the-rails-application-reports-that-it-s-unable-to-start-because-of-a-permission-error-58ww8s
+
+9.6.3. The Rails application’s log file is not being written to	=>	the-rails-application-s-log-file-is-not-being-written-to-9m2i5h
 
 10. Analysis and system maintenance	=>	analysis-and-system-maintenance-1nnlnj8
 

data/doc/Users guide Standalone.idmap.txt

@@ -14,7 +14,7 @@
 
 1. Support information	=>	support-information-1x8e9ee
 
-1.1. Supported operating systems	=>	supported-operating-systems-1387080
+1.1. Supported operating systems and languages	=>	supported-operating-systems-1387080
 
 1.2. Where to get support	=>	where-to-get-support-xkx7rx
 
@@ -92,6 +92,8 @@
 
 7.2. Upon uploading a file, Phusion Passenger reports "client_body_temp/00000000xx failed (2: No such file or directory)"	=>	upon-uploading-a-file-phusion-passenger-reports-client-body-temp-00000000xx-failed-2-no-such-file-or-directory--d01goe
 
+7.3. I get "command not found" when running a Phusion Passenger command through sudo	=>	i-get-command-not-found-when-running-a-phusion-passenger-command-through-sudo-14k8kde
+
 8. Appendix: About environment variables	=>	appendix-about-environment-variables-1ct91x3
 
 8.1. Working with environment variables	=>	working-with-environment-variables-11cmwlv

data/doc/Users guide Standalone.txt

@@ -130,7 +130,7 @@ Every time you start Standalone, you must pass the `--nginx-config-template` par
 
 [source,sh]
 ------------------------------------------
-passenger start --nginx-config-template nginx.config.erb
+passenger start --nginx-config-template nginx.conf.erb
 ------------------------------------------
 
 Alternatively, if you don't want to pass this parameter every time, you can also set the `nginx_config_template` option in <<config_file,passenger-standalone.json>>.

data/doc/users_guide_snippets/environment_variables.txt

@@ -69,6 +69,7 @@ export PATH=/opt/local/bin:$PATH
 export PATH=$PATH:/usr/local/bin
 ---------------------------------
 
+[[the_path_env_var]]
 === The PATH environment variable
 
 The `PATH` environment variable dictates where the system looks for command. It is a colon-separated list of directories. If you get a "command not found" error while you know that the command is installed, then setting `PATH` will help. For example suppose that the command `frobnicator` is in `/opt/local/bin`:

data/doc/users_guide_snippets/installation.txt

@@ -61,7 +61,7 @@ We provide an official Phusion Passenger APT repository. This APT repository con
 
 If you use these packages to install Phusion Passenger then you do not need to run `passenger-install-apache2-module` or `passenger-install-nginx-module`. These packages contain all the binaries that you need.
 
-Packages are available for the x86 and x86_64 architectures. Our policy is to support all Ubuntu LTS releases that are still supported by Canonical, plus the latest non-LTS Ubuntu release, plus all Debian releases that are still supported by Debian.
+Packages are available for the x86 and x86_64 architectures. Our policy is to support all Ubuntu LTS releases that are still supported by Canonical, plus the latest Ubuntu release, plus all Debian releases that are still supported by Debian.
 
 [[install_add_apt_repo]]
 ==== Adding our APT repository
@@ -85,8 +85,8 @@ sudo apt-get install apt-transport-https ca-certificates
 [source,sh]
 --------------------------------------------------------------
 ##### !!!! Only add ONE of these lines, not all of them !!!! #####
-# Ubuntu 13.10
-deb https://oss-binaries.phusionpassenger.com/apt/passenger saucy main
+# Ubuntu 14.04
+deb https://oss-binaries.phusionpassenger.com/apt/passenger trusty main
 # Ubuntu 12.04
 deb https://oss-binaries.phusionpassenger.com/apt/passenger precise main
 # Ubuntu 10.04
@@ -102,8 +102,8 @@ deb https://oss-binaries.phusionpassenger.com/apt/passenger squeeze main
 [source,sh]
 --------------------------------------------------------------
 ##### !!!! Only add ONE of these lines, not all of them !!!! #####
-# Ubuntu 13.10
-deb https://download:YOUR_DOWNLOAD_TOKEN@www.phusionpassenger.com/enterprise_apt saucy main
+# Ubuntu 14.04
+deb https://download:YOUR_DOWNLOAD_TOKEN@www.phusionpassenger.com/enterprise_apt trusty main
 # Ubuntu 12.04
 deb https://download:YOUR_DOWNLOAD_TOKEN@www.phusionpassenger.com/enterprise_apt precise main
 # Ubuntu 10.04

data/doc/users_guide_snippets/support_information.txt

@@ -1,18 +1,51 @@
-=== Supported operating systems ===
+=== Supported operating systems and languages ===
 
-Phusion Passenger works on any POSIX-compliant operating system. In other
+Phusion Passenger works on almost 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. OpenBSD is supported since version 5.2.
-Both 32-bit and 64-bit platforms are supported.
+Supported operating systems:
 
-Please
+[options="header"]
+|==================================================
+| OS                  | Minimum version
+| Ubuntu              | 10.04
+| Debian              | 6
+| Mac OS X            | 10.8 Mountain Lion
+| FreeBSD             | 8
+| OpenBSD             | 5.2
+| Other Unix          | -
+|==================================================
+
+"Other Unix" is supported on a "best-effort" basis. We do not regularly check whether Phusion Passenger still works on other Unices, but if users report issues then we'll try to address them.
+
+Supported architectures:
+
+[options="header"]
+|==================================================
+| Architecture      | Notes
+| x86 (32-bit)      | -
+| x86_64 (64-bit)   | -
+| Other             | Supported on a "best-effort" basis.
+|==================================================
+
+Supported languages and frameworks:
+
+[options="header"]
+|==================================================
+| Language/framework  | Minimum version
+| Ruby (MRI)          | 1.8.5
+| JRuby               | 1.7.0
+| Rubinius            | 2.2.0
+| Ruby on Rails       | 1.2
+| Python              | 2.6
+| Node.js             | 0.10
+| Meteor              | 0.6
+|==================================================
+
+If you run into any issues, 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.
+link:http://groups.google.com/group/phusion-passenger[join our discussion forum].
 
 [[where_to_get_support]]
 === Where to get support ===