Permalink
Browse files

bug #3544 Fix build errors (xabbuh)

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
  • Loading branch information...
weaverryan committed Feb 11, 2014
2 parents bdc6c3f + 46e0b52 commit 642e7768952225b06834acb47496a593b4b7d162
View
@@ -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
...............................
@@ -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
}
}
@@ -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
@@ -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
@@ -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`).

0 comments on commit 642e776

Please sign in to comment.