Fix license formatting and update notice wording

lay295 · Aug 2, 2023 · a987102 · a987102
1 parent add6d55
commit a987102
Show file tree

Hide file tree

Showing 2 changed files with 76 additions and 38 deletions.
diff --git a/TwitchDownloaderCore/Resources/TD-License b/TwitchDownloaderCore/Resources/TD-License
@@ -1,32 +1,51 @@
-This notice MUST be included UNMODIFIED with all copies and redistributions of
-the TwitchDownloaderCLI, TwitchDownloaderCore, or TwitchDownloaderWPF libraries
-unless explicit written permission from a maintainer is given.
+Definitions
 
-TwitchDownloaderCLI, TwitchDownloaderCore, and TwitchDownloaderWPF are provided
-free of charge under the MIT license.
+  - "TwitchDownloader"
+    Any of the TwitchDownloaderCLI, TwitchDownloaderCore, and TwitchDownloaderWPF
+    libraries.
 
-A copy of the MIT license can be found below.
+  - "You" (or "Your")
+    An individual or Legal Entity exercising permissions granted by this License.
 
-----------
+Notice
 
-The MIT License
+  This notice MUST be included UNMODIFIED with all copies, modifications, and
+  redistributions of the TwitchDownloader libraries unless explicit written
+  permission from a maintainer is given.
 
-Copyright (c) 2019 lay295 and contributors
+  The TwitchDownloader libraries are provided free of charge under the MIT
+  license. As per this license, you are permitted to utilize, modify,
+  and redistribute the TwitchDownloader libraries in any form under the
+  conditions:
+   - This notice is included with any source files; and
+   - This notice is included with any compiled binaries; and
+   - The third party licenses file is updated to reflect to any modifications
+     made.
 
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
+  TwitchDownloader utilizes several third party libraries and resources provided
+  under various licenses. The full list of third party components and licenses
+  can be found in the file THIRD-PARTY-LICENSES.txt.
 
-The above copyright notice and this permission notice shall be included in all
-copies or substantial portions of the Software.
+License
 
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-SOFTWARE.
+  The MIT License
+
+  Copyright (c) 2019 lay295 and contributors
+
+  Permission is hereby granted, free of charge, to any person obtaining a copy
+  of this software and associated documentation files (the "Software"), to deal
+  in the Software without restriction, including without limitation the rights
+  to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+  copies of the Software, and to permit persons to whom the Software is
+  furnished to do so, subject to the following conditions:
+
+  The above copyright notice and this permission notice shall be included in all
+  copies or substantial portions of the Software.
+
+  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+  IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+  FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+  AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+  LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+  OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+  SOFTWARE.
diff --git a/TwitchDownloaderCore/Resources/THIRD-PARTY-LICENSES.txt b/TwitchDownloaderCore/Resources/THIRD-PARTY-LICENSES.txt
@@ -1977,29 +1977,48 @@ EXHIBIT A -Mozilla Public License.
 
 Microsoft Permissive License (Ms-PL)
 
-	This license governs use of the accompanying software. If you use the software, you accept this license. If you do not accept the license, do not use the software.
+	This license governs use of the accompanying software. If you use the software, you accept this license. If you do
+	not accept the license, do not use the software.
 
 1. Definitions
 
-	The terms reproduce, reproduction, derivative works, and distribution have the same meaning here as under U.S. copyright law.
-	A contribution is the original software, or any additions or changes to the software.
-	A contributor is any person that distributes its contribution under this license.
-	 Licensed patents are a contributors patent claims that read directly on its contribution.
+	The terms "reproduce," "reproduction," "derivative works," and "distribution" have the same meaning
+	here as under U.S. copyright law.
+	A "contribution" is the original software, or any additions or changes to the software.
+	A "contributor" is any person that distributes its contribution under this license.
+	 "Licensed patents" are a contributor's patent claims that read directly on its contribution.
 
 2. Grant of Rights
 
-	(A) Copyright Grant- Subject to the terms of this license, including the license conditions and limitations in section 3, each contributor grants you a non-exclusive, worldwide, royalty-free copyright license to reproduce its contribution, prepare derivative works of its contribution, and distribute its contribution or any derivative works that you create.
-	(B) Patent Grant- Subject to the terms of this license, including the license conditions and limitations in section 3, each contributor grants you a non-exclusive, worldwide, royalty-free license under its licensed patents to make, have made, use, sell, offer for sale, import, and/or otherwise dispose of its contribution in the software or derivative works of the contribution in the software.
+	(A) Copyright Grant- Subject to the terms of this license, including the license conditions and limitations in
+	    section 3, each contributor grants you a non-exclusive, worldwide, royalty-free copyright license to reproduce
+	    its contribution, prepare derivative works of its contribution, and distribute its contribution or any
+	    derivative works that you create.
+	(B) Patent Grant- Subject to the terms of this license, including the license conditions and limitations in section
+	    3, each contributor grants you a non-exclusive, worldwide, royalty-free license under its licensed patents to
+	    make, have made, use, sell, offer for sale, import, and/or otherwise dispose of its contribution in the software
+	    or derivative works of the contribution in the software.
 
 3. Conditions and Limitations
 
-	(A) No Trademark License- This license does not grant you rights to use any contributors name, logo, or trademarks.
-	(B) If you bring a patent claim against any contributor over patents that you claim are infringed by the software, your patent license from such contributor to the software ends automatically.
-	(C) If you distribute any portion of the software, you must retain all copyright, patent, trademark, and attribution notices that are present in the software.
-	(D) If you distribute any portion of the software in source code form, you may do so only under this license by including a complete copy of this license with your distribution. If you distribute any portion of the software in compiled or object code form, you may only do so under a license that complies with this license.
-	(E) The software is licensed as-is. You bear the risk of using it. The contributors give no express warranties, guarantees or conditions. You may have additional consumer rights under your local laws which this license cannot change. To the extent permitted under your local laws, the contributors exclude the implied warranties of merchantability, fitness for a particular purpose and non-infringement.
-	(F) If you distribute the software or derivative works with programs you develop, you agree to indemnify, defend, and hold harmless all contributors from any claims, including attorneys fees, related to the distribution or use of your programs.  For clarity, you have no such obligations to a contributor for any claims based solely on the unmodified contributions of that contributor.
-	(G) If you make any additions or changes to the original software, you may only distribute them under a new namespace.  In addition, you will clearly identify your changes or additions as your own.
+	(A) No Trademark License- This license does not grant you rights to use any contributors' name, logo, or trademarks.
+	(B) If you bring a patent claim against any contributor over patents that you claim are infringed by the software,
+	    your patent license from such contributor to the software ends automatically.
+	(C) If you distribute any portion of the software, you must retain all copyright, patent, trademark, and attribution
+	    notices that are present in the software.
+	(D) If you distribute any portion of the software in source code form, you may do so only under this license by
+	    including a complete copy of this license with your distribution. If you distribute any portion of the software
+	    in compiled or object code form, you may only do so under a license that complies with this license.
+	(E) The software is licensed "as-is." You bear the risk of using it. The contributors give no express warranties,
+	    guarantees or conditions. You may have additional consumer rights under your local laws which this license
+	    cannot change. To the extent permitted under your local laws, the contributors exclude the implied warranties of
+	    merchantability, fitness for a particular purpose and non-infringement.
+	(F) If you distribute the software or derivative works with programs you develop, you agree to indemnify, defend,
+	    and hold harmless all contributors from any claims, including attorneys' fees, related to the distribution or
+	    use of your programs.  For clarity, you have no such obligations to a contributor for any claims based solely on
+	    the unmodified contributions of that contributor.
+	(G) If you make any additions or changes to the original software, you may only distribute them under a new
+	    namespace.  In addition, you will clearly identify your changes or additions as your own.
 
 ### Infozip BSD