Merge branch '2.5'

* 2.5:
  Removing 2.6 message from the 2.3 branch
  Documented info method
  Double-quotes instead of single quotes (UnexpectedValueException in Windows 8)

Author: weaverryan

components/config/definition.rst

@@ -281,6 +281,15 @@ has a certain value:
         ->end()
     ;
 
+Documenting the Option
+----------------------
+
+All options can be documented using the
+:method:`Symfony\\Component\\Config\\Definition\\Builder\\NodeDefinition::info`
+method.
+
+The info will be printed as a comment when dumping the configuration tree.
+
 Optional Sections
 -----------------
 

cookbook/workflow/new_project_git.rst

@@ -26,7 +26,7 @@ git repository:
 
    .. code-block:: bash
 
-        $ php composer.phar create-project symfony/framework-standard-edition path/ '~2.3'
+        $ php composer.phar create-project symfony/framework-standard-edition path/ "~2.3"
 
    Composer will now download the Standard Distribution along with all of the
    required vendor libraries. For more information about downloading Symfony using

quick_tour/the_big_picture.rst

@@ -20,7 +20,7 @@ directory:
 
 .. code-block:: bash
 
-    $ composer create-project symfony/framework-standard-edition myproject/ '~2.3'
+    $ composer create-project symfony/framework-standard-edition myproject/ "~2.3"
 
 .. note::