Merge remote-tracking branch 'origin/2.0' into 2.1

Author: weaverryan

book/doctrine.rst

@@ -1369,7 +1369,12 @@ Some notable or interesting tasks include:
 
   .. code-block:: bash
 
-    $ php app/console doctrine:ensure-production-settings --env=prod
+      $ php app/console doctrine:ensure-production-settings --no-debug --env=prod
+
+  .. caution::
+
+      Don't forget to add the ``--no-debug`` switch, because the debug flag is 
+      always set to true, even if the environment is set to ``prod``.
 
 * ``doctrine:mapping:import`` - allows Doctrine to introspect an existing
   database and create mapping information. For more information, see

contributing/documentation/format.rst

@@ -149,6 +149,8 @@ You can also add links to the API documentation:
 
 .. code-block:: rst
 
+    :namespace:`Symfony\\Component\\BrowserKit`
+
     :class:`Symfony\\Component\\Routing\\Matcher\\ApacheUrlMatcher`
 
     :method:`Symfony\\Component\\HttpKernel\\Bundle\\Bundle::build`