Update doctrine.rst

In 'Deleting an Object' you are not going to delete the entity itself but the given object.
minor #4053 Update doctrine.rst (sr972)

This PR was submitted for the master branch but it was merged into the 2.3 branch instead (closes #4053).

Discussion
----------

Update doctrine.rst

| Q             | A
| ------------- | ---
| Doc fix?      | [yes]
| New docs?     | [no]
| Applies to    | [2.3+]

In 'Deleting an Object' you are not going to delete the entity itself but the given object.

Commits
-------

b269ff0 Update doctrine.rst
eraseCredentials method typo
minor #4059 eraseCredentials method typo (danielsan)

This PR was submitted for the 2.5 branch but it was merged into the 2.3 branch instead (closes #4059).

Discussion
----------

eraseCredentials method typo

Commits
-------

819c588 eraseCredentials method typo
Remove diff info from file.
minor #4068 Remove diff info from cookbook/security/voters.rst (pmartelletti)

This PR was submitted for the 2.5 branch but it was merged into the 2.4 branch instead (closes #4068).

Discussion
----------

Remove diff info from cookbook/security/voters.rst

Commits
-------

3fb678a Remove diff info from file.
Merge branch '2.3' into 2.4

* 2.3:
  eraseCredentials method typo
  Update doctrine.rst
Merge branch '2.4' into 2.5

* 2.4:
  Remove diff info from file.
  eraseCredentials method typo
  Update doctrine.rst
Merge branch '2.5'

* 2.5:
  Remove diff info from file.
  eraseCredentials method typo
  Update doctrine.rst
First draft of "Deploying to Heroku Cloud" cookbook article
Fixed som RST syntax errors
Added the new cookbook to the article map
Fixed all problems reported by @WouterJ
Fixed the target of one link
Applied all the fixes suggested by @xabbuh
feature #4045 Added a new "Deploying to Heroku Cloud" cookbook article (javiereguiluz)

This PR was submitted for the master branch but it was merged into the 2.3 branch instead (closes #4045).

Discussion
----------

Added a new "Deploying to Heroku Cloud" cookbook article

| Q             | A
| ------------- | ---
| Doc fix?      | no
| New docs?     | yes
| Applies to    | master
| Fixed tickets | -

Commits
-------

0a1ba36 Applied all the fixes suggested by @xabbuh
87c0d08 Fixed the target of one link
2fdfd6d Fixed all problems reported by @WouterJ
31003b2 Added the new cookbook to the article map
d76bf8e Fixed som RST syntax errors
0371402 First draft of "Deploying to Heroku Cloud" cookbook article
Merge branch '2.3' into 2.4

* 2.3:
  Applied all the fixes suggested by @xabbuh
  Fixed the target of one link
  Fixed all problems reported by @WouterJ
  Added the new cookbook to the article map
  Fixed som RST syntax errors
  First draft of "Deploying to Heroku Cloud" cookbook article
Merge branch '2.4' into 2.5

* 2.4:
  Applied all the fixes suggested by @xabbuh
  Fixed the target of one link
  Fixed all problems reported by @WouterJ
  Added the new cookbook to the article map
  Fixed som RST syntax errors
  First draft of "Deploying to Heroku Cloud" cookbook article
Merge branch '2.5'

* 2.5:
  Applied all the fixes suggested by @xabbuh
  Fixed the target of one link
  Fixed all problems reported by @WouterJ
  Added the new cookbook to the article map
  Fixed som RST syntax errors
  First draft of "Deploying to Heroku Cloud" cookbook article