Skip to content

Fix build errors #3544

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 3 commits into from
Feb 11, 2014
Merged

Fix build errors #3544

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
64602c8
fix referenced documents names
xabbuh Feb 5, 2014
7e3c0e3
readd configuration block
xabbuh Feb 5, 2014
46e0b52
remove empty_data from the list of inherited options, it's documented…
xabbuh Feb 5, 2014
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Next Next commit
fix referenced documents names
  • Loading branch information
@xabbuh
xabbuh committed Feb 5, 2014
commit 64602c83849b29088bfbf60b46a8fb802bcc9860
2 changes: 1 addition & 1 deletion book/security.rst
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
...............................
Expand Down
2 changes: 1 addition & 1 deletion reference/forms/types/collection.rst
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
2 changes: 1 addition & 1 deletion reference/forms/types/options/checkbox_empty_data.rst.inc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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`).