Skip to content

Commit b7a110b

Browse files
authored
Merge pull request #51 from oracle/docs-updates
Update docs
2 parents 1a7ad0c + 3cc2d6a commit b7a110b

File tree

4 files changed

+63
-20
lines changed

4 files changed

+63
-20
lines changed

CONTRIBUTING.md

Lines changed: 47 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,55 @@
1-
# Before submitting a code contribution please discuss it with us by creating a new issue
1+
# Contributing to this repository
22

3-
Pull requests can be made under [The Oracle Contributor Agreement (OCA)](https://www.oracle.com/technetwork/community/oca-486395.html).
3+
We welcome your contributions! There are multiple ways to contribute.
44

5-
For pull requests to be accepted into this project, the bottom of your commit message must have the following line using your name and e-mail address as it appears in the OCA Signatories list.
5+
## Opening issues
66

7-
**Signed-off-by**: Your Name you@example.org
7+
For bugs or enhancement requests, please file a GitHub issue unless it's
8+
security related. When filing a bug remember that the better written the bug is,
9+
the more likely it is to be fixed. If you think you've found a security
10+
vulnerability, do not raise a GitHub issue and follow the instructions in our
11+
[security policy](./SECURITY.md).
812

9-
This can be automatically added to pull requests by committing with:
13+
## Contributing code
1014

11-
```bash
15+
We welcome your code contributions. Before submitting code via a pull request,
16+
you will need to have signed the [Oracle Contributor Agreement][OCA] (OCA) and
17+
your commits need to include the following line using the name and e-mail
18+
address you used to sign the OCA:
19+
20+
```text
21+
Signed-off-by: Your Name <you@example.org>
22+
```
23+
24+
This can be automatically added to pull requests by committing with `--sign-off`
25+
or `-s`, e.g.
26+
27+
```text
1228
git commit --signoff
1329
```
1430

15-
Only pull requests from committers that can be verified as having signed the OCA can be accepted.
31+
Only pull requests from committers that can be verified as having signed the OCA
32+
can be accepted.
33+
34+
## Pull request process
35+
36+
1. Ensure there is an issue created to track and discuss the fix or enhancement
37+
you intend to submit.
38+
1. Fork this repository.
39+
1. Create a branch in your fork to implement the changes. We recommend using
40+
the issue number as part of your branch name, e.g. `1234-fixes`.
41+
1. Ensure that any documentation is updated with the changes that are required
42+
by your change.
43+
1. Ensure that any samples are updated if the base image has been changed.
44+
1. Submit the pull request. *Do not leave the pull request blank*. Explain exactly
45+
what your changes are meant to do and provide simple steps on how to validate.
46+
your changes. Ensure that you reference the issue you created as well.
47+
1. We will assign the pull request to 2-3 people for review before it is merged.
48+
49+
## Code of conduct
50+
51+
Follow the [Golden Rule](https://en.wikipedia.org/wiki/Golden_Rule). If you'd
52+
like more specific guidelines, see the [Contributor Covenant Code of Conduct][COC].
53+
54+
[OCA]: https://oca.opensource.oracle.com
55+
[COC]: https://www.contributor-covenant.org/version/1/4/code-of-conduct/

LICENSE.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,4 +32,4 @@ FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
3232
AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
3333
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
3434
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
35-
SOFTWARE.
35+
SOFTWARE.

README.md

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,9 +17,13 @@ Ask questions on by sending us an email to <hospitality_apis_ww_grp@oracle.com>.
1717
- Learn how to [contribute](CONTRIBUTING.md)
1818
- See [issues](https://github.com/oracle/hospitality-api-docs/issues) for issues you can help with.
1919

20-
## Reporting Security Vulnerabilities
20+
## Contributing
2121

22-
Please do NOT raise a GitHub Issue to report a security vulnerability. Refer to [SECURITY](SECURITY.md) for details on how to report security vulnerabilities.
22+
This project welcomes contributions from the community. Before submitting a pull request, please [review our contribution guide](./CONTRIBUTING.md)
23+
24+
## Security
25+
26+
Please consult the [security guide](./SECURITY.md) for our responsible security vulnerability disclosure process
2327

2428
## License
2529

SECURITY.md

Lines changed: 9 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -6,10 +6,10 @@ and privacy of all our users.
66

77
Please do NOT raise a GitHub Issue to report a security vulnerability. If you
88
believe you have found a security vulnerability, please submit a report to
9-
<mailto:secalert_us@oracle.com> preferably with a proof of concept. Please review
10-
some additional information on [how to report security vulnerabilities to Oracle][1].
9+
[secalert_us@oracle.com][1] preferably with a proof of concept. Please review
10+
some additional information on [how to report security vulnerabilities to Oracle][2].
1111
We encourage people who contact Oracle Security to use email encryption using
12-
[our encryption key][2].
12+
[our encryption key][3].
1313

1414
We ask that you do not use other channels or contact the project maintainers
1515
directly.
@@ -21,10 +21,8 @@ security features are welcome on GitHub Issues.
2121

2222
Security updates will be released on a regular cadence. Many of our projects
2323
will typically release security fixes in conjunction with the
24-
[Oracle Critical Patch Update][3] program. Security updates are released on the
25-
Tuesday closest to the 17th day of January, April, July and October. A pre-release
26-
announcement will be published on the Thursday preceding each release. Additional
27-
information, including past advisories, is available on our [security alerts][3]
24+
[Oracle Critical Patch Update][3] program. Additional
25+
information, including past advisories, is available on our [security alerts][4]
2826
page.
2927

3028
## Security-related information
@@ -34,6 +32,7 @@ for secure use, or any known security issues in our documentation. Please note
3432
that labs and sample code are intended to demonstrate a concept and may not be
3533
sufficiently hardened for production use.
3634

37-
[1]: https://www.oracle.com/corporate/security-practices/assurance/vulnerability/reporting.html
38-
[2]: https://www.oracle.com/security-alerts/encryptionkey.html
39-
[3]: https://www.oracle.com/security-alerts/
35+
[1]: mailto:secalert_us@oracle.com
36+
[2]: https://www.oracle.com/corporate/security-practices/assurance/vulnerability/reporting.html
37+
[3]: https://www.oracle.com/security-alerts/encryptionkey.html
38+
[4]: https://www.oracle.com/security-alerts/

0 commit comments

Comments
 (0)