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

Author: weaverryan

components/console.rst

@@ -353,8 +353,8 @@ Then, you need to create a new
 options you want to pass to the command.
 
 Eventually, calling the ``run()`` method actually executes the command and
-returns the returned code from the command (``0`` if everything went fine, any
-other integer otherwise).
+returns the returned code from the command (return value from command's
+``execute()`` method).
 
 .. note::
 

contributing/documentation/format.rst

@@ -157,6 +157,9 @@ Installing the Sphinx extensions
 
     # use PHP as the primary domain
     primary_domain = 'php'
+    
+    # set url for API links
+    api_url = 'http://api.symfony.com/master/%s'
 
 .. _reStructuredText:        http://docutils.sf.net/rst.html
 .. _Sphinx:                  http://sphinx.pocoo.org/