Skip to content

Update options_resolver.rst #6566

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.

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

Closed
wants to merge 1 commit into from
Closed

Conversation

snake77se
Copy link
Contributor

No description provided.

xabbuh added a commit that referenced this pull request May 14, 2016
This PR was submitted for the 2.8 branch but it was merged into the 2.7 branch instead (closes #6566).

Discussion
----------

Update options_resolver.rst

Commits
-------

0bc1cc7 Update options_resolver.rst
xabbuh added a commit that referenced this pull request May 14, 2016
xabbuh added a commit that referenced this pull request May 14, 2016
* 2.7:
  [#6566] fix indentation
  Update options_resolver.rst
  Fixing a typo - thanks to @tacman
  Remove extra spaces in Nginx template
  [#6539] Some small improvements
  Documented the "autoescape" TwigBundle config option
  fixing special shortcut syntax
  Editing the Doctrine section to improve accuracy and readability
  Improved "optional argument" documentation"
@xabbuh
Copy link
Member

xabbuh commented May 14, 2016

Nice catch and thanks for fixing it @snake77se! FYI, I have merged your change into the 2.7 branch (which was also affected). That's why your PR is shown as closed instead of merged. Though you will still get the full credit for your contribution.

@xabbuh xabbuh closed this May 14, 2016
xabbuh added a commit that referenced this pull request May 14, 2016
* 2.8:
  [#6566] fix indentation
  Update options_resolver.rst
  Fixing a typo - thanks to @tacman
  Fix build
  [#6564] Revert doc removal in 2.8
  Replace property_accessor by property_access
  Remove extra spaces in Nginx template
  [#6539] Some small improvements
  Documented the "autoescape" TwigBundle config option
  [PhpUnitBridge] Add versionadded directive to clock mocking section
  [PhpUnitBridge] Remove section about clock mocking
  fixing special shortcut syntax
  Add missed link to the external PSR-4 specification.
  Editing the Doctrine section to improve accuracy and readability
  Typo fix in the Serializer deserialization example
  drop AppBundle examples in components section
  Make ClockMock Tests\\ namespace matching less specific
  Improved "optional argument" documentation"
xabbuh added a commit that referenced this pull request May 14, 2016
* 3.0:
  [#6566] fix indentation
  Update options_resolver.rst
  Fixing a typo - thanks to @tacman
  Fix build
  [#6564] Revert doc removal in 2.8
  Replace property_accessor by property_access
  Remove extra spaces in Nginx template
  [#6539] Some small improvements
  Documented the "autoescape" TwigBundle config option
  [PhpUnitBridge] Add versionadded directive to clock mocking section
  [PhpUnitBridge] Remove section about clock mocking
  fixing special shortcut syntax
  Add missed link to the external PSR-4 specification.
  Editing the Doctrine section to improve accuracy and readability
  Typo fix in the Serializer deserialization example
  drop AppBundle examples in components section
  merge choice_translation_domain files
  remove 2.x versionadded directives
  Make ClockMock Tests\\ namespace matching less specific
  Improved "optional argument" documentation"
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants