diff options
| author | Michael D Kinney <michael.d.kinney@intel.com> | 2017-07-24 14:53:10 -0700 |
|---|---|---|
| committer | Michael D Kinney <michael.d.kinney@intel.com> | 2017-08-03 11:02:10 -0700 |
| commit | f4a8878b090ced9175ee343f20838a15dfa74ae2 (patch) | |
| tree | c59309ea30206178af548931afb752b93446be4a /Contributions.txt | |
| parent | b6538c118ae827f73b7d1decd9ec30853cdf9b3b (diff) | |
| download | edk2-f4a8878b090ced9175ee343f20838a15dfa74ae2.tar.gz edk2-f4a8878b090ced9175ee343f20838a15dfa74ae2.tar.bz2 edk2-f4a8878b090ced9175ee343f20838a15dfa74ae2.zip | |
edk2: Reformat TianoCore Contribution Agreement 1.1
https://bugzilla.tianocore.org/show_bug.cgi?id=629
Update formatting of Contributions.txt to line wrap
at 80 columns.
Cc: Leif Lindholm <leif.lindholm@linaro.org>
Cc: Andrew Fish <afish@apple.com>
Cc: Jordan Justen <jordan.l.justen@intel.com>
Contributed-under: TianoCore Contribution Agreement 1.1
Signed-off-by: Michael D Kinney <michael.d.kinney@intel.com>
Reviewed-by: Jordan Justen <jordan.l.justen@intel.com>
Reviewed-by: Leif Lindholm <leif.lindholm@linaro.org>
Diffstat (limited to 'Contributions.txt')
| -rw-r--r-- | Contributions.txt | 28 |
1 files changed, 14 insertions, 14 deletions
diff --git a/Contributions.txt b/Contributions.txt index 5e47c3de83..bd2f11f407 100644 --- a/Contributions.txt +++ b/Contributions.txt @@ -68,8 +68,8 @@ Patch content inline or attached === Notes for sample patch email ===
* The first line of commit message is taken from the email's subject
- line following [Repository/Branch PATCH]. The remaining portion of the commit message
- is the email's content until the '---' line.
+ line following [Repository/Branch PATCH]. The remaining portion of the
+ commit message is the email's content until the '---' line.
* git format-patch is one way to create this format
=== Definitions for sample patch email ===
@@ -98,22 +98,22 @@ Patch content inline or attached = TianoCore Contribution Agreement 1.1 =
========================================
-INTEL CORPORATION ("INTEL") MAKES AVAILABLE SOFTWARE, DOCUMENTATION ("DOCUMENTATION"),
-INFORMATION AND/OR OTHER MATERIALS FOR USE IN THE TIANOCORE OPEN SOURCE
-PROJECT (COLLECTIVELY "CONTENT"). USE OF THE CONTENT IS GOVERNED BY THE
-TERMS AND CONDITIONS OF THIS AGREEMENT BETWEEN YOU AND INTEL AND/OR THE
-TERMS AND CONDITIONS OF LICENSE AGREEMENTS OR NOTICES INDICATED OR
-REFERENCED BELOW. BY USING THE CONTENT, YOU AGREE THAT YOUR USE OF THE
-CONTENT IS GOVERNED BY THIS AGREEMENT AND/OR THE TERMS AND CONDITIONS
-OF ANY APPLICABLE LICENSE AGREEMENTS OR NOTICES INDICATED OR REFERENCED
-BELOW. IF YOU DO NOT AGREE TO THE TERMS AND CONDITIONS OF THIS
+INTEL CORPORATION ("INTEL") MAKES AVAILABLE SOFTWARE, DOCUMENTATION
+("DOCUMENTATION"), INFORMATION AND/OR OTHER MATERIALS FOR USE IN THE
+TIANOCORE OPEN SOURCE PROJECT (COLLECTIVELY "CONTENT"). USE OF THE CONTENT
+IS GOVERNED BY THE TERMS AND CONDITIONS OF THIS AGREEMENT BETWEEN YOU AND
+INTEL AND/OR THE TERMS AND CONDITIONS OF LICENSE AGREEMENTS OR NOTICES
+INDICATED OR REFERENCED BELOW. BY USING THE CONTENT, YOU AGREE THAT YOUR
+USE OF THE CONTENT IS GOVERNED BY THIS AGREEMENT AND/OR THE TERMS AND
+CONDITIONS OF ANY APPLICABLE LICENSE AGREEMENTS OR NOTICES INDICATED OR
+REFERENCED BELOW. IF YOU DO NOT AGREE TO THE TERMS AND CONDITIONS OF THIS
AGREEMENT AND THE TERMS AND CONDITIONS OF ANY APPLICABLE LICENSE
AGREEMENTS OR NOTICES INDICATED OR REFERENCED BELOW, THEN YOU MAY NOT
USE THE CONTENT.
-Unless otherwise indicated, all Content (except Documentation) made available on the TianoCore
-site is provided to you under the terms and conditions of the BSD
-License ("BSD"). A copy of the BSD License is available at
+Unless otherwise indicated, all Content (except Documentation) made available
+on the TianoCore site is provided to you under the terms and conditions of the
+BSD License ("BSD"). A copy of the BSD License is available at
http://opensource.org/licenses/bsd-license.php
or when applicable, in the associated License.txt file.
|