summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorintrigeri <intrigeri@boum.org>2016-07-13 16:02:43 +0000
committerintrigeri <intrigeri@boum.org>2016-07-13 16:02:43 +0000
commita9a9dc07d85d414d7de46af5c4b48018bc9aa680 (patch)
tree9e588195226a2779d0a2cea29ce851ee8402fa13
parent5ff7e75619c1207b05c311cd49d9302da9178582 (diff)
parentc80ff1c864158826afec53a2fbccb5daa4b8ae69 (diff)
Merge remote-tracking branch 'origin/doc/6311-source-packages' into doc/6311-source-packages
-rw-r--r--wiki/src/doc/about.index.mdwn2
-rw-r--r--wiki/src/doc/about/license.mdwn28
2 files changed, 15 insertions, 15 deletions
diff --git a/wiki/src/doc/about.index.mdwn b/wiki/src/doc/about.index.mdwn
index ea49a92..39045c6 100644
--- a/wiki/src/doc/about.index.mdwn
+++ b/wiki/src/doc/about.index.mdwn
@@ -4,6 +4,6 @@
- [[!traillink Why_does_Tails_use_Tor?|about/tor]]
- [[!traillink Can_I_hide_the_fact_that_I_am_using_Tails?|about/fingerprint]]
- [[!traillink Trusting_Tails|about/trust]]
- - [[!traillink License|about/license]]
+ - [[!traillink License_and_source_code_distribution|about/license]]
- [[!traillink Acknowledgments_and_similar_projects|about/acknowledgments_and_similar_projects]]
- [[!traillink Finances|about/finances]]
diff --git a/wiki/src/doc/about/license.mdwn b/wiki/src/doc/about/license.mdwn
index bbc60ee..093b326 100644
--- a/wiki/src/doc/about/license.mdwn
+++ b/wiki/src/doc/about/license.mdwn
@@ -1,4 +1,4 @@
-[[!meta title="License"]]
+[[!meta title="License and source code distribution"]]
Tails is [Free Software](https://www.gnu.org/philosophy/free-sw.html): you can download, use, and
share it with no restrictions.
@@ -8,6 +8,19 @@ Tails is released under the GNU/GPL (version 3 or above).
However, Tails includes non-free firmware in order to work on as much hardware as
possible.
+Source code
+===========
+
+Most of the software included in Tails is taken directly from upstream
+Debian packages and is neither modified nor recompiled by Tails.
+
+- The source code of software that is specific to Tails is available in
+ [[our Git repositories|contribute/git]].
+
+- The source code of the Debian packages included in Tails is available
+ in the [APT snapshot](http://tagged.snapshots.deb.tails.boum.org/)
+ that we created for that version of Tails.
+
Website
=======
@@ -46,16 +59,3 @@ Creative Commons Attribution 3.0 United States License.
- [[Pause|https://thenounproject.com/term/pause/152046]]:
Creative Commons — Attribution, by Zech Nelson.
-Distribution of the source code
-===============================
-
-Most of the software distributed with Tails is taken directly from
-upstream Debian packages, and is not modified or recompiled by
-Tails. Software that is specific to Tails is available
-in [[our Git repositories|/contribute/git]].
-
-If you require or desire the sources for the Debian packages shipped
-in some version of Tails, retrieve them directly from Debian, or from
-the [[APT snapshot|contribute/APT_repository/tagged_snapshots]] we
-created for that version, e.g.
-<http://tagged.snapshots.deb.tails.boum.org/2.4/>.