Skip to content

Commit abce45b

Browse files
authored
Merge pull request #664 from github/afl-osl-fmt
Consistent formatting of AFL-3.0 and OSL-3.0
2 parents 613c52a + 00f0953 commit abce45b

2 files changed

Lines changed: 8 additions & 6 deletions

File tree

_licenses/afl-3.0.txt

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ limitations:
2626

2727
---
2828

29-
Academic Free License (AFL) v. 3.0
29+
Academic Free License ("AFL") v. 3.0
3030

3131
This Academic Free License (the "License") applies to any original work of
3232
authorship (the "Original Work") whose owner (the "Licensor") has placed the
@@ -48,9 +48,11 @@ the following:
4848

4949
c) to distribute or communicate copies of the Original Work and
5050
Derivative Works to the public, under any license of your choice that
51-
does not contradict the terms and conditions, including Licensors
51+
does not contradict the terms and conditions, including Licensor's
5252
reserved rights and remedies, in this Academic Free License;
53+
5354
d) to perform the Original Work publicly; and
55+
5456
e) to display the Original Work publicly.
5557

5658
2) Grant of Patent License. Licensor grants You a worldwide, royalty-free,
@@ -74,7 +76,7 @@ of any contributors to the Original Work, nor any of their trademarks or
7476
service marks, may be used to endorse or promote products derived from this
7577
Original Work without express prior permission of the Licensor. Except as
7678
expressly stated herein, nothing in this License grants any license to
77-
Licensors trademarks, copyrights, patents, trade secrets or any other
79+
Licensor's trademarks, copyrights, patents, trade secrets or any other
7880
intellectual property. No patent license is granted to make, use, sell, offer
7981
for sale, have made, or import embodiments of any patent claims other than the
8082
licensed claims defined in Section 2. No license is granted to the trademarks
@@ -132,7 +134,7 @@ the activities listed in Section 1, including your right to create Derivative
132134
Works based upon the Original Work, and doing so without honoring these terms
133135
and conditions is prohibited by copyright law and international treaty.
134136
Nothing in this License is intended to affect copyright exceptions and
135-
limitations (including fair use or fair dealing). This License shall
137+
limitations (including "fair use" or "fair dealing"). This License shall
136138
terminate immediately and You may no longer exercise any of the rights granted
137139
to You by this License upon your failure to honor the conditions in Section
138140
1(c).
@@ -156,7 +158,7 @@ subject to the requirements and penalties of copyright or patent law in the
156158
appropriate jurisdiction. This section shall survive the termination of this
157159
License.
158160

159-
12) Attorneys Fees. In any action to enforce the terms of this License or
161+
12) Attorneys' Fees. In any action to enforce the terms of this License or
160162
seeking damages relating thereto, the prevailing party shall be entitled to
161163
recover its costs and expenses, including, without limitation, reasonable
162164
attorneys' fees and costs incurred in connection with such action, including

_licenses/osl-3.0.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ limitations:
3434

3535
---
3636

37-
Open Software License ("OSL") v 3.0
37+
Open Software License ("OSL") v. 3.0
3838

3939
This Open Software License (the "License") applies to any original work of
4040
authorship (the "Original Work") whose owner (the "Licensor") has placed the

0 commit comments

Comments
 (0)