diff --git a/book/service_container.rst b/book/service_container.rst index da165ceae4b..1482d6223d3 100644 --- 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 - http://symfony.com/?foo=%%s&bar=%%d + http://symfony.com/?foo=%%s&bar=%%d .. caution:: diff --git a/components/config/definition.rst b/components/config/definition.rst index e8eb49e2594..e9d8787fc76 100644 --- a/components/config/definition.rst +++ b/components/config/definition.rst @@ -238,7 +238,7 @@ Or the following XML configuration: .. code-block:: xml - msyql + mysql sqlite The processed configuration is:: @@ -341,7 +341,7 @@ In order to maintain the array keys use the ``useAttributeAsKey()`` method:: The argument of this method (``name`` in the example above) defines the name of the attribute added to each XML node to differentiate them. Now you can use the -same YAML configuration showed before or the following XML configuration: +same YAML configuration shown before or the following XML configuration: .. code-block:: xml diff --git a/components/dependency_injection/parameters.rst b/components/dependency_injection/parameters.rst index fd2e8f99f9d..e38fd0efd1d 100644 --- 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 - http://symfony.com/?foo=%%s&bar=%%d + http://symfony.com/?foo=%%s&bar=%%d .. code-block:: php diff --git a/components/event_dispatcher/introduction.rst b/components/event_dispatcher/introduction.rst index 6e0a9ae3e3a..8279d679c0b 100644 --- a/components/event_dispatcher/introduction.rst +++ b/components/event_dispatcher/introduction.rst @@ -393,6 +393,7 @@ subscribes to the ``kernel.response`` and ``store.order`` events:: use Symfony\Component\EventDispatcher\EventSubscriberInterface; use Symfony\Component\HttpKernel\Event\FilterResponseEvent; + use Acme\StoreBundle\Event\FilterOrderEvent; class StoreSubscriber implements EventSubscriberInterface { diff --git a/components/intl.rst b/components/intl.rst index dda3830e4d2..b8047db0cd0 100644 --- 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/contributing/code/core_team.rst b/contributing/code/core_team.rst index 985912f7905..be7e365543c 100644 --- a/contributing/code/core_team.rst +++ b/contributing/code/core_team.rst @@ -65,9 +65,9 @@ Active Core Members * **Abdellatif AitBoudad** (`aitboudad`_) can merge into the Translation_ component; - * **Jakub Zalas** (`jakzal`_) can merge into the DomCrawler_ component. + * **Jakub Zalas** (`jakzal`_) can merge into the DomCrawler_ component; - * **Christian Flothmann** (`xabbuh`_) can merge into the Yaml_ component. + * **Christian Flothmann** (`xabbuh`_) can merge into the Yaml_ component; * **Javier Eguiluz** (`javiereguiluz`_) can merge into the WebProfilerBundle_ bundle. diff --git a/cookbook/assetic/apply_to_option.rst b/cookbook/assetic/apply_to_option.rst index 0e329087506..8f5776c7fe0 100644 --- 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 index d6032b9ce38..a17185e0730 100644 --- 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 index 92feaabe329..0bb743fada1 100644 --- 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 index 7a2277cb2cc..0d5b1df2444 100644 --- 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:: javascript use session_db db.session.ensureIndex( { "expires_at": 1 }, { expireAfterSeconds: 0 } ) diff --git a/cookbook/form/unit_testing.rst b/cookbook/form/unit_testing.rst index 6ab99830165..f532c1ee3f5 100644 --- a/cookbook/form/unit_testing.rst +++ b/cookbook/form/unit_testing.rst @@ -39,7 +39,6 @@ The simplest ``TypeTestCase`` implementation looks like the following:: // src/AppBundle/Tests/Form/Type/TestedTypeTest.php namespace AppBundle\Tests\Form\Type; - use AppBundle\Form\Type\TestedType; use AppBundle\Model\TestObject; use Symfony\Component\Form\Test\TypeTestCase; @@ -52,7 +51,7 @@ The simplest ``TypeTestCase`` implementation looks like the following:: 'test2' => 'test2', ); - $type = new TestedType(); + $type = 'AppBundle\Form\Type\TestedType'; $form = $this->factory->create($type); $object = TestObject::fromArray($formData); diff --git a/cookbook/install/unstable_versions.rst b/cookbook/install/unstable_versions.rst index b1d2b9abc77..6d8464c9489 100644 --- 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 index e6d66b9469e..376bf5affba 100644 --- a/cookbook/logging/monolog.rst +++ b/cookbook/logging/monolog.rst @@ -252,17 +252,22 @@ option of your handler to ``rotating_file``: .. code-block:: xml - - + + + max_files="10" /> diff --git a/cookbook/logging/monolog_email.rst b/cookbook/logging/monolog_email.rst index cf801de561b..f23f0510cc6 100644 --- a/cookbook/logging/monolog_email.rst +++ b/cookbook/logging/monolog_email.rst @@ -41,6 +41,7 @@ it is broken down. .. code-block:: xml + + ^/ - --> />