You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@guacamole.apache.org by mj...@apache.org on 2016/05/18 06:59:14 UTC

incubator-guacamole-website git commit: GUACAMOLE-3: Deploy updated contribution guidelines (remove CLA requirement).

Repository: incubator-guacamole-website
Updated Branches:
  refs/heads/asf-site af9b9c05b -> 8790ef8f1


GUACAMOLE-3: Deploy updated contribution guidelines (remove CLA requirement).


Project: http://git-wip-us.apache.org/repos/asf/incubator-guacamole-website/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-guacamole-website/commit/8790ef8f
Tree: http://git-wip-us.apache.org/repos/asf/incubator-guacamole-website/tree/8790ef8f
Diff: http://git-wip-us.apache.org/repos/asf/incubator-guacamole-website/diff/8790ef8f

Branch: refs/heads/asf-site
Commit: 8790ef8f1bdef9eda2f900e3f85f869826b73c5e
Parents: af9b9c0
Author: Michael Jumper <mj...@apache.org>
Authored: Tue May 17 23:58:40 2016 -0700
Committer: Michael Jumper <mj...@apache.org>
Committed: Tue May 17 23:58:40 2016 -0700

----------------------------------------------------------------------
 content/CONTRIBUTING           | 52 +++++++++++++++++++++++++++++++++++++
 content/open-source/index.html |  7 -----
 2 files changed, 52 insertions(+), 7 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-guacamole-website/blob/8790ef8f/content/CONTRIBUTING
----------------------------------------------------------------------
diff --git a/content/CONTRIBUTING b/content/CONTRIBUTING
new file mode 100644
index 0000000..3864b66
--- /dev/null
+++ b/content/CONTRIBUTING
@@ -0,0 +1,52 @@
+
+------------------------------------------------------------
+ Contributing to Apache Guacamole
+------------------------------------------------------------
+
+Thank you for contributing to the Apache Guacamole project!
+
+There are certain procedures that must be followed for all contributions. These
+procedures are necessary to allow us to allocate resources for reviewing and
+testing your contribution, as well as communicate effectively with you during
+the review process.
+
+1) Create an issue in our JIRA
+
+    All changes to Guacamole must have corresponding issues in JIRA so the
+    change can be properly tracked:
+
+        https://issues.apache.org/jira/browse/GUACAMOLE/
+
+    If you do not already have an account on the Apache Software Foundation's
+    JIRA, you will need to create one before creating your new issue.
+
+2) Make and test your changes locally
+
+    The Guacamole source is maintained in git repositories hosted on GitHub:
+
+        https://github.com/apache/incubator-guacamole-client
+        https://github.com/apache/incubator-guacamole-manual
+        https://github.com/apache/incubator-guacamole-server
+        https://github.com/apache/incubator-guacamole-website
+
+    To make your changes, fork the applicable repositories and make commits
+    to a topic branch in your fork. Commits should be made in logical units
+    and must reference the JIRA issue number:
+
+    $ git commit -m "GUACAMOLE-123: High-level message describing the changes."
+
+    Avoid commits which cover multiple, distinct goals that could (and should)
+    be handled separately.
+
+    If you do not already have an account on GitHub, you will need to create
+    one before making your changes.
+
+3) Submit your changes via a pull request on GitHub
+
+    Once your changes are ready, submit them by creating a pull request for
+    the corresponding topic branch you created when you began working on your
+    changes.
+
+    The Guacamole team will then review your changes and, if they pass review,
+    your changes will be merged.
+

http://git-wip-us.apache.org/repos/asf/incubator-guacamole-website/blob/8790ef8f/content/open-source/index.html
----------------------------------------------------------------------
diff --git a/content/open-source/index.html b/content/open-source/index.html
index 02f5dd4..f3fee54 100644
--- a/content/open-source/index.html
+++ b/content/open-source/index.html
@@ -139,13 +139,6 @@ work with the project for the common good, not fight against it.</li>
   <li>Develop against the most recent code on git. Patches against releases and
 naive copies of entire files cannot be accepted as they lack context and
 are likely out of date.</li>
-  <li>You will need a <a href="https://www.apache.org/licenses/icla.txt">signed CLA</a> on
-file with the Apache Software Foundation, to ensure we have the legal right
-to include your code. If the contribution was created for your employer or
-using your employer\u2019s resources, the ASF will also need to sign the
-<a href="https://www.apache.org/licenses/cla-corporate.txt">corporate CLA</a>. For more
-information, please see
-<a href="https://www.apache.org/licenses/#clas">the ASF\u2019s documentation regarding CLAs</a>.</li>
   <li>Code must follow consistent style or it will become unreadable and
 unmaintainable. Please read through our <a href="/guac-style/">style guidelines</a> and,
 when in doubt, follow the style of the code you are modifying.</li>