diff --git a/cookbook/bundles/installation.rst b/cookbook/bundles/installation.rst index c546ffad58c..d6124026554 100644 --- a/cookbook/bundles/installation.rst +++ b/cookbook/bundles/installation.rst @@ -34,9 +34,9 @@ the library on the `Packagist.org`_ site. Now that you know the package name, you can install it via Composer: - .. code-block:: bash +.. code-block:: bash - $ php composer.phar require friendsofsymfony/user-bundle + $ php composer.phar require friendsofsymfony/user-bundle This will choose the best version for your project, add it to ``composer.json`` and download the library into the ``vendor/`` directory. If you need a specific diff --git a/reference/configuration/security.rst b/reference/configuration/security.rst index b1fba8ed721..c680bba3d4f 100644 --- a/reference/configuration/security.rst +++ b/reference/configuration/security.rst @@ -419,20 +419,20 @@ multiple firewalls, the "context" could actually be shared: .. code-block:: xml - - - - - - - - - + + + + + + + + + .. code-block:: php - // app/config/security.php - $container->loadFromExtension('security', array( + // app/config/security.php + $container->loadFromExtension('security', array( 'firewalls' => array( 'somename' => array( // ... @@ -443,7 +443,7 @@ multiple firewalls, the "context" could actually be shared: 'context' => 'my_context' ), ), - )); + )); HTTP-Digest Authentication -------------------------- @@ -452,38 +452,38 @@ To use HTTP-Digest authentication you need to provide a realm and a key: .. configuration-block:: - .. code-block:: yaml - - # app/config/security.yml - security: - firewalls: - somename: - http_digest: - key: "a_random_string" - realm: "secure-api" - - .. code-block:: xml - - - - - - - - - .. code-block:: php - - // app/config/security.php - $container->loadFromExtension('security', array( - 'firewalls' => array( - 'somename' => array( - 'http_digest' => array( - 'key' => 'a_random_string', - 'realm' => 'secure-api', - ), - ), - ), - )); + .. code-block:: yaml + + # app/config/security.yml + security: + firewalls: + somename: + http_digest: + key: "a_random_string" + realm: "secure-api" + + .. code-block:: xml + + + + + + + + + .. code-block:: php + + // app/config/security.php + $container->loadFromExtension('security', array( + 'firewalls' => array( + 'somename' => array( + 'http_digest' => array( + 'key' => 'a_random_string', + 'realm' => 'secure-api', + ), + ), + ), + )); .. _`PBKDF2`: http://en.wikipedia.org/wiki/PBKDF2 .. _`ircmaxell/password-compat`: https://packagist.org/packages/ircmaxell/password-compat