Merge branch '2.3' into 2.7

weaverryan · weaverryan · commit e7246b64a9bb · 2016-03-17T19:44:26.000-04:00
* 2.3: (24 commits) [#6365] Removing extra : Added minor clarification [#6360] Minor changes [#6349][#6351][#6352] Editing the Doctrine section to improve readability. Minor corrections Fixed typo Fix escaping of backtick inside double back-quotes Removed server:stop code block for 2.3 Removed the PR table example (this is now included by GitHub template) Updated link to Translatable Extension [reference] [constraints] added missing colon character for Image constraint documentation in YAML format. Editing the Doctrine section to improve readability. Removed info about reducing visibility for private Updated link to Translatable Extension Editing the Doctrine section to improve readability. typo controller ch review, part 3 typo controller ch review, part 2 ...
diff --git a/book/controller.rst b/book/controller.rst
diff --git a/book/doctrine.rst b/book/doctrine.rst
diff --git a/book/installation.rst b/book/installation.rst
@@ -195,11 +195,7 @@ your `Apache`_ or `Nginx`_ web server as explained in
 :doc:`/cookbook/configuration/web_server_configuration`.
 
 When you are finished working on your Symfony application, you can stop the
-server with the ``server:stop`` command:
-
-.. code-block:: bash
-
-    $ php app/console server:stop
+server by pressing `Ctrl+C` from terminal.
 
 Checking Symfony Application Configuration and Setup
 ----------------------------------------------------
diff --git a/book/templating.rst b/book/templating.rst
@@ -382,7 +382,7 @@ Template Naming and Locations
 By default, templates can live in two different locations:
 
 ``app/Resources/views/``
-    The applications ``views`` directory can contain application-wide base templates
+    The application's ``views`` directory can contain application-wide base templates
     (i.e. your application's layouts and templates of the application bundle) as
     well as templates that override third party bundle templates
     (see :ref:`overriding-bundle-templates`).
@@ -620,7 +620,7 @@ articles::
         }
     }
 
-The ``recentList`` template is perfectly straightforward:
+The ``recent_list`` template is perfectly straightforward:
 
 .. configuration-block::
 
@@ -979,7 +979,7 @@ route:
 
 In this case, you need to specify both the route name (``article_show``) and
 a value for the ``{slug}`` parameter. Using this route, revisit the
-``recentList`` template from the previous section and link to the articles
+``recent_list`` template from the previous section and link to the articles
 correctly:
 
 .. configuration-block::
@@ -1063,7 +1063,7 @@ being used and generating the correct paths accordingly.
 
 Additionally, if you use the ``asset`` function, Symfony can automatically
 append a query string to your asset, in order to guarantee that updated static
-assets won't be cached when deployed. For example, ``/images/logo.png`` might
+assets won't be loaded from cache after being deployed. For example, ``/images/logo.png`` might
 look like ``/images/logo.png?v2``. For more information, see the :ref:`reference-framework-assets-version`
 configuration option.
 
diff --git a/book/translation.rst b/book/translation.rst
@@ -888,5 +888,5 @@ steps:
 .. _`i18n`: https://en.wikipedia.org/wiki/Internationalization_and_localization
 .. _`ISO 3166-1 alpha-2`: https://en.wikipedia.org/wiki/ISO_3166-1#Current_codes
 .. _`ISO 639-1`: https://en.wikipedia.org/wiki/List_of_ISO_639-1_codes
-.. _`Translatable Extension`: https://github.com/l3pp4rd/DoctrineExtensions
+.. _`Translatable Extension`: http://atlantic18.github.io/DoctrineExtensions/doc/translatable.html
 .. _`Translatable Behavior`: https://github.com/KnpLabs/DoctrineBehaviors
diff --git a/components/http_foundation/introduction.rst b/components/http_foundation/introduction.rst
@@ -507,7 +507,8 @@ if it should::
 
     BinaryFileResponse::trustXSendfileTypeHeader();
 
-You can still set the ``Content-Type`` of the sent file, or change its ``Content-Disposition``::
+With the ``BinaryFileResponse``, you can still set the ``Content-Type`` of the sent file,
+or change its ``Content-Disposition``::
 
     $response->headers->set('Content-Type', 'text/plain');
     $response->setContentDisposition(
diff --git a/components/yaml/yaml_format.rst b/components/yaml/yaml_format.rst
@@ -50,7 +50,7 @@ can use double quotes, for these characters it is more convenient to use single
 quotes, which avoids having to escape any backslash ``\``:
 
 * ``:``, ``{``, ``}``, ``[``, ``]``, ``,``, ``&``, ``*``, ``#``, ``?``, ``|``,
-  ``-``, ``<``, ``>``, ``=``, ``!``, ``%``, ``@``, ``\```
+  ``-``, ``<``, ``>``, ``=``, ``!``, ``%``, ``@``, `````
 
 The double-quoted style provides a way to express arbitrary strings, by
 using ``\`` to escape characters and sequences. For instance, it is very useful
diff --git a/contributing/code/bc.rst b/contributing/code/bc.rst
@@ -236,7 +236,6 @@ Change return type                                  No
 Add private method                                  Yes
 Remove private method                               Yes
 Change name                                         Yes
-Reduce visibility                                   Yes
 Add argument without a default value                Yes
 Add argument with a default value                   Yes
 Remove argument                                     Yes
diff --git a/contributing/code/patches.rst b/contributing/code/patches.rst
@@ -272,49 +272,10 @@ pull request message, like in:
     [Yaml] fixed something
     [Form] [Validator] [FrameworkBundle] added something
 
-The pull request description must include the following checklist at the top
-to ensure that contributions may be reviewed without needless feedback
-loops and that your contributions can be included into Symfony as quickly as
-possible:
-
-.. code-block:: text
-
-    | Q             | A
-    | ------------- | ---
-    | Bug fix?      | [yes|no]
-    | New feature?  | [yes|no]
-    | BC breaks?    | [yes|no]
-    | Deprecations? | [yes|no]
-    | Tests pass?   | [yes|no]
-    | Fixed tickets | [comma separated list of tickets fixed by the PR]
-    | License       | MIT
-    | Doc PR        | [The reference to the documentation PR if any]
-
-An example submission could now look as follows:
-
-.. code-block:: text
-
-    | Q             | A
-    | ------------- | ---
-    | Bug fix?      | no
-    | New feature?  | no
-    | BC breaks?    | no
-    | Deprecations? | no
-    | Tests pass?   | yes
-    | Fixed tickets | #12, #43
-    | License       | MIT
-    | Doc PR        | symfony/symfony-docs#123
-
-The whole table must be included (do **not** remove lines that you think are
-not relevant). For simple typos, minor changes in the PHPDocs, or changes in
-translation files, use the shorter version of the check-list:
-
-.. code-block:: text
-
-    | Q             | A
-    | ------------- | ---
-    | Fixed tickets | [comma separated list of tickets fixed by the PR]
-    | License       | MIT
+The default pull request description contains a table which you must fill in
+with the appropriate answers. This ensures that contributions may be reviewed
+without needless feedback loops and that your contributions can be included into
+Symfony as quickly as possible.
 
 Some answers to the questions trigger some more requirements:
 
diff --git a/contributing/community/releases.rst b/contributing/community/releases.rst
@@ -91,7 +91,19 @@ Below is the schedule for the first few versions that use this release model:
 * **Blue** represents the Stabilization phase
 * **Green** represents the Maintenance period
 
-This results in very predictable dates and maintenance periods:
+.. tip::
+
+    If you want to learn more about the timeline of any given Symfony version,
+    use the online `timeline calculator`_.
+
+.. tip::
+
+    Whenever an important event related to Symfony versions happens (a version
+    reaches end of maintenance or a new patch version is released for
+    instance), you can automatically receive an email notification if you
+    subscribed on the `roadmap notification`_ page.
+
+.. _version-history:
 
 =======  ==============  =======  ========================  ===========
 Version  Feature Freeze  Release  End of Maintenance        End of Life
@@ -123,19 +135,6 @@ Version  Feature Freeze  Release  End of Maintenance        End of Life
 .. [2] Symfony 2.8 is the last version of the Symfony 2.x branch.
 .. [3] Symfony 3.0 is the first version to use the new release process based on five minor releases.
 
-.. tip::
-
-    If you want to learn more about the timeline of any given Symfony version,
-    use the online `timeline calculator`_. You can also get all data as a JSON
-    string via a URL like `https://symfony.com/roadmap.json?version=2.x`.
-
-.. tip::
-
-    Whenever an important event related to Symfony versions happens (a version
-    reaches end of maintenance or a new patch version is released for
-    instance), you can automatically receive an email notification if you
-    subscribed on the `roadmap notification`_ page.
-
 Backwards Compatibility
 -----------------------
 
diff --git a/cookbook/assetic/php.rst b/cookbook/assetic/php.rst
@@ -40,7 +40,7 @@ Organizing your Web Asset Files
 -------------------------------
 
 This example will include a setup using the Bootstrap CSS framework, jQuery, FontAwesome
-and some regular CSS and and JavaScript application files (called ``main.css`` and
+and some regular CSS and JavaScript application files (called ``main.css`` and
 ``main.js``). The recommended directory structure for this set-up looks like this:
 
 .. code-block:: text
diff --git a/reference/constraints/Image.rst b/reference/constraints/Image.rst
@@ -99,7 +99,7 @@ that it is between a certain size, add the following:
     .. code-block:: yaml
 
         # src/AppBundle/Resources/config/validation.yml
-        AppBundle\Entity\Author
+        AppBundle\Entity\Author:
             properties:
                 headshot:
                     - Image:
