Merge pull request #420 from apache/geertjanw-patch-19
Create index.asciidoc for 11.2 Downloads
diff --git a/netbeans.apache.org/src/content/download/dev/index.asciidoc b/netbeans.apache.org/src/content/download/dev/index.asciidoc
index 050315d..57403d4 100644
--- a/netbeans.apache.org/src/content/download/dev/index.asciidoc
+++ b/netbeans.apache.org/src/content/download/dev/index.asciidoc
@@ -43,9 +43,9 @@
Once you're all set just enter the `netbeans` directory and type:
-- `ant` to build the Apache NetBeans IDE on JDK 8, on JDK 11 also type -Dpermit.jdk9.builds=true with the `ant` command.
- ** Once built, the IDE bits are placed in the `./nbbuild/netbeans` directory. You can run the IDE from within the `netbeans` directory by typing `./nbbuild/netbeans/bin/netbeans` on unixes (for Windows the command is equivalent).
-- `ant tryme` to run the Apache NetBeans IDE.
+- `ant build` to build the Apache NetBeans IDE on JDK 8, on JDK 11 also type -Dpermit.jdk9.builds=true with the `ant build` command.
+ ** This will build a binary zip bundle of the IDE at `./nbbuild/NetBeans-<version-hash>-release.zip`. Extract that zip in a place of your choosing and run `netbeans/bin/netbeans` (or `netbeans/bin/netbeans.exe` on Windows).
+- `ant tryme` to run the Apache NetBeans IDE directly from the build folder rather than the zip for development purposes.
For details, go here: https://cwiki.apache.org/confluence/display/NETBEANS/Development+Environment
diff --git a/netbeans.apache.org/src/content/participate/index.asciidoc b/netbeans.apache.org/src/content/participate/index.asciidoc
index 63749c4..6136810 100644
--- a/netbeans.apache.org/src/content/participate/index.asciidoc
+++ b/netbeans.apache.org/src/content/participate/index.asciidoc
@@ -35,7 +35,11 @@
== Contributing code
-See link:submit-pr.html[contributing code] to learn how to contribute code to the Apache NetBeans project.
+You may want to fix issues or provide a new functionality that is your personal work to Apache NetBeans project.
+You will need to follow the link:submit-pr.html#contributing-code[contributing code] procedure to learn how to contribute code to the Apache NetBeans project.
+
+If your contribution code is owned or developped in another organization outside Apache. Your organization may want to *donate* this contribution to Apache NetBeans project.
+You will need to follow this link:submit-pr.html#donating-code[donating code] procedure.
== Reporting issues
diff --git a/netbeans.apache.org/src/content/participate/submit-pr.asciidoc b/netbeans.apache.org/src/content/participate/submit-pr.asciidoc
index 7b8f58e..d5f9b3c 100644
--- a/netbeans.apache.org/src/content/participate/submit-pr.asciidoc
+++ b/netbeans.apache.org/src/content/participate/submit-pr.asciidoc
@@ -16,7 +16,7 @@
specific language governing permissions and limitations
under the License.
////
-= Submitting Pull Requests
+= Contributing Code
:jbake-type: page
:jbake-tags: community
:jbake-status: published
@@ -26,7 +26,7 @@
:toclevels: 4
:toc-title:
-[contributing-code]
+[[contributing-code]]
Contributing code to the Apache NetBeans project is not very different to contributing code for any other Apache software project,
so the link:https://www.apache.org/dev/contributors[Apache's Guide for New Project Contributors] is worth a read.
@@ -135,5 +135,24 @@
After submission (and certainly after someone starts reviewing the PR) you shouldn't touch the PR's history.
+[[donating-code]]
+= Donating Code
+You may find official information here: https://incubator.apache.org/ip-clearance/
+
+Donator can use pull request as show above. (squashed for having a better readability of the hash)
+
+In order to accept a donation the Apache NetBeans PMC should do a vote to accept the intention of donation.
+
+PMC will have to setup a form to append the list at https://incubator.apache.org/ip-clearance/ and open a JIRA issue to track donation.
+
+Donator must ensure that the following step are ok (PMC member need to check):
+
+- His company fill and send a Software Grant and/or corporate CLA if applicable
+- Any contributor involved in donated code has an individual CLA
+- License are correct and compatible with Apache.
+
+Once every step are ok, PMC will call a lazy vote at general@incubator.
+
+If no issue are detected the code can be merged.
