summaryrefslogtreecommitdiffstats
path: root/wiki/src/doc/about/license.mdwn
diff options
context:
space:
mode:
Diffstat (limited to 'wiki/src/doc/about/license.mdwn')
-rw-r--r--wiki/src/doc/about/license.mdwn117
1 files changed, 70 insertions, 47 deletions
diff --git a/wiki/src/doc/about/license.mdwn b/wiki/src/doc/about/license.mdwn
index dcee1f1..8bc68e3 100644
--- a/wiki/src/doc/about/license.mdwn
+++ b/wiki/src/doc/about/license.mdwn
@@ -30,50 +30,73 @@ Website
This website uses several images with distinct copyright, licenses, trademarks
and distribution terms:
- - The Tails logo is based on [[USB|http://thenounproject.com/term/usb/23873/]]
- by Ilsur Aptukov from the Noun Project.
- - Debian logo: Copyright (c) 1999 Software in the Public Interest.
- - Onion logo: registered trademark of The Tor Project, Inc.; the Tails
-project is authorized to use it under certain conditions; licensed under
-Creative Commons Attribution 3.0 United States License.
- - Icons from [[The Noun Project|http://thenounproject.com/]]:
- - [[Announcement|http://thenounproject.com/term/announcement/1186/]]:
- Creative Commons - Attribution, by Olivier Guin.
- - [[Code|http://thenounproject.com/term/code/18033/]]:
- Creative Commons — Attribution, by Azis.
- - [[Pen|http://thenounproject.com/term/pen/18907/]]:
- Creative Commons — Attribution, by factor[e] design initiative.
- - [[Loan|http://thenounproject.com/term/loan/19538/]]:
- Public Domain, by Rohith M S.
- - [[User|http://thenounproject.com/term/user/419/]]:
- Creative Commons — Attribution, by Edward Boatman.
- - [[Translation|http://thenounproject.com/term/translation/5735/]]:
- Creative Commons — Attribution, by Joe Mortell.
- - [[Gears|http://thenounproject.com/term/gears/8949/]]:
- Creative Commons — Attribution, by Cris Dobbins.
- - [[Graphic Design|http://thenounproject.com/term/graphic_design/9198/]]:
- Creative Commons — Attribution, by Cornelius Danger.
- - [[Check Mark|https://thenounproject.com/term/check/4489/]]:
- Public Domain, by Julian Norton.
- - [[Delete|https://thenounproject.com/term/delete/49691/]]:
- Creative Commons — Attribution, by Kervin Markle.
- - [[Play|https://thenounproject.com/term/play/152052]]:
- Creative Commons — Attribution, by Zech Nelson.
- - [[Pause|https://thenounproject.com/term/pause/152046]]:
- Creative Commons — Attribution, by Zech Nelson.
- - [[USB|https://thenounproject.com/term/usb/28901]]:
- Creative Commons — Attribution, by Wilson Joseph.
- - [[Time|https://thenounproject.com/term/time/6732]]:
- Creative Commons — Attribution, by Richard de Vos.
- - [[Printer|https://thenounproject.com/term/printer/146674]]:
- Creative Commons — Attribution, by Diego Naive.
- - [[Smart Phones|https://thenounproject.com/term/smartphone/25790]]:
- Creative Commons — Attribution, by Pham Thi Dieu Linh.
- - [[Laptop|https://thenounproject.com/term/laptop/6729]]:
- Public Domain, by Jean Yashu.
- - [[Love|https://thenounproject.com/term/love/218846/]]:
- Creative Commons — Attribution, by Thomas Helbig.
- - [[Survey|https://thenounproject.com/term/survey/1296072]]:
- Creative Commons — Attribution, by unlimicon.
- - [[Info|https://thenounproject.com/term/info/808461]]:
- Creative Commons — Attribution, by icongeek]].
+- The Tails logo is based on [[USB|http://thenounproject.com/term/usb/23873/]]
+ by Ilsur Aptukov from the Noun Project.
+
+- Debian logo: Copyright (c) 1999 Software in the Public Interest.
+
+- Onion logo: registered trademark of The Tor Project, Inc.; the Tails
+ project is authorized to use it under certain conditions; licensed under
+ Creative Commons Attribution 3.0 United States License.
+
+- Icons from [[The Noun Project|http://thenounproject.com/]]:
+
+ - [[Announcement|http://thenounproject.com/term/announcement/1186/]]:
+ Creative Commons - Attribution, by Olivier Guin.
+
+ - [[Code|http://thenounproject.com/term/code/18033/]]:
+ Creative Commons — Attribution, by Azis.
+
+ - [[Pen|http://thenounproject.com/term/pen/18907/]]:
+ Creative Commons — Attribution, by factor[e] design initiative.
+
+ - [[Loan|http://thenounproject.com/term/loan/19538/]]:
+ Public Domain, by Rohith M S.
+
+ - [[User|http://thenounproject.com/term/user/419/]]:
+ Creative Commons — Attribution, by Edward Boatman.
+
+ - [[Translation|http://thenounproject.com/term/translation/5735/]]:
+ Creative Commons — Attribution, by Joe Mortell.
+
+ - [[Gears|http://thenounproject.com/term/gears/8949/]]:
+ Creative Commons — Attribution, by Cris Dobbins.
+
+ - [[Graphic Design|http://thenounproject.com/term/graphic_design/9198/]]:
+ Creative Commons — Attribution, by Cornelius Danger.
+
+ - [[Check Mark|https://thenounproject.com/term/check/4489/]]:
+ Public Domain, by Julian Norton.
+
+ - [[Delete|https://thenounproject.com/term/delete/49691/]]:
+ Creative Commons — Attribution, by Kervin Markle.
+
+ - [[Play|https://thenounproject.com/term/play/152052]]:
+ Creative Commons — Attribution, by Zech Nelson.
+
+ - [[Pause|https://thenounproject.com/term/pause/152046]]:
+ Creative Commons — Attribution, by Zech Nelson.
+
+ - [[USB|https://thenounproject.com/term/usb/28901]]:
+ Creative Commons — Attribution, by Wilson Joseph.
+
+ - [[Time|https://thenounproject.com/term/time/6732]]:
+ Creative Commons — Attribution, by Richard de Vos.
+
+ - [[Printer|https://thenounproject.com/term/printer/146674]]:
+ Creative Commons — Attribution, by Diego Naive.
+
+ - [[Smart Phones|https://thenounproject.com/term/smartphone/25790]]:
+ Creative Commons — Attribution, by Pham Thi Dieu Linh.
+
+ - [[Laptop|https://thenounproject.com/term/laptop/6729]]:
+ Public Domain, by Jean Yashu.
+
+ - [[Love|https://thenounproject.com/term/love/218846/]]:
+ Creative Commons — Attribution, by Thomas Helbig.
+
+ - [[Survey|https://thenounproject.com/term/survey/1296072]]:
+ Creative Commons — Attribution, by unlimicon.
+
+ - [[Info|https://thenounproject.com/term/info/808461]]:
+ Creative Commons — Attribution, by icongeek]].