From b2b3434c4a8ef0a6786a0e1ca6c286c85e551e48 Mon Sep 17 00:00:00 2001 From: Paul Gear Date: Mon, 23 Jun 2014 10:18:59 +1000 Subject: [PATCH] Moved contributor agreement part to the top --- doc/CONTRIBUTING.md | 62 ++++++++++++++++++++++----------------------- 1 file changed, 31 insertions(+), 31 deletions(-) diff --git a/doc/CONTRIBUTING.md b/doc/CONTRIBUTING.md index 3b94adca7..d8135e1b4 100644 --- a/doc/CONTRIBUTING.md +++ b/doc/CONTRIBUTING.md @@ -1,3 +1,34 @@ +Contributor Agreement +--------------------- + +By contributing code to LibreNMS (whether by a github pull request, or by +any other means), you assert that: + +- You have the rights to include the code, either as its original author, + or due to it being released to you under a compatible license. + +- You are not aware of any third party claims on the code, including + copyright infringement, patent, or any other claim. + +- You have not viewed code written under the [Observium License][4] in the + production of contributed code. This includes all Observium code after + Subversion revision 3250 and any patches or other code covered by that + license from Observium web sites after Tue May 29 13:08:01 2012 +0000 (the + date of Observium r3250). + +To agree with these assertions, please submit a github pull request against +the file doc/AUTHORS.md including your name, email address, and github user +id in the file (so that it can be matched to your commits), and stating in +the commit log that you agree to the conditions of the Contributor Agreement +contained in doc/CONTRIBUTING.md. + +Note that contributors to LibreNMS retain copyright to their own code and +are not required to sign over their rights to any other party. We recommend +that if you add a new file containing original code to the code base that +you include a copyright notice in it as per the Free Software Foundation's +guidelines. + + Guidelines for contributing to LibreNMS --------------------------------------- @@ -57,37 +88,6 @@ Guidelines for contributing to LibreNMS statement of our intent and current interpretation. -Contributor Agreement ---------------------- - -By contributing code to LibreNMS (whether by a github pull request, or by -any other means), you assert that: - -- You have the rights to include the code, either as its original author, - or due to it being released to you under a compatible license. - -- You are not aware of any third party claims on the code, including - copyright infringement, patent, or any other claim. - -- You have not viewed code written under the [Observium License][4] in the - production of contributed code. This includes all Observium code after - Subversion revision 3250 and any patches or other code covered by that - license from Observium web sites after Tue May 29 13:08:01 2012 +0000 (the - date of Observium r3250). - -To agree with these assertions, please submit a github pull request against -the file doc/AUTHORS.md including your name, email address, and github user -id in the file (so that it can be matched to your commits), and stating in -the commit log that you agree to the conditions of the Contributor Agreement -contained in doc/CONTRIBUTING.md. - -Note that contributors to LibreNMS retain copyright to their own code and -are not required to sign over their rights to any other party. We recommend -that if you add a new file containing original code to the code base that -you include a copyright notice in it as per the Free Software Foundation's -guidelines. - - Proposed workflow for submitting pull requests ----------------------------------------------