From 27984d450a43629320d2da31dd2abd57902a9023 Mon Sep 17 00:00:00 2001
From: Brent Huisman <brenthuisman@users.noreply.github.com>
Date: Mon, 4 Jan 2021 11:22:25 +0100
Subject: [PATCH] Clarify PR acceptance condition (#1288)
Update the PR licensing rules in the PR contribution guide.
---
doc/contrib/pr.rst | 7 +++++--
1 file changed, 5 insertions(+), 2 deletions(-)
diff --git a/doc/contrib/pr.rst b/doc/contrib/pr.rst
index 89b0945f..5eb2dae5 100644
--- a/doc/contrib/pr.rst
+++ b/doc/contrib/pr.rst
@@ -27,8 +27,11 @@ the workflow is as follows:
to the features in the PR, keep the PR description updated.
- Use text like `fixes #123` in the description to refer to an issue.
-4. An administrative matter: we request that you grant us a right of use on your contribution.
- Please contact us at `arbor-sim@fz-juelich.de <mailto:arbor-sim@fz-juelich.de>`__.
+4. We will accept contributions licensed with the same
+ `BSD 3-Clause "New" or "Revised" License <https://github.com/arbor-sim/arbor/blob/master/LICENSE>`_,
+ as the Arbor project.
+ If this is a problem for you, please contact us at
+ `arbor-sim@fz-juelich.de <mailto:arbor-sim@fz-juelich.de>`__.
5. A PR on Github is automatically built and tested by our CI bot called Travis.
You can also run these tests yourself by building them first
(``make tests``) and then running them (``./bin/*unit*``).
--
GitLab