Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Minor XML codes fixes #7744

Closed
wants to merge 2 commits into from
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion assetic/apply_to_option.rst
Original file line number Diff line number Diff line change
Expand Up @@ -161,7 +161,7 @@ In this case you can specify that the ``coffee`` filter is applied to all
name="coffee"
bin="/usr/bin/coffee"
node="/usr/bin/node"
apply-to="\.coffee$" />
apply-to="\.coffee$">
<assetic:node-path>/usr/lib/node_modules/</assetic:node-path>
</assetic:filter>
</assetic:config>
Expand Down
2 changes: 1 addition & 1 deletion bundles/configuration.rst
Original file line number Diff line number Diff line change
Expand Up @@ -81,8 +81,8 @@ bundle configuration would look like:

<!-- app/config/config.xml -->
<?xml version="1.0" ?>

<container xmlns="http://symfony.com/schema/dic/services"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xmlns:acme-social="http://example.org/schema/dic/acme_social"
xsi:schemaLocation="http://symfony.com/schema/dic/services
http://symfony.com/schema/dic/services/services-1.0.xsd">
Expand Down
3 changes: 0 additions & 3 deletions configuration.rst
Original file line number Diff line number Diff line change
Expand Up @@ -150,8 +150,6 @@ it *also* loads other configuration files via its ``imports`` key:
<?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:framework="http://symfony.com/schema/dic/symfony"
xmlns:twig="http://symfony.com/schema/dic/twig"
xsi:schemaLocation="http://symfony.com/schema/dic/services
http://symfony.com/schema/dic/services/services-1.0.xsd
http://symfony.com/schema/dic/symfony
Expand Down Expand Up @@ -216,7 +214,6 @@ key:
<container xmlns="http://symfony.com/schema/dic/services"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xmlns:framework="http://symfony.com/schema/dic/symfony"
xmlns:twig="http://symfony.com/schema/dic/twig"
xsi:schemaLocation="http://symfony.com/schema/dic/services
http://symfony.com/schema/dic/services/services-1.0.xsd
http://symfony.com/schema/dic/symfony
Expand Down
4 changes: 2 additions & 2 deletions doctrine/pdo_session_storage.rst
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@ To use it, you just need to change some parameters in the main configuration fil

<services>
<service id="session.handler.pdo" class="Symfony\Component\HttpFoundation\Session\Storage\Handler\PdoSessionHandler" public="false">
<argument>mysql:dbname=mydatabase</agruement>
<argument>mysql:dbname=mydatabase</argument>
<argument type="collection">
<argument key="db_username">myuser</argument>
<argument key="db_password">mypassword</argument>
Expand Down Expand Up @@ -99,7 +99,7 @@ a second array argument to ``PdoSessionHandler``:
<!-- app/config/config.xml -->
<services>
<service id="session.handler.pdo" class="Symfony\Component\HttpFoundation\Session\Storage\Handler\PdoSessionHandler" public="false">
<argument>mysql:dbname=mydatabase</agruement>
<argument>mysql:dbname=mydatabase</argument>
<argument type="collection">
<argument key="db_table">sessions</argument>
<argument key="db_username">myuser</argument>
Expand Down
2 changes: 1 addition & 1 deletion http_cache/esi.rst
Original file line number Diff line number Diff line change
Expand Up @@ -237,7 +237,7 @@ that must be enabled in your configuration:
<?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:framework="http://symfony.com/schema/dic/framework"
xmlns:framework="http://symfony.com/schema/dic/symfony"
xsi:schemaLocation="http://symfony.com/schema/dic/services
http://symfony.com/schema/dic/services/services-1.0.xsd
http://symfony.com/schema/dic/symfony
Expand Down
4 changes: 2 additions & 2 deletions reference/configuration/security.rst
Original file line number Diff line number Diff line change
Expand Up @@ -494,10 +494,10 @@ multiple firewalls, the "context" could actually be shared:
<!-- app/config/security.xml -->
<security:config>
<security:firewall name="somename" context="my_context">
<! ... ->
<!-- ... -->
</security:firewall>
<security:firewall name="othername" context="my_context">
<! ... ->
<!-- ... -->
</security:firewall>
</security:config>

Expand Down
5 changes: 3 additions & 2 deletions security/api_key_authentication.rst
Original file line number Diff line number Diff line change
Expand Up @@ -436,8 +436,9 @@ If you have defined ``access_control``, make sure to add a new entry:
xmlns:srv="http://symfony.com/schema/dic/services"
xsi:schemaLocation="http://symfony.com/schema/dic/services
http://symfony.com/schema/dic/services/services-1.0.xsd">

<rule path="^/api" role="ROLE_API" />
<config>
<rule path="^/api" role="ROLE_API" />
</config>
</srv:container>

.. code-block:: php
Expand Down