Work_Archive/ToolDisks_ISO-Main
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

doc: fix license formatting

Browse Source
This commit is contained in:
nodiscc
2021-10-24 18:34:39 +02:00
parent 0964bea097
commit 61c3834db5
3 changed files with 19 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
LICENSE
View File

@@ -1,13 +1,14 @@
dlc is under the GNU GENERAL PUBLIC LICENSE Version 3. - `*`: GNU GPL-3.0
- `config/includes.chroot/usr/share/backgrounds/futureprototype-darker-4096x2160`.svg: (c) 2018 Alex Makas, GNU GPL-3.0
- `config/includes.chroot/usr/share/backgrounds/homeworld-darker-3840x2160.png, config/bootloaders/*/splash.png`: (c) 2020 Juliette Taka, CC-BY-SA-4.0 or GNU GPL-2.0
The ISO image resulting from the build includes software packages under The ISO image resulting from the build includes software packages under
various licenses. See README/COPYING/AUTHORS/LICENSE/COPYRIGHT files in various licenses. See `README/COPYING/AUTHORS/LICENSE/COPYRIGHT` files in
/usr/share/doc/ on the installed system for licenses of each software package. `/usr/share/doc/` on the installed system for licenses of each software package.
-------------------------------------------------------------------------------- --------------------------------------------------------------------------------
```
GNU GENERAL PUBLIC LICENSE GNU GENERAL PUBLIC LICENSE
Version 3, 29 June 2007 Version 3, 29 June 2007
@@ -682,13 +683,12 @@ may consider it more useful to permit linking proprietary applications with
the library. If this is what you want to do, use the GNU Lesser General the library. If this is what you want to do, use the GNU Lesser General
Public License instead of this License. But first, please read Public License instead of this License. But first, please read
<http://www.gnu.org/philosophy/why-not-lgpl.html>. <http://www.gnu.org/philosophy/why-not-lgpl.html>.
```
------------------------------------------------------------------ ------------------------------------------------------------------
```
License: CC-BY-SA-3.0 License: CC-BY-SA-3.0
Creative Commons Attribution-ShareAlike 3.0 Unported Creative Commons Attribution-ShareAlike 3.0 Unported
. .
@@ -1066,7 +1066,4 @@ License: CC-BY-SA-3.0
. .
Creative Commons may be contacted at http://creativecommons.org/. Creative Commons may be contacted at http://creativecommons.org/.
---------------------------- ```
- config/includes.chroot/usr/share/backgrounds/futureprototype-darker-4096x2160.svg (c) 2018 Alex Makas, GPLv3
- config/includes.chroot/usr/share/backgrounds/homeworld-darker-3840x2160.png, config/bootloaders/*/splash.png (c) 2020 Juliette Taka, CC-BY-SA-4.0 or GNU GPL-2.0+

2
doc/md/CHANGELOG.md
View File

@@ -34,7 +34,7 @@ The format is based on [Keep a Changelog](http://keepachangelog.com/).
### Added ### Added
- network: add support for more IM protocols in pidgin: [OMEMO encryption](https://packages.debian.org/bullseye/purple-lurch), [discord](https://packages.debian.org/bullseye/purple-discord), [telegram](https://packages.debian.org/bullseye/telegram-purple), [https://packages.debian.org/bullseye/purple-rocketchat], XMPP [HTTP upload](https://packages.debian.org/bullseye/purple-xmpp-http-upload) and [message carbons](https://packages.debian.org/bullseye/purple-xmpp-carbons) - network: add support for more IM protocols in pidgin: [OMEMO encryption](https://packages.debian.org/bullseye/purple-lurch), [discord](https://packages.debian.org/bullseye/purple-discord), [telegram](https://packages.debian.org/bullseye/telegram-purple), (rocketchat)[https://packages.debian.org/bullseye/purple-rocketchat], XMPP [HTTP upload](https://packages.debian.org/bullseye/purple-xmpp-http-upload) and [message carbons](https://packages.debian.org/bullseye/purple-xmpp-carbons)
- graphics: add [gcolor3](https://packages.debian.org/bullseye/gcolor3) color picker - graphics: add [gcolor3](https://packages.debian.org/bullseye/gcolor3) color picker
- doc: add [Software: Extras](https://debian-live-config.readthedocs.io/en/latest/packages/extras.html) page listing all third-party downloads - doc: add [Software: Extras](https://debian-live-config.readthedocs.io/en/latest/packages/extras.html) page listing all third-party downloads

21
doc/md/LICENSE.md
View File

@@ -1,13 +1,14 @@
dlc is under the GNU GENERAL PUBLIC LICENSE Version 3. - `*`: GNU GPL-3.0
- `config/includes.chroot/usr/share/backgrounds/futureprototype-darker-4096x2160`.svg: (c) 2018 Alex Makas, GNU GPL-3.0
- `config/includes.chroot/usr/share/backgrounds/homeworld-darker-3840x2160.png, config/bootloaders/*/splash.png`: (c) 2020 Juliette Taka, CC-BY-SA-4.0 or GNU GPL-2.0
The ISO image resulting from the build includes software packages under The ISO image resulting from the build includes software packages under
various licenses. See README/COPYING/AUTHORS/LICENSE/COPYRIGHT files in various licenses. See `README/COPYING/AUTHORS/LICENSE/COPYRIGHT` files in
/usr/share/doc/ on the installed system for licenses of each software package. `/usr/share/doc/` on the installed system for licenses of each software package.
-------------------------------------------------------------------------------- --------------------------------------------------------------------------------
```
GNU GENERAL PUBLIC LICENSE GNU GENERAL PUBLIC LICENSE
Version 3, 29 June 2007 Version 3, 29 June 2007
@@ -682,13 +683,12 @@ may consider it more useful to permit linking proprietary applications with
the library. If this is what you want to do, use the GNU Lesser General the library. If this is what you want to do, use the GNU Lesser General
Public License instead of this License. But first, please read Public License instead of this License. But first, please read
<http://www.gnu.org/philosophy/why-not-lgpl.html>. <http://www.gnu.org/philosophy/why-not-lgpl.html>.
```
------------------------------------------------------------------ ------------------------------------------------------------------
```
License: CC-BY-SA-3.0 License: CC-BY-SA-3.0
Creative Commons Attribution-ShareAlike 3.0 Unported Creative Commons Attribution-ShareAlike 3.0 Unported
. .
@@ -1066,7 +1066,4 @@ License: CC-BY-SA-3.0
. .
Creative Commons may be contacted at http://creativecommons.org/. Creative Commons may be contacted at http://creativecommons.org/.
---------------------------- ```
- config/includes.chroot/usr/share/backgrounds/futureprototype-darker-4096x2160.svg (c) 2018 Alex Makas, GPLv3
- config/includes.chroot/usr/share/backgrounds/homeworld-darker-3840x2160.png, config/bootloaders/*/splash.png (c) 2020 Juliette Taka, CC-BY-SA-4.0 or GNU GPL-2.0+