summary refs log tree commit diff
diff options
context:
space:
mode:
authorMatthew Hodgson <matthew@arasphere.net>2018-06-30 00:21:10 +0100
committerGitHub <noreply@github.com>2018-06-30 00:21:10 +0100
commit75d4986a8c7e1fb9bb5c005ad8f1ca7f263d34a3 (patch)
tree25d9dc1ed2ac171f6f26ed2928d126ee64c1e848
parentMerge pull request #3456 from matrix-org/hawkowl/federation-prevevent-checking (diff)
parenttopfile (diff)
downloadsynapse-75d4986a8c7e1fb9bb5c005ad8f1ca7f263d34a3.tar.xz
Merge pull request #3467 from matrix-org/hawkowl/contributor-requirements
Clarify "real name" in contributor requirements
Diffstat (limited to '')
-rw-r--r--CONTRIBUTING.rst14
-rw-r--r--changelog.d/3467.misc0
2 files changed, 9 insertions, 5 deletions
diff --git a/CONTRIBUTING.rst b/CONTRIBUTING.rst
index 954758afdc..6c295cfbfe 100644
--- a/CONTRIBUTING.rst
+++ b/CONTRIBUTING.rst
@@ -130,11 +130,15 @@ If you agree to this for your contribution, then all that's needed is to
 include the line in your commit or pull request comment::
 
     Signed-off-by: Your Name <your@email.example.org>
-    
-...using your real name; unfortunately pseudonyms and anonymous contributions
-can't be accepted. Git makes this trivial - just use the -s flag when you do
-``git commit``, having first set ``user.name`` and ``user.email`` git configs
-(which you should have done anyway :)
+
+We accept contributions under a legally identifiable name, such as
+your name on government documentation or common-law names (names
+claimed by legitimate usage or repute). Unfortunately, we cannot
+accept anonymous contributions at this time.
+
+Git allows you to add this signoff automatically when using the ``-s``
+flag to ``git commit``, which uses the name and email set in your
+``user.name`` and ``user.email`` git configs.
 
 Conclusion
 ~~~~~~~~~~
diff --git a/changelog.d/3467.misc b/changelog.d/3467.misc
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/changelog.d/3467.misc