Adjusted the BSD copyright on the Open Source Initiative Text.

2 files changed, 55 insertions, 68 deletions

diff --git a/Copyright b/Copyright
index 3a28229..aa026a6 100644
--- a/Copyright
+++ b/Copyright
@@ -1,28 +1,24 @@
-This software is copyrighted by the Centre d'études de la Navigation
-Aérienne, Patrick Lecoanet, and other parties.  The following terms
-apply to all files associated with the software unless explicitly
-disclaimed in individual files.
+Copyright (c) 2005, Centre d'études de la Navigation Aérienne, Patrick Lecoanet
+All rights reserved.
 
-The authors hereby grant permission to use, copy, modify, distribute,
-and license this software and its documentation for any purpose, provided
-that existing copyright notices are retained in all copies and that this
-notice is included verbatim in any distributions. No written agreement,
-license, or royalty fee is required for any of the authorized uses.
-Modifications to this software may be copyrighted by their authors
-and need not follow the licensing terms described here, provided that
-the new terms are clearly indicated on the first page of each file where
-they apply.
+Redistribution and use in source and binary forms, with or without modification, are permitted
+provided that the following conditions are met:
 
-IN NO EVENT SHALL THE AUTHORS OR DISTRIBUTORS BE LIABLE TO ANY PARTY
-FOR DIRECT, INDIRECT, SPECIAL, INCIDENTAL, OR CONSEQUENTIAL DAMAGES
-ARISING OUT OF THE USE OF THIS SOFTWARE, ITS DOCUMENTATION, OR ANY
-DERIVATIVES THEREOF, EVEN IF THE AUTHORS HAVE BEEN ADVISED OF THE
-POSSIBILITY OF SUCH DAMAGE.
+    * Redistributions of source code must retain the above copyright notice, this list of
+      conditions and the following disclaimer.
+    * Redistributions in binary form must reproduce the above copyright notice, this list of
+      conditions and the following disclaimer in the documentation and/or other materials
+      provided with the distribution.
+    * Neither the name of the Centre d'études de la Navigation Aérienne nor the names of
+      its contributors may be used to endorse or promote products derived from this software
+      without specific prior written permission.
 
-THE AUTHORS AND DISTRIBUTORS SPECIFICALLY DISCLAIM ANY WARRANTIES,
-INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE, AND NON-INFRINGEMENT.  THIS SOFTWARE
-IS PROVIDED ON AN "AS IS" BASIS, AND THE AUTHORS AND DISTRIBUTORS HAVE
-NO OBLIGATION TO PROVIDE MAINTENANCE, SUPPORT, UPDATES, ENHANCEMENTS, OR
-MODIFICATIONS.
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS
+OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY
+AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR
+CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING
+IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
diff --git a/win/Copyright.rtf b/win/Copyright.rtf
index 6848bf6..8544f95 100644
--- a/win/Copyright.rtf
+++ b/win/Copyright.rtf
@@ -6,51 +6,42 @@
 \red255\green0\blue255;\red255\green0\blue0;\red255\green255\blue0;\red255\green255\blue255;\red0\green0\blue128;\red0\green128\blue128;\red0\green128\blue0;\red128\green0\blue128;\red128\green0\blue0;\red128\green128\blue0;\red128\green128\blue128;

 \red192\green192\blue192;}{\stylesheet{\ql \li0\ri0\widctlpar\aspalpha\aspnum\faauto\adjustright\rin0\lin0\itap0 \fs24\lang1036\langfe1036\cgrid\langnp1036\langfenp1036 \snext0 Normal;}{\*\cs10 \additive \ssemihidden Default Paragraph Font;}{\*

 \ts11\tsrowd\trftsWidthB3\trpaddl108\trpaddr108\trpaddfl3\trpaddft3\trpaddfb3\trpaddfr3\trcbpat1\trcfpat1\tscellwidthfts0\tsvertalt\tsbrdrt\tsbrdrl\tsbrdrb\tsbrdrr\tsbrdrdgl\tsbrdrdgr\tsbrdrh\tsbrdrv 

-\ql \li0\ri0\widctlpar\aspalpha\aspnum\faauto\adjustright\rin0\lin0\itap0 \fs20\lang1024\langfe1024\cgrid\langnp1024\langfenp1024 \snext11 \ssemihidden Normal Table;}}{\*\rsidtbl \rsid11037878}{\*\generator Microsoft Word 10.0.3416;}{\info

-{\title This software is copyrighted by the Centre d\'92\'e9tude de la Navigation}{\author Lecoanet}{\operator Lecoanet}{\creatim\yr2005\mo3\dy23\hr17\min11}{\revtim\yr2005\mo3\dy23\hr17\min11}{\version2}{\edmins5}{\nofpages1}{\nofwords336}{\nofchars1851}

-{\*\company CENA}{\nofcharsws2183}{\vern16453}}\margl1417\margr1417\margt1417\margb1417 \widowctrl\ftnbj\aenddoc\hyphhotz425\noxlattoyen\expshrtn\noultrlspc\dntblnsbdb\nospaceforul\hyphcaps0\horzdoc\dghspace120\dgvspace120\dghorigin1701\dgvorigin1984

-\dghshow0\dgvshow3\jcompress\viewkind4\viewscale100\nolnhtadjtbl\rsidroot11037878 \fet0\sectd \linex0\sectdefaultcl\sftnbj {\*\pnseclvl1\pnucrm\pnstart1\pnindent720\pnhang {\pntxta .}}{\*\pnseclvl2\pnucltr\pnstart1\pnindent720\pnhang {\pntxta .}}

-{\*\pnseclvl3\pndec\pnstart1\pnindent720\pnhang {\pntxta .}}{\*\pnseclvl4\pnlcltr\pnstart1\pnindent720\pnhang {\pntxta )}}{\*\pnseclvl5\pndec\pnstart1\pnindent720\pnhang {\pntxtb (}{\pntxta )}}{\*\pnseclvl6\pnlcltr\pnstart1\pnindent720\pnhang {\pntxtb (}

-{\pntxta )}}{\*\pnseclvl7\pnlcrm\pnstart1\pnindent720\pnhang {\pntxtb (}{\pntxta )}}{\*\pnseclvl8\pnlcltr\pnstart1\pnindent720\pnhang {\pntxtb (}{\pntxta )}}{\*\pnseclvl9\pnlcrm\pnstart1\pnindent720\pnhang {\pntxtb (}{\pntxta )}}\pard\plain 

-\ql \li0\ri0\nowidctlpar\faauto\rin0\lin0\itap0\pararsid11037878 \fs24\lang1036\langfe1036\cgrid\langnp1036\langfenp1036 {\f1\fs20\lang1033\langfe1036\langnp1033\insrsid11037878\charrsid11037878 This software is copyrighted by the }{

-\f1\fs20\lang1033\langfe1036\langnp1033\insrsid11037878 Centre d\rquote \'e9tude de la Navigation

-\par A\'e9rienne and Patrick Lecoanet. }{\f1\fs20\lang1033\langfe1036\langnp1033\insrsid11037878\charrsid11037878 The following terms apply to all files

-\par associated with the software unless explicitly disclaimed in

-\par individual files.

+\ql \li0\ri0\widctlpar\aspalpha\aspnum\faauto\adjustright\rin0\lin0\itap0 \fs20\lang1024\langfe1024\cgrid\langnp1024\langfenp1024 \snext11 \ssemihidden Normal Table;}}{\*\rsidtbl \rsid11037878\rsid11602808\rsid16008859}

+{\*\generator Microsoft Word 10.0.3416;}{\info{\title This software is copyrighted by the Centre d\'92\'e9tude de la Navigation}{\author Lecoanet}{\operator Lecoanet}{\creatim\yr2005\mo3\dy23\hr17\min11}{\revtim\yr2005\mo5\dy2\hr11\min34}{\version4}

+{\edmins8}{\nofpages1}{\nofwords244}{\nofchars1347}{\*\company CENA}{\nofcharsws1588}{\vern16453}}\margl1417\margr1417\margt1417\margb1417 

+\widowctrl\ftnbj\aenddoc\hyphhotz425\noxlattoyen\expshrtn\noultrlspc\dntblnsbdb\nospaceforul\hyphcaps0\horzdoc\dghspace120\dgvspace120\dghorigin1701\dgvorigin1984\dghshow0\dgvshow3\jcompress\viewkind4\viewscale100\nolnhtadjtbl\rsidroot11037878 \fet0

+\sectd \linex0\sectdefaultcl\sftnbj {\*\pnseclvl1\pnucrm\pnstart1\pnindent720\pnhang {\pntxta .}}{\*\pnseclvl2\pnucltr\pnstart1\pnindent720\pnhang {\pntxta .}}{\*\pnseclvl3\pndec\pnstart1\pnindent720\pnhang {\pntxta .}}{\*\pnseclvl4

+\pnlcltr\pnstart1\pnindent720\pnhang {\pntxta )}}{\*\pnseclvl5\pndec\pnstart1\pnindent720\pnhang {\pntxtb (}{\pntxta )}}{\*\pnseclvl6\pnlcltr\pnstart1\pnindent720\pnhang {\pntxtb (}{\pntxta )}}{\*\pnseclvl7\pnlcrm\pnstart1\pnindent720\pnhang {\pntxtb (}

+{\pntxta )}}{\*\pnseclvl8\pnlcltr\pnstart1\pnindent720\pnhang {\pntxtb (}{\pntxta )}}{\*\pnseclvl9\pnlcrm\pnstart1\pnindent720\pnhang {\pntxtb (}{\pntxta )}}\pard\plain \ql \li0\ri50\nowidctlpar\faauto\rin50\lin0\itap0\pararsid11602808 

+\fs24\lang1036\langfe1036\cgrid\langnp1036\langfenp1036 {\f1\fs20\insrsid16008859\charrsid16008859 Copyright (c) 2005, Centre d'\'e9tudes de la Navigation A\'e9rienne, Patrick Lecoanet

+\par }\pard \ql \li0\ri0\nowidctlpar\faauto\rin0\lin0\itap0\pararsid16008859 {\f1\fs20\lang1033\langfe1036\langnp1033\insrsid16008859\charrsid16008859 All rights reserved.

 \par 

-\par The authors hereby grant permission to use, copy, modify, distribute,

-\par and license this software and its documentation for any purpose, provided

-\par that existing copyright notices are retained in all copies and that this

-\par notice is included verbatim in any distributions. No written agreement,

-\par license, or royalty fee is required for any of the authorized uses.

-\par Modifications to this software may be copyrighted by their authors

-\par and need not follow the licensing terms described here, provided that

-\par the new terms are clearly indicated on the first page of each file where

-\par they apply.

+\par Redistribution and use in source and binary forms, with or without modification, are permitted

+\par provided that the following conditions are met:

 \par 

-\par IN NO EVENT SHALL THE AUTHORS OR DISTRIBUTORS BE LIABLE TO ANY PARTY

-\par FOR DIRECT, INDIRECT, SPECIAL, INCIDENTAL, OR CONSEQUENTIAL DAMAGES

-\par ARISING OUT OF THE USE OF THIS SOFTWARE, ITS DOCUMENTATION, OR ANY

-\par DERIVATIVES THEREOF, EVEN IF THE AUTHORS HAVE BEEN ADVISED OF THE

-\par POSSIBILITY OF SUCH DAMAGE.

+\par     * Redistributions of source code must retain the above copyright notice, this list of

+\par       conditions and the following disclaimer.

+\par     * Redistributions in binary form must reproduce the above copyright notice, this list of

+\par       conditions and the following disclaimer in the documentation and/or other materials

+\par       provided with the distribution.

+\par     * Neither the name of the Centre d'\'e9tudes de la Navigation A\'e9rienne nor the names of

+\par       its contributors may be used to endorse or promote products derived from this software

+\par       without specific prior written permission.

 \par 

-\par THE AUTHORS AND DISTRIBUTORS SPECIFICALLY DISCLAIM ANY WARRANTIES,

-\par INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY,

-\par FITNESS FOR A PARTICULAR PURPOSE, AND NON-INFRINGEMENT.  THIS SOFTWARE

-\par IS PROVIDED ON AN "AS IS" BASIS, AND THE AUTHORS AND DISTRIBUTORS HAVE

-\par NO OBLIGATION TO PROVIDE MAINTENANCE, SUPPORT, UPDATES, ENHANCEMENTS, OR

-\par MODIFICATIONS.

-\par 

-\par GOVERNMENT USE: If you are acquiring this software on behalf of the

-\par U.S. government, the Government shall have only "Restricted Rights"

-\par in the software and related documentation as defined in the Federal 

-\par Acquisition Regulations (FARs) in Clause 52.227.19 (c) (2).  If you

-\par are acquiring the software on behalf of the Department of Defense, the

-\par software shall be classified as "Commercial Computer Software" and the

-\par Government shall have only "Restricted Rights" as defined in Clause

-\par 252.227-7013 (c) (1) of DFARs.  Notwithstanding the foregoing, the

-\par authors grant the U.S. Government and others acting in its behalf

-\par permission to use and distribute the software in accordance with the

-\par }\pard \ql \li0\ri0\nowidctlpar\faauto\rin0\lin0\itap0 {\f1\fs20\lang1033\langfe1036\langnp1033\insrsid11037878\charrsid11037878 t}{\f1\fs20\lang1033\langfe1036\langnp1033\insrsid11037878 erms specified in this license.}{

-\f1\fs20\lang1033\langfe1036\langnp1033\insrsid11037878\charrsid11037878 

+\par }\pard \ql \li0\ri50\nowidctlpar\faauto\rin50\lin0\itap0\pararsid11602808 {\f1\fs20\lang1033\langfe1036\langnp1033\insrsid16008859\charrsid16008859 THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"}{

+\f1\fs20\lang1033\langfe1036\langnp1033\insrsid11602808 

+\par }{\f1\fs20\lang1033\langfe1036\langnp1033\insrsid16008859\charrsid16008859 AND ANY EXPRESS}{\f1\fs20\lang1033\langfe1036\langnp1033\insrsid11602808  }{\f1\fs20\lang1033\langfe1036\langnp1033\insrsid16008859\charrsid16008859 

+OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED}{\f1\fs20\lang1033\langfe1036\langnp1033\insrsid11602808 

+\par }{\f1\fs20\lang1033\langfe1036\langnp1033\insrsid16008859\charrsid16008859 WARRANTIES OF MERCHANTABILITY}{\f1\fs20\lang1033\langfe1036\langnp1033\insrsid11602808  }{\f1\fs20\lang1033\langfe1036\langnp1033\insrsid16008859\charrsid16008859 

+AND FITNESS FOR A PARTICULAR PURPOSE ARE}{\f1\fs20\lang1033\langfe1036\langnp1033\insrsid11602808 

+\par }{\f1\fs20\lang1033\langfe1036\langnp1033\insrsid16008859\charrsid16008859 DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR}{\f1\fs20\lang1033\langfe1036\langnp1033\insrsid11602808  CONTRIBUTORS BE LIABLE

+\par }{\f1\fs20\lang1033\langfe1036\langnp1033\insrsid16008859\charrsid16008859 FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL

+\par DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR}{\f1\fs20\lang1033\langfe1036\langnp1033\insrsid11602808 

+\par }{\f1\fs20\lang1033\langfe1036\langnp1033\insrsid16008859\charrsid16008859 SERVICES; LOSS OF USE,}{\f1\fs20\lang1033\langfe1036\langnp1033\insrsid11602808  }{\f1\fs20\lang1033\langfe1036\langnp1033\insrsid16008859\charrsid16008859 DATA, OR PROFITS; OR}{

+\f1\fs20\lang1033\langfe1036\langnp1033\insrsid11602808  BUSINESS INTERRUPTION) HOWEVER

+\par }{\f1\fs20\lang1033\langfe1036\langnp1033\insrsid16008859\charrsid16008859 CAUSED AND ON ANY THEORY OF LIABILITY,}{\f1\fs20\lang1033\langfe1036\langnp1033\insrsid11602808  }{\f1\fs20\lang1033\langfe1036\langnp1033\insrsid16008859\charrsid16008859 

+WHETHER IN}{\f1\fs20\lang1033\langfe1036\langnp1033\insrsid11602808  CONTRACT, STRICT LIABILITY, OR

+\par }{\f1\fs20\lang1033\langfe1036\langnp1033\insrsid16008859\charrsid16008859 TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING}{\f1\fs20\lang1033\langfe1036\langnp1033\insrsid11602808  }{

+\f1\fs20\lang1033\langfe1036\langnp1033\insrsid16008859\charrsid16008859 IN ANY WAY OUT OF THE USE OF}{\f1\fs20\lang1033\langfe1036\langnp1033\insrsid11602808 

+\par }{\f1\fs20\lang1033\langfe1036\langnp1033\insrsid16008859\charrsid16008859 THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.}{\f1\fs20\lang1033\langfe1036\langnp1033\insrsid16008859\charrsid16008859 

 \par }}
\ No newline at end of file