Skip to content
Snippets Groups Projects
Commit 67639888 authored by Fabien Potencier's avatar Fabien Potencier
Browse files

Merge branch '1.0' into 1.1

* 1.0:
  Fix typos
parents 33da608a 185be1eb
No related branches found
No related tags found
No related merge requests found
...@@ -32,8 +32,8 @@ By calling ``handle``, you can make a sub-request manually. Here's an example:: ...@@ -32,8 +32,8 @@ By calling ``handle``, you can make a sub-request manually. Here's an example::
$response = $app->handle($subRequest, HttpKernelInterface::SUB_REQUEST, false); $response = $app->handle($subRequest, HttpKernelInterface::SUB_REQUEST, false);
There's some more things that you need to keep in mind though. In most cases There's some more things that you need to keep in mind though. In most cases
you will want to forward some parts of the current master request to the sub- you will want to forward some parts of the current master request to the
request. That includes: Cookies, server information, session. sub-request. That includes: Cookies, server information, session.
Here is a more advanced example that forwards said information (``$request`` Here is a more advanced example that forwards said information (``$request``
holds the master request):: holds the master request)::
......
...@@ -127,8 +127,7 @@ example:: ...@@ -127,8 +127,7 @@ example::
return $app['twig']->render('index.twig', array('form' => $form->createView())); return $app['twig']->render('index.twig', array('form' => $form->createView()));
}); });
And here is the ``index.twig`` form template (requires ``symfony/twig- And here is the ``index.twig`` form template (requires ``symfony/twig-bridge``):
bridge``):
.. code-block:: jinja .. code-block:: jinja
......
...@@ -13,7 +13,7 @@ Parameters ...@@ -13,7 +13,7 @@ Parameters
* **monolog.logfile**: File where logs are written to. * **monolog.logfile**: File where logs are written to.
* **monolog.level** (optional): Level of logging defaults * **monolog.level** (optional): Level of logging, defaults
to ``DEBUG``. Must be one of ``Logger::DEBUG``, ``Logger::INFO``, to ``DEBUG``. Must be one of ``Logger::DEBUG``, ``Logger::INFO``,
``Logger::WARNING``, ``Logger::ERROR``. ``DEBUG`` will log ``Logger::WARNING``, ``Logger::ERROR``. ``DEBUG`` will log
everything, ``INFO`` will log everything except ``DEBUG``, everything, ``INFO`` will log everything except ``DEBUG``,
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment