Skip to content

Commit

Permalink
Docs updates
Browse files Browse the repository at this point in the history
[ci skip]
  • Loading branch information
lgritz committed Mar 17, 2016
1 parent b396233 commit 9117d04
Show file tree
Hide file tree
Showing 3 changed files with 23 additions and 15 deletions.
4 changes: 4 additions & 0 deletions .github/PULL_REQUEST_TEMPLATE.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,6 @@
NOTE: delete this section after reading, it is just to give guidance for new contributors.


Please read the [contribution guidelines](https://github.com/OpenImageIO/oiio/blob/master/CONTRIBUTING.md), and be sure we have a Contributor License Agreement ([individual](https://github.com/OpenImageIO/oiio/blob/master/src/doc/CLA-INDIVIDUAL) or [corporate](https://github.com/OpenImageIO/oiio/blob/master/src/doc/CLA-CORPORATE)) on record with the project.

## Description
Expand All @@ -10,3 +13,4 @@ and how it works (if it's not going to be very clear from the code).
Did you / should you add a testsuite case (new test, or add to an existing
test) to verify that this works?

------
28 changes: 16 additions & 12 deletions CONTRIBUTING.md
Original file line number Diff line number Diff line change
Expand Up @@ -52,25 +52,29 @@ bug fix, etc.) may be accepted without a CLA, at the sole discretion of the
project leader, but anything complex needs a CLA. This is for your own
safety.

Download our [Individual CLA](https://github.com/OpenImageIO/oiio/blob/master/src/doc/CLA-INDIVIDUAL)
(or find it in the `src/doc/CLA-INDIVIDUAL` file in the oiio code
distribution); print, sign, and rescan it (or just add a digital signature
directly), and email it back to us ([email protected]).
* If you are an individual writing the code on your own time and you're SURE
you are the sole owner of any intellectual property you contribute, use the
[Individual CLA](https://github.com/OpenImageIO/oiio/blob/master/src/doc/CLA-INDIVIDUAL).

If you are contributing to OpenImageIO while "on the job" working for a
company, or even on your own time if you work for a company that does not
explicitly give you permission to contribute to open source projects on your
own time, you also need your employers to send us a signed [Corporate
CLA](https://github.com/OpenImageIO/oiio/blob/master/src/doc/CLA-CORPORATE)
(also found in `src/doc/CLA-CORPORATE`).
* If you are writing the code as part of your job, or if there is any
possibility that your employers might think they own any intellectual
property you create, then you should use the [Corporate
CLA](https://github.com/OpenImageIO/oiio/blob/master/src/doc/CLA-CORPORATE).

Our CLA's are identical to those used by Apache and many other open source projects.
Download the appropriate CLA from the links above (or find them in the
src/doc directory of the software distribution), print, sign, and rescan it
(or just add a digital signature directly), and email it back to us
([email protected]).

Our CLA's are identical to those used by Apache and many other open source
projects.


Pull Requests and Code Review
-----------------------------

The best way to submit changes is via GitHub Pull Request.
The best way to submit changes is via GitHub Pull Request. GitHub has a
[Pull Request Howto](https://help.github.com/articles/using-pull-requests/).

All code must be formally reviewed before being merged into the official repository. The protocol is like this:

Expand Down
6 changes: 3 additions & 3 deletions README.rst
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
README for OpenImageIO
======================

Build Status:

.. image:: https://img.shields.io/badge/license-BSD%203--Clause-blue.svg?style=flat-square
:target: https://github.com/OpenImageIO/oiio/blob/master/LICENSE
.. image:: https://travis-ci.org/OpenImageIO/oiio.svg?branch=master
:target: https://travis-ci.org/OpenImageIO/oiio


Introduction
------------
Expand Down

0 comments on commit 9117d04

Please sign in to comment.