Commit 2ed0ede2 authored by Fabien Potencier's avatar Fabien Potencier

Merge branch '1.3'

* 1.3:
  Documentation code-block fixes
parents 554fa106 1d119228
...@@ -2,9 +2,7 @@ Silex, a simple Web Framework ...@@ -2,9 +2,7 @@ Silex, a simple Web Framework
============================= =============================
Silex is a PHP micro-framework to develop websites based on `Symfony Silex is a PHP micro-framework to develop websites based on `Symfony
components`_: components`_::
.. code-block:: php
<?php <?php
......
...@@ -58,9 +58,7 @@ setting Response HTTP cache headers:: ...@@ -58,9 +58,7 @@ setting Response HTTP cache headers::
in `Trusting Proxies in `Trusting Proxies
<http://symfony.com/doc/current/components/http_foundation/trusting_proxies.html>`_. <http://symfony.com/doc/current/components/http_foundation/trusting_proxies.html>`_.
If you would be running Varnish in front of your application on the same machine: If you would be running Varnish in front of your application on the same machine::
.. code-block:: php
use Symfony\Component\HttpFoundation\Request; use Symfony\Component\HttpFoundation\Request;
...@@ -69,9 +67,7 @@ setting Response HTTP cache headers:: ...@@ -69,9 +67,7 @@ setting Response HTTP cache headers::
This provider allows you to use the Symfony reverse proxy natively with This provider allows you to use the Symfony reverse proxy natively with
Silex applications by using the ``http_cache`` service. The Symfony reverse proxy Silex applications by using the ``http_cache`` service. The Symfony reverse proxy
acts much like any other proxy would, so you will want to whitelist it: acts much like any other proxy would, so you will want to whitelist it::
.. code-block:: php
use Symfony\Component\HttpFoundation\Request; use Symfony\Component\HttpFoundation\Request;
......
...@@ -44,9 +44,7 @@ Registering ...@@ -44,9 +44,7 @@ Registering
Usage Usage
----- -----
The ``SerializerServiceProvider`` provider provides a ``serializer`` service: The ``SerializerServiceProvider`` provider provides a ``serializer`` service::
.. code-block:: php
use Silex\Application; use Silex\Application;
use Silex\Provider\SerializerServiceProvider; use Silex\Provider\SerializerServiceProvider;
...@@ -73,4 +71,3 @@ The ``SerializerServiceProvider`` provider provides a ``serializer`` service: ...@@ -73,4 +71,3 @@ The ``SerializerServiceProvider`` provider provides a ``serializer`` service:
)); ));
})->assert("_format", "xml|json") })->assert("_format", "xml|json")
->assert("id", "\d+"); ->assert("id", "\d+");
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment