From 885b04663629623bb87a9d35ad47cb0ed4de739b Mon Sep 17 00:00:00 2001 From: Steve Lewis AB7PA Date: Wed, 25 May 2022 10:05:35 -0700 Subject: [PATCH] correct registered service mark and minor format changes --- files/www/about.html | 101 ++++++++++++++++++------------------------- 1 file changed, 43 insertions(+), 58 deletions(-) diff --git a/files/www/about.html b/files/www/about.html index 606101aa..d143955b 100644 --- a/files/www/about.html +++ b/files/www/about.html @@ -1,7 +1,7 @@ -AREDN™ information +AREDN® information @@ -9,69 +9,54 @@ - - + +

Part of AREDN -- Used for creating Amateur Radio Emergency Data Networks
-Copyright (C) 2015 Conrad Lara
- See Contributors file for additional contributors
+
Copyright © 2015 Conrad Lara
+See CONTRIBUTORS file for additional contributors.

-Copyright (c) 2013 David Rivenburg et al. BroadBand-HamNet
-
-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 http://www.gnu.org/licenses/.
-
-
-Additional Terms:
-
-Additional use restrictions exist on the AREDN™ trademark and logo.
- See AREDNLicense.txt for more info.
-
-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.
-
-You must not misrepresent the origin of the material contained within.
-
-Modified versions must be modified to attribute to the original source -and be marked in reasonable ways as differentiate it from the original -version.
-
-AREDN™ Terms:
-In accordance with the permissions granted under section 7(e) of the GPLv3 License:
-
-The AREDN™ trademark and AREDN™ logo and for use in official Amateur Radio Emergency Data Network (AREDN™) sanctioned builds.
-
-Permission is not granted to use the AREDN™ marks for any build that has been modified from official source channels.
-
-The AREDN™ trademark and AREDN™ logo are property of Amateur Radio Emergency Data Network, Inc. and are used with Permission.
-
---- End Additional terms ---
-Permission of Amateur Radio Emergency Data Network, Inc. listed below
-
-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
-/s/ Randolph Smith, President, Amateur Radio Emergency Data Network, Inc.
-
-
+

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 http://www.gnu.org/licenses/.

+ +

Additional Terms:

+ + +

AREDN® Terms:

+

In accordance with the permissions granted under section 7(e) of the GPLv3 License: +

+--- End Additional terms ---

+ +

Permission of Amateur Radio Emergency Data Network, Inc. listed below:

+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. +