Skip to content

Adding more information about content license and OCA #65

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
carimura merged 6 commits into from
Apr 30, 2024
Merged

Adding more information about content license and OCA #65

Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
f7d69f8
adding content license fixes #39
carimura Feb 1, 2024
ab690e1
adding content license fixes #39
carimura Feb 1, 2024
ccff5fd
adding content license fixes #39
carimura Feb 1, 2024
c7edb97
adding content license fixes #39
carimura Feb 1, 2024
f5556ef
fixing label typo
carimura Feb 1, 2024
b719231
resolve conflict
carimura Apr 30, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 10 additions & 3 deletions README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +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. This repository contains a lightweight JavaScript toolchain to build the site into static HTML and guidelines for contributing to it.
[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 repository. [Click here](https://dev.java/authors) for examples of contributed content.

This repository 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:

Expand All @@ -9,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)

Expand Down Expand Up @@ -59,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
Expand All @@ -68,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


### Content License

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

Expand Down