diff --git a/best_practices/forms.rst b/best_practices/forms.rst index 5041e604d0d..4bfd3bf1221 100644 --- a/best_practices/forms.rst +++ b/best_practices/forms.rst @@ -143,7 +143,7 @@ view layer: {{ form_widget(form) }} + class="btn btn-default pull-right"/> {{ form_end(form) }} Validation diff --git a/best_practices/web-assets.rst b/best_practices/web-assets.rst index 04d468cbc0c..c567bf36e47 100644 --- a/best_practices/web-assets.rst +++ b/best_practices/web-assets.rst @@ -18,8 +18,8 @@ much more concise: .. code-block:: html+twig - - + + {# ... #} @@ -62,7 +62,7 @@ matter of wrapping all the assets with a single Twig tag: 'css/bootstrap.min.css' 'css/main.css' filter='cssrewrite' output='css/compiled/app.css' %} - + {% endstylesheets %} {# ... #} diff --git a/bundles/configuration.rst b/bundles/configuration.rst index 666cd1c0f13..bbd379a7e36 100644 --- a/bundles/configuration.rst +++ b/bundles/configuration.rst @@ -33,7 +33,7 @@ as integration of other related components: http://symfony.com/schema/dic/symfony/symfony-1.0.xsd"> - + @@ -82,7 +82,7 @@ allow users to configure it with some configuration that looks like this: https://symfony.com/schema/dic/services/services-1.0.xsd"> - + diff --git a/bundles/prepend_extension.rst b/bundles/prepend_extension.rst index 84a61e55844..b9f2d7adc0b 100644 --- a/bundles/prepend_extension.rst +++ b/bundles/prepend_extension.rst @@ -128,7 +128,7 @@ The above would be the equivalent of writing the following into the non_default - + diff --git a/components/config/definition.rst b/components/config/definition.rst index 87119092e21..571c9988c01 100644 --- a/components/config/definition.rst +++ b/components/config/definition.rst @@ -295,8 +295,8 @@ Or the following XML configuration: .. code-block:: xml - - + + The processed configuration is:: @@ -364,9 +364,9 @@ same YAML configuration shown before or the following XML configuration: .. code-block:: xml + table="symfony" user="root" password="null"/> + table="foo" user="root" password="pa$$"/> In both cases, the processed configuration maintains the ``sf_connection`` and ``default`` keys:: @@ -490,7 +490,7 @@ and in XML: .. code-block:: xml - + Optional Sections ----------------- diff --git a/components/dependency_injection.rst b/components/dependency_injection.rst index 3f457fd9adc..ea1c0cc9c36 100644 --- a/components/dependency_injection.rst +++ b/components/dependency_injection.rst @@ -282,7 +282,7 @@ config files: - + diff --git a/components/dependency_injection/_imports-parameters-note.rst.inc b/components/dependency_injection/_imports-parameters-note.rst.inc index c71bced2af9..18c35870ef3 100644 --- a/components/dependency_injection/_imports-parameters-note.rst.inc +++ b/components/dependency_injection/_imports-parameters-note.rst.inc @@ -22,7 +22,7 @@ https://symfony.com/schema/dic/services/services-1.0.xsd"> - + diff --git a/components/dom_crawler.rst b/components/dom_crawler.rst index 0fa5db13101..1a7ca342f51 100644 --- a/components/dom_crawler.rst +++ b/components/dom_crawler.rst @@ -231,16 +231,16 @@ Adding the Content The crawler supports multiple ways of adding the content:: - $crawler = new Crawler(''); + $crawler = new Crawler(''); - $crawler->addHtmlContent(''); - $crawler->addXmlContent(''); + $crawler->addHtmlContent(''); + $crawler->addXmlContent(''); - $crawler->addContent(''); - $crawler->addContent('', 'text/xml'); + $crawler->addContent(''); + $crawler->addContent('', 'text/xml'); - $crawler->add(''); - $crawler->add(''); + $crawler->add(''); + $crawler->add(''); .. note:: @@ -264,7 +264,7 @@ to interact with native :phpclass:`DOMDocument`, :phpclass:`DOMNodeList` and :phpclass:`DOMNode` objects:: $domDocument = new \DOMDocument(); - $domDocument->loadXml(''); + $domDocument->loadXml(''); $nodeList = $domDocument->getElementsByTagName('node'); $node = $domDocument->getElementsByTagName('node')->item(0); @@ -469,9 +469,9 @@ You can virtually set and get values on the form:: To work with multi-dimensional fields::
- - - + + +
Pass an array of values:: diff --git a/components/form.rst b/components/form.rst index 435979b6a30..9d3c93c0caf 100644 --- a/components/form.rst +++ b/components/form.rst @@ -518,7 +518,7 @@ helper functions: {{ form_start(form) }} {{ form_widget(form) }} - + {{ form_end(form) }} .. image:: /_images/form/simple-form.png diff --git a/components/phpunit_bridge.rst b/components/phpunit_bridge.rst index a4565fec684..fb0e5e6360b 100644 --- a/components/phpunit_bridge.rst +++ b/components/phpunit_bridge.rst @@ -55,7 +55,7 @@ to register a new `test listener`_ called ``SymfonyTestsListener``: - + @@ -122,7 +122,7 @@ The summary includes: - + Trigger Deprecation Notices @@ -179,8 +179,8 @@ message, enclosed with ``/``. For example, with: - - + + @@ -317,7 +317,7 @@ following listener in your PHPUnit configuration: - + .. note:: @@ -650,7 +650,7 @@ Add the following configuration to the ``phpunit.xml.dist`` file - + diff --git a/components/serializer.rst b/components/serializer.rst index ee7175dfd40..c197d1b92ae 100644 --- a/components/serializer.rst +++ b/components/serializer.rst @@ -829,7 +829,7 @@ Here, we set it to 2 for the ``$child`` property: http://symfony.com/schema/dic/serializer-mapping/serializer-mapping-1.0.xsd" > - + @@ -924,7 +924,7 @@ The array keys beginning with ``@`` are considered XML attributes:: // is encoded as follows: // // - // + // // Use the special ``#`` key to define the data of a node:: diff --git a/configuration.rst b/configuration.rst index 0138fe212cb..91e1615d0cc 100644 --- a/configuration.rst +++ b/configuration.rst @@ -51,18 +51,18 @@ The main configuration file is called ``config.yml``: https://symfony.com/schema/dic/twig/twig-1.0.xsd"> - - - + + + - + - + @@ -154,9 +154,9 @@ it *also* loads other configuration files via its ``imports`` key: https://symfony.com/schema/dic/services/services-1.0.xsd"> - - - + + + @@ -206,7 +206,7 @@ can also load XML files or PHP files. https://symfony.com/schema/dic/twig/twig-1.0.xsd"> - + @@ -342,7 +342,7 @@ configure DoctrineBundle and other parts of Symfony: driver="pdo_mysql" user="%database_user%" - password="%database_password%" /> + password="%database_password%"/> diff --git a/configuration/configuration_organization.rst b/configuration/configuration_organization.rst index 1bc57e98090..32a6109b15f 100644 --- a/configuration/configuration_organization.rst +++ b/configuration/configuration_organization.rst @@ -131,9 +131,9 @@ needed for the ``app/config/dev/config.yml`` file: http://symfony.com/schema/dic/symfony/symfony-1.0.xsd"> - - - + + + @@ -242,10 +242,10 @@ format (``.yml``, ``.xml``, ``.php``, ``.ini``): http://symfony.com/schema/dic/symfony/symfony-1.0.xsd"> - - - - + + + + @@ -306,8 +306,8 @@ any other configuration file: http://symfony.com/schema/dic/symfony/symfony-1.0.xsd"> - - + + @@ -349,8 +349,8 @@ doesn't exist: http://symfony.com/schema/dic/symfony/symfony-1.0.xsd"> - - + + diff --git a/configuration/environments.rst b/configuration/environments.rst index f41cb1ae0cf..8f39889635f 100644 --- a/configuration/environments.rst +++ b/configuration/environments.rst @@ -77,7 +77,7 @@ accomplished easily and transparently: http://symfony.com/schema/dic/doctrine/doctrine-1.0.xsd"> - + @@ -123,10 +123,10 @@ configuration file: http://symfony.com/schema/dic/webprofiler/webprofiler-1.0.xsd"> - + - + @@ -229,7 +229,7 @@ this code and changing the environment string. http://symfony.com/schema/dic/doctrine http://symfony.com/schema/dic/doctrine/doctrine-1.0.xsd"> - + @@ -319,11 +319,11 @@ The best way to accomplish this is via a new environment called, for example, http://symfony.com/schema/dic/symfony/symfony-1.0.xsd"> - + - + diff --git a/configuration/external_parameters.rst b/configuration/external_parameters.rst index 67cacdaaa7d..2f6322b9ce4 100644 --- a/configuration/external_parameters.rst +++ b/configuration/external_parameters.rst @@ -175,7 +175,7 @@ turn the value of the ``HTTP_PORT`` env var into an integer: http://symfony.com/schema/dic/symfony/symfony-1.0.xsd"> - + @@ -219,7 +219,7 @@ Symfony provides the following env var processors: some_secret - + .. code-block:: php @@ -259,7 +259,7 @@ Symfony provides the following env var processors: true - + .. code-block:: php @@ -305,7 +305,7 @@ Symfony provides the following env var processors: - + @@ -355,7 +355,7 @@ Symfony provides the following env var processors: ["10.0.0.1", "10.0.0.2"] - + .. code-block:: php @@ -395,7 +395,7 @@ Symfony provides the following env var processors: http://%env(HOST)%/project - + .. code-block:: php @@ -436,7 +436,7 @@ Symfony provides the following env var processors: ../config/auth.json - + .. code-block:: php @@ -523,7 +523,7 @@ in the container. The following imports a file named ``parameters.php``. https://symfony.com/schema/dic/services/services-1.0.xsd"> - + diff --git a/configuration/micro_kernel_trait.rst b/configuration/micro_kernel_trait.rst index 893a22161d6..34ff0aaa11d 100644 --- a/configuration/micro_kernel_trait.rst +++ b/configuration/micro_kernel_trait.rst @@ -236,7 +236,7 @@ because the configuration started to get bigger: twig - + diff --git a/configuration/override_dir_structure.rst b/configuration/override_dir_structure.rst index 3f9d660832c..8a6cba69b43 100644 --- a/configuration/override_dir_structure.rst +++ b/configuration/override_dir_structure.rst @@ -197,7 +197,7 @@ You also need to change the ``extra.symfony-web-dir`` option in the http://symfony.com/schema/dic/assetic/assetic-1.0.xsd"> - + diff --git a/configuration/using_parameters_in_dic.rst b/configuration/using_parameters_in_dic.rst index 4162c0c145c..3bdbcebf34e 100644 --- a/configuration/using_parameters_in_dic.rst +++ b/configuration/using_parameters_in_dic.rst @@ -53,15 +53,15 @@ Now, examine the results to see this closely: - + - + - + - + - + diff --git a/controller/error_pages.rst b/controller/error_pages.rst index 9a5bd013536..74fd299953f 100644 --- a/controller/error_pages.rst +++ b/controller/error_pages.rst @@ -157,7 +157,7 @@ To use this feature, you need to have a definition in your https://symfony.com/schema/routing/routing-1.0.xsd"> + prefix="/_error"/> .. code-block:: php @@ -287,7 +287,7 @@ In that case, you might want to override one or both of the ``showAction()`` and - + diff --git a/controller/soap_web_service.rst b/controller/soap_web_service.rst index d531613f14c..92d73760deb 100644 --- a/controller/soap_web_service.rst +++ b/controller/soap_web_service.rst @@ -120,17 +120,17 @@ An example WSDL is below. - - + + - + - + @@ -160,7 +160,7 @@ An example WSDL is below. - + diff --git a/controller/upload_file.rst b/controller/upload_file.rst index a6f056f1928..b8b8d7104a2 100644 --- a/controller/upload_file.rst +++ b/controller/upload_file.rst @@ -399,7 +399,7 @@ Now, register this class as a Doctrine listener: https://symfony.com/schema/dic/services/services-1.0.xsd"> - + diff --git a/create_framework/http_kernel_httpkernelinterface.rst b/create_framework/http_kernel_httpkernelinterface.rst index 225a1652d73..7a682e5c7b4 100644 --- a/create_framework/http_kernel_httpkernelinterface.rst +++ b/create_framework/http_kernel_httpkernelinterface.rst @@ -158,7 +158,7 @@ page as being the content of a sub-request call: This is the content of your page - Is 2012 a leap year? + Is 2012 a leap year? Some other content diff --git a/deployment/azure-website.rst b/deployment/azure-website.rst index 05626ae03f2..f96521b662b 100644 --- a/deployment/azure-website.rst +++ b/deployment/azure-website.rst @@ -407,25 +407,25 @@ application, configure it with the following content: - + - + - + - + - + - + - + - + diff --git a/deployment/fortrabbit.rst b/deployment/fortrabbit.rst index 8804d6b21a4..d30cf4c9adf 100644 --- a/deployment/fortrabbit.rst +++ b/deployment/fortrabbit.rst @@ -54,7 +54,7 @@ to redirect it to :phpfunction:`error_log`: - + @@ -144,14 +144,14 @@ Make sure this file is imported into the main config file: http://symfony.com/schema/dic/symfony http://symfony.com/schema/dic/symfony/symfony-1.0.xsd"> - - + + - + diff --git a/doctrine.rst b/doctrine.rst index c5e3af8f00a..eb9efb7f6cc 100644 --- a/doctrine.rst +++ b/doctrine.rst @@ -93,7 +93,7 @@ information. By convention, this information is usually configured in an host="%database_host%" dbname="%database_name%" user="%database_user%" - password="%database_password%" /> + password="%database_password%"/> @@ -241,7 +241,7 @@ can automatically generate an empty ``test_project`` database for you: + charset="UTF-8"/> @@ -383,11 +383,11 @@ directly inside the ``Product`` class via DocBlock annotations: - + - - - + + + diff --git a/doctrine/associations.rst b/doctrine/associations.rst index b34acddd3bd..f00c27095f7 100644 --- a/doctrine/associations.rst +++ b/doctrine/associations.rst @@ -93,7 +93,7 @@ property on the ``Product`` class, annotated as follows: inversed-by="products" join-column="category"> - + @@ -157,7 +157,7 @@ to hold those associated objects. + mapped-by="category"/> - + - + - + @@ -222,7 +222,7 @@ to the tag like so: - + @@ -272,10 +272,10 @@ numbers mean that listeners are invoked earlier. - + - + diff --git a/doctrine/lifecycle_callbacks.rst b/doctrine/lifecycle_callbacks.rst index a6535a9c749..95923eee7cf 100644 --- a/doctrine/lifecycle_callbacks.rst +++ b/doctrine/lifecycle_callbacks.rst @@ -63,7 +63,7 @@ the current date, only when the entity is first persisted (i.e. inserted): - + diff --git a/doctrine/multiple_entity_managers.rst b/doctrine/multiple_entity_managers.rst index bdc553d1652..4861e432dff 100644 --- a/doctrine/multiple_entity_managers.rst +++ b/doctrine/multiple_entity_managers.rst @@ -98,12 +98,12 @@ The following configuration code shows how you can configure two entity managers - - + + - + diff --git a/email/dev_environment.rst b/email/dev_environment.rst index f6ccc2cc19f..d28fbbdbb3c 100644 --- a/email/dev_environment.rst +++ b/email/dev_environment.rst @@ -41,7 +41,7 @@ will not be sent when you run tests, but will continue to be sent in the https://symfony.com/schema/dic/services/services-1.0.xsd http://symfony.com/schema/dic/swiftmailer https://symfony.com/schema/dic/swiftmailer/swiftmailer-1.0.xsd"> - + .. code-block:: php diff --git a/email/spool.rst b/email/spool.rst index 94b03179131..744240382fc 100644 --- a/email/spool.rst +++ b/email/spool.rst @@ -43,7 +43,7 @@ swiftmailer with the memory option, use the following configuration: http://symfony.com/schema/dic/swiftmailer https://symfony.com/schema/dic/swiftmailer/swiftmailer-1.0.xsd"> - + diff --git a/event_dispatcher.rst b/event_dispatcher.rst index 4945ac6f665..8d0f540136f 100644 --- a/event_dispatcher.rst +++ b/event_dispatcher.rst @@ -92,7 +92,7 @@ using a special "tag": - + diff --git a/form/create_form_type_extension.rst b/form/create_form_type_extension.rst index c0307f0aef4..4632cd2da3a 100644 --- a/form/create_form_type_extension.rst +++ b/form/create_form_type_extension.rst @@ -88,7 +88,7 @@ your class as a service and using the ``form.type_extension`` tag: - + diff --git a/form/form_collections.rst b/form/form_collections.rst index f7b75af4870..d3fe427cf4a 100644 --- a/form/form_collections.rst +++ b/form/form_collections.rst @@ -497,7 +497,7 @@ you will learn about next!). - + diff --git a/form/form_customization.rst b/form/form_customization.rst index 36877742cf8..300a9c14bb8 100644 --- a/form/form_customization.rst +++ b/form/form_customization.rst @@ -40,7 +40,7 @@ above templates would render:
  • This field is required
- + To quickly prototype and test a form, you can render the entire form with @@ -122,7 +122,7 @@ renders: .. code-block:: html - + Internally, Symfony uses the ``integer_widget`` fragment to render the field. This is because the field type is ``integer`` and you're rendering its ``widget`` diff --git a/form/form_dependencies.rst b/form/form_dependencies.rst index 7b5e2b070b4..f10e268a423 100644 --- a/form/form_dependencies.rst +++ b/form/form_dependencies.rst @@ -123,7 +123,7 @@ manually and tag it with ``form.type``: - + diff --git a/forms.rst b/forms.rst index bce0c2096a4..7f69f7b0ec7 100644 --- a/forms.rst +++ b/forms.rst @@ -353,10 +353,10 @@ object. - + - + \DateTime diff --git a/frontend/assetic/asset_management.rst b/frontend/assetic/asset_management.rst index 0ffc086d283..3a3125f8c92 100644 --- a/frontend/assetic/asset_management.rst +++ b/frontend/assetic/asset_management.rst @@ -64,7 +64,7 @@ your application: http://symfony.com/schema/dic/assetic/assetic-1.0.xsd"> - + @@ -181,7 +181,7 @@ except with the ``stylesheets`` tag: .. code-block:: html+twig {% stylesheets 'bundles/app/css/*' filter='cssrewrite' %} - + {% endstylesheets %} .. note:: @@ -195,7 +195,7 @@ except with the ``stylesheets`` tag: {# ... #} {% block stylesheets %} {% stylesheets 'bundles/app/css/*' filter='cssrewrite' %} - + {% endstylesheets %} {% endblock %} {# ... #} @@ -223,7 +223,7 @@ To include an image you can use the ``image`` tag. .. code-block:: html+twig {% image '@AppBundle/Resources/public/images/example.jpg' %} - Example + Example {% endimage %} You can also use Assetic for image optimization. More information in @@ -411,7 +411,7 @@ should be defined: + bin="/usr/local/bin/uglifyjs"/> @@ -536,7 +536,7 @@ the following change in your ``config_dev.yml`` file: http://symfony.com/schema/dic/assetic http://symfony.com/schema/dic/assetic/assetic-1.0.xsd"> - + .. code-block:: php diff --git a/frontend/assetic/jpeg_optimize.rst b/frontend/assetic/jpeg_optimize.rst index 0411ae02fa2..670943ee930 100644 --- a/frontend/assetic/jpeg_optimize.rst +++ b/frontend/assetic/jpeg_optimize.rst @@ -44,7 +44,7 @@ using the ``bin`` option of the ``jpegoptim`` filter: + bin="path/to/jpegoptim"/> @@ -102,7 +102,7 @@ to ``true``: + strip-all="true"/> @@ -153,7 +153,7 @@ be at the expense of its quality: + max="70"/> @@ -204,10 +204,10 @@ following configuration: + bin="path/to/jpegoptim"/> + name="jpegoptim"/> @@ -263,11 +263,11 @@ file: + bin="path/to/jpegoptim"/> + output="images/*.jpg"/> diff --git a/frontend/assetic/php.rst b/frontend/assetic/php.rst index b4039647d4d..7e165e16407 100644 --- a/frontend/assetic/php.rst +++ b/frontend/assetic/php.rst @@ -98,7 +98,7 @@ First, configure a new ``scssphp`` Assetic filter: http://symfony.com/schema/dic/assetic/assetic-1.0.xsd"> - + @@ -136,7 +136,7 @@ by Assetic: "assets/scss/font-awesome.scss" "assets/css/*.css" %} - + {% endstylesheets %} This simple configuration compiles, combines and minifies the SCSS files into a @@ -171,7 +171,7 @@ First, configure a new ``jsqueeze`` Assetic filter as follows: http://symfony.com/schema/dic/assetic/assetic-1.0.xsd"> - + diff --git a/frontend/assetic/uglifyjs.rst b/frontend/assetic/uglifyjs.rst index b279e226c66..3098520fac7 100644 --- a/frontend/assetic/uglifyjs.rst +++ b/frontend/assetic/uglifyjs.rst @@ -104,7 +104,7 @@ your JavaScripts: + bin="/usr/local/bin/uglifyjs"/> @@ -172,7 +172,7 @@ can configure its location using the ``node`` key: node="/usr/bin/nodejs" > + bin="/usr/local/bin/uglifyjs"/> @@ -275,7 +275,7 @@ Next, add the configuration for this filter: + bin="/usr/local/bin/uglifycss"/> @@ -296,7 +296,7 @@ helper: .. code-block:: html+twig {% stylesheets 'bundles/App/css/*' filter='uglifycss' filter='cssrewrite' %} - + {% endstylesheets %} Just like with the ``uglifyjs2`` filter, if you prefix the filter name with diff --git a/frontend/assetic/yuicompressor.rst b/frontend/assetic/yuicompressor.rst index 013f7ecd34b..438586bd3b1 100644 --- a/frontend/assetic/yuicompressor.rst +++ b/frontend/assetic/yuicompressor.rst @@ -57,10 +57,10 @@ stylesheets: + jar="%kernel.project_dir%/app/Resources/java/yuicompressor.jar"/> + jar="%kernel.project_dir%/app/Resources/java/yuicompressor.jar"/> @@ -115,7 +115,7 @@ can be repeated to minify your stylesheets. .. code-block:: html+twig {% stylesheets '@AppBundle/Resources/public/css/*' filter='yui_css' %} - + {% endstylesheets %} Disable Minification in Debug Mode diff --git a/frontend/custom_version_strategy.rst b/frontend/custom_version_strategy.rst index 9ca1b559c87..a8008ea9e75 100644 --- a/frontend/custom_version_strategy.rst +++ b/frontend/custom_version_strategy.rst @@ -182,7 +182,7 @@ the :ref:`version_strategy ` option: http://symfony.com/schema/dic/symfony http://symfony.com/schema/dic/symfony/symfony-1.0.xsd"> - + diff --git a/http_cache/esi.rst b/http_cache/esi.rst index 8576fb8c1df..c9912e2c090 100644 --- a/http_cache/esi.rst +++ b/http_cache/esi.rst @@ -27,7 +27,7 @@ as this is the only useful one outside of Akamai context: - + @@ -81,7 +81,7 @@ First, to use ESI, be sure to enable it in your application configuration: - + @@ -211,7 +211,7 @@ that must be enabled in your configuration: - + diff --git a/logging/formatter.rst b/logging/formatter.rst index db6047f733b..dfde6aabbff 100644 --- a/logging/formatter.rst +++ b/logging/formatter.rst @@ -40,7 +40,7 @@ configure your handler to use it: http://symfony.com/schema/dic/monolog/monolog-1.0.xsd"> - + diff --git a/logging/monolog_email.rst b/logging/monolog_email.rst index 381ffd1a4e1..d6b0ebb1494 100644 --- a/logging/monolog_email.rst +++ b/logging/monolog_email.rst @@ -167,7 +167,7 @@ You can adjust the time period using the ``time`` option: + handler="swift"/> .. code-block:: php diff --git a/logging/processors.rst b/logging/processors.rst index 031bdd454de..56dd9b514eb 100644 --- a/logging/processors.rst +++ b/logging/processors.rst @@ -85,7 +85,7 @@ information: - + @@ -191,7 +191,7 @@ the ``monolog.processor`` tag: - + @@ -236,7 +236,7 @@ the ``monolog.processor`` tag: - + diff --git a/profiler/data_collector.rst b/profiler/data_collector.rst index 667be46d9c5..8ec9f4822b1 100644 --- a/profiler/data_collector.rst +++ b/profiler/data_collector.rst @@ -163,7 +163,7 @@ block and set the value of two variables called ``icon`` and ``text``: .. code-block:: html - + Another solution is to define the images as SVG files. In addition to being resolution-independent, these images can be embedded in the Twig template diff --git a/profiler/matchers.rst b/profiler/matchers.rst index 838dbdae6ba..790f905002d 100644 --- a/profiler/matchers.rst +++ b/profiler/matchers.rst @@ -50,7 +50,7 @@ configuration: - + @@ -143,7 +143,7 @@ profiler to use this service as the matcher: - + diff --git a/profiler/storage.rst b/profiler/storage.rst index dd63cfd7ce1..a4763c13605 100644 --- a/profiler/storage.rst +++ b/profiler/storage.rst @@ -34,7 +34,7 @@ directory. If you want to use another location to store the profiles, define the http://symfony.com/schema/dic/symfony/symfony-1.0.xsd"> - + diff --git a/quick_tour/the_view.rst b/quick_tour/the_view.rst index db281a3780d..c33e2872096 100644 --- a/quick_tour/the_view.rst +++ b/quick_tour/the_view.rst @@ -122,10 +122,10 @@ the ``base.html.twig`` template and you'll find the following Twig code: - + {% block title %}Welcome!{% endblock %} {% block stylesheets %}{% endblock %} - + {% block body %}{% endblock %} @@ -258,9 +258,9 @@ Symfony provides the ``asset()`` function to deal with them easily: .. code-block:: twig - + - + The ``asset()`` function looks for the web assets inside the ``web/`` directory. If you store them in another directory, read diff --git a/reference/configuration/debug.rst b/reference/configuration/debug.rst index bc14d108448..08bfaf3630a 100644 --- a/reference/configuration/debug.rst +++ b/reference/configuration/debug.rst @@ -92,7 +92,7 @@ destination for dumps. Typically, you would set this to ``php://stderr``: https://symfony.com/schema/dic/services/services-1.0.xsd http://symfony.com/schema/dic/debug https://symfony.com/schema/dic/debug/debug-1.0.xsd"> - + .. code-block:: php diff --git a/reference/configuration/doctrine.rst b/reference/configuration/doctrine.rst index aae0235b51c..ead6d97d0c3 100644 --- a/reference/configuration/doctrine.rst +++ b/reference/configuration/doctrine.rst @@ -334,7 +334,7 @@ directory instead: - + diff --git a/reference/configuration/framework.rst b/reference/configuration/framework.rst index 88c5ccd4964..31698d3997d 100644 --- a/reference/configuration/framework.rst +++ b/reference/configuration/framework.rst @@ -312,7 +312,7 @@ doubling them to prevent Symfony from interpreting them as container parameters) https://symfony.com/schema/dic/services/services-1.0.xsd http://symfony.com/schema/dic/symfony http://symfony.com/schema/dic/symfony/symfony-1.0.xsd"> - + .. code-block:: php @@ -547,7 +547,7 @@ You can also set ``esi`` to ``true`` to enable it: http://symfony.com/schema/dic/symfony http://symfony.com/schema/dic/symfony/symfony-1.0.xsd"> - + @@ -952,7 +952,7 @@ setting the value to ``null``: http://symfony.com/schema/dic/symfony http://symfony.com/schema/dic/symfony/symfony-1.0.xsd"> - + @@ -1009,7 +1009,7 @@ Whether to enable the session support in the framework. http://symfony.com/schema/dic/symfony http://symfony.com/schema/dic/symfony/symfony-1.0.xsd"> - + @@ -1065,7 +1065,7 @@ This option allows you to define a base path to be used for assets: http://symfony.com/schema/dic/symfony http://symfony.com/schema/dic/symfony/symfony-1.0.xsd"> - + @@ -1114,7 +1114,7 @@ collection each time it generates an asset's path: http://symfony.com/schema/dic/symfony http://symfony.com/schema/dic/symfony/symfony-1.0.xsd"> - + @@ -1162,7 +1162,7 @@ You can group assets into packages, to specify different base URLs for them: + base-url="http://static_cdn.example.com/avatars"/> @@ -1213,7 +1213,7 @@ For example, suppose you have the following: .. code-block:: html+twig - Symfony! + Symfony! By default, this will render a path to your image such as ``/images/logo.png``. Now, activate the ``version`` option: @@ -1240,7 +1240,7 @@ Now, activate the ``version`` option: http://symfony.com/schema/dic/symfony http://symfony.com/schema/dic/symfony/symfony-1.0.xsd"> - + @@ -1358,15 +1358,15 @@ individually for each asset package: + version="null"/> + version-strategy="app.asset.another_version_strategy"/> + base_path="/images"/> @@ -1458,11 +1458,11 @@ package: + json-manifest-path="%kernel.project_dir%/web/assets/a_different_manifest.json"/> + base-path="/images"/> @@ -2211,7 +2211,7 @@ A list of workflows to be created by the framework extension: + name="my_workflow"/> diff --git a/reference/configuration/security.rst b/reference/configuration/security.rst index 3fd618a970b..2cef36eb091 100644 --- a/reference/configuration/security.rst +++ b/reference/configuration/security.rst @@ -531,7 +531,7 @@ To use HTTP-Digest authentication you need to provide a realm and a secret: - + diff --git a/reference/constraints/All.rst b/reference/constraints/All.rst index 5be6d9fdfeb..cef70cc3690 100644 --- a/reference/constraints/All.rst +++ b/reference/constraints/All.rst @@ -65,7 +65,7 @@ entry in that array: @@ -246,7 +246,7 @@ user to be logged in to access this URL: - + @@ -339,8 +339,8 @@ provider, but it's better to think of it as an "in configuration" provider: - - + + @@ -413,7 +413,7 @@ To fix this, add an ``encoders`` key: + algorithm="plaintext"/> @@ -493,7 +493,7 @@ is ``bcrypt``: + cost="12"/> @@ -557,8 +557,8 @@ It will give you something like this: - - + + @@ -733,7 +733,7 @@ URL pattern. You saw this earlier, where anything matching the regular expressio - + @@ -789,8 +789,8 @@ matches the URL. - - + + @@ -1126,7 +1126,7 @@ the firewall can handle this automatically for you when you activate the - + @@ -1164,7 +1164,7 @@ Next, you'll need to create a route for this URL (but not a controller): xsi:schemaLocation="http://symfony.com/schema/routing https://symfony.com/schema/routing/routing-1.0.xsd"> - + .. code-block:: php diff --git a/security/access_control.rst b/security/access_control.rst index 77a4f433a9e..6d1db76f0c2 100644 --- a/security/access_control.rst +++ b/security/access_control.rst @@ -54,10 +54,10 @@ Take the following ``access_control`` entries as an example: - - - - + + + + @@ -202,7 +202,7 @@ pattern so that it is only accessible by requests from the local server itself: ::1 - + @@ -279,7 +279,7 @@ key: + allow-if="'127.0.0.1' == request.getClientIp() or has_role('ROLE_ADMIN')"/> diff --git a/security/acl.rst b/security/acl.rst index 9eac8a9a3d3..e0e449e2860 100644 --- a/security/acl.rst +++ b/security/acl.rst @@ -75,7 +75,7 @@ First, you need to configure the connection the ACL system is supposed to use: - + diff --git a/security/api_key_authentication.rst b/security/api_key_authentication.rst index b5a038f5b30..c1d08b8a9ea 100644 --- a/security/api_key_authentication.rst +++ b/security/api_key_authentication.rst @@ -320,14 +320,14 @@ and ``provider`` keys: - + - + @@ -381,7 +381,7 @@ If you have defined ``access_control``, make sure to add a new entry: xsi:schemaLocation="http://symfony.com/schema/dic/services https://symfony.com/schema/dic/services/services-1.0.xsd"> - + diff --git a/security/csrf_in_login_form.rst b/security/csrf_in_login_form.rst index f9526408523..d6718f942a1 100644 --- a/security/csrf_in_login_form.rst +++ b/security/csrf_in_login_form.rst @@ -41,7 +41,7 @@ file: http://symfony.com/schema/dic/symfony/symfony-1.0.xsd"> - + @@ -85,7 +85,7 @@ use the default provider available in the security component: - + diff --git a/security/custom_authentication_provider.rst b/security/custom_authentication_provider.rst index ca37091dd83..acb5d011374 100644 --- a/security/custom_authentication_provider.rst +++ b/security/custom_authentication_provider.rst @@ -431,7 +431,7 @@ to service ids that may not exist yet: ``AppBundle\Security\Authentication\Provi public="false" > - + @@ -621,7 +621,7 @@ set to any desirable value per firewall. - + diff --git a/security/custom_provider.rst b/security/custom_provider.rst index eabcb1cb409..9969f8f1ecf 100644 --- a/security/custom_provider.rst +++ b/security/custom_provider.rst @@ -213,7 +213,7 @@ to the list of providers in the "security" section. Choose a name for the user p - + @@ -261,7 +261,7 @@ users, e.g. by filling in a login form. You can do this by adding a line to the + algorithm="bcrypt"/> @@ -332,7 +332,7 @@ is compared to the hashed password returned by your ``getPassword()`` method. + cost="12"/> diff --git a/security/entity_provider.rst b/security/entity_provider.rst index baa202ff4b3..2d0df268d17 100644 --- a/security/entity_provider.rst +++ b/security/entity_provider.rst @@ -241,18 +241,18 @@ the username and then check the password (more on passwords in a moment): https://symfony.com/schema/dic/services/services-1.0.xsd"> - + - + - + @@ -488,7 +488,7 @@ To finish this, just remove the ``property`` key from the user provider in - + diff --git a/security/force_https.rst b/security/force_https.rst index 4e1e88e0c4d..00c1b0c797d 100644 --- a/security/force_https.rst +++ b/security/force_https.rst @@ -33,7 +33,7 @@ to use HTTPS then you could use the following configuration: - + diff --git a/security/form_login.rst b/security/form_login.rst index 822e513f479..d4f676da939 100644 --- a/security/form_login.rst +++ b/security/form_login.rst @@ -59,7 +59,7 @@ a relative/absolute URL or a Symfony route name: - + @@ -117,7 +117,7 @@ previously requested URL and always redirect to the default page: - + @@ -163,8 +163,8 @@ Defining the redirect URL via POST using a hidden form field:
{# ... #} - - + +
Using the Referring URL @@ -205,7 +205,7 @@ parameter is included in the request, you may use the value of the - + @@ -271,7 +271,7 @@ option to define a new target via a relative/absolute URL or a Symfony route nam - + @@ -305,8 +305,8 @@ This option can also be set via the ``_failure_path`` request parameter:
{# ... #} - - + +
Customizing the Target and Failure Request Parameters @@ -346,8 +346,8 @@ redirects can be customized using the ``target_path_parameter`` and - - + + @@ -382,9 +382,9 @@ are now fully customized:
{# ... #} - - - + + +
Redirecting to the Last Accessed Page with ``TargetPathTrait`` diff --git a/security/form_login_setup.rst b/security/form_login_setup.rst index 057dbe50e1c..b83799a2be0 100644 --- a/security/form_login_setup.rst +++ b/security/form_login_setup.rst @@ -41,8 +41,8 @@ First, enable form login under your firewall: - - + + @@ -185,15 +185,15 @@ Finally, create the template:
- + - + {# If you want to control the URL the user is redirected to on success (more details below) - + #} @@ -297,7 +297,7 @@ all URLs (including the ``/login`` URL), will cause a redirect loop: - + @@ -336,8 +336,8 @@ fixes the problem: - - + + diff --git a/security/guard_authentication.rst b/security/guard_authentication.rst index 2cb32a00aa9..b78089fd415 100644 --- a/security/guard_authentication.rst +++ b/security/guard_authentication.rst @@ -116,7 +116,7 @@ Next, make sure you've configured a "user provider" for the user: - + @@ -307,7 +307,7 @@ Finally, configure your ``firewalls`` key in ``security.yml`` to use this authen pattern="^/" anonymous="true" > - + AppBundle\Security\TokenAuthenticator diff --git a/security/impersonating_user.rst b/security/impersonating_user.rst index 16b08548629..5cb0a40690c 100644 --- a/security/impersonating_user.rst +++ b/security/impersonating_user.rst @@ -47,7 +47,7 @@ listener: - + @@ -159,7 +159,7 @@ setting: - + diff --git a/security/json_login_setup.rst b/security/json_login_setup.rst index d6e0d786af4..d2c8eae82a4 100644 --- a/security/json_login_setup.rst +++ b/security/json_login_setup.rst @@ -33,8 +33,8 @@ First, enable the JSON login under your firewall: - - + + @@ -182,10 +182,10 @@ The security configuration should be: - + + password-path="security.credentials.password"/> diff --git a/security/ldap.rst b/security/ldap.rst index c9ce6de88ba..ee2c36f850f 100644 --- a/security/ldap.rst +++ b/security/ldap.rst @@ -79,7 +79,7 @@ An LDAP client can be simply configured using the built-in - + @@ -360,7 +360,7 @@ Configuration example for form login + dn-string="uid={username},dc=example,dc=com"/> @@ -412,7 +412,7 @@ Configuration example for HTTP Basic - + @@ -469,7 +469,7 @@ Configuration example for form login and query_string + query-string="(&(uid={username})(memberOf=cn=users,ou=Services,dc=example,dc=com))"/> diff --git a/security/multiple_guard_authenticators.rst b/security/multiple_guard_authenticators.rst index 6cbbdf08da1..ff4c1b364a7 100644 --- a/security/multiple_guard_authenticators.rst +++ b/security/multiple_guard_authenticators.rst @@ -47,7 +47,7 @@ This is how your security configuration can look in action: - + AppBundle\Security\LoginFormAuthenticator AppBundle\Security\FacebookConnectAuthenticator @@ -130,14 +130,14 @@ the solution is to split the configuration into two separate firewalls: - + AppBundle\Security\LoginFormAuthenticator - - - + + + diff --git a/security/multiple_user_providers.rst b/security/multiple_user_providers.rst index f487f6cd09e..917a904c54a 100644 --- a/security/multiple_user_providers.rst +++ b/security/multiple_user_providers.rst @@ -50,12 +50,12 @@ a new provider that chains the two together: - + - + @@ -133,8 +133,8 @@ the first provider is always used: - - + + diff --git a/security/named_encoders.rst b/security/named_encoders.rst index 41bbad3ac34..78c31332dcd 100644 --- a/security/named_encoders.rst +++ b/security/named_encoders.rst @@ -84,7 +84,7 @@ named encoders: + cost="15"/> @@ -160,7 +160,7 @@ you must register a service for it in order to use it as a named encoder: + id="app.password_encoder_service"/> diff --git a/security/pre_authenticated.rst b/security/pre_authenticated.rst index 75e0038bf18..de433454960 100644 --- a/security/pre_authenticated.rst +++ b/security/pre_authenticated.rst @@ -56,7 +56,7 @@ Enable the x509 authentication for a particular firewall in the security configu - + diff --git a/security/remember_me.rst b/security/remember_me.rst index b181b95d76b..4c13e56aaf7 100644 --- a/security/remember_me.rst +++ b/security/remember_me.rst @@ -50,7 +50,7 @@ the session lasts using a cookie with the ``remember_me`` firewall option: + path="/"/> @@ -152,15 +152,15 @@ this: - + - + - + - + The user will then automatically be logged in on subsequent visits while diff --git a/security/voters.rst b/security/voters.rst index 377b78c2be5..ca47559f046 100644 --- a/security/voters.rst +++ b/security/voters.rst @@ -310,7 +310,7 @@ security configuration: > - + diff --git a/serializer.rst b/serializer.rst index 7015f355219..69585c534c7 100644 --- a/serializer.rst +++ b/serializer.rst @@ -42,10 +42,10 @@ it in your configuration: http://symfony.com/schema/dic/symfony/symfony-1.0.xsd"> - + @@ -142,7 +142,7 @@ properties and setters (``setXxx()``) to change properties: - + @@ -195,7 +195,7 @@ with the following configuration: - + @@ -262,7 +262,7 @@ value: - + .. code-block:: php diff --git a/serializer/encoders.rst b/serializer/encoders.rst index 5499394e31f..f77c1f2c1a4 100644 --- a/serializer/encoders.rst +++ b/serializer/encoders.rst @@ -67,7 +67,7 @@ Be aware that this encoder will consider keys beginning with ``@`` as attributes // will return: // // - // + // // The ``YamlEncoder`` diff --git a/service_container.rst b/service_container.rst index 41bc44ecb60..2c8399812d0 100644 --- a/service_container.rst +++ b/service_container.rst @@ -211,10 +211,10 @@ each time you ask for it. - + - + @@ -480,7 +480,7 @@ pass here. No problem! In your configuration, you can explicitly set this argume - + @@ -671,7 +671,7 @@ But, you can control this and pass in a different logger: - + @@ -828,7 +828,7 @@ as a service, and :doc:`tag ` it with ``twig.extension` - + @@ -881,7 +881,7 @@ this file is ``public: false`` by default: - + @@ -972,10 +972,10 @@ key. For example, the default Symfony configuration contains this: - + - + @@ -1126,18 +1126,18 @@ admin email. In this case, each needs to have a unique service id: - - + + superadmin@example.com - - + + contact@example.com - + diff --git a/service_container/3.3-di-changes.rst b/service_container/3.3-di-changes.rst index 88a1bfd33be..251e8327b9d 100644 --- a/service_container/3.3-di-changes.rst +++ b/service_container/3.3-di-changes.rst @@ -75,12 +75,12 @@ Symfony Standard Edition: https://symfony.com/schema/dic/services/services-1.0.xsd"> - + - + - + @@ -130,7 +130,7 @@ thanks to the following config: - + @@ -202,12 +202,12 @@ service as an argument to another with the following config: + class="AppBundle\Service\InvoiceGenerator"/> - + @@ -321,7 +321,7 @@ The third big change is that, in a new Symfony 3.3 project, your controllers are - + @@ -465,7 +465,7 @@ inherited from an abstract definition: - + diff --git a/service_container/alias_private.rst b/service_container/alias_private.rst index dfeb035cbea..e0bf94339a9 100644 --- a/service_container/alias_private.rst +++ b/service_container/alias_private.rst @@ -46,7 +46,7 @@ You can also control the ``public`` option on a service-by-service basis: xsi:schemaLocation="http://symfony.com/schema/dic/services https://symfony.com/schema/dic/services/services-1.0.xsd"> - + @@ -114,9 +114,9 @@ services. https://symfony.com/schema/dic/services/services-1.0.xsd"> - + - + @@ -186,11 +186,11 @@ The following example shows how to inject an anonymous service into another serv https://symfony.com/schema/dic/services/services-1.0.xsd"> - + - + @@ -220,7 +220,7 @@ Using an anonymous service as a factory looks like this: https://symfony.com/schema/dic/services/services-1.0.xsd"> - + diff --git a/service_container/autowiring.rst b/service_container/autowiring.rst index cdb9430eff7..fceda9868ac 100644 --- a/service_container/autowiring.rst +++ b/service_container/autowiring.rst @@ -90,12 +90,12 @@ both services: xsi:schemaLocation="http://symfony.com/schema/dic/services https://symfony.com/schema/dic/services/services-1.0.xsd"> - + - + - + @@ -231,8 +231,8 @@ adding a service alias: - - + + @@ -323,9 +323,9 @@ To fix that, add an :ref:`alias `: - + - + @@ -406,13 +406,13 @@ that alias: - - + + - + - + diff --git a/service_container/calls.rst b/service_container/calls.rst index c4c3d403273..c2f6d6c2b92 100644 --- a/service_container/calls.rst +++ b/service_container/calls.rst @@ -57,7 +57,7 @@ To configure the container to call the ``setLogger`` method, use the ``calls`` k - + diff --git a/service_container/configurators.rst b/service_container/configurators.rst index 17ba5ee9037..a10c2fb2507 100644 --- a/service_container/configurators.rst +++ b/service_container/configurators.rst @@ -151,14 +151,14 @@ all the classes are already loaded as services. All you need to do is specify th https://symfony.com/schema/dic/services/services-1.0.xsd"> - + - + - + diff --git a/service_container/factories.rst b/service_container/factories.rst index 09fce40c3ba..e981e21ad88 100644 --- a/service_container/factories.rst +++ b/service_container/factories.rst @@ -58,12 +58,12 @@ configure the service container to use the - + @@ -122,7 +122,7 @@ Configuration of the service container then looks like this: https://symfony.com/schema/dic/services/services-1.0.xsd"> - + diff --git a/service_container/injection_types.rst b/service_container/injection_types.rst index 919be723a44..0d6b092dd05 100644 --- a/service_container/injection_types.rst +++ b/service_container/injection_types.rst @@ -141,7 +141,7 @@ that accepts the dependency:: - + @@ -212,7 +212,7 @@ Another possibility is just setting public fields of the class directly:: - + diff --git a/service_container/lazy_services.rst b/service_container/lazy_services.rst index b0c0b11227d..44dec8552c4 100644 --- a/service_container/lazy_services.rst +++ b/service_container/lazy_services.rst @@ -66,7 +66,7 @@ You can mark the service as ``lazy`` by manipulating its definition: https://symfony.com/schema/dic/services/services-1.0.xsd"> - + diff --git a/service_container/optional_dependencies.rst b/service_container/optional_dependencies.rst index 1b4f5fc8c69..b6f413839b3 100644 --- a/service_container/optional_dependencies.rst +++ b/service_container/optional_dependencies.rst @@ -26,7 +26,7 @@ if the service does not exist: - + diff --git a/service_container/parent_services.rst b/service_container/parent_services.rst index 394b522a213..0b1e40cd89c 100644 --- a/service_container/parent_services.rst +++ b/service_container/parent_services.rst @@ -92,10 +92,10 @@ duplicated service definitions: - + - + @@ -207,14 +207,14 @@ the child class: > - + - + diff --git a/service_container/service_decoration.rst b/service_container/service_decoration.rst index 43cd9054a56..fcedb9ef55d 100644 --- a/service_container/service_decoration.rst +++ b/service_container/service_decoration.rst @@ -28,11 +28,11 @@ When overriding an existing definition, the original service is lost: xsd:schemaLocation="http://symfony.com/schema/dic/services https://symfony.com/schema/dic/services/services-1.0.xsd"> - + - + @@ -82,13 +82,13 @@ but keeps a reference of the old one as ``App\DecoratingMailer.inner``: xsd:schemaLocation="http://symfony.com/schema/dic/services https://symfony.com/schema/dic/services/services-1.0.xsd"> - + - + @@ -154,7 +154,7 @@ replaces the ``AppBundle\Mailer`` service. The old ``AppBundle\Mailer`` service decoration-inner-name="AppBundle\DecoratingMailer.wooz" public="false" > - + @@ -208,14 +208,14 @@ the ``decoration_priority`` option. Its value is an integer that defaults to xsi:schemaLocation="http://symfony.com/schema/dic/services https://symfony.com/schema/dic/services/services-1.0.xsd"> - + - + - + diff --git a/service_container/service_subscribers_locators.rst b/service_container/service_subscribers_locators.rst index cfc027eafaa..31b0dbf8a1f 100644 --- a/service_container/service_subscribers_locators.rst +++ b/service_container/service_subscribers_locators.rst @@ -220,7 +220,7 @@ service type to a service. - + @@ -276,10 +276,10 @@ include as many services as needed in it. - - + + - + @@ -329,7 +329,7 @@ Now you can use the service locator by injecting it in any other service: - + diff --git a/service_container/shared.rst b/service_container/shared.rst index 7fec4267f67..49cbcd4dc5a 100644 --- a/service_container/shared.rst +++ b/service_container/shared.rst @@ -26,7 +26,7 @@ in your service definition: - + .. code-block:: php diff --git a/service_container/synthetic_services.rst b/service_container/synthetic_services.rst index d6a87d932b9..59bb6fd3cd2 100644 --- a/service_container/synthetic_services.rst +++ b/service_container/synthetic_services.rst @@ -55,7 +55,7 @@ configuration: - + diff --git a/service_container/tags.rst b/service_container/tags.rst index cd23b12189b..513e62a0876 100644 --- a/service_container/tags.rst +++ b/service_container/tags.rst @@ -30,7 +30,7 @@ example: - + @@ -87,7 +87,7 @@ If you want to apply tags automatically for your own services, use the - + @@ -171,7 +171,7 @@ Then, define the chain as a service: https://symfony.com/schema/dic/services/services-1.0.xsd"> - + @@ -212,11 +212,11 @@ For example, you may add the following transports as services: %mailer_host% - + - + @@ -362,11 +362,11 @@ To answer this, change the service declaration: %mailer_host% - + - + @@ -479,16 +479,16 @@ first constructor argument to the ``App\HandlerCollection`` service: - + - + - + @@ -546,7 +546,7 @@ application handlers:: - + diff --git a/session/locale_sticky_session.rst b/session/locale_sticky_session.rst index 5866f4fb657..6f7439e074d 100644 --- a/session/locale_sticky_session.rst +++ b/session/locale_sticky_session.rst @@ -93,7 +93,7 @@ via some "Change Locale" route & controller), or create a route with a the :ref: %kernel.default_locale% - + diff --git a/session/proxy_examples.rst b/session/proxy_examples.rst index 871c6444049..3a731077ce6 100644 --- a/session/proxy_examples.rst +++ b/session/proxy_examples.rst @@ -38,7 +38,7 @@ Symfony to use your session handler instead of the default one: https://symfony.com/schema/dic/services/services-1.0.xsd"> - + diff --git a/session/sessions_directory.rst b/session/sessions_directory.rst index dc732d92340..a792f934ee4 100644 --- a/session/sessions_directory.rst +++ b/session/sessions_directory.rst @@ -30,7 +30,7 @@ this path, update the ``framework.session.save_path`` configuration key: http://symfony.com/schema/dic/symfony/symfony-1.0.xsd"> - + diff --git a/templating.rst b/templating.rst index 4c7e8746147..65f6bb9835c 100644 --- a/templating.rst +++ b/templating.rst @@ -638,9 +638,9 @@ but Symfony provides a more dynamic option via the ``asset()`` Twig function: .. code-block:: html+twig - Symfony! + Symfony! - + The ``asset()`` function's main purpose is to make your application more portable. If your application lives at the root of your host (e.g. ``http://example.com``), @@ -662,7 +662,7 @@ as follows: .. code-block:: html+twig - Symfony! + Symfony! .. index:: single: Templating; Including stylesheets and JavaScripts @@ -697,7 +697,7 @@ stylesheets and JavaScripts that you'll need throughout your site: {# ... #} {% block stylesheets %} - + {% endblock %} @@ -722,7 +722,7 @@ page. From inside that contact page's template, do the following: {% block stylesheets %} {{ parent() }} - + {% endblock %} {# ... #} @@ -740,7 +740,7 @@ is by default the "web/" directory of your application). .. code-block:: html+twig - + The end result is a page that includes ``main.js`` and both the ``main.css`` and ``contact.css`` stylesheets. diff --git a/templating/PHP.rst b/templating/PHP.rst index 25617108571..fd3bd7b9545 100644 --- a/templating/PHP.rst +++ b/templating/PHP.rst @@ -45,8 +45,8 @@ your application configuration file: - - + + @@ -166,7 +166,7 @@ global views for your entire project: - + <?php $view['slots']->output('title', 'Hello Application') ?> @@ -208,7 +208,7 @@ The base layout already has the code to output the title in the header: - + <?php $view['slots']->output('title', 'Hello Application') ?> @@ -344,9 +344,9 @@ Symfony provides the ``assets`` tag to deal with them easily: .. code-block:: html+php - + - + The ``assets`` helper's main purpose is to make your application more portable. Thanks to this helper, you can move the application root directory diff --git a/templating/hinclude.rst b/templating/hinclude.rst index 056fc1f34aa..d2d3e2e0bd4 100644 --- a/templating/hinclude.rst +++ b/templating/hinclude.rst @@ -45,7 +45,7 @@ tags: - + @@ -83,7 +83,7 @@ in your application configuration: - + diff --git a/testing.rst b/testing.rst index ac60aa908dd..cfcb9d02bf5 100644 --- a/testing.rst +++ b/testing.rst @@ -179,7 +179,7 @@ As an example, a test could look like this:: - + @@ -852,7 +852,7 @@ configuration option: https://symfony.com/schema/dic/swiftmailer/swiftmailer-1.0.xsd"> - + .. code-block:: php diff --git a/testing/bootstrap.rst b/testing/bootstrap.rst index dac44ecca07..ae4c6037b2d 100644 --- a/testing/bootstrap.rst +++ b/testing/bootstrap.rst @@ -44,7 +44,7 @@ cache to be cleared: - + diff --git a/testing/http_authentication.rst b/testing/http_authentication.rst index 8a932153ac8..41d96ddd18e 100644 --- a/testing/http_authentication.rst +++ b/testing/http_authentication.rst @@ -40,7 +40,7 @@ firewall, but only in the configuration file used by tests: - + diff --git a/testing/profiling.rst b/testing/profiling.rst index f66ea82ae2e..7e11312d3cd 100644 --- a/testing/profiling.rst +++ b/testing/profiling.rst @@ -103,7 +103,7 @@ to false: - + diff --git a/translation/locale.rst b/translation/locale.rst index e1cd7f61e50..f17ea5b0b7b 100644 --- a/translation/locale.rst +++ b/translation/locale.rst @@ -153,7 +153,7 @@ the framework: http://symfony.com/schema/dic/symfony http://symfony.com/schema/dic/symfony/symfony-1.0.xsd"> - + .. code-block:: php diff --git a/validation.rst b/validation.rst index 2d872d1dfb4..c331a2c51ef 100644 --- a/validation.rst +++ b/validation.rst @@ -76,7 +76,7 @@ following: - + @@ -218,7 +218,7 @@ file: http://symfony.com/schema/dic/symfony http://symfony.com/schema/dic/symfony/symfony-1.0.xsd"> - + @@ -254,7 +254,7 @@ previous configuration by the following: http://symfony.com/schema/dic/symfony http://symfony.com/schema/dic/symfony/symfony-1.0.xsd"> - + @@ -558,7 +558,7 @@ class to have at least 3 characters. - + diff --git a/validation/custom_constraint.rst b/validation/custom_constraint.rst index 98dc1bbfda0..0ab944c812c 100644 --- a/validation/custom_constraint.rst +++ b/validation/custom_constraint.rst @@ -139,8 +139,8 @@ You can use custom validators just as the ones provided by Symfony itself: - - + + @@ -232,5 +232,5 @@ not to the property: - + diff --git a/validation/sequence_provider.rst b/validation/sequence_provider.rst index 12f28d0248a..bb372f57c48 100644 --- a/validation/sequence_provider.rst +++ b/validation/sequence_provider.rst @@ -75,11 +75,11 @@ username and the password are different only if all other validation passes - + - + @@ -223,7 +223,7 @@ entity and a new constraint group called ``Premium``: - + @@ -337,7 +337,7 @@ provides a sequence of groups to be validated: https://symfony.com/schema/dic/constraint-mapping/constraint-mapping-1.0.xsd"> - + diff --git a/workflow/usage.rst b/workflow/usage.rst index f059c7f743e..bff4a62ad42 100644 --- a/workflow/usage.rst +++ b/workflow/usage.rst @@ -65,7 +65,7 @@ like this: - + currentPlace