Skip to content
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

Update migration_2_5.rst #1271

Merged
merged 1 commit into from Jan 20, 2015
Merged

Update migration_2_5.rst #1271

merged 1 commit into from Jan 20, 2015

Conversation

kix
Copy link
Contributor

@kix kix commented Jan 20, 2015

Fixed some formatting issues and typos.

Fixed some formatting issues and typos.
@doctrinebot
Copy link

Hello,

thank you for creating this pull request. However did not open it on the "master"
branch. Our Git workflow requires all pull requests to go through "master" branch
and the release masters then merge them back into stable branches, if they are
bug fixes.

Please open the pull request again for the "master" branch and close
this one.

Nevertheless I have opened a Jira ticket for this Pull Request to track this
issue:

http://www.doctrine-project.org/jira/browse/DDC-3523

We use Jira to track the state of pull requests and the versions they got
included in.

@Ocramius
Copy link
Member

@kix thanks for the fixes!

Ocramius added a commit that referenced this pull request Jan 20, 2015
Update migration_2_5.rst
@Ocramius Ocramius merged commit daf2763 into doctrine:UpgradingDocs Jan 20, 2015
@Ocramius Ocramius self-assigned this Jan 20, 2015
@kix kix deleted the patch-1 branch January 20, 2015 10:42
@@ -320,27 +320,27 @@ Better support for EntityManagerInterface
Many of the locations where previously only the ``Doctrine\ORM\EntityManager``
was allowed are now changed to accept the ``EntityManagerInterface`` that was
introduced in 2.4. This allows you to more easily use the decorator pattern
to extend the EntityManager if you need. Its still not replaced everywhere,
to extend the EntityManager if you need. It`s still not replaced everywhere,
Copy link
Member

Choose a reason for hiding this comment

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

this should not be a backtick

Copy link
Member

Choose a reason for hiding this comment

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

@stof this was fixed when merging branch UpgradingDocs

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Oops, sorry. And thanks, @Ocramius!

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.

None yet

4 participants