Browse code

Update CONTRIBUTING.rst to allow GitHub PRs for code review purposes

Signed-off-by: Samuli Seppänen <samuli@openvpn.net>
Acked-by: Gert Doering <gert@greenie.muc.de>
Message-Id: <1463647909-18383-1-git-send-email-samuli@openvpn.net>
URL: http://article.gmane.org/gmane.network.openvpn.devel/11679
Signed-off-by: Gert Doering <gert@greenie.muc.de>
(cherry picked from commit 698f0dab76741f4ce8c1a98236786d59eca338ef)

Samuli Seppänen authored on 2016/05/19 17:51:49
Showing 1 changed files
... ...
@@ -4,15 +4,19 @@ CONTRIBUTING TO THE OPENVPN PROJECT
4 4
 Patches should be written against the Git "master" branch. Some patches may get
5 5
 backported to a release branch.
6 6
 
7
-We do not currently accept GitHub pull requests for the core OpenVPN project.
8
-Instead, all patches must be sent to "openvpn-devel" mailing list for review:
7
+The preferred procedure to send patches to the "openvpn-devel" mailing list:
9 8
 
10 9
 - https://lists.sourceforge.net/lists/listinfo/openvpn-devel
11 10
 
12
-The subject line should preferably be prefixed with [PATCH]. To avoid merging
13
-issues the patches should be generated with git-format-patch or sent using
14
-git-send-email. Try to split large patches into small, atomic pieces to make
15
-reviews easier.
11
+While we do not merge GitHub pull requests as-is, we do allow their use for code
12
+review purposes. After the patch has been ACKed (reviewed and accepted), it must
13
+be sent to the mailing list. This last step does not necessarily need to be done
14
+by the patch author, although that is definitely recommended.
15
+
16
+When sending patches to "openvpn-devel" the subject line should be prefixed with
17
+[PATCH]. To avoid merging issues the patches should be generated with
18
+git-format-patch or sent using git-send-email. Try to split large patches into
19
+small, atomic pieces to make reviews easier.
16 20
 
17 21
 If you want quick feedback on a patch before sending it to openvpn-devel mailing
18 22
 list, you can visit the #openvpn-devel channel on irc.freenode.net. Note that