diff --git a/appendices/mit-glfs.xml b/appendices/mit-glfs.xml deleted file mode 100644 index 39a026bd3c..0000000000 --- a/appendices/mit-glfs.xml +++ /dev/null @@ -1,45 +0,0 @@ - - - %general-entities; -]> - - - - - - $Date$ - - - The MIT License - - - Copyright © ©rightdate; ©holder; - - - - 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/appendices/mit-lic.xml b/appendices/mit-lic.xml index 0d9ee00dd5..d9aacd7632 100644 --- a/appendices/mit-lic.xml +++ b/appendices/mit-lic.xml @@ -15,7 +15,35 @@ The MIT License - Copyright © ©rightdate; BLFS Development Team; + Copyright © 1999-2024 The BLFS Development Team + + + + 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. + + + + Copyright © ©rightdate; ©holder; diff --git a/index.xml b/index.xml index 232a55b763..e70eae9b8e 100644 --- a/index.xml +++ b/index.xml @@ -24,7 +24,6 @@ $Date$ - diff --git a/introduction/welcome/changelog.xml b/introduction/welcome/changelog.xml index bc18e66e4f..4291be8fb5 100644 --- a/introduction/welcome/changelog.xml +++ b/introduction/welcome/changelog.xml @@ -42,6 +42,9 @@ July 28th, 2024 + + [Zeckmathederg] - Combined the two MIT licenses. + [Zeckmathederg] - Rust: Fix a few installation issues.