summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorintrigeri <intrigeri@boum.org>2018-01-04 07:33:02 +0000
committerintrigeri <intrigeri@boum.org>2018-01-04 07:33:02 +0000
commit7a05052f4c4f8d8e726f276484cc877cdf9fb5b7 (patch)
tree04dd61c031a6317a847aee956c6a69e38a40d331
parent78c11b68525e8e22b0378867c04aac38bb1b20e6 (diff)
Clarify copyright and licensing.
-rwxr-xr-xauto/scripts/ikiwiki-supported-languages2
-rw-r--r--config/chroot_local-includes/usr/share/doc/amnesia/README2
-rw-r--r--debian/copyright2
-rw-r--r--wiki/src/doc/about/license.mdwn5
4 files changed, 8 insertions, 3 deletions
diff --git a/auto/scripts/ikiwiki-supported-languages b/auto/scripts/ikiwiki-supported-languages
index e44e4d8..be02187 100755
--- a/auto/scripts/ikiwiki-supported-languages
+++ b/auto/scripts/ikiwiki-supported-languages
@@ -21,7 +21,7 @@ Tails developers <amnesia@boum.org>
=head1 LICENSE AND COPYRIGHT
-Copyright (C) 2011 Tails developers <amnesia@boum.org>
+Copyright (C) 2011 Tails developers <tails@boum.org>
Licensed under the GNU GPL version 3 or any later version.
diff --git a/config/chroot_local-includes/usr/share/doc/amnesia/README b/config/chroot_local-includes/usr/share/doc/amnesia/README
index df22370..c4c23d7 100644
--- a/config/chroot_local-includes/usr/share/doc/amnesia/README
+++ b/config/chroot_local-includes/usr/share/doc/amnesia/README
@@ -1,2 +1,4 @@
See the Tails website (https://tails.boum.org/), whose source lies
in the "wiki" directory of this very Git repository.
+
+For copyright and licensing information, see `debian/copyright`.
diff --git a/debian/copyright b/debian/copyright
index f2e6944..7846133 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -1,6 +1,6 @@
Copyright:
- Copyright (C) Amnesia <amnesia@boum.org>
+ Copyright (C) Tails developers <tails@boum.org>
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
diff --git a/wiki/src/doc/about/license.mdwn b/wiki/src/doc/about/license.mdwn
index 737d4be..2a00837 100644
--- a/wiki/src/doc/about/license.mdwn
+++ b/wiki/src/doc/about/license.mdwn
@@ -3,7 +3,10 @@
Tails is [Free Software](https://www.gnu.org/philosophy/free-sw.html): you can download, use, and
share it with no restrictions.
-Tails is released under the GNU/GPL (version 3 or above).
+The Tails source code is released under the GNU/GPL (version 3 or
+above) and is Copyright (C) Tails developers <tails@boum.org>.
+Any exception to this rule is documented either below or in the
+affected source file.
However, Tails includes non-free firmware in order to work on as much hardware as
possible.