Merge branch 'ipr-policy-update' into invited-expert

BSD 3-Clause License.md

@@ -0,0 +1,13 @@
+# WHATWG BSD 3-Clause License
+
+Copyright © WHATWG (Apple, Google, Mozilla, Microsoft).
+
+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.
+
+NOTE: Text from [OSI's 3-Clause BSD License](https://opensource.org/licenses/BSD-3-Clause).

Code of Conduct.md

@@ -31,6 +31,6 @@ And if someone takes issue with something you said or did, resist the urge to be
 
 <small>Adapted from [The Rust Code of Conduct](https://www.rust-lang.org/conduct.html).</small>
 
-<small>Copyright © 2018 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/).</small>
+<small>Copyright © 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/).</small>
 
 </footer>

IPR Policy.md

@@ -190,16 +190,18 @@ WHATWG Standards may be identified as "the WHATWG [Standard]" so that forks can
 
 #### 7.1.1. Living Standards and Review Drafts
 
-WHATWG [Living Standards][Living Standard] and [Review Drafts][review-draft] are published under [Creative Commons "Attribution 4.0 International (CC BY 4.0)"](https://creativecommons.org/licenses/by/4.0/).
+WHATWG [Living Standards][Living Standard] and [Review Drafts][review-draft] are published under [Creative Commons "Attribution 4.0 International (CC BY 4.0)"](https://creativecommons.org/licenses/by/4.0/) and a [BSD 3-Clause License]. Which license to exercise is at the option of the licensee, per the [publication copyright notices].
 
 #### 7.1.2. Other documents
 
-Documents other than [Living Standards][Living Standard] and [Review Drafts][review-draft] are published under [Creative Commons "Attribution 4.0 International (CC BY 4.0)"](https://creativecommons.org/licenses/by/4.0/) unless a different license (or license waiver) is specified by the [Steering Group].
+Documents other than [Living Standards][Living Standard] and [Review Drafts][review-draft] are published under [Creative Commons "Attribution 4.0 International (CC BY 4.0)"](https://creativecommons.org/licenses/by/4.0/) and a [BSD 3-Clause License], unless a different license (or license waiver) is specified by the [Steering Group].
 
 [contribution]: ./IPR%20Policy.md#21-contribution
 [contributor]: ./IPR%20Policy.md#contributor
 [cw-agreement]: https://participate.whatwg.org/agreement
+[publication copyright notices]: ./Workstream%20Policy.md#publications
 [review-draft]: ./Workstream%20Policy.md#review-draft
+[BSD 3-Clause License]: ./BSD%203-Clause%20License.md
 [Day]: ./IPR%20Policy.md#29-day
 [Editor]: ./Workstream%20Policy.md#editor
 [Entity]: https://participate.whatwg.org/agreement#entity
@@ -227,6 +229,6 @@ Documents other than [Living Standards][Living Standard] and [Review Drafts][rev
 
 <small>This document includes material derived from the [W3C Patent Policy](http://www.w3.org/Consortium/Patent-Policy-20040205/). Copyright © 2004 W3C® (MIT, ERCIM, Keio, Beihang). See [W3C Notices](./ThirdPartyNotices/W3CLicenses.md).</small>
 
-<small>Copyright © 2018 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/).</small>
+<small>Copyright © 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/).</small>
 
 </footer>

LICENSE

@@ -1,61 +1,8 @@
-Copyright © 2018 WHATWG (Apple, Google, Mozilla, Microsoft).
-This work is licensed under a Creative Commons Attribution 4.0 International License:
-
-Attribution 4.0 International
-
-=======================================================================
-
-Creative Commons Corporation ("Creative Commons") is not a law firm and
-does not provide legal services or legal advice. Distribution of
-Creative Commons public licenses does not create a lawyer-client or
-other relationship. Creative Commons makes its licenses and related
-information available on an "as-is" basis. Creative Commons gives no
-warranties regarding its licenses, any material licensed under their
-terms and conditions, or any related information. Creative Commons
-disclaims all liability for damages resulting from their use to the
-fullest extent possible.
-
-Using Creative Commons Public Licenses
-
-Creative Commons public licenses provide a standard set of terms and
-conditions that creators and other rights holders may use to share
-original works of authorship and other material subject to copyright
-and certain other rights specified in the public license below. The
-following considerations are for informational purposes only, are not
-exhaustive, and do not form part of our licenses.
-
-     Considerations for licensors: Our public licenses are
-     intended for use by those authorized to give the public
-     permission to use material in ways otherwise restricted by
-     copyright and certain other rights. Our licenses are
-     irrevocable. Licensors should read and understand the terms
-     and conditions of the license they choose before applying it.
-     Licensors should also secure all rights necessary before
-     applying our licenses so that the public can reuse the
-     material as expected. Licensors should clearly mark any
-     material not subject to the license. This includes other CC-
-     licensed material, or material used under an exception or
-     limitation to copyright. More considerations for licensors:
- wiki.creativecommons.org/Considerations_for_licensors
-
-     Considerations for the public: By using one of our public
-     licenses, a licensor grants the public permission to use the
-     licensed material under specified terms and conditions. If
-     the licensor's permission is not necessary for any reason--for
-     example, because of any applicable exception or limitation to
-     copyright--then that use is not regulated by the license. Our
-     licenses grant only permissions under copyright and certain
-     other rights that a licensor has authority to grant. Use of
-     the licensed material may still be restricted for other
-     reasons, including because others have copyright or other
-     rights in the material. A licensor may make special requests,
-     such as asking that all changes be marked or described.
-     Although not required by our licenses, you are encouraged to
-     respect those requests where reasonable. More_considerations
-     for the public:
- wiki.creativecommons.org/Considerations_for_licensees
-
-=======================================================================
+Copyright © WHATWG (Apple, Google, Mozilla, Microsoft).
+This work is licensed under a Creative Commons Attribution 4.0 International
+License or a BSD 3-Clause License, at your option.
+
+- - - -
 
 Creative Commons Attribution 4.0 International Public License
 
@@ -375,22 +322,33 @@ Section 8 -- Interpretation.
      that apply to the Licensor or You, including from the legal
      processes of any jurisdiction or authority.
 
+- - - -
+
+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.
 
-=======================================================================
-
-Creative Commons is not a party to its public licenses.
-Notwithstanding, Creative Commons may elect to apply one of its public
-licenses to material it publishes and in those instances will be
-considered the "Licensor." Except for the limited purpose of indicating
-that material is shared under a Creative Commons public license or as
-otherwise permitted by the Creative Commons policies published at
-creativecommons.org/policies, Creative Commons does not authorize the
-use of the trademark "Creative Commons" or any other trademark or logo
-of Creative Commons without its prior written consent including,
-without limitation, in connection with any unauthorized modifications
-to any of its public licenses or any other arrangements,
-understandings, or agreements concerning use of licensed material. For
-the avoidance of doubt, this paragraph does not form part of the public
-licenses.
-
-Creative Commons may be contacted at creativecommons.org.
+- - - -

Policies.md

@@ -20,6 +20,6 @@ Additionally, the WHATWG Steering Group was created by the [Steering Group Agree
 
 <footer>
 
-<small>Copyright © 2018 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/).</small>
+<small>Copyright © 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/).</small>
 
 </footer>

Principles.md

@@ -28,6 +28,6 @@ Editors modify the [Living Standards] based on available information and communi
 
 <footer>
 
-<small>Copyright © 2018 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/).</small>
+<small>Copyright © 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/).</small>
 
 </footer>

Privacy Policy.md

@@ -54,6 +54,6 @@ We may amend this privacy policy periodically by publishing an updated version o
 
 <footer>
 
-<small>Copyright © 2020 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/).</small>
+<small>Copyright © 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/).</small>
 
 </footer>

SG Agreement.md

@@ -230,6 +230,6 @@ this [Agreement] on behalf of the identified [Steering Group Member].
 
 <footer>
 
-<small>Copyright © 2018 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/).</small>
+<small>Copyright © 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/).</small>
 
 </footer>

SG Policy.md

@@ -128,6 +128,6 @@ C. On technical matters, [editors][editor] and participants are welcome and enco
 
 <footer>
 
-<small>Copyright © 2018 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/).</small>
+<small>Copyright © 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/).</small>
 
 </footer>

Working Mode.md

@@ -166,6 +166,6 @@ After discussion concludes, such requested anchors get promoted to be permanent.
 
 <footer>
 
-<small>Copyright © 2018 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/).</small>
+<small>Copyright © 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/).</small>
 
 </footer>

Workstream Policy.md

@@ -276,9 +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/).
-
-In the text above, YEAR must be replaced by the current year at the time the [Living Standard] is published.
+> Copyright © 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/) or a [BSD 3-Clause License], at your option.
 
 For each [Living Standard] that has had at least one [Review Draft][review-draft] published, it must also include the following notice:
 > This is the Living Standard. Those interested in the patent-review version should view the Living
@@ -289,9 +287,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/).
-
-In the text above, YEAR must be replaced by the current year at the time the [Living Standard Review Draft][review-draft] is published.
+> Copyright © 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/) or a [BSD 3-Clause License], at your option.
 
 In addition, [Living Standard Review Drafts][review-draft] must include the following notice:
 > This is the Review Draft. It is published primarily for purposes of patent review by Workstream Participants; it mirrors the Living Standard closely, redacting only text that is identified as "Objection Pending" or "Confirmation Pending". Developers should refer to the Living Standard for the most current error corrections and other developments.
@@ -334,12 +330,12 @@ The repositories for all WHATWG publications and other deliverables
 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:
+> Copyright © WHATWG (Apple, Google, Mozilla, Microsoft).
+> This work is licensed under a Creative Commons Attribution 4.0 International
+> License or a BSD 3-Clause License, at your option.
 
-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.
+This copyright notice must be followed by the full text of the Creative Commons Attribution 4.0
+International 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).
 
@@ -361,6 +357,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
@@ -387,6 +384,6 @@ initiatives.
 
 <footer>
 
-<small>Copyright © 2018 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/).</small>
+<small>Copyright © 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/).</small>
 
 </footer>

policy-link-mapping.txt

@@ -1,3 +1,4 @@
+./BSD%203-Clause%20License.md=bsd-license
 ./IPR%20Policy.md=ipr-policy
 ./Workstream%20Policy.md=workstream-policy
 ./SG%20Agreement.md=sg-agreement