From f7d69f8a4ba7a8453d94dc5021fc1fb61f1ee6cb Mon Sep 17 00:00:00 2001 From: Chad Arimura Date: Thu, 1 Feb 2024 15:49:18 +0100 Subject: [PATCH 1/5] adding content license fixes #39 --- README.md | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/README.md b/README.md index 3be7290..5f71916 100644 --- a/README.md +++ b/README.md @@ -1,8 +1,8 @@ -# Dev.java +# Contributing to Dev.java -[Dev.java](https://dev.java) is the official website for the Java platform and language maintained by the Java Platform Group at Oracle. +[Dev.java](https://dev.java) is the official website for the Java platform and language maintained by the Java Platform Group at Oracle. We accept contributions from community members through this repo. [Click here](https://dev.java/authors) for examples of contributed content. -We [recently announced](https://inside.java) that we are accepting contributions to Dev.java. This repository contains a lightweight JavaScript toolchain to build the site into static HTML and guidelines for contributing to it. +This repo contains the contribution guidelines as well as a lightweight JavaScript toolchain to build the site into static HTML. Here are the sections of this document: @@ -11,6 +11,7 @@ Here are the sections of this document: * [Content Lifecycle](#content-lifecycle) * [Content Proposal](#content-proposal) * [GitHub Workflow](#github-workflow) + * [Content License](#content-license) * [Building the Site](#building-the-site) * [Working with Content](#working-with-content) @@ -70,6 +71,10 @@ Once your proposal has been moved to the `accepted` stage, you can begin working 1. Submit a pull request back to this repo +### Contributor Agreement and License + +Contributors must sign the OCA which will be verified once there is a pull request created. Contributed content is made available under the [UPL license](https://oss.oracle.com/licenses/upl/). You can find examples [here](https://dev.java/authors). + ## Building the Site From ab690e1ba27dd795d4e4e2f486c4f4a7e41a0cb4 Mon Sep 17 00:00:00 2001 From: Chad Arimura Date: Thu, 1 Feb 2024 15:50:33 +0100 Subject: [PATCH 2/5] adding content license fixes #39 --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 5f71916..2697304 100644 --- a/README.md +++ b/README.md @@ -71,7 +71,7 @@ Once your proposal has been moved to the `accepted` stage, you can begin working 1. Submit a pull request back to this repo -### Contributor Agreement and License +### Content License Contributors must sign the OCA which will be verified once there is a pull request created. Contributed content is made available under the [UPL license](https://oss.oracle.com/licenses/upl/). You can find examples [here](https://dev.java/authors). From ccff5fd988a3ec473607c7187d882b1b6ca9f97d Mon Sep 17 00:00:00 2001 From: Chad Arimura Date: Thu, 1 Feb 2024 15:51:51 +0100 Subject: [PATCH 3/5] adding content license fixes #39 --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 2697304..0742ebe 100644 --- a/README.md +++ b/README.md @@ -73,7 +73,7 @@ Once your proposal has been moved to the `accepted` stage, you can begin working ### Content License -Contributors must sign the OCA which will be verified once there is a pull request created. Contributed content is made available under the [UPL license](https://oss.oracle.com/licenses/upl/). You can find examples [here](https://dev.java/authors). +Contributors must sign the Oracle Contributor Agreement ([OCA](https://oca.opensource.oracle.com/)) which will be verified once there is a pull request created. Contributed content is made available under the [UPL license](https://oss.oracle.com/licenses/upl/). You can find examples [here](https://dev.java/authors). ## Building the Site From c7edb970d14424e7a88484b6450ca62cb4ba10f7 Mon Sep 17 00:00:00 2001 From: Chad Arimura Date: Thu, 1 Feb 2024 17:56:51 +0100 Subject: [PATCH 4/5] adding content license fixes #39 --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 0742ebe..f2be09d 100644 --- a/README.md +++ b/README.md @@ -73,7 +73,7 @@ Once your proposal has been moved to the `accepted` stage, you can begin working ### Content License -Contributors must sign the Oracle Contributor Agreement ([OCA](https://oca.opensource.oracle.com/)) which will be verified once there is a pull request created. Contributed content is made available under the [UPL license](https://oss.oracle.com/licenses/upl/). You can find examples [here](https://dev.java/authors). +Contributors must sign the [Oracle Contributor Agreement](https://oca.opensource.oracle.com/) which will be verified once there is a pull request created. Contributed content is made available under the [UPL license](https://oss.oracle.com/licenses/upl/). You can find examples [here](https://dev.java/authors). ## Building the Site From f5556efbee1bdb9677342f2c20a7a0f4fa2cec73 Mon Sep 17 00:00:00 2001 From: Chad Arimura Date: Thu, 1 Feb 2024 18:24:01 +0100 Subject: [PATCH 5/5] fixing label typo --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index f2be09d..e72e642 100644 --- a/README.md +++ b/README.md @@ -62,7 +62,7 @@ All content must start with a Content Proposal. This will be in the form of a Gi ### GitHub Workflow -Once your proposal has been moved to the `accepted` stage, you can begin working on your content. Here are the steps to do this: +Once your proposal has been moved to the `approved` stage, you can begin working on your content. Here are the steps to do this: 1. Fork this repo 1. Create a branch off of `main` for each piece of content