Skip to content

Commit 7c45786

Browse files
authored
Merge pull request #604 from github/numbered-bsd
BSD-2/3-Clause numbered list, uses
2 parents 2221481 + 63220fb commit 7c45786

File tree

3 files changed

+19
-15
lines changed

3 files changed

+19
-15
lines changed

_licenses/bsd-2-clause.txt

Lines changed: 8 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,9 @@ description: A permissive license that comes in two variants, the <a href="/lice
99
how: Create a text file (typically named LICENSE or LICENSE.txt) in the root of your source code and copy the text of the license into the file. Replace [year] with the current year and [fullname] with the name (or names) of the copyright holders.
1010

1111
using:
12+
- go-redis: https://github.com/go-redis/redis/blob/master/LICENSE
13+
- Homebrew: https://github.com/Homebrew/brew/blob/master/LICENSE.txt
14+
- Pony: https://github.com/ponylang/ponyc/blob/master/LICENSE
1215

1316
permissions:
1417
- commercial-use
@@ -33,12 +36,12 @@ All rights reserved.
3336
Redistribution and use in source and binary forms, with or without
3437
modification, are permitted provided that the following conditions are met:
3538

36-
* Redistributions of source code must retain the above copyright notice, this
37-
list of conditions and the following disclaimer.
39+
1. Redistributions of source code must retain the above copyright notice, this
40+
list of conditions and the following disclaimer.
3841

39-
* Redistributions in binary form must reproduce the above copyright notice,
40-
this list of conditions and the following disclaimer in the documentation
41-
and/or other materials provided with the distribution.
42+
2. Redistributions in binary form must reproduce the above copyright notice,
43+
this list of conditions and the following disclaimer in the documentation
44+
and/or other materials provided with the distribution.
4245

4346
THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
4447
AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE

_licenses/bsd-3-clause.txt

Lines changed: 11 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,9 @@ description: A permissive license similar to the <a href="/licenses/bsd-2-clause
88
how: Create a text file (typically named LICENSE or LICENSE.txt) in the root of your source code and copy the text of the license into the file. Replace [year] with the current year and [fullname] with the name (or names) of the copyright holders. Replace [project] with the project organization, if any, that sponsors this work.
99

1010
using:
11+
- d3: https://github.com/d3/d3/blob/master/LICENSE
12+
- LevelDB: https://github.com/google/leveldb/blob/master/LICENSE
13+
- Quill: https://github.com/quilljs/quill/blob/develop/LICENSE
1114

1215
permissions:
1316
- commercial-use
@@ -32,16 +35,16 @@ All rights reserved.
3235
Redistribution and use in source and binary forms, with or without
3336
modification, are permitted provided that the following conditions are met:
3437

35-
* Redistributions of source code must retain the above copyright notice, this
36-
list of conditions and the following disclaimer.
38+
1. Redistributions of source code must retain the above copyright notice, this
39+
list of conditions and the following disclaimer.
3740

38-
* Redistributions in binary form must reproduce the above copyright notice,
39-
this list of conditions and the following disclaimer in the documentation
40-
and/or other materials provided with the distribution.
41+
2. Redistributions in binary form must reproduce the above copyright notice,
42+
this list of conditions and the following disclaimer in the documentation
43+
and/or other materials provided with the distribution.
4144

42-
* Neither the name of the copyright holder nor the names of its
43-
contributors may be used to endorse or promote products derived from
44-
this software without specific prior written permission.
45+
3. Neither the name of the copyright holder nor the names of its
46+
contributors may be used to endorse or promote products derived from
47+
this software without specific prior written permission.
4548

4649
THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
4750
AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE

spec/license_meta_spec.rb

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -26,8 +26,6 @@
2626
'afl-3.0',
2727
'agpl-3.0',
2828
'artistic-2.0',
29-
'bsd-2-clause',
30-
'bsd-3-clause',
3129
'bsd-3-clause-clear',
3230
'bsl-1.0',
3331
'cc0-1.0',

0 commit comments

Comments
 (0)