[#4050] Backporting some additions to 2.3

weaverryan · weaverryan · commit 2af0b3f24047 · 2014-12-07T09:40:57.000-05:00
diff --git a/reference/configuration/framework.rst b/reference/configuration/framework.rst
@@ -45,6 +45,9 @@ Configuration
 * `profiler`_
     * `collect`_
     * :ref:`enabled <profiler.enabled>`
+* `translator`_
+    * :ref:`enabled <translator.enabled>`
+    * `fallback`_
 
 secret
 ~~~~~~
@@ -493,6 +496,27 @@ and activate the data collectors by hand::
 
     $profiler->enable();
 
+translator
+~~~~~~~~~~
+
+.. _translator.enabled:
+
+enabled
+.......
+
+**type**: ``boolean`` **default**: ``false``
+
+Whether or not to enable the ``translator`` service in the service container.
+
+fallback
+........
+
+**default**: ``en``
+
+This option is used when the translation key for the current locale wasn't found.
+
+For more details, see :doc:`/book/translation`.
+
 Full default Configuration
 --------------------------
 
