Merge branch '2.0' into 2.1

weaverryan · weaverryan · commit 801644d21239 · 2012-12-30T16:41:34.000-05:00
diff --git a/reference/constraints/Type.rst b/reference/constraints/Type.rst
@@ -46,7 +46,7 @@ Basic Usage
             protected $age;
         }
 
-   .. code-block:: xml
+    .. code-block:: xml
 
         <!-- src/Acme/BlogBundle/Resources/config/validation.xml -->
         <class name="Acme\BlogBundle\Entity\Author">

Original file line number	Diff line number	Diff line change
`@@ -46,7 +46,7 @@ Basic Usage`
`46`	`46`	`protected $age;`
`47`	`47`	`}`
`48`	`48`
`49`		`- .. code-block:: xml`
	`49`	`+ .. code-block:: xml`
`50`	`50`
`51`	`51`	`<!-- src/Acme/BlogBundle/Resources/config/validation.xml -->`
`52`	`52`	`<class name="Acme\BlogBundle\Entity\Author">`