Skip to content

Commit 0c7b0c5

Browse files
committed
[skip ci] Updated licenses and gitignores
1 parent 8498e67 commit 0c7b0c5

File tree

11 files changed

+64
-63
lines changed

11 files changed

+64
-63
lines changed

options/license/APL-1.0

Lines changed: 22 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -210,21 +210,21 @@ PART 1: INITIAL CONTRIBUTOR AND DESIGNATED WEB SITE
210210

211211
The Initial Contributor is:
212212
____________________________________________________
213-
 
213+
214214
[Enter full name of Initial Contributor]
215215

216216
Address of Initial Contributor:
217217
________________________________________________
218-
 
218+
219219
________________________________________________
220-
 
220+
221221
________________________________________________
222-
 
222+
223223
[Enter address above]
224224

225225
The Designated Web Site is:
226226
__________________________________________________
227-
 
227+
228228
[Enter URL for Designated Web Site of Initial Contributor]
229229

230230
NOTE: The Initial Contributor is to complete this Part 1, along with Parts 2, 3, and 5, and, if applicable, Parts 4 and 6.
@@ -237,27 +237,27 @@ The date on which the Initial Work was first available under this License: _____
237237

238238
PART 3: GOVERNING JURISDICTION
239239

240-
For the purposes of this License, the Governing Jurisdiction is _________________________________________________. [Initial Contributor to Enter Governing Jurisdiction here]
240+
For the purposes of this License, the Governing Jurisdiction is _________________________________________________. [Initial Contributor to Enter Governing Jurisdiction here]
241241

242242
PART 4: THIRD PARTIES
243243

244244
For the purposes of this License, "Third Party" has the definition set forth below in the ONE paragraph selected by the Initial Contributor from paragraphs A, B, C, D and E when the Initial Work is distributed or otherwise made available by the Initial Contributor. To select one of the following paragraphs, the Initial Contributor must place an "X" or "x" in the selection box alongside the one respective paragraph selected.
245245
SELECTION
246-
 
246+
247247
BOX PARAGRAPH
248-
[  ] A. "THIRD PARTY" means any third party.
249-
 
250-
 
251-
[  ] B. "THIRD PARTY" means any third party except for any of the following: (a) a wholly owned subsidiary of the Subsequent Contributor in question; (b) a legal entity (the "PARENT") that wholly owns the Subsequent Contributor in question; or (c) a wholly owned subsidiary of the wholly owned subsidiary in (a) or of the Parent in (b).
252-
 
253-
 
254-
[  ] C. "THIRD PARTY" means any third party except for any of the following: (a) any Person directly or indirectly owning a majority of the voting interest in the Subsequent Contributor or (b) any Person in which the Subsequent Contributor directly or indirectly owns a majority voting interest.
255-
 
256-
 
257-
[  ] D. "THIRD PARTY" means any third party except for any Person directly or indirectly controlled by the Subsequent Contributor. For purposes of this definition, "control" shall mean the power to direct or cause the direction of, the management and policies of such Person whether through the ownership of voting interests, by contract, or otherwise.
258-
 
259-
 
260-
[  ] E. "THIRD PARTY" means any third party except for any Person directly or indirectly controlling, controlled by, or under common control with the Subsequent Contributor. For purposes of this definition, "control" shall mean the power to direct or cause the direction of, the management and policies of such Person whether through the ownership of voting interests, by contract, or otherwise.
248+
[ ] A. "THIRD PARTY" means any third party.
249+
250+
251+
[ ] B. "THIRD PARTY" means any third party except for any of the following: (a) a wholly owned subsidiary of the Subsequent Contributor in question; (b) a legal entity (the "PARENT") that wholly owns the Subsequent Contributor in question; or (c) a wholly owned subsidiary of the wholly owned subsidiary in (a) or of the Parent in (b).
252+
253+
254+
[ ] C. "THIRD PARTY" means any third party except for any of the following: (a) any Person directly or indirectly owning a majority of the voting interest in the Subsequent Contributor or (b) any Person in which the Subsequent Contributor directly or indirectly owns a majority voting interest.
255+
256+
257+
[ ] D. "THIRD PARTY" means any third party except for any Person directly or indirectly controlled by the Subsequent Contributor. For purposes of this definition, "control" shall mean the power to direct or cause the direction of, the management and policies of such Person whether through the ownership of voting interests, by contract, or otherwise.
258+
259+
260+
[ ] E. "THIRD PARTY" means any third party except for any Person directly or indirectly controlling, controlled by, or under common control with the Subsequent Contributor. For purposes of this definition, "control" shall mean the power to direct or cause the direction of, the management and policies of such Person whether through the ownership of voting interests, by contract, or otherwise.
261261
The default definition of "THIRD PARTY" is the definition set forth in paragraph A, if NONE OR MORE THAN ONE of paragraphs A, B, C, D or E in this Part 4 are selected by the Initial Contributor.
262262

263263
PART 5: NOTICE
@@ -271,8 +271,8 @@ PART 6: PATENT LICENSING TERMS
271271
For the purposes of this License, paragraphs A, B, C, D and E of this Part 6 of Exhibit A are only incorporated and form part of the terms of the License if the Initial Contributor places an "X" or "x" in the selection box alongside the YES answer to the question immediately below.
272272

273273
Is this a Patents-Included License pursuant to Section 2.2 of the License?
274-
YES [      ]
275-
NO [      ]
274+
YES [ ]
275+
NO [ ]
276276

277277
By default, if YES is not selected by the Initial Contributor, the answer is NO.
278278

options/license/IBM-pibs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,5 +4,5 @@ Any user of this software should understand that IBM cannot provide technical su
44

55
Any person who transfers this source code or any derivative work must include the IBM copyright notice, this paragraph, and the preceding two paragraphs in the transferred software.
66

7-
COPYRIGHT   I B M   CORPORATION 2002
8-
LICENSED MATERIAL  -  PROGRAM PROPERTY OF I B M
7+
COPYRIGHT I B M CORPORATION 2002
8+
LICENSED MATERIAL - PROGRAM PROPERTY OF I B M

options/license/NCGL-UK-2.0

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -12,15 +12,15 @@ The Licensor grants you a worldwide, royalty-free, perpetual, non-exclusive lice
1212
This licence does not affect your freedom under fair dealing or fair use or any other copyright or database right exceptions and limitations.
1313

1414
You are free to:
15-
copy, publish, distribute and transmit the Information;
15+
copy, publish, distribute and transmit the Information;
1616
adapt the Information;
1717
exploit the Information for Non-Commercial purposes for example, by combining it with other information in your own product or application.
1818

1919
You are not permitted to:
20-
exercise any of the rights granted to you by this licence in any manner that is primarily intended for or directed toward commercial advantage or private monetary compensation.
20+
exercise any of the rights granted to you by this licence in any manner that is primarily intended for or directed toward commercial advantage or private monetary compensation.
2121

2222
You must, where you do any of the above:
23-
acknowledge the source of the Information by including any attribution statement specified by the Information Provider(s) and, where possible, provide a link to this licence;
23+
acknowledge the source of the Information by including any attribution statement specified by the Information Provider(s) and, where possible, provide a link to this licence;
2424

2525
If the Information Provider does not provide a specific attribution statement, you must use the following:
2626
Contains information licensed under the Non-Commercial Government Licence v2.0.

options/license/NPL-1.1

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ Netscape Public LIcense version 1.1
22

33
AMENDMENTS
44

5-
The Netscape Public License Version 1.1 ("NPL") consists of the Mozilla Public License Version 1.1 with the following Amendments, including Exhibit A-Netscape Public License.  Files identified with "Exhibit A-Netscape Public License" are governed by the Netscape Public License Version 1.1.
5+
The Netscape Public License Version 1.1 ("NPL") consists of the Mozilla Public License Version 1.1 with the following Amendments, including Exhibit A-Netscape Public License. Files identified with "Exhibit A-Netscape Public License" are governed by the Netscape Public License Version 1.1.
66

77
Additional Terms applicable to the Netscape Public License.
88

@@ -28,7 +28,7 @@ Additional Terms applicable to the Netscape Public License.
2828
Notwithstanding the limitations of Section 11 above, the provisions regarding litigation in Section 11(a), (b) and (c) of the License shall apply to all disputes relating to this License.
2929

3030
EXHIBIT A-Netscape Public License.
31-
 
31+
3232
"The contents of this file are subject to the Netscape Public License Version 1.1 (the "License"); you may not use this file except in compliance with the License. You may obtain a copy of the License at http://www.mozilla.org/NPL/
3333

3434
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.
@@ -37,8 +37,8 @@ The Original Code is Mozilla Communicator client code, released March 31, 1998.
3737

3838
The Initial Developer of the Original Code is Netscape Communications Corporation. Portions created by Netscape are Copyright (C) 1998-1999 Netscape Communications Corporation. All Rights Reserved.
3939
Contributor(s): ______________________________________.
40-
 
41-
Alternatively, the contents of this file may be used under the terms of the _____ 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 NPL, indicate your decision by deleting  the provisions above and replace  them with the notice and other provisions required by the [___] License.  If you do not delete the provisions above, a recipient may use your version of this file under either the NPL or the [___] License."
40+
41+
Alternatively, the contents of this file may be used under the terms of the _____ 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 NPL, indicate your decision by deleting the provisions above and replace them with the notice and other provisions required by the [___] License. If you do not delete the provisions above, a recipient may use your version of this file under either the NPL or the [___] License."
4242

4343

4444
Mozilla Public License Version 1.1

options/license/OCCT-PL

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ OPEN CASCADE releases and makes publicly available the source code of the softwa
66
It is not the purpose of this license to induce you to infringe any patents or other property right claims or to contest validity of any such claims; this license has the sole purpose of protecting the integrity of the free software distribution system, which is implemented by public license practices. Many people have made generous contributions to the wide range of software distributed through that system in reliance on consistent application of that system; it is up to the author/donor to decide if he or she is willing to distribute software through any other system and a licensee cannot impose that choice.
77

88
Please read this license carefully and completely before downloading this software. By downloading, using, modifying, distributing and sublicensing this software, you indicate your acceptance to be bound by the terms and conditions of this license. If you do not want to accept or cannot accept for any reasons the terms and conditions of this license, please do not download or use in any manner this software.
9-
 
9+
1010
1. Definitions
1111

1212
Unless there is something in the subject matter or in the context inconsistent therewith, the capitalized terms used in this License shall have the following meaning.
@@ -26,13 +26,13 @@ Unless there is something in the subject matter or in the context inconsistent t
2626
"Software": means the Original Code, the Modifications, the combination of Original Code and any Modifications or any respective portions thereof.
2727

2828
"You" or "Your": means an individual or a legal entity exercising rights under this License
29-
 
29+
3030
2. Acceptance of license
3131
By using, reproducing, modifying, distributing or sublicensing the Software or any portion thereof, You expressly indicate Your acceptance of the terms and conditions of this License and undertake to act in accordance with all the provisions of this License applicable to You.
32-
 
32+
3333
3. Scope and purpose
3434
This License applies to the Software and You may not use, reproduce, modify, distribute, sublicense or circulate the Software, or any portion thereof, except as expressly provided under this License. Any attempt to otherwise use, reproduce, modify, distribute or sublicense the Software is void and will automatically terminate Your rights under this License.
35-
 
35+
3636
4. Contributor license
3737
Subject to the terms and conditions of this License, the Initial Developer and each of the Contributors hereby grant You a world-wide, royalty-free, irrevocable and non-exclusive license under the Applicable Intellectual Property Rights they own or control, to use, reproduce, modify, distribute and sublicense the Software provided that:
3838

options/license/OGL-UK-1.0

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -10,20 +10,20 @@ The Licensor grants you a worldwide, royalty-free, perpetual, non-exclusive lice
1010
This licence does not affect your freedom under fair dealing or fair use or any other copyright or database right exceptions and limitations.
1111

1212
You are free to:
13-
copy, publish, distribute and transmit the Information;
13+
copy, publish, distribute and transmit the Information;
1414
adapt the Information;
1515
exploit the Information commercially for example, by combining it with other Information, or by including it in your own product or application.
1616

1717
You must, where you do any of the above:
18-
acknowledge the source of the Information by including any attribution statement specified by the Information Provider(s) and, where possible, provide a link to this licence;
19-
 If the Information Provider does not provide a specific attribution statement, or if you are using Information from several Information Providers and multiple attributions are not practical in your product or application, you may consider using the following:
 Contains public sector information licensed under the Open Government Licence v1.0.
18+
acknowledge the source of the Information by including any attribution statement specified by the Information Provider(s) and, where possible, provide a link to this licence;
19+
If the Information Provider does not provide a specific attribution statement, or if you are using Information from several Information Providers and multiple attributions are not practical in your product or application, you may consider using the following: Contains public sector information licensed under the Open Government Licence v1.0.
2020
ensure that you do not use the Information in a way that suggests any official status or that the Information Provider endorses you or your use of the Information;
2121
ensure that you do not mislead others or misrepresent the Information or its source;
2222
ensure that your use of the Information does not breach the Data Protection Act 1998 or the Privacy and Electronic Communications (EC Directive) Regulations 2003.
2323

2424
These are important conditions of this licence and if you fail to comply with them the rights granted to you under this licence, or any similar licence granted by the Licensor, will end automatically.
2525

26-
 Exemptions
26+
Exemptions
2727

2828
This licence does not cover the use of:
2929
- personal data in the Information;
@@ -48,22 +48,22 @@ Definitions
4848

4949
In this licence, the terms below have the following meanings:
5050

51-
‘Information’means information protected by copyright or by database right (for example, literary and artistic works, content, data and source code) offered for use under the terms of this licence.
51+
‘Information’ means information protected by copyright or by database right (for example, literary and artistic works, content, data and source code) offered for use under the terms of this licence.
5252

53-
‘Information Provider’means the person or organisation providing the Information under this licence.
53+
‘Information Provider’ means the person or organisation providing the Information under this licence.
5454

55-
‘Licensor’means any Information Provider which has the authority to offer Information under the terms of this licence or the Controller of Her Majesty’s Stationery Office, who has the authority to offer Information subject to Crown copyright and Crown database rights and Information subject to copyright and database right that has been assigned to or acquired by the Crown, under the terms of this licence.
55+
‘Licensor’ means any Information Provider which has the authority to offer Information under the terms of this licence or the Controller of Her Majesty’s Stationery Office, who has the authority to offer Information subject to Crown copyright and Crown database rights and Information subject to copyright and database right that has been assigned to or acquired by the Crown, under the terms of this licence.
5656

57-
‘Use’as a verb, means doing any act which is restricted by copyright or database right, whether in the original medium or in any other medium, and includes without limitation distributing, copying, adapting, modifying as may be technically necessary to use it in a different mode or format.
57+
‘Use’ as a verb, means doing any act which is restricted by copyright or database right, whether in the original medium or in any other medium, and includes without limitation distributing, copying, adapting, modifying as may be technically necessary to use it in a different mode or format.
5858

59-
‘You’means the natural or legal person, or body of persons corporate or incorporate, acquiring rights under this licence.
59+
‘You’ means the natural or legal person, or body of persons corporate or incorporate, acquiring rights under this licence.
6060

6161
About the Open Government Licence
6262
The Controller of Her Majesty’s Stationery Office (HMSO) has developed this licence as a tool to enable Information Providers in the public sector to license the use and re-use of their Information under a common open licence. The Controller invites public sector bodies owning their own copyright and database rights to permit the use of their Information under this licence.
6363

64-
The Controller of HMSO has authority to license Information subject to copyright and database right owned by the Crown. The extent of the Controller’s offer to license this Information under the terms of this licence is set out in the UK Government Licensing Framework.
64+
The Controller of HMSO has authority to license Information subject to copyright and database right owned by the Crown. The extent of the Controller’s offer to license this Information under the terms of this licence is set out in the UK Government Licensing Framework.
6565

6666
This is version 1.0 of the Open Government Licence. The Controller of HMSO may, from time to time, issue new versions of the Open Government Licence. However, you may continue to use Information licensed under this version should you wish to do so.
6767
These terms have been aligned to be interoperable with any Creative Commons Attribution Licence, which covers copyright, and Open Data Commons Attribution License, which covers database rights and applicable copyrights.
6868

69-
Further context, best practice and guidance can be found in the UK Government Licensing Framework section on The National Archives website.
69+
Further context, best practice and guidance can be found in the UK Government Licensing Framework section on The National Archives website.

0 commit comments

Comments
 (0)