Skip to content

Commit 48420cd

Browse files
committed
Merge branch 'patch-13' of github.com:WouterJ/symfony-docs into WouterJ-patch-13
Conflicts: contributing/documentation/overview.rst
2 parents eac3adc + a0a755f commit 48420cd

File tree

1 file changed

+12
-1
lines changed

1 file changed

+12
-1
lines changed

contributing/documentation/overview.rst

Lines changed: 12 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -79,12 +79,23 @@ GitHub covers the topic of `pull requests`_ in detail.
7979
The Symfony2 documentation is licensed under a Creative Commons
8080
Attribution-Share Alike 3.0 Unported :doc:`License <license>`.
8181

82+
You can also prefix the title of your pull request in a few cases:
83+
84+
* ``[WIP]`` (Work in Progress) is used when you are not yet finished with your
85+
pull request, but you would like it to be reviewed. The pull request won't
86+
be merged until you say it is ready.
87+
88+
* ``[WCM]`` (Waiting Code Merge) is used when you're documenting a new feature
89+
or change that hasn't been accepted yet into the core code. The pull request
90+
will not be merged until it is merged in the core code (or closed if the
91+
change is rejected).
92+
8293
.. _doc-contributing-pr-format:
8394

8495
Pull Request Format
8596
~~~~~~~~~~~~~~~~~~~
8697

87-
Unless you're fixing some minor typos, the pull request description must**
98+
Unless you're fixing some minor typos, the pull request description **must**
8899
include the following checklist to ensure that contributions may be reviewed
89100
without needless feedback loops and that your contributions can be included
90101
into the documentation as quickly as possible:

0 commit comments

Comments
 (0)