Skip to content

Commit

Permalink
Tentatively update Workstream Policy and LICENSE
Browse files Browse the repository at this point in the history
  • Loading branch information
foolip committed May 19, 2020
1 parent 350cc17 commit 5e32a85
Show file tree
Hide file tree
Showing 2 changed files with 44 additions and 7 deletions.
41 changes: 38 additions & 3 deletions LICENSE
Original file line number Diff line number Diff line change
@@ -1,7 +1,10 @@
Copyright © 2018 WHATWG (Apple, Google, Mozilla, Microsoft).
This work is licensed under a Creative Commons Attribution 4.0 International License:
Copyright © 2020 WHATWG (Apple, Google, Mozilla, Microsoft).
This work is licensed under a Creative Commons Attribution 4.0 International License.
Alternatively, this work is licensed under a BSD 3-Clause License for incorporation into software.

Attribution 4.0 International
=======================================================================

Creative Commons Attribution 4.0 International License

=======================================================================

Expand Down Expand Up @@ -394,3 +397,35 @@ the avoidance of doubt, this paragraph does not form part of the public
licenses.

Creative Commons may be contacted at creativecommons.org.

=======================================================================

BSD 3-Clause License

=======================================================================

Redistribution and use in source and binary forms, with or without
modification, are permitted provided that the following conditions are
met:

1. Redistributions of source code must retain the above copyright
notice, this list of conditions and the following disclaimer.
2. Redistributions in binary form must reproduce the above copyright
notice, this list of conditions and the following disclaimer in the
documentation and/or other materials provided with the
distribution.
3. Neither the name of the copyright holder nor the names of its
contributors may be used to endorse or promote products derived
from this software without specific prior written permission.

THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS
IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A
PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED
TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
10 changes: 6 additions & 4 deletions Workstream Policy.md
Original file line number Diff line number Diff line change
Expand Up @@ -276,7 +276,7 @@ The [Steering Group]'s determination in each instance is final and non-appealabl
### Notice for Living Standards

[Living Standards][Living Standard] must include the following notice, including the link:
> Copyright © YEAR WHATWG (Apple, Google, Mozilla, Microsoft). This work is licensed under a [Creative Commons Attribution 4.0 International License](https://creativecommons.org/licenses/by/4.0/).
> Copyright © YEAR WHATWG (Apple, Google, Mozilla, Microsoft). This work is licensed under a [Creative Commons Attribution 4.0 International License](https://creativecommons.org/licenses/by/4.0/). Alternatively, this work is licensed under a [BSD 3-Clause License] for incorporation into software.
In the text above, YEAR must be replaced by the current year at the time the [Living Standard] is published.

Expand All @@ -289,7 +289,7 @@ In the text above, "Living Standard Review Draft" must link to the latest [Revie
### Notice for Living Standard Review Drafts

[Living Standard Review Drafts][review-draft] must include the following notice, including the link:
> Copyright © YEAR WHATWG (Apple, Google, Mozilla, Microsoft). This work is licensed under a [Creative Commons Attribution 4.0 International License](https://creativecommons.org/licenses/by/4.0/).
> Copyright © YEAR WHATWG (Apple, Google, Mozilla, Microsoft). This work is licensed under a [Creative Commons Attribution 4.0 International License](https://creativecommons.org/licenses/by/4.0/). Alternatively, this work is licensed under a [BSD 3-Clause License] for incorporation into software.
In the text above, YEAR must be replaced by the current year at the time the [Living Standard Review Draft][review-draft] is published.

Expand Down Expand Up @@ -335,11 +335,12 @@ must include the text of the applicable license in a LICENSE file.

The contents of the license file must start with:
> Copyright © YEAR WHATWG (Apple, Google, Mozilla, Microsoft).
> This work is licensed under a Creative Commons Attribution 4.0 International License:
> This work is licensed under a Creative Commons Attribution 4.0 International License.
> Alternatively, this work is licensed under a BSD 3-Clause License for incorporation into software.
where YEAR is the current year. This copyright notice must be followed
by the full text of the Creative Commons Attribution 4.0 International
License in plaintext.
License and the BSD 3-Clause License in plaintext.

The SG repository has an example of how to do this correctly in its [LICENSE file](./LICENSE).

Expand All @@ -361,6 +362,7 @@ initiatives.

[contributor]: ./IPR%20Policy.md#contributor
[review-draft]: ./Workstream%20Policy.md#review-draft
[BSD 3-Clause License]: ./BSD%203-Clause%20License.md
[Code of Conduct]: ./Code%20of%20Conduct.md
[Contributions]: ./IPR%20Policy.md#21-contribution
[Contributor and Workstream Participant Agreement]: https://participate.whatwg.org/agreement
Expand Down

0 comments on commit 5e32a85

Please sign in to comment.