0
@@ -177,7 +177,7 @@
0
     line
0
     render_template 'apache2_config_snippets',
0
       :module_location => "#{PASSENGER_ROOT}/ext/apache2/mod_passenger.so",
0
-			:spawn_server_location => "#{PASSENGER_ROOT}/bin/passenger-spawn-server",
0
+			:passenger_root => PASSENGER_ROOT,
0
       :ruby => RUBY
0
     wait
0
   end

0
@@ -234,14 +234,12 @@
0
 Passenger's behavior. Passenger's Apache module supports the following
0
 configuration options:
0
 
0
-RailsSpawnServer <filename>::
0
-	The location to the Passenger spawn server. This configuration option is
0
+PassengerRoot <directory>::
0
+	The location to the Passenger root directory. This configuration option is
0
   essential to Passenger. The correct value is given by the installer,
0
   and should usually not be changed manually.
0
 +
0
-This option may only occur once, in the global server configuration. If
0
-this option is not given, then Passenger will look for the program
0
-`passenger-spawn-server` in `$PATH`.
0
+This required option may only occur once, in the global server configuration.
0
 
0
 RailsBaseURI <uri>::
0
   Used to specify that the given URI is a Rails application. See
0
@@ -601,7 +599,7 @@
0
 
0
 ==== The Apache error log says that the spawn manager script does not exist, or that it does not have permission to execute it ====
0
 
0
-If you are sure that the RailsSpawnServer configuration option is set correctly,
0
+If you are sure that the 'PassengerRoot' configuration option is set correctly,
0
 then this problem is most likely caused by the fact that you're running Apache
0
 with SELinux. On Fedora, CentOS and RedHat Enterprise Linux, Apache is locked
0
 down by SELinux policies.
0
@@ -748,7 +746,7 @@
0
 involves two steps:
0
 
0
 1. Moving the directory.
0
-2. Updating the ``RailsSpawnServer'' configuration option in Apache.
0
+2. Updating the ``PassengerRoot'' configuration option in Apache.
0
 
0
 For example, if Passenger is located in '/opt/passenger/', and you'd like to
0
 move it to '/usr/local/passenger/', then do this:
0
@@ -761,7 +759,7 @@
0
 2. Edit your Apache configuration file, and set:
0
 +
0
 ------------------------------------
0
-RailsSpawnServer /usr/local/passenger/bin/passenger-spawn-server
0
+PassengerRoot /usr/local/passenger
0
 ------------------------------------
0
 
0
 === Installing multiple Ruby on Rails versions ===

0
@@ -3,7 +3,7 @@
0
 Please edit your Apache configuration file, and add these lines:
0
 
0
    <b>LoadModule passenger_module <%= @module_location %></b>
0
-   <b>RailsSpawnServer <%= @spawn_server_location %></b>
0
+   <b>PassengerRoot <%= @passenger_root %></b>
0
    <b>RailsRuby <%= @ruby %></b>
0
 
0
 After you restart Apache, you are ready to deploy any number of Ruby on Rails