Merge branch '2.4' into 2.5

weaverryan · weaverryan · commit 8c9847daa8dc · 2014-10-01T09:37:13.000-04:00
* 2.4:
  Removing 2.6 message from the 2.3 branch
  Documented info method
diff --git a/components/config/definition.rst b/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
 -----------------
 
