From 4c48a4287a440aa66f02945d2909431e99dd5012 Mon Sep 17 00:00:00 2001
From: Tarjei Huse <tarjei.huse@gmail.com>
Date: Mon, 21 Jan 2013 20:54:44 +0100
Subject: [PATCH 1/5] Add comment on http_digest auth.

I just thought it would be usefull to see what keys are needed to get HTTP Digest Auth working.
---
 reference/configuration/security.rst | 17 +++++++++++++++++
 1 file changed, 17 insertions(+)

diff --git a/reference/configuration/security.rst b/reference/configuration/security.rst
index b02485800fc..9a2989424e5 100644
--- a/reference/configuration/security.rst
+++ b/reference/configuration/security.rst
@@ -284,3 +284,20 @@ A good configuration lies around at least 1000 iterations and sha512
 for the hash algorithm.
 
 .. _`PBKDF2`: http://en.wikipedia.org/wiki/PBKDF2
+
+HTTP-Digest Authentication
+--------------------------
+
+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"
+

From b784172c093ef05fdaa4b80d925a7ce97bc338ba Mon Sep 17 00:00:00 2001
From: Tarjei Huse <tarjei.huse@gmail.com>
Date: Mon, 21 Jan 2013 21:11:12 +0100
Subject: [PATCH 2/5] Update reference/configuration/security.rst

add empty line
---
 reference/configuration/security.rst | 1 +
 1 file changed, 1 insertion(+)

diff --git a/reference/configuration/security.rst b/reference/configuration/security.rst
index 9a2989424e5..5f68ece0122 100644
--- a/reference/configuration/security.rst
+++ b/reference/configuration/security.rst
@@ -289,6 +289,7 @@ HTTP-Digest Authentication
 --------------------------
 
 To use HTTP-Digest authentication you need to provide a realm and a key:
+
 .. configuration-block::
 
     .. code-block:: yaml

From 95bf4da09d753fc98c945643ef99d6d055c5b18b Mon Sep 17 00:00:00 2001
From: Tarjei Huse <tarjei.huse@gmail.com>
Date: Tue, 22 Jan 2013 13:01:36 +0100
Subject: [PATCH 3/5] Update reference/configuration/security.rst

Added PHP and XML examples.
---
 reference/configuration/security.rst | 37 ++++++++++++++++++++--------
 1 file changed, 27 insertions(+), 10 deletions(-)

diff --git a/reference/configuration/security.rst b/reference/configuration/security.rst
index 5f68ece0122..93c5ac94144 100644
--- a/reference/configuration/security.rst
+++ b/reference/configuration/security.rst
@@ -292,13 +292,30 @@ 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:: yaml
+      # app/config/security.yml
+      security:
+         firewalls:
+            somename:
+              http_digest:
+               key: "a_random_string"
+               realm: "secure-api"
+
+   .. code-block:: xml
+      <security:config>
+         <firewall name="somename">
+            <http-digest key="a_random_string" realm="secure-api" />
+         </firewall>
+      </security:config>
+
+   .. code-block:: php
+      $container->loadFromExtension('security', array(
+           'firewalls' => array(
+               'somename' => array(
+                   'http_digest' => array(
+                       'key'   => 'a_random_string',
+                       'realm' => 'secure-api',
+                   ),
+               ),
+           ),
+      ));

From 96466b94cce3bede3b1274a403ee55d6132c55c3 Mon Sep 17 00:00:00 2001
From: Tarjei Huse <tarjei.huse@gmail.com>
Date: Tue, 22 Jan 2013 13:32:19 +0100
Subject: [PATCH 4/5] Update reference/configuration/security.rst

Formatting fixes, added file comments.
---
 reference/configuration/security.rst | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/reference/configuration/security.rst b/reference/configuration/security.rst
index 93c5ac94144..e55d2a676c6 100644
--- a/reference/configuration/security.rst
+++ b/reference/configuration/security.rst
@@ -293,6 +293,7 @@ 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:
@@ -302,6 +303,7 @@ To use HTTP-Digest authentication you need to provide a realm and a key:
                realm: "secure-api"
 
    .. code-block:: xml
+      <!-- app/config/security.xml -->
       <security:config>
          <firewall name="somename">
             <http-digest key="a_random_string" realm="secure-api" />
@@ -309,6 +311,8 @@ To use HTTP-Digest authentication you need to provide a realm and a key:
       </security:config>
 
    .. code-block:: php
+
+      // app/config/security.php
       $container->loadFromExtension('security', array(
            'firewalls' => array(
                'somename' => array(

From 75a4f6185f4530dc635197d576f5682932dce02a Mon Sep 17 00:00:00 2001
From: Tarjei Huse <tarjei.huse@gmail.com>
Date: Tue, 22 Jan 2013 13:55:42 +0100
Subject: [PATCH 5/5] Update reference/configuration/security.rst

fix newline
---
 reference/configuration/security.rst | 1 +
 1 file changed, 1 insertion(+)

diff --git a/reference/configuration/security.rst b/reference/configuration/security.rst
index e55d2a676c6..f28e0ebe3e6 100644
--- a/reference/configuration/security.rst
+++ b/reference/configuration/security.rst
@@ -303,6 +303,7 @@ To use HTTP-Digest authentication you need to provide a realm and a key:
                realm: "secure-api"
 
    .. code-block:: xml
+
       <!-- app/config/security.xml -->
       <security:config>
          <firewall name="somename">