From 61c3834db54940a510918b0dcf165c8717e63a3a Mon Sep 17 00:00:00 2001 From: nodiscc Date: Sun, 24 Oct 2021 18:34:39 +0200 Subject: [PATCH] doc: fix license formatting --- LICENSE | 21 +++++++++------------ doc/md/CHANGELOG.md | 2 +- doc/md/LICENSE.md | 21 +++++++++------------ 3 files changed, 19 insertions(+), 25 deletions(-) diff --git a/LICENSE b/LICENSE index 45a4426..f62de18 100644 --- a/LICENSE +++ b/LICENSE @@ -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 -various licenses. See README/COPYING/AUTHORS/LICENSE/COPYRIGHT files in -/usr/share/doc/ on the installed system for licenses of each software package. +various licenses. See `README/COPYING/AUTHORS/LICENSE/COPYRIGHT` files in +`/usr/share/doc/` on the installed system for licenses of each software package. -------------------------------------------------------------------------------- - - +``` GNU GENERAL PUBLIC LICENSE 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 Public License instead of this License. But first, please read . +``` ------------------------------------------------------------------ - - - +``` License: CC-BY-SA-3.0 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/. ----------------------------- - -- 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+ +``` \ No newline at end of file diff --git a/doc/md/CHANGELOG.md b/doc/md/CHANGELOG.md index c4fb81d..96ee6b8 100644 --- a/doc/md/CHANGELOG.md +++ b/doc/md/CHANGELOG.md @@ -34,7 +34,7 @@ The format is based on [Keep a Changelog](http://keepachangelog.com/). ### 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 - doc: add [Software: Extras](https://debian-live-config.readthedocs.io/en/latest/packages/extras.html) page listing all third-party downloads diff --git a/doc/md/LICENSE.md b/doc/md/LICENSE.md index 45a4426..f62de18 100644 --- a/doc/md/LICENSE.md +++ b/doc/md/LICENSE.md @@ -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 -various licenses. See README/COPYING/AUTHORS/LICENSE/COPYRIGHT files in -/usr/share/doc/ on the installed system for licenses of each software package. +various licenses. See `README/COPYING/AUTHORS/LICENSE/COPYRIGHT` files in +`/usr/share/doc/` on the installed system for licenses of each software package. -------------------------------------------------------------------------------- - - +``` GNU GENERAL PUBLIC LICENSE 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 Public License instead of this License. But first, please read . +``` ------------------------------------------------------------------ - - - +``` License: CC-BY-SA-3.0 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/. ----------------------------- - -- 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+ +``` \ No newline at end of file