From 450cecda904a14499fa6691b171a7a431e6733d8 Mon Sep 17 00:00:00 2001
From: Fabien Potencier <fabien.potencier@gmail.com>
Date: Fri, 26 Apr 2013 19:10:52 +0200
Subject: [PATCH] added the new collect flag for the profiler

---
 reference/configuration/framework.rst | 18 ++++++++++++++++++
 1 file changed, 18 insertions(+)

diff --git a/reference/configuration/framework.rst b/reference/configuration/framework.rst
index 0adc4abf598..030a8c8759d 100644
--- a/reference/configuration/framework.rst
+++ b/reference/configuration/framework.rst
@@ -41,6 +41,8 @@ Configuration
     * `assets_base_urls`_
     * `assets_version`_
     * `assets_version_format`_
+* `profiler`_
+    * `collect`_
 
 secret
 ~~~~~~
@@ -398,6 +400,21 @@ would be ``/images/logo.png?version=5``.
     The latter option is useful if you would like older asset versions to remain
     accessible at their original URL.
 
+profiler
+~~~~~~~~
+
+collect
+.......
+
+**default**: ``true``
+
+This option configures the way the profiler behaves when it is enabled. If set
+to ``true``, the profiler collects data for all requests. If you want to only
+collect information on-demand, you can set the ``collect`` flag to ``false``
+and activate the data collects by hand::
+
+    $profiler->enable();
+
 Full Default Configuration
 --------------------------
 
@@ -432,6 +449,7 @@ Full Default Configuration
             # profiler configuration
             profiler:
                 enabled:              false
+                collect:              true
                 only_exceptions:      false
                 only_master_requests: false
                 dsn:                  file:%kernel.cache_dir%/profiler