Updated credits

This commit is contained in:
Klaus Basan
2017-11-22 19:40:21 +01:00
parent 162c3d07b5
commit 520d79edb5
5 changed files with 65 additions and 67 deletions

View File

@@ -3,7 +3,7 @@
<head> <head>
<meta charset="UTF-8"> <meta charset="UTF-8">
<link rel="stylesheet" type="text/css" href="style.css"> <link rel="stylesheet" type="text/css" href="style.css">
<title>Third-Party Licenses Used in swift project</title> <title>Third-Party Licenses used in swift project</title>
</head> </head>
<body> <body>
<h1>Third-Party Licenses Used in swift project</h1> <h1>Third-Party Licenses Used in swift project</h1>
@@ -434,7 +434,7 @@ https://datatracker.ietf.org/ipr/1526/
GNU LESSER GENERAL PUBLIC LICENSE GNU LESSER GENERAL PUBLIC LICENSE
Version 3, 29 June 2007 Version 3, 29 June 2007
Copyright © 2007 Free Software Foundation, Inc. <http: //fsf.org /> Copyright © 2007 Free Software Foundation, Inc. http: //fsf.org/
Everyone is permitted to copy and distribute verbatim copies of this Everyone is permitted to copy and distribute verbatim copies of this
licensedocument, but changing it is not allowed. licensedocument, but changing it is not allowed.
@@ -606,11 +606,10 @@ permanent authorization for you to choose that version for the Library.</pre>
</tr> </tr>
</table> </table>
<pre> <pre>
Copyright 2002-2008 Xiph.org Foundation Copyright 2002-2008 Xiph.org Foundation
Copyright 2002-2008 Jean-Marc Valin Copyright 2002-2008 Jean-Marc Valin
Copyright 2005-2007 Analog Devices Inc. Copyright 2005-2007 Analog Devices Inc.
Copyright 2005-2008 Commonwealth Scientific and Industrial Research Copyright 2005-2008 Commonwealth Scientific and Industrial Research Organisation (CSIRO)
Organisation (CSIRO)
Copyright 1993, 2002, 2006 David Rowe Copyright 1993, 2002, 2006 David Rowe
Copyright 2003 EpicGames Copyright 2003 EpicGames
Copyright 1992-1994 Jutta Degener, Carsten Bormann Copyright 1992-1994 Jutta Degener, Carsten Bormann
@@ -655,7 +654,6 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
</tr> </tr>
</table> </table>
<pre> <pre>
TBW
</pre> </pre>
</body> </body>
</html> </html>

View File

@@ -6,28 +6,29 @@
<title>swift about</title> <title>swift about</title>
</head> </head>
<body> <body>
<h1>About the project</h1> <h1>About the project</h1>
swift is an independent (private and non-commercial) software project creating open source software for flight simulation. swift is an independent (private and non-commercial) software project creating open source software for flight simulation.
<h1>Legal</h1> <h1>Legal</h1>
<ul> <ul>
<li>swift <a href="./software.html">software license</a> <li>swift <a href="./software.html">software license</a>
<li>swift website <a href="./impressum.html">impressum</a> <li>swift website <a href="./impressum.html">impressum</a>
<li>swift <a href="./cla.html">contributor license agreement</a> <li>swift <a href="./cla.html">contributor license agreement</a>
<li>swift <a href="./privacy.html">privacy and cookie policy</a> <li>swift <a href="./privacy.html">privacy and cookie policy</a>
<li>We use Google Analytics, see the <a href="./privacy.html">privacy and cookie policy</a> for details <li>We use Google Analytics, see the <a href="./privacy.html">privacy and cookie policy</a> for details
</ul> </ul>
<h1>Data copyright</h1> <h1>Data copyright</h1>
<ul> <ul>
<li>swift <a href="./data.html">data copyright</a> <li>swift <a href="./data.html">data copyright</a>
</ul> </ul>
<h1>Other swift resources</h1> <h1>Other swift resources</h1>
<ul> <ul>
<li>swift <a class="urlextern" href="http://swift-project.org/">Blog</a> <li>swift <a class="urlextern" href="http://swift-project.org/">Blog</a>
</ul> </ul>
<h1>Credits</h1> <h1>Credits</h1>
<ul> <ul>
<li><a href="./3rdparty.html">Third-Party licenses used in the swift project</a> <li><a href="./3rdparty.html">Third-Party licenses used in the swift project</a>
<li><a href="./credits.html">Credits and a list of software components</a>, UI elements, support provided by others. <li><a href="./credits.html">Credits and a list of software components</a>, UI elements, support provided by others.
</ul> <li><a href="./credits.html">Icon libraries</a>
</ul>
</body> </body>
</html> </html>

View File

@@ -6,40 +6,38 @@
<title>swift data copyright</title> <title>swift data copyright</title>
</head> </head>
<body> <body>
<h1>Credits</h1> <h1>Credits</h1>
<h1>Main contributors</h1> <h1>Main contributors</h1>
<ul> <ul>
<li>Roland W.</li> <li>Roland W.</li>
<li>Mathew S.</li> <li>Mathew S.</li>
<li>Klaus B.</li> <li>Klaus B.</li>
</ul> </ul>
<h1>Contributors</h1> <h1>Contributors</h1>
<ul> <ul>
<li>Peter B. (traffic simulator)</li> <li>Peter B. (traffic simulator)</li>
<li>Michal G.</li> <li>Michal G.</li>
</ul> </ul>
<h2>Used software libraries</h2> <h2>Used software libraries</h2>
<ul> <ul>
<li>See the <a href="3rdparty.html">3rd party licenses</a> <li>See the <a href="3rdparty.html">3rd party licenses</a>
</ul> </ul>
<h2>Used icons, graphics etc.</h2> <h2>Used icons, graphics etc.</h2>
<ul> <ul>
<li>FAMFAMFAM icons used, both in client and on websites, see <a target="_parent" href="http://www.famfamfam.com/archive/silk-icons-thats-your-lot/">here</a> <li>FAMFAMFAM icons used, both in client and on websites, see <a target="_parent" href="http://www.famfamfam.com/archive/silk-icons-thats-your-lot/">here</a></li>
<li>DIAGONA icons: C) 2013 Yusuke Kamiyamane (<a target="_parent" href="http://p.yusukekamiyamane.com/">site</a>). <li>DIAGONA icons: &copy; 2013 Yusuke Kamiyamane (<a target="_parent" href="http://p.yusukekamiyamane.com/">site</a>). All rights reserved. These icons are licensed under a <a target="_parent" href="http://creativecommons.org/licenses/by/3.0/">Creative
All rights reserved. These icons are licensed under a Commons Attribution 3.0 License</a>.
<a target="_parent" href="http://creativecommons.org/licenses/by/3.0/">Creative Commons Attribution 3.0 License</a>. </li>
<li>Screenshots and aviation photos courtesy of: <li>icondrawer icons: Using icons of http://www.icondrawer.com/ on web site and with client</li>
Lukas E., Timm R., Christoph J., Rainer J., Wolfgang S., <li>Screenshots and aviation photos courtesy of: Lukas E., Timm R., Christoph J., Rainer J., Wolfgang S., Wiki Commons (Creative Commons) images</li>
Wiki Commons (Creative Commons) images </ul>
</li> <h2>Misc</h2>
</ul> <ul>
<h2>Misc</h2> <li>Ben S. for X-Plane support</li>
<ul> <li>Ross C. for joint development of aircraft parts concept and vPilot rules permission</li>
<li>Ben S. for X-Plane support</li> <li>Kieran H., Kai K., Christoph N., Dominik S. for support</li>
<li>Ross C. for joint development of aircraft parts concept and vPilot rules permission</li> <li>Sascha S. for kicking off the project</li>
<li>Kieran H., Kai K., Christoph N., Dominik S. for support</li> <li>BitRock for sponsoring a free license for Open Source projects</li>
<li>Sascha S. for kicking off the project</li> </ul>
<li>BitRock for sponsoring a free license for Open Source projects</li>
</ul>
</body> </body>
</html> </html>

View File

@@ -10,6 +10,7 @@
<ul> <ul>
<li>All data stored in the database are legal property of swift. <li>All data stored in the database are legal property of swift.
<li>No unauthorized usage or copying allowed. <li>No unauthorized usage or copying allowed.
<li>Usage is only allowed within swift software components.
<li>When you ("the user") enter/upload data to this DB, swift can use them now and forever. <li>When you ("the user") enter/upload data to this DB, swift can use them now and forever.
</ul> </ul>
</body> </body>

View File

@@ -18,7 +18,7 @@
The following terms apply to all swift programs: The following terms apply to all swift programs:
<pre> <pre>
swift pilot client suite swift pilot client suite
Copyright (C) 2016 swift Team Copyright (C) 2016, 2017, 2018 swift Team
This program is free software: you can redistribute it and/or modify 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 it under the terms of the GNU General Public License as published by
@@ -38,7 +38,7 @@ and
<pre> <pre>
swift pilot client suite swift pilot client suite
Copyright (C) 2016 swift Team Copyright (C) 2016, 2017, 2018 swift Team
This program comes with ABSOLUTELY NO WARRANTY; for details see This program comes with ABSOLUTELY NO WARRANTY; for details see
see here https://datastore.swift-project.org/page/legal.php. see here https://datastore.swift-project.org/page/legal.php.