mirror of https://github.com/aredn/aredn.git
Merge pull request #373 from ab7pa/update-about
correct registered service mark and copyright symbols
This commit is contained in:
commit
f6cfb1ebdc
|
@ -1,7 +1,7 @@
|
|||
<!DOCTYPE html PUBLIC "-//W3C//DTD H™L 4.01 Transitional//EN">
|
||||
<html>
|
||||
<head>
|
||||
<title>AREDN™ information</title>
|
||||
<title>AREDN® information</title>
|
||||
<meta http-equiv='expires' content='0'>
|
||||
<meta http-equiv='cache-control' content='no-cache'>
|
||||
<meta http-equiv='pragma' content='no-cache'>
|
||||
|
@ -9,69 +9,54 @@
|
|||
</head>
|
||||
<body>
|
||||
|
||||
<img style="background:rgb(231,231,231)" src="/AREDN.png"></img>
|
||||
|
||||
<img src="/AREDN.png"></img>
|
||||
|
||||
<hr>
|
||||
|
||||
</br>
|
||||
Part of AREDN -- Used for creating Amateur Radio Emergency Data Networks</br>
|
||||
Copyright (C) 2015 Conrad Lara</br>
|
||||
See Contributors file for additional contributors</br>
|
||||
<br>Copyright © 2015 Conrad Lara</br>
|
||||
See CONTRIBUTORS file for additional contributors.</br>
|
||||
</br>
|
||||
Copyright (c) 2013 David Rivenburg et al. BroadBand-HamNet</br>
|
||||
</br>
|
||||
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
|
||||
the Free Software Foundation version 3 of the License</br>
|
||||
</br>
|
||||
This program is distributed in the hope that it will be useful,
|
||||
but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||
GNU General Public License for more details.</br>
|
||||
</br>
|
||||
You should have received a copy of the GNU General Public License
|
||||
along with this program. If not, see <a href="http://www.gnu.org/licenses/">http://www.gnu.org/licenses/</a>.</br>
|
||||
</br>
|
||||
</br>
|
||||
Additional Terms:</br>
|
||||
</br>
|
||||
Additional use restrictions exist on the AREDN™ trademark and logo.</br>
|
||||
See AREDNLicense.txt for more info.</br>
|
||||
</br>
|
||||
Attributions to the AREDN Project must be retained in the source code.
|
||||
If importing this code into a new or existing project attribution
|
||||
to the AREDN project must be added to the source code.</br>
|
||||
</br>
|
||||
You must not misrepresent the origin of the material contained within.</br>
|
||||
</br>
|
||||
Modified versions must be modified to attribute to the original source
|
||||
and be marked in reasonable ways as differentiate it from the original
|
||||
version.</br>
|
||||
</br>
|
||||
AREDN™ Terms:</br>
|
||||
In accordance with the permissions granted under section 7(e) of the GPLv3 License: </br>
|
||||
</br>
|
||||
The AREDN™ trademark and AREDN™ logo and for use in official Amateur Radio Emergency Data Network (AREDN™) sanctioned builds. </br>
|
||||
</br>
|
||||
Permission is not granted to use the AREDN™ marks for any build that has been modified from official source channels.</br>
|
||||
</br>
|
||||
The AREDN™ trademark and AREDN™ logo are property of Amateur Radio Emergency Data Network, Inc. and are used with Permission. </br>
|
||||
</br>
|
||||
--- End Additional terms --- </br>
|
||||
Permission of Amateur Radio Emergency Data Network, Inc. listed below</br>
|
||||
</br>
|
||||
Amateur Radio Emergency Data Network, Inc. grants a license to use the AREDN™ trademark in
|
||||
officially sanctioned AREDN™ software releases and promotional material
|
||||
including, but not limited to, the arednmesh.org website.
|
||||
Where questions arise as to the licensed use or the validity of an AREDN™
|
||||
software release, the decision of Amateur Radio Emergency Data Network, Inc. shall be binding.
|
||||
Upon receipt of a demand all use shall cease within 30 days. This license
|
||||
may be terminated for breach of this condition. This grant is made without
|
||||
royalty from the licensee and runs for an indefinite term.
|
||||
Copyright © 2013 David Rivenburg et al. BroadBand-HamNet</br>
|
||||
|
||||
/s/ Randolph Smith, President, Amateur Radio Emergency Data Network, Inc.</br>
|
||||
</br>
|
||||
</br>
|
||||
<p>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
|
||||
the Free Software Foundation version 3 of the License. This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. You should have received a copy of the GNU General Public License along with this program. If not, see <a href="http://www.gnu.org/licenses/">http://www.gnu.org/licenses/</a>.</p>
|
||||
|
||||
<h4>Additional Terms:</h4>
|
||||
<ul>
|
||||
<li>Additional use restrictions exist on the AREDN® trademark and logo. See AREDNLicense.txt for more info.</li>
|
||||
<li>Attributions to the AREDN® Project must be retained in the source code.
|
||||
If importing this code into a new or existing project, attribution
|
||||
to the AREDN® project must be added to the source code.</li>
|
||||
<li>You must not misrepresent the origin of the material contained within.</li>
|
||||
<li>Modified versions must be modified to attribute to the original source
|
||||
and be marked in reasonable ways to differentiate it from the original
|
||||
version.</li>
|
||||
</ul>
|
||||
|
||||
<h4>AREDN® Terms:</h4>
|
||||
<p>In accordance with the permissions granted under section 7(e) of the GPLv3 License:
|
||||
<ul>
|
||||
<li>The AREDN® trademark and AREDN® logo are for use in official Amateur Radio Emergency Data Network (AREDN®) sanctioned builds. </li>
|
||||
<li>Permission is not granted to use the AREDN® marks for any build that has been modified from official source channels.</li>
|
||||
<li>The AREDN® trademark and AREDN® logo are property of Amateur Radio Emergency Data Network, Inc. and are used with permission. </li>
|
||||
</ul>
|
||||
--- End Additional terms --- </p>
|
||||
|
||||
<p>Permission of Amateur Radio Emergency Data Network, Inc. listed below:</p>
|
||||
<code>Amateur Radio Emergency Data Network, Inc. grants a license to use the AREDN® trademark in
|
||||
officially sanctioned AREDN® software releases and promotional material
|
||||
including, but not limited to, the arednmesh.org website.
|
||||
Where questions arise as to the licensed use or the validity of an AREDN®
|
||||
software release, the decision of Amateur Radio Emergency Data Network, Inc. shall be binding.
|
||||
Upon receipt of a demand, all use shall cease within 30 days. This license
|
||||
may be terminated for breach of this condition. This grant is made without
|
||||
royalty from the licensee and runs for an indefinite term.
|
||||
|
||||
/s/ Randolph Smith, President, Amateur Radio Emergency Data Network, Inc.</code>
|
||||
<p></p>
|
||||
</div>
|
||||
</body>
|
||||
</html>
|
||||
|
|
Loading…
Reference in New Issue