Merge branch '2.5'

weaverryan · weaverryan · commit 1afb389d3858 · 2014-10-19T11:36:28.000-04:00
* 2.5: [#4104] Re-organizing language in one sentence APACHE_LOG_DIR note added Use ${APACHE_LOG_DIR} instead of /var/log/apache2
diff --git a/cookbook/configuration/web_server_configuration.rst b/cookbook/configuration/web_server_configuration.rst
@@ -52,6 +52,11 @@ are:
         CustomLog /var/log/apache2/project_access.log combined
     </VirtualHost>
 
+.. note::
+
+    If your system supports the ``APACHE_LOG_DIR`` variable, you may want
+    to use ``${APACHE_LOG_DIR}/`` instead of ``/var/log/apache2/``.
+
 .. note::
 
     For performance reasons, you will probably want to set
