Skip to content

Commit 2feb801

Browse files
committed
Implemented all the changes suggested by reviewers
1 parent 9f49497 commit 2feb801

File tree

5 files changed

+21
-15
lines changed

5 files changed

+21
-15
lines changed

cookbook/configuration/apache_router.rst

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -62,20 +62,20 @@ To test that it's working, create a very basic route for the AppBundle:
6262
# app/config/routing.yml
6363
hello:
6464
path: /hello/{name}
65-
defaults: { _controller: AppBundle:Default:hello }
65+
defaults: { _controller: AppBundle:Greet:hello }
6666
6767
.. code-block:: xml
6868
6969
<!-- app/config/routing.xml -->
7070
<route id="hello" path="/hello/{name}">
71-
<default key="_controller">AppBundle:Default:hello</default>
71+
<default key="_controller">AppBundle:Greet:hello</default>
7272
</route>
7373
7474
.. code-block:: php
7575
7676
// app/config/routing.php
7777
$collection->add('hello', new Route('/hello/{name}', array(
78-
'_controller' => 'AppBundle:Default:hello',
78+
'_controller' => 'AppBundle:Greet:hello',
7979
)));
8080
8181
Now generate the mod_rewrite rules:

cookbook/configuration/environments.rst

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -363,12 +363,15 @@ includes the following:
363363
``appDevDebugProjectContainer.php``
364364
The cached "service container" that represents the cached application
365365
configuration.
366+
366367
``appDevUrlGenerator.php``
367368
The PHP class generated from the routing configuration and used when
368369
generating URLs.
370+
369371
``appDevUrlMatcher.php``
370372
The PHP class used for route matching - look here to see the compiled regular
371373
expression logic used to match incoming URLs to different routes.
374+
372375
``twig/``
373376
This directory contains all the cached Twig templates.
374377

cookbook/configuration/override_dir_structure.rst

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -80,7 +80,7 @@ method::
8080

8181
Here you have changed the location of the directory to ``app/{environment}/logs``.
8282

83-
.. _override-web-directory:
83+
.. _override-web-dir:
8484

8585
Override the ``web`` Directory
8686
------------------------------
@@ -118,7 +118,7 @@ the ``extra.symfony-web-dir`` option in the ``composer.json`` file:
118118

119119
.. note::
120120

121-
If you use the AsseticBundle you need to configure the ``read_from`` option
121+
If you use the AsseticBundle, you need to configure the ``read_from`` option
122122
to point to the correct ``web`` directory:
123123

124124
.. configuration-block::

cookbook/configuration/pdo_session_storage.rst

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -123,10 +123,13 @@ These are parameters that you must configure:
123123

124124
``db_table``
125125
The name of the session table in your database.
126+
126127
``db_id_col``
127128
The name of the id column in your session table (``VARCHAR(255)`` or larger).
129+
128130
``db_data_col``
129131
The name of the value column in your session table (``TEXT`` or ``CLOB``).
132+
130133
``db_time_col``:
131134
The name of the time column in your session table (``INTEGER``).
132135

cookbook/configuration/web_server_configuration.rst

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -8,9 +8,9 @@ The preferred way to develop your Symfony application is to use
88
:doc:`PHP's internal web server </cookbook/web_server/built_in>`. However,
99
when using an older PHP version or when running the application in the production
1010
environment, you'll need to use a fully-featured web server. This article
11-
describes several ways to use Symfony with Apache2 or Nginx.
11+
describes several ways to use Symfony with Apache or Nginx.
1212

13-
When using Apache2, you can configure PHP as an
13+
When using Apache, you can configure PHP as an
1414
:ref:`Apache module <web-server-apache-mod-php>` or with FastCGI using
1515
:ref:`PHP FPM <web-server-apache-fpm>`. FastCGI also is the preferred way
1616
to use PHP :ref:`with Nginx <web-server-nginx>`.
@@ -27,14 +27,14 @@ to use PHP :ref:`with Nginx <web-server-nginx>`.
2727

2828
If your hosting provider requires you to change the ``web/`` directory to
2929
another location (e.g. ``public_html/``) make sure you
30-
:ref:`override the location of the web/ directory <override-web-directory>`.
30+
:ref:`override the location of the web/ directory <override-web-dir>`.
3131

3232
.. _web-server-apache-mod-php:
3333

34-
Apache2 with mod_php/PHP-CGI
35-
----------------------------
34+
Apache with mod_php/PHP-CGI
35+
---------------------------
3636

37-
The **minimum configuration** to get your application running under Apache2 is:
37+
The **minimum configuration** to get your application running under Apache is:
3838

3939
.. code-block:: apache
4040
@@ -110,8 +110,8 @@ and increase web server performance:
110110
Using mod_php/PHP-CGI with Apache 2.4
111111
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
112112

113-
In Apache 2.4, ``Order allow,deny`` has been replaced by ``Require all granted``,
114-
and hence you need to modify your ``Directory`` permission settings as follows:
113+
In Apache 2.4, ``Order allow,deny`` has been replaced by ``Require all granted``.
114+
Hence, you need to modify your ``Directory`` permission settings as follows:
115115

116116
.. code-block:: apache
117117
@@ -124,8 +124,8 @@ For advanced Apache configuration options, read the official `Apache documentati
124124

125125
.. _web-server-apache-fpm:
126126

127-
Apache2 with PHP-FPM
128-
--------------------
127+
Apache with PHP-FPM
128+
-------------------
129129

130130
To make use of PHP5-FPM with Apache, you first have to ensure that you have
131131
the FastCGI process manager ``php-fpm`` binary and Apache's FastCGI module

0 commit comments

Comments
 (0)