[skip ci] Updated licenses and gitignores

1 files changed, 25 insertions, 31 deletions

diff --git a/options/license/CUA-OPL-1.0 b/options/license/CUA-OPL-1.0
index 3c46119b11..8026e578ee 100644
--- a/options/license/CUA-OPL-1.0
+++ b/options/license/CUA-OPL-1.0
@@ -1,6 +1,6 @@
 CUA Office Public License Version 1.0
 
-   1. Definitions.
+1. Definitions.
 
 1.0.1. "Commercial Use" means distribution or otherwise making the Covered
 Code available to a third party.
@@ -18,7 +18,7 @@ of the Original Code and Modifications, in each case including portions thereof.
 1.4. "Electronic Distribution Mechanism" means a mechanism generally accepted
 in the software development community for the electronic transfer of data.
 
-      1.5. "Executable" means Covered Code in any form other than Source Code.
+1.5. "Executable" means Covered Code in any form other than Source Code.
 
 1.6. "Initial Developer" means the individual or entity identified as the
 Initial Developer in the Source Code notice required by Exhibit A.
@@ -26,7 +26,7 @@ Initial Developer in the Source Code notice required by Exhibit A.
 1.7. "Larger Work" means a work which combines Covered Code or portions thereof
 with code not governed by the terms of this License.
 
-      1.8. "License" means this document.
+1.8. "License" means this document.
 
 1.8.1. "Licensable" means having the right to grant, to the maximum extent
 possible, whether at the time of the initial grant or subsequently acquired,
@@ -68,7 +68,7 @@ or indirect, to cause the direction or management of such entity, whether
 by contract or otherwise, or (b) ownership of more than fifty percent (50%)
 of the outstanding shares or beneficial ownership of such entity.
 
-   2. Source Code License.
+2. Source Code License.
 
 2.1. The Initial Developer Grant. The Initial Developer hereby grants You
 a world-wide, royalty-free, non-exclusive license, subject to third party
@@ -120,7 +120,7 @@ Modifications made by that Contributor with other software (except as part
 of the Contributor Version) or other devices; or 4) under Patent Claims infringed
 by Covered Code in the absence of Modifications made by that Contributor.
 
-   3. Distribution Obligations.
+3. Distribution Obligations.
 
 3.1. Application of License. The Modifications which You create or to which
 You contribute are governed by the terms of this License, including without
@@ -153,7 +153,7 @@ Developer in (a) the Source Code, and (b) in any notice in an Executable version
 or related documentation in which You describe the origin or ownership of
 the Covered Code.
 
-      3.4. Intellectual Property Matters
+3.4. Intellectual Property Matters
 
 (a) Third Party Claims. If Contributor has knowledge that a license under
 a third party's intellectual property rights is required to exercise the rights
@@ -219,8 +219,7 @@ with other code not governed by the terms of this License and distribute the
 Larger Work as a single product. In such a case, You must make sure the requirements
 of this License are fulfilled for the Covered Code.
 
-   4. Inability to Comply Due to Statute or Regulation.
-
+4. Inability to Comply Due to Statute or Regulation.
 If it is impossible for You to comply with any of the terms of this License
 with respect to some or all of the Covered Code due to statute, judicial order,
 or regulation then You must: (a) comply with the terms of this License to
@@ -231,12 +230,11 @@ Except to the extent prohibited by statute or regulation, such description
 must be sufficiently detailed for a recipient of ordinary skill to be able
 to understand it.
 
-   5. Application of this License.
-
+5. Application of this License.
 This License applies to code to which the Initial Developer has attached the
 notice in Exhibit A and to related Covered Code.
 
-   6. Versions of the License.
+6. Versions of the License.
 
 6.1. New Versions. CUA Office Project may publish revised and/or new versions
 of the License from time to time. Each version will be given a distinguishing
@@ -260,8 +258,7 @@ the name of the Initial Developer, Original Code or Contributor in the notice
 described in Exhibit A shall not of themselves be deemed to be modifications
 of this License.)
 
-   7. DISCLAIMER OF WARRANTY.
-
+7. DISCLAIMER OF WARRANTY.
 COVERED CODE IS PROVIDED UNDER THIS LICENSE ON AN "AS IS" BASIS, WITHOUT WARRANTY
 OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, WITHOUT LIMITATION, WARRANTIES
 THAT THE COVERED CODE IS FREE OF DEFECTS, MERCHANTABLE, FIT FOR A PARTICULAR
@@ -272,7 +269,7 @@ THE COST OF ANY NECESSARY SERVICING, REPAIR OR CORRECTION. THIS DISCLAIMER
 OF WARRANTY CONSTITUTES AN ESSENTIAL PART OF THIS LICENSE. NO USE OF ANY COVERED
 CODE IS AUTHORIZED HEREUNDER EXCEPT UNDER THIS DISCLAIMER.
 
-   8. TERMINATION.
+8. TERMINATION.
 
 8.1. This License and the rights granted hereunder will terminate automatically
 if You fail to comply with terms herein and fail to cure such breach within
@@ -318,8 +315,7 @@ user license agreements (excluding distributors and resellers) which have
 been validly granted by You or any distributor hereunder prior to termination
 shall survive termination.
 
-   9. LIMITATION OF LIABILITY.
-
+9. LIMITATION OF LIABILITY.
 UNDER NO CIRCUMSTANCES AND UNDER NO LEGAL THEORY, WHETHER TORT (INCLUDING
 NEGLIGENCE), CONTRACT, OR OTHERWISE, SHALL YOU, THE INITIAL DEVELOPER, ANY
 OTHER CONTRIBUTOR, OR ANY DISTRIBUTOR OF COVERED CODE, OR ANY SUPPLIER OF
@@ -334,8 +330,7 @@ SOME JURISDICTIONS DO NOT ALLOW THE EXCLUSION OR LIMITATION OF INCIDENTAL
 OR CONSEQUENTIAL DAMAGES, SO THIS EXCLUSION AND LIMITATION MAY NOT APPLY TO
 YOU.
 
-   10. U.S. GOVERNMENT END USERS.
-
+10. U.S. GOVERNMENT END USERS.
 The Covered Code is a "commercial item," as that term is defined in 48 C.F.R.
 2.101 (Oct. 1995), consisting of "commercial computer software" and "commercial
 computer software documentation," as such terms are used in 48 C.F.R. 12.212
@@ -343,8 +338,7 @@ computer software documentation," as such terms are used in 48 C.F.R. 12.212
 227.7202-4 (June 1995), all U.S. Government End Users acquire Covered Code
 with only those rights set forth herein.
 
-   11. MISCELLANEOUS.
-
+11. MISCELLANEOUS.
 This License represents the complete agreement concerning subject matter hereof.
 If any provision of this License is held to be unenforceable, such provision
 shall be reformed only to the extent necessary to make it enforceable. This
@@ -361,8 +355,7 @@ on Contracts for the International Sale of Goods is expressly excluded. Any
 law or regulation which provides that the language of a contract shall be
 construed against the drafter shall not apply to this License.
 
-   12. RESPONSIBILITY FOR CLAIMS.
-
+12. RESPONSIBILITY FOR CLAIMS.
 As between Initial Developer and the Contributors, each party is responsible
 for claims and damages arising, directly or indirectly, out of its utilization
 of rights under this License and You agree to work with Initial Developer
@@ -370,13 +363,14 @@ and Contributors to distribute such responsibility on an equitable basis.
 Nothing herein is intended or shall be deemed to constitute any admission
 of liability.
 
-   13. MULTIPLE-LICENSED CODE.
-
+13. MULTIPLE-LICENSED CODE.
 Initial Developer may designate portions of the Covered Code as "Multiple-Licensed".
 "Multiple-Licensed" means that the Initial Developer permits you to utilize
 portions of the Covered Code under Your choice of the NPL or the alternative
 licenses, if any, specified by the Initial Developer in the file described
-in Exhibit A. EXHIBIT A - CUA Office Public License.
+in Exhibit A.
+
+EXHIBIT A - CUA Office Public License.
 
 "The contents of this file are subject to the CUA Office Public License Version
 1.0 (the "License"); you may not use this file except in compliance with the
@@ -386,16 +380,16 @@ Software distributed under the License is distributed on an "AS IS" basis,
 WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License for
 the specific language governing rights and limitations under the License.
 
-The Original Code is ______________________________________ .
+The Original Code is ______________________________________.
 
-The Initial Developer of the Original Code is ________________________ . Portions
-created by ______________________ are Copyright (C) ______ _______________________
-. All Rights Reserved.
+The Initial Developer of the Original Code is ________________________. Portions
+created by ______________________ are Copyright (C) ______ _______________________.
+All Rights Reserved.
 
-Contributor(s): ______________________________________ .
+Contributor(s): ______________________________________.
 
 Alternatively, the contents of this file may be used under the terms of the
-_____ license (the " [___] License"), in which case the provisions of [______]
+_____ license (the "[___] License"), in which case the provisions of [______]
 License are applicable instead of those above. If you wish to allow use of
 your version of this file only under the terms of the [____] License and not
 to allow others to use your version of this file under the CUAPL, indicate