minor #6183 use valid XML in code block (xabbuh)

This PR was merged into the 2.3 branch. Discussion ---------- use valid XML in code block Commits ------- 674becd use valid XML in code block
symfony · Jan 27, 2016 · 628b308 · 628b308
2 parents e4f6bf8 + 674becd
commit 628b308
Show file tree

Hide file tree

Showing 12 changed files with 30 additions and 24 deletions.
diff --git a/book/service_container.rst b/book/service_container.rst
@@ -269,7 +269,7 @@ parameter and uses it in the service definition.
 
     .. code-block:: xml
 
-        <argument type="string">http://symfony.com/?foo=%%s&bar=%%d</argument>
+        <argument type="string">http://symfony.com/?foo=%%s&amp;bar=%%d</argument>
 
 .. caution::
 

diff --git a/components/dependency_injection/parameters.rst b/components/dependency_injection/parameters.rst
@@ -155,7 +155,7 @@ the parameter value in one place if needed.
 
         .. code-block:: xml
 
-            <argument>http://symfony.com/?foo=%%s&bar=%%d</argument>
+            <argument>http://symfony.com/?foo=%%s&amp;bar=%%d</argument>
 
         .. code-block:: php
 

diff --git a/components/intl.rst b/components/intl.rst
@@ -126,8 +126,10 @@ code::
 
     .. code-block:: json
 
-        "require: {
-            "symfony/icu": "1.1.*"
+        {
+            "require": {
+                "symfony/icu": "1.1.*"
+            }
         }
 
     Set the version to

diff --git a/cookbook/assetic/apply_to_option.rst b/cookbook/assetic/apply_to_option.rst
@@ -142,7 +142,7 @@ In this case you can specify that the ``coffee`` filter is applied to all
                     bin:        /usr/bin/coffee
                     node:       /usr/bin/node
                     node_paths: [/usr/lib/node_modules/]
-                    apply_to:   "\.coffee$"
+                    apply_to:   '\.coffee$'
 
     .. code-block:: xml
 

diff --git a/cookbook/configuration/override_dir_structure.rst b/cookbook/configuration/override_dir_structure.rst
@@ -177,12 +177,10 @@ The change in the ``composer.json`` will look like this:
 .. code-block:: json
 
     {
-        ...
         "config": {
             "bin-dir": "bin",
             "vendor-dir": "/some/dir/vendor"
         },
-        ...
     }
 
 Then, update the path to the ``autoload.php`` file in ``app/autoload.php``::

diff --git a/cookbook/deployment/heroku.rst b/cookbook/deployment/heroku.rst
@@ -167,7 +167,7 @@ variables, you can issue a single command to prepare your app for a deployment:
 Next up, it's finally time to deploy your application to Heroku. If you are
 doing this for the very first time, you may see a message such as the following:
 
-.. code-block:: bash
+.. code-block:: text
 
     The authenticity of host 'heroku.com (50.19.85.132)' can't be established.
     RSA key fingerprint is 8b:48:5e:67:0e:c9:16:47:32:f2:87:0c:1f:c8:60:ad.

diff --git a/cookbook/doctrine/mongodb_session_storage.rst b/cookbook/doctrine/mongodb_session_storage.rst
@@ -162,7 +162,7 @@ Because MongoDB uses dynamic collection schemas, you do not need to do anything
 session collection. However, you may want to add an index to improve garbage collection performance.
 From the `MongoDB shell`_:
 
-.. code-block:: sql
+.. code-block:: text
 
     use session_db
     db.session.ensureIndex( { "expires_at": 1 }, { expireAfterSeconds: 0 } )

diff --git a/cookbook/install/unstable_versions.rst b/cookbook/install/unstable_versions.rst
@@ -41,7 +41,6 @@ dependency as follows:
 
     {
         "require": {
-            // ...
             "symfony/symfony" : "2.7.*@dev"
         }
     }

diff --git a/cookbook/logging/monolog.rst b/cookbook/logging/monolog.rst
@@ -252,17 +252,22 @@ option of your handler to ``rotating_file``:
     .. code-block:: xml
 
         <!-- app/config/config_dev.xml -->
-        <?xml version="1.0" charset="UTF-8" ?>
-        <container xmlns=''http://symfony.com/schema/dic/services"
-            xmlns:monolog="http://symfony.com/schema/dic/monolog">
+        <?xml version="1.0" encoding="UTF-8" ?>
+        <container xmlns="http://symfony.com/schema/dic/services"
+            xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+            xmlns:monolog="http://symfony.com/schema/dic/monolog"
+            xsi:schemaLocation="http://symfony.com/schema/dic/services
+                http://symfony.com/schema/dic/services/services-1.0.xsd
+                http://symfony.com/schema/dic/monolog
+                http://symfony.com/schema/dic/monolog/monolog-1.0.xsd">
 
             <monolog:config>
+                <!-- "max_files": max number of log files to keep
+                     defaults to zero, which means infinite files -->
                 <monolog:handler name="main"
                     type="rotating_file"
                     path="%kernel.logs_dir%/%kernel.environment%.log"
                     level="debug"
-                    <!-- max number of log files to keep
-                         defaults to zero, which means infinite files -->
                     max_files="10"
                 />
             </monolog:config>

diff --git a/cookbook/logging/monolog_email.rst b/cookbook/logging/monolog_email.rst
@@ -41,24 +41,25 @@ it is broken down.
     .. code-block:: xml
 
         <!-- app/config/config_prod.xml -->
+        <?xml version="1.0" encoding="UTF-8" ?>
         <container xmlns="http://symfony.com/schema/dic/services"
             xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
             xmlns:monolog="http://symfony.com/schema/dic/monolog"
             xsi:schemaLocation="http://symfony.com/schema/dic/services http://symfony.com/schema/dic/services/services-1.0.xsd
                                 http://symfony.com/schema/dic/monolog http://symfony.com/schema/dic/monolog/monolog-1.0.xsd">
 
             <monolog:config>
+                <!--
+                To also log 400 level errors (but not 404's):
+                action-level="error"
+                And add this child inside this monolog:handler
+                <monolog:excluded-404>^/</monolog:excluded-404>
+                -->
                 <monolog:handler
                     name="mail"
                     type="fingers_crossed"
                     action-level="critical"
                     handler="buffered"
-                    <!--
-                    To also log 400 level errors (but not 404's):
-                    action-level="error"
-                    And add this child inside this monolog:handler
-                    <monolog:excluded-404>^/</monolog:excluded-404>
-                    -->
                 />
                 <monolog:handler
                     name="buffered"

diff --git a/cookbook/symfony1.rst b/cookbook/symfony1.rst
@@ -170,8 +170,10 @@ from specific directories without defining a dependency:
 
 .. code-block:: json
 
-    "autoload": {
-        "psr-0": { "": "src/" }
+    {
+        "autoload": {
+            "psr-0": { "": "src/" }
+        }
     }
 
 This means that if a class is not found in the ``vendor`` directory, Composer

diff --git a/cookbook/testing/bootstrap.rst b/cookbook/testing/bootstrap.rst
@@ -28,7 +28,6 @@ with ``tests.bootstrap.php``:
 
     <!-- ... -->
     <phpunit
-        ...
         bootstrap = "tests.bootstrap.php"
     >
-Original file line number
+Diff line change
@@ Expand Up / @@ -41,7 +41,6 @@ dependency as follows: @@
         {
             "require": {
-                // ...
                 "symfony/symfony" : "2.7.*@dev"
             }
         }
@@ Expand Down @@