[skip ci] Updated licenses and gitignores

1 files changed, 17 insertions, 24 deletions

diff --git a/options/license/CATOSL-1.1 b/options/license/CATOSL-1.1
index d53787c1de..b18fa79a54 100644
--- a/options/license/CATOSL-1.1
+++ b/options/license/CATOSL-1.1
@@ -1,5 +1,4 @@
 Computer Associates Trusted Open Source License
-
 Version 1.1
 
 PLEASE READ THIS DOCUMENT CAREFULLY AND IN ITS ENTIRETY. THE ACCOMPANYING
@@ -26,7 +25,7 @@ Contributions to the Program must be distributed under the terms of this License
 The provisions that follow set forth the terms and conditions under which
 you may use the Program.
 
-   1. DEFINITIONS
+1. DEFINITIONS
 
 1.1 Contribution means (a) in the case of CA, the Original Program; and (b)
 in the case of each Contributor (including CA), changes and additions to the
@@ -55,11 +54,11 @@ by the use or sale of its Contribution alone or when combined with the Program.
 License is attached and as released by CA, including source code, object code
 and documentation, if any.
 
-      1.7 Program means the Original Program and Contributions.
+1.7 Program means the Original Program and Contributions.
 
 1.8 Recipient means anyone who modifies, copies, uses or distributes the Program.
 
-   2. GRANT OF RIGHTS
+2. GRANT OF RIGHTS
 
 2.1 Subject to the terms of this License, each Contributor hereby grants Recipient
 an irrevocable, non-exclusive, worldwide, royalty-free license to reproduce,
@@ -99,7 +98,7 @@ any other intellectual property rights needed, if any.
 and interest in the copyrights in its Contributions, and has the right to
 grant the copyright licenses set forth in this License.
 
-   3. DISTRIBUTION REQUIREMENTS
+3. DISTRIBUTION REQUIREMENTS
 
 3.1 If the Program is distributed in object code form, then a prominent notice
 must be included in the code itself as well as in any related documentation,
@@ -108,31 +107,25 @@ with information on how and where to obtain the source code. A Contributor
 may choose to distribute the Program in object code form under its own license
 agreement, provided that:
 
-         * it complies with the terms and conditions of this License; and
-
-         * its license agreement:
-
+     * it complies with the terms and conditions of this License; and
+     * its license agreement:
 * effectively disclaims on behalf of all Contributors all warranties and conditions,
 express and implied, including warranties or conditions of title and non-infringement,
 and implied warranties or conditions of merchantability and fitness for a
 particular purpose, to the maximum extent permitted by applicable law;
-
 * effectively excludes on behalf of all Contributors all liability for damages,
 including direct, indirect, special, incidental and consequential damages,
 such as lost profits, to the maximum extent permitted by applicable law;
-
 * states that any provisions which are inconsistent with this License are
 offered by that Contributor alone and not by any other party; and
-
 * states that source code for the Program is available from such Contributor
 at the cost of distribution, and informs licensees how to obtain it in a reasonable
 manner.
 
-      3.2 When the Program is made available in source code form:
-
-         * it must be made available under this License; and
+3.2 When the Program is made available in source code form:
 
-* a copy of this License must be included with each copy of the Program.
+     * it must be made available under this License; and
+     * a copy of this License must be included with each copy of the Program.
 
 3.3 This License is intended to facilitate the commercial distribution of
 the Program by any Contributor. However, Contributors may only charge Recipients
@@ -188,7 +181,7 @@ obligations set forth in Section 4, each Contributor must identify itself
 as the originator of its Contribution, if any, in a manner that reasonably
 allows subsequent Recipients to identify the originator of the Contribution.
 
-   4. CONTRIBUTION RESTRICTIONS
+4. CONTRIBUTION RESTRICTIONS
 
 4.1 Each Contributor must cause the Program to which the Contributor provides
 a Contribution to contain a file documenting the changes the Contributor made
@@ -200,7 +193,7 @@ derived, in (a) the Program source code, and (b) in any notice in an executable
 version or related documentation in which the Contributor describes the origin
 or ownership of the Program.
 
-   5. NO WARRANTY
+5. NO WARRANTY
 
 5.1 EXCEPT AS EXPRESSLY SET FORTH IN THIS LICENSE, THE PROGRAM IS PROVIDED
 AS IS AND IN ITS PRESENT STATE AND CONDITION. NO WARRANTY, REPRESENTATION,
@@ -222,7 +215,7 @@ the operation of nuclear facilities, aircraft navigation, communication systems,
 or air traffic control machines in which case the failure of the Program could
 lead to death, personal injury, or severe physical or environmental damage.
 
-   6. DISCLAIMER OF LIABILITY
+6. DISCLAIMER OF LIABILITY
 
 6.1 EXCEPT AS EXPRESSLY SET FORTH IN THIS LICENSE, AND TO THE EXTENT PERMITTED
 BY LAW, NO CONTRIBUTOR SHALL HAVE ANY LIABILITY FOR ANY DIRECT, INDIRECT,
@@ -233,7 +226,7 @@ ARISING IN ANY WAY OUT OF THE USE OR DISTRIBUTION OF THE PROGRAM OR THE EXERCISE
 OF ANY RIGHTS GRANTED HEREUNDER, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH
 DAMAGES.
 
-   7. TRADEMARKS AND BRANDING
+7. TRADEMARKS AND BRANDING
 
 7.1 This License does not grant any Recipient or any third party any rights
 to use the trademarks or trade names now or subsequently posted at http://www.ca.com/catrdmrk.htm,
@@ -247,7 +240,7 @@ to endorse or promote products derived from the Original Program.
 logos, and product names belonging to the Recipient provided that all copyright
 and other attribution notices remain in the Program.
 
-   8. PATENT LITIGATION
+8. PATENT LITIGATION
 
 8.1 If Recipient institutes patent litigation against any person or entity
 (including a cross-claim or counterclaim in a lawsuit) alleging that the Program
@@ -255,7 +248,7 @@ itself (excluding combinations of the Program with other software or hardware)
 infringes such Recipients patent(s), then such Recipients rights granted under
 Section 2.2 shall terminate as of the date such litigation is filed.
 
-   9. OWNERSHIP
+9. OWNERSHIP
 
 9.1 Subject to the licenses granted under this License in Sections 2.1 and
 2.2 above, each Contributor retains all rights, title and interest in and
@@ -267,7 +260,7 @@ choose to license such CA Contributions under this License, or on different
 terms from those contained in this License or may choose not to license them
 at all.
 
-   10. TERMINATION
+10. TERMINATION
 
 10.1 All of Recipients rights under this License shall terminate if it fails
 to comply with any of the material terms or conditions of this License and
@@ -278,7 +271,7 @@ practicable. However, Recipients obligations under this License and any licenses
 granted by Recipient as a Contributor relating to the Program shall continue
 and survive termination.
 
-   11. GENERAL
+11. GENERAL
 
 11.1 If any provision of this License is invalid or unenforceable under applicable
 law, it shall not affect the validity or enforceability of the remainder of