diff --git a/contributing/code/bugs.rst b/contributing/code/bugs.rst index d80e6da1c05..fcc0f2f010a 100644 --- a/contributing/code/bugs.rst +++ b/contributing/code/bugs.rst @@ -25,7 +25,7 @@ If your problem definitely looks like a bug, report it using the official bug * Describe the steps needed to reproduce the bug with short code examples (providing a unit test that illustrates the bug is best); -* Give as much details as possible about your environment (OS, PHP version, +* Give as much detail as possible about your environment (OS, PHP version, Symfony version, enabled extensions, ...); * *(optional)* Attach a :doc:`patch `. diff --git a/contributing/code/patches.rst b/contributing/code/patches.rst index ce7aea92f2a..5ad43d23fff 100644 --- a/contributing/code/patches.rst +++ b/contributing/code/patches.rst @@ -71,7 +71,7 @@ Get the Symfony2 source code: * Fork the `Symfony2 repository`_ (click on the "Fork" button); -* After the "hardcore forking action" has completed, clone your fork locally +* After the "forking action" has completed, clone your fork locally (this will create a `symfony` directory): .. code-block:: bash diff --git a/contributing/code/security.rst b/contributing/code/security.rst index 55d9bbbbb4a..9a7ea2d8b74 100644 --- a/contributing/code/security.rst +++ b/contributing/code/security.rst @@ -53,9 +53,9 @@ This section indexes security vulnerabilities that were fixed in Symfony releases, starting from Symfony 1.0.0: * November 29, 2012: `Security release: Symfony 2.0.19 and 2.1.4 `_ -* November 25, 2012: `Security release: symfony 1.4.20 released `_ +* November 25, 2012: `Security release: symfony 1.4.20 released `_ (`CVE-2012-5574 `_) * August 28, 2012: `Security Release: Symfony 2.0.17 released `_ -* May 30, 2012: `Security Release: symfony 1.4.18 released `_ +* May 30, 2012: `Security Release: symfony 1.4.18 released `_ (`CVE-2012-2667 `_) * February 24, 2012: `Security Release: Symfony 2.0.11 released `_ * November 16, 2011: `Security Release: Symfony 2.0.6 `_ * March 21, 2011: `symfony 1.3.10 and 1.4.10: security releases `_ diff --git a/contributing/code/standards.rst b/contributing/code/standards.rst index f6bb4bb3bf9..f7f97dd4636 100644 --- a/contributing/code/standards.rst +++ b/contributing/code/standards.rst @@ -15,7 +15,7 @@ documents. Since a picture - or some code - is worth a thousand words, here's a short example containing most features described below: -.. code-block:: php+html +.. code-block:: html+php - mysql:dbname=%database_name% + mysql:host=%database_host%;port=%database_port%;dbname=%database_name% %database_user% %database_password% @@ -151,7 +151,7 @@ parameter.ini by referencing the database-related parameters defined there: .. code-block:: php $pdoDefinition = new Definition('PDO', array( - 'mysql:dbname=%database_name%', + 'mysql:host=%database_host%;port=%database_port%;dbname=%database_name%', '%database_user%', '%database_password%', )); diff --git a/cookbook/doctrine/file_uploads.rst b/cookbook/doctrine/file_uploads.rst index 0d6d911349c..27d35080cca 100644 --- a/cookbook/doctrine/file_uploads.rst +++ b/cookbook/doctrine/file_uploads.rst @@ -176,7 +176,7 @@ The following controller shows you how to handle the entire process:: When writing the template, don't forget to set the ``enctype`` attribute: - .. code-block:: html+php + .. code-block:: html+jinja

Upload File

diff --git a/images/book/doctrine_image_1.png b/images/book/doctrine_image_1.png index aa4e51209be..6f88c6cacfa 100644 Binary files a/images/book/doctrine_image_1.png and b/images/book/doctrine_image_1.png differ diff --git a/images/book/doctrine_image_3.png b/images/book/doctrine_image_3.png index ed472b2a68c..935153291d4 100644 Binary files a/images/book/doctrine_image_3.png and b/images/book/doctrine_image_3.png differ diff --git a/images/request-flow.png b/images/request-flow.png index 22d6b933501..d33716beb28 100644 Binary files a/images/request-flow.png and b/images/request-flow.png differ diff --git a/reference/configuration/doctrine.rst b/reference/configuration/doctrine.rst index 42c3b7b28d3..c2115238e27 100644 --- a/reference/configuration/doctrine.rst +++ b/reference/configuration/doctrine.rst @@ -2,8 +2,8 @@ single: Doctrine; ORM configuration reference single: Configuration reference; Doctrine ORM -Configuration Reference -======================= +Doctrine Configuration Reference +================================ .. configuration-block:: diff --git a/reference/configuration/framework.rst b/reference/configuration/framework.rst index bdd52f16b74..04b60301ff6 100644 --- a/reference/configuration/framework.rst +++ b/reference/configuration/framework.rst @@ -88,7 +88,7 @@ trust_proxy_headers **type**: ``Boolean`` Configures if HTTP headers (like ``HTTP_X_FORWARDED_FOR``, ``X_FORWARDED_PROTO``, and -``X_FORWARDED_HOST``) are trusted as indication for an SSL connection. By default, it is +``X_FORWARDED_HOST``) are trusted as an indication for an SSL connection. By default, it is set to ``false`` and only SSL_HTTPS connections are indicated as secure. You should enable this setting if your application is behind a reverse proxy. diff --git a/reference/configuration/monolog.rst b/reference/configuration/monolog.rst index 99eb3e2c348..8acf1f5fbb1 100644 --- a/reference/configuration/monolog.rst +++ b/reference/configuration/monolog.rst @@ -1,8 +1,8 @@ .. index:: pair: Monolog; Configuration reference -Configuration Reference -======================= +Monolog Configuration Reference +=============================== .. configuration-block:: diff --git a/reference/requirements.rst b/reference/requirements.rst index cca93635a1a..28b698b45ad 100644 --- a/reference/requirements.rst +++ b/reference/requirements.rst @@ -12,7 +12,7 @@ the command line via: .. code-block:: bash - php app/check.php + $ php app/check.php Below is the list of required and optional requirements.