8000 Fix build errors by xabbuh · Pull Request #3544 · symfony/symfony-docs · GitHub
[go: up one dir, main page]
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

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
Prev Previous commit
remove empty_data from the list of inherited options, it's documented… 
… in the overriden options section
  • Loading branch information
@xabbuh
xabbuh committed Feb 5, 2014
commit 46e0b52f66cb2bebbf769c1590c27108a1e257a0
2 changes: 0 additions & 2 deletions reference/forms/types/checkbox.rst
View file
Open in desktop
B741
Original file line number Diff line number Diff line change
Expand Up @@ -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
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This is the third time you submit this change, could you please revert it, otherwise it'll cause conflicts

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

No, this one is not related to the other ones before. Actually, this was added in #3416 which has already been merged. After that merged the empty_data option was added in ab4aafe to the overriden options sections which makes it necessary to remove it now from the inherited options section.


.. include:: /reference/forms/types/options/label.rst.inc
Expand Down
0