[symfony#2410] Minor tweaks for new web server documentation

weaverryan · weaverryan · commit 8443b187542d · 2013-04-09T08:12:54.000-05:00
diff --git a/cookbook/configuration/web_server_configuration.rst b/cookbook/configuration/web_server_configuration.rst
@@ -6,12 +6,10 @@ Configuring a web server
 
 The web directory is the home of all of your application's public and static
 files. Including images, stylesheets and JavaScript files. It is also where the
-front controllers live. For more details, see the chapter about
-:ref:`the-web-directory`.
+front controllers live. For more details, see the :ref:`the-web-directory`.
 
-The web directory is the one that you will need to configure in your webserver
-as the documentroot. In the examples below, this directory is in
-``/var/www/project/web/``.
+The web directory services as the document root when configuring your web
+server. In the examples below, this directory is in ``/var/www/project/web/``.
 
 Apache2
 -------
@@ -20,7 +18,7 @@ For advanced Apache configuration options, see the official `Apache`_
 documentation. The minimum basics to get your application running under Apache2
 are:
 
-.. code-block:: Apache2
+.. code-block:: apache
 
     <VirtualHost *:80>
         ServerName www.domain.tld
@@ -40,8 +38,8 @@ are:
 .. note::
 
     For performance reasons, you will probably want to set
-    ``AllowOverride None`` and implement your ``.htaccess`` into the
-    vhost config.
+    ``AllowOverride None`` and implement the rewrite rules in the ``web/.htaccess``
+    into the virtualhost config.
 
 Nginx
 -----
@@ -66,14 +64,14 @@ are:
             rewrite ^(.*)$ /app.php/$1 last;
         }
 
-        location ~ ^/(config|app|app_dev)\.php(/|$) {
+        location ~ ^/(app|app_dev)\.php(/|$) {
             fastcgi_pass unix:/var/run/php5-fpm.sock;
             fastcgi_split_path_info ^(.+\.php)(/.*)$;
             include fastcgi_params;
             fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name;
             fastcgi_param HTTPS off;
         }
-        
+
         error_log /var/log/nginx/project_error.log;
         access_log /var/log/nginx/project_access.log;
     }
@@ -83,6 +81,12 @@ are:
     Depending on your PHP-FPM config, the ``fastcgi_pass`` can also be
     ``fastcgi_pass 127.0.0.1:9000``.
 
+.. tip::
+
+    This executes **only** ``app.php`` and ``app_dev.php`` in the web directory.
+    All other files will be served as text. If you have other PHP files in
+    your web directory, be sure to include them in the ``location`` block
+    above.
+
 .. _`Apache`: http://httpd.apache.org/docs/current/mod/core.html#documentroot
 .. _`Nginx`: http://wiki.nginx.org/Symfony
-
