1 files changed, 13 insertions, 2 deletions
diff --git a/railties/configs/apache.conf b/railties/configs/apache.conf
index 499477c57b..f24e1753fc 100755
--- a/railties/configs/apache.conf
+++ b/railties/configs/apache.conf
@@ -4,11 +4,22 @@ AddHandler cgi-script .cgi
 Options +FollowSymLinks +ExecCGI
 
 # Redirect all requests not available on the filesystem to Rails
+# By default the cgi dispatcher is used which is very slow
+# 
+# For better performance replace the dispatcher with the fastcgi one
+#
+# Example:
+#   RewriteRule ^(.*)$ dispatch.fcgi?$1 [QSA,L]
 RewriteEngine On
 RewriteRule ^$ index.html [QSA]
 RewriteRule ^([^.]+)$ $1.html [QSA]
 RewriteCond %{REQUEST_FILENAME} !-f
-RewriteRule ^(.*)$ /dispatch.cgi?$1 [QSA,L]
+RewriteRule ^(.*)$ dispatch.cgi?$1 [QSA,L]
 
 # In case Rails experiences terminal errors
-ErrorDocument 500 /500.html
-\ No newline at end of file
+# Instead of displaying this message you can supply a file here which will be rendered instead
+# 
+# Example:
+#   ErrorDocument 500 /500.html
+
+ErrorDocument 500 "<h2>Application error</h2>Rails application failed to start properly"
+\ No newline at end of file