-\r
======================\r
= Code Contributions =\r
======================\r
contribution is made under the terms of the specified\r
contribution agreement. Your "Contributed-under" message\r
must include the name of contribution agreement and version.\r
- For example: Contributed-under: TianoCore Contribution Agreement 1.0\r
+ For example: Contributed-under: TianoCore Contribution Agreement 1.1\r
The "TianoCore Contribution Agreement" is included below in\r
this document.\r
4. Submit your code to the TianoCore project using the process\r
* Python-2.0: http://opensource.org/licenses/Python-2.0\r
* Zlib: http://opensource.org/licenses/Zlib\r
\r
+ For documentation:\r
+ * FreeBSD Documentation License\r
+ https://www.freebsd.org/copyright/freebsd-doc-license.html\r
+\r
Contributions of code put into the public domain can also be\r
accepted.\r
\r
=== Start of sample patch email message ===\r
\r
From: Contributor Name <contributor@example.com>\r
-Subject: [PATCH] CodeModule: Brief-single-line-summary\r
+Subject: [Repository/Branch PATCH] Module: Brief-single-line-summary\r
\r
Full-commit-message\r
\r
-Contributed-under: TianoCore Contribution Agreement 1.0\r
+Contributed-under: TianoCore Contribution Agreement 1.1\r
Signed-off-by: Contributor Name <contributor@example.com>\r
---\r
\r
=== Notes for sample patch email ===\r
\r
* The first line of commit message is taken from the email's subject\r
- line following [PATCH]. The remaining portion of the commit message\r
- is the email's content until the '---' line.\r
+ line following [Repository/Branch PATCH]. The remaining portion of the\r
+ commit message is the email's content until the '---' line.\r
* git format-patch is one way to create this format\r
\r
=== Definitions for sample patch email ===\r
\r
-* "CodeModule" is a short idenfier for the affected code. For\r
- example MdePkg, or MdeModulePkg UsbBusDxe.\r
+* "Repository" is the identifier of the repository the patch applies.\r
+ This identifier should only be provided for repositories other than\r
+ 'edk2'. For example 'edk2-BuildSpecification' or 'staging'.\r
+* "Branch" is the identifier of the branch the patch applies. This\r
+ identifier should only be provided for branches other than 'edk2/master'.\r
+ For example 'edk2/UDK2015', 'edk2-BuildSpecification/release/1.27', or\r
+ 'staging/edk2-test'.\r
+* "Module" is a short identifier for the affected code or documentation. For\r
+ example 'MdePkg', 'MdeModulePkg/UsbBusDxe', 'Introduction', or\r
+ 'EDK II INF File Format'.\r
* "Brief-single-line-summary" is a short summary of the change.\r
* The entire first line should be less than ~70 characters.\r
* "Full-commit-message" a verbose multiple line comment describing\r
the change. Each line should be less than ~70 characters.\r
-* "Contributed-under" explicitely states that the contribution is\r
- made under the terms of the contribtion agreement. This\r
+* "Contributed-under" explicitly states that the contribution is\r
+ made under the terms of the contribution agreement. This\r
agreement is included below in this document.\r
* "Signed-off-by" is the contributor's signature identifying them\r
by their real/legal name and their email address.\r
\r
========================================\r
-= TianoCore Contribution Agreement 1.0 =\r
+= TianoCore Contribution Agreement 1.1 =\r
========================================\r
\r
-INTEL CORPORATION ("INTEL") MAKES AVAILABLE SOFTWARE, DOCUMENTATION,\r
-INFORMATION AND/OR OTHER MATERIALS FOR USE IN THE TIANOCORE OPEN SOURCE\r
-PROJECT (COLLECTIVELY "CONTENT"). USE OF THE CONTENT IS GOVERNED BY THE\r
-TERMS AND CONDITIONS OF THIS AGREEMENT BETWEEN YOU AND INTEL AND/OR THE\r
-TERMS AND CONDITIONS OF LICENSE AGREEMENTS OR NOTICES INDICATED OR\r
-REFERENCED BELOW. BY USING THE CONTENT, YOU AGREE THAT YOUR USE OF THE\r
-CONTENT IS GOVERNED BY THIS AGREEMENT AND/OR THE TERMS AND CONDITIONS\r
-OF ANY APPLICABLE LICENSE AGREEMENTS OR NOTICES INDICATED OR REFERENCED\r
-BELOW. IF YOU DO NOT AGREE TO THE TERMS AND CONDITIONS OF THIS\r
+INTEL CORPORATION ("INTEL") MAKES AVAILABLE SOFTWARE, DOCUMENTATION\r
+("DOCUMENTATION"), INFORMATION AND/OR OTHER MATERIALS FOR USE IN THE\r
+TIANOCORE OPEN SOURCE PROJECT (COLLECTIVELY "CONTENT"). USE OF THE CONTENT\r
+IS GOVERNED BY THE TERMS AND CONDITIONS OF THIS AGREEMENT BETWEEN YOU AND\r
+INTEL AND/OR THE TERMS AND CONDITIONS OF LICENSE AGREEMENTS OR NOTICES\r
+INDICATED OR REFERENCED BELOW. BY USING THE CONTENT, YOU AGREE THAT YOUR\r
+USE OF THE CONTENT IS GOVERNED BY THIS AGREEMENT AND/OR THE TERMS AND\r
+CONDITIONS OF ANY APPLICABLE LICENSE AGREEMENTS OR NOTICES INDICATED OR\r
+REFERENCED BELOW. IF YOU DO NOT AGREE TO THE TERMS AND CONDITIONS OF THIS\r
AGREEMENT AND THE TERMS AND CONDITIONS OF ANY APPLICABLE LICENSE\r
AGREEMENTS OR NOTICES INDICATED OR REFERENCED BELOW, THEN YOU MAY NOT\r
USE THE CONTENT.\r
\r
-Unless otherwise indicated, all Content made available on the TianoCore\r
-site is provided to you under the terms and conditions of the BSD\r
-License ("BSD"). A copy of the BSD License is available at\r
+Unless otherwise indicated, all Content (except Documentation) made available\r
+on the TianoCore site is provided to you under the terms and conditions of the\r
+BSD License ("BSD"). A copy of the BSD License is available at\r
http://opensource.org/licenses/bsd-license.php\r
or when applicable, in the associated License.txt file.\r
\r
+Unless otherwise indicated, all Documentation made available on the\r
+TianoCore site is provided to you under the terms and conditions of the\r
+FreeBSD Documentation License ("FreeBSD"). A copy of the license is\r
+available at https://www.freebsd.org/copyright/freebsd-doc-license.html or,\r
+when applicable, in the associated License.txt file.\r
+\r
Certain other content may be made available under other licenses as\r
-indicated in or with such Content. (For example, in a License.txt file.)\r
+indicated in or with such Content (for example, in a License.txt file).\r
\r
You accept and agree to the following terms and conditions for Your\r
present and future Contributions submitted to TianoCore site. Except\r
of such entity.\r
* "Contribution" shall mean any original work of authorship,\r
including any modifications or additions to an existing work,\r
- that is intentionally submitted by You to the TinaoCore site for\r
+ that is intentionally submitted by You to the TianoCore site for\r
inclusion in, or documentation of, any of the Content. For the\r
purposes of this definition, "submitted" means any form of\r
electronic, verbal, or written communication sent to the\r
projects / mirror_edk2.git / blobdiff