bug #3544 Fix build errors (xabbuh)

weaverryan · weaverryan · commit 642e77689522 · 2014-02-11T12:11:44.000-06:00
This PR was merged into the master branch. Discussion ---------- Fix build errors | Q | A | ------------- | --- | Doc fix? | yes | New docs? | no | Applies to | 2.5 | Fixed tickets | Commits ------- 46e0b52 remove empty_data from the list of inherited options, it's documented in the overriden options section 7e3c0e3 readd configuration block 64602c8 fix referenced documents names
diff --git a/book/security.rst b/book/security.rst
@@ -1437,7 +1437,7 @@ is available by calling the PHP function :phpfunction:`hash_algos`.
 .. tip::
 
     It's also possible to use different hashing algorithms on a user-by-user
-    basis. See :doc:`/cookbook/security/named-encoders` for more details.
+    basis. See :doc:`/cookbook/security/named_encoders` for more details.
 
 Determining the Hashed Password
 ...............................
diff --git a/cookbook/security/named_encoders.rst b/cookbook/security/named_encoders.rst
@@ -10,6 +10,10 @@ How to Choose the Password Encoder Algorithm Dynamically
 Usually, the same password encoder is used for all users by configuring it
 to apply to all instances of a specific class:
 
+.. configuration-block::
+
+    .. code-block:: yaml
+
         # app/config/security.yml
         security:
             # ...
@@ -117,7 +121,7 @@ the name of the encoder to use::
             if ($this->isAdmin()) {
                 return 'harsh';
             }
-            
+
             return null; // use the default encoder
         }
     }
diff --git a/reference/forms/types/checkbox.rst b/reference/forms/types/checkbox.rst
@@ -60,8 +60,6 @@ These options inherit from the :doc:`form </reference/forms/types/form>` type:
 
 .. include:: /reference/forms/types/options/data.rst.inc
 
-.. include:: /reference/forms/types/options/empty_data.rst.inc
-
 .. include:: /reference/forms/types/options/required.rst.inc
 
 .. include:: /reference/forms/types/options/label.rst.inc
diff --git a/reference/forms/types/collection.rst b/reference/forms/types/collection.rst
@@ -379,4 +379,4 @@ error_bubbling
 
 .. include:: /reference/forms/types/options/mapped.rst.inc
 
-.. include:: /reference/forms/type/options/cascade_validation.rst.inc
+.. include:: /reference/forms/types/options/cascade_validation.rst.inc
diff --git a/reference/forms/types/options/checkbox_empty_data.rst.inc b/reference/forms/types/options/checkbox_empty_data.rst.inc
@@ -6,4 +6,4 @@ empty_data
 This option determines what value the field will return when the ``empty_value``
 choice is selected.
 In checkbox, the value of ``empty_data`` is overriden by the value returned by
-the data transformer (see :doc:`/cookbook/form/data_transformers.rst`).
+the data transformer (see :doc:`/cookbook/form/data_transformers`).

Original file line number	Diff line number	Diff line change
`@@ -10,6 +10,10 @@ How to Choose the Password Encoder Algorithm Dynamically`
`10`	`10`	`Usually, the same password encoder is used for all users by configuring it`
`11`	`11`	`to apply to all instances of a specific class:`
`12`	`12`
	`13`	`+.. configuration-block::`
	`14`	`+`
	`15`	`+ .. code-block:: yaml`
	`16`	`+`
`13`	`17`	`# app/config/security.yml`
`14`	`18`	`security:`
`15`	`19`	`# ...`
`@@ -117,7 +121,7 @@ the name of the encoder to use::`
`117`	`121`	`if ($this->isAdmin()) {`
`118`	`122`	`return 'harsh';`
`119`	`123`	`}`
`120`		`-`
	`124`	`+`
`121`	`125`	`return null; // use the default encoder`
`122`	`126`	`}`
`123`	`127`	`}`
Original file line number	Diff line number	Diff line change
`@@ -379,4 +379,4 @@ error_bubbling`
`379`	`379`
`380`	`380`	`.. include:: /reference/forms/types/options/mapped.rst.inc`
`381`	`381`
`382`		`-.. include:: /reference/forms/type/options/cascade_validation.rst.inc`
	`382`	`+.. include:: /reference/forms/types/options/cascade_validation.rst.inc`