Skip to content

Commit 62548db

Browse files
microdev1microdev1
committed
update formatting of LICENSE and clean-up
1 parent 4b065c4 commit 62548db

File tree

4 files changed

+99
-79
lines changed

4 files changed

+99
-79
lines changed

Diff for: ‎LICENSE

+6-70
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
The MIT License (MIT)
1+
MIT License
22

3-
Copyright (c) 2013-2022 Damien P. George
3+
Copyright (c) 2013-2022 Damien P. George and others
44

55
Permission is hereby granted, free of charge, to any person obtaining a copy
66
of this software and associated documentation files (the "Software"), to deal
@@ -9,77 +9,13 @@ to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
99
copies of the Software, and to permit persons to whom the Software is
1010
furnished to do so, subject to the following conditions:
1111

12-
The above copyright notice and this permission notice shall be included in
13-
all copies or substantial portions of the Software.
12+
The above copyright notice and this permission notice shall be included in all
13+
copies or substantial portions of the Software.
1414

1515
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
1616
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
1717
FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
1818
AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
1919
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
20-
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
21-
THE SOFTWARE.
22-
23-
--------------------------------------------------------------------------------
24-
25-
Unless specified otherwise (see below), the above license and copyright applies
26-
to all files in this repository.
27-
28-
Individual files may include additional copyright holders.
29-
30-
The various ports of MicroPython may include third-party software that is
31-
licensed under different terms. These licenses are summarised in the tree
32-
below, please refer to these files and directories for further license and
33-
copyright information. Note that (L)GPL-licensed code listed below is only
34-
used during the build process and is not part of the compiled source code.
35-
36-
/ (MIT)
37-
/drivers
38-
/cc3000 (BSD-3-clause)
39-
/cc3100 (BSD-3-clause)
40-
/wiznet5k (BSD-3-clause)
41-
/lib
42-
/asf4 (Apache-2.0)
43-
/axtls (BSD-3-clause)
44-
/config
45-
/scripts
46-
/config (GPL-2.0-or-later)
47-
/Rules.mak (GPL-2.0)
48-
/berkeley-db-1xx (BSD-4-clause)
49-
/btstack (See btstack/LICENSE)
50-
/cmsis (BSD-3-clause)
51-
/crypto-algorithms (NONE)
52-
/libhydrogen (ISC)
53-
/littlefs (BSD-3-clause)
54-
/lwip (BSD-3-clause)
55-
/mynewt-nimble (Apache-2.0)
56-
/nrfx (BSD-3-clause)
57-
/nxp_driver (BSD-3-Clause)
58-
/oofatfs (BSD-1-clause)
59-
/pico-sdk (BSD-3-clause)
60-
/re15 (BSD-3-clause)
61-
/stm32lib (BSD-3-clause)
62-
/tinytest (BSD-3-clause)
63-
/tinyusb (MIT)
64-
/uzlib (Zlib)
65-
/logo (uses OFL-1.1)
66-
/ports
67-
/cc3200
68-
/hal (BSD-3-clause)
69-
/simplelink (BSD-3-clause)
70-
/FreeRTOS (GPL-2.0 with FreeRTOS exception)
71-
/stm32
72-
/usbd*.c (MCD-ST Liberty SW License Agreement V2)
73-
/stm32_it.* (MIT + BSD-3-clause)
74-
/system_stm32*.c (MIT + BSD-3-clause)
75-
/boards
76-
/startup_stm32*.s (BSD-3-clause)
77-
/*/stm32*.h (BSD-3-clause)
78-
/usbdev (MCD-ST Liberty SW License Agreement V2)
79-
/usbhost (MCD-ST Liberty SW License Agreement V2)
80-
/teensy
81-
/core (PJRC.COM)
82-
/zephyr
83-
/src (Apache-2.0)
84-
/tools
85-
/dfu.py (LGPL-3.0-only)
20+
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
21+
SOFTWARE.

Diff for: ‎LICENSE_MicroPython

+85
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,85 @@
1+
The MIT License (MIT)
2+
3+
Copyright (c) 2013-2022 Damien P. George
4+
5+
Permission is hereby granted, free of charge, to any person obtaining a copy
6+
of this software and associated documentation files (the "Software"), to deal
7+
in the Software without restriction, including without limitation the rights
8+
to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
9+
copies of the Software, and to permit persons to whom the Software is
10+
furnished to do so, subject to the following conditions:
11+
12+
The above copyright notice and this permission notice shall be included in
13+
all copies or substantial portions of the Software.
14+
15+
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
16+
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
17+
FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
18+
AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
19+
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
20+
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
21+
THE SOFTWARE.
22+
23+
--------------------------------------------------------------------------------
24+
25+
Unless specified otherwise (see below), the above license and copyright applies
26+
to all files in this repository.
27+
28+
Individual files may include additional copyright holders.
29+
30+
The various ports of MicroPython may include third-party software that is
31+
licensed under different terms. These licenses are summarised in the tree
32+
below, please refer to these files and directories for further license and
33+
copyright information. Note that (L)GPL-licensed code listed below is only
34+
used during the build process and is not part of the compiled source code.
35+
36+
/ (MIT)
37+
/drivers
38+
/cc3000 (BSD-3-clause)
39+
/cc3100 (BSD-3-clause)
40+
/wiznet5k (BSD-3-clause)
41+
/lib
42+
/asf4 (Apache-2.0)
43+
/axtls (BSD-3-clause)
44+
/config
45+
/scripts
46+
/config (GPL-2.0-or-later)
47+
/Rules.mak (GPL-2.0)
48+
/berkeley-db-1xx (BSD-4-clause)
49+
/btstack (See btstack/LICENSE)
50+
/cmsis (BSD-3-clause)
51+
/crypto-algorithms (NONE)
52+
/libhydrogen (ISC)
53+
/littlefs (BSD-3-clause)
54+
/lwip (BSD-3-clause)
55+
/mynewt-nimble (Apache-2.0)
56+
/nrfx (BSD-3-clause)
57+
/nxp_driver (BSD-3-Clause)
58+
/oofatfs (BSD-1-clause)
59+
/pico-sdk (BSD-3-clause)
60+
/re15 (BSD-3-clause)
61+
/stm32lib (BSD-3-clause)
62+
/tinytest (BSD-3-clause)
63+
/tinyusb (MIT)
64+
/uzlib (Zlib)
65+
/logo (uses OFL-1.1)
66+
/ports
67+
/cc3200
68+
/hal (BSD-3-clause)
69+
/simplelink (BSD-3-clause)
70+
/FreeRTOS (GPL-2.0 with FreeRTOS exception)
71+
/stm32
72+
/usbd*.c (MCD-ST Liberty SW License Agreement V2)
73+
/stm32_it.* (MIT + BSD-3-clause)
74+
/system_stm32*.c (MIT + BSD-3-clause)
75+
/boards
76+
/startup_stm32*.s (BSD-3-clause)
77+
/*/stm32*.h (BSD-3-clause)
78+
/usbdev (MCD-ST Liberty SW License Agreement V2)
79+
/usbhost (MCD-ST Liberty SW License Agreement V2)
80+
/teensy
81+
/core (PJRC.COM)
82+
/zephyr
83+
/src (Apache-2.0)
84+
/tools
85+
/dfu.py (LGPL-3.0-only)

Diff for: ‎license.rst renamed to ‎docs/LICENSE.md

+7-8
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,8 @@
1-
MicroPython & CircuitPython license information
2-
===============================================
1+
# MicroPython & CircuitPython License
32

4-
The MIT License (MIT)
3+
MIT License
54

6-
Copyright (c) 2013-2017 Damien P. George, and others
5+
Copyright (c) 2013-2022 Damien P. George and others
76

87
Permission is hereby granted, free of charge, to any person obtaining a copy
98
of this software and associated documentation files (the "Software"), to deal
@@ -12,13 +11,13 @@ to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
1211
copies of the Software, and to permit persons to whom the Software is
1312
furnished to do so, subject to the following conditions:
1413

15-
The above copyright notice and this permission notice shall be included in
16-
all copies or substantial portions of the Software.
14+
The above copyright notice and this permission notice shall be included in all
15+
copies or substantial portions of the Software.
1716

1817
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
1918
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
2019
FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
2120
AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
2221
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
23-
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
24-
THE SOFTWARE.
22+
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
23+
SOFTWARE.

Diff for: ‎docs/index.rst

+1-1
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@ Full Table of Contents
4848
../CONTRIBUTING
4949
../BUILDING
5050
../CODE_OF_CONDUCT
51-
../license.rst
51+
../docs/LICENSE
5252
../WEBUSB_README
5353

5454
Indices and tables

0 commit comments

Comments
 (0)