Made some updates suggested by Richard Stallman of the Free

          Software Foundation (http://www.fsf.org/).

1 files changed, 80 insertions, 73 deletions

diff --git a/COPYING b/COPYING
index b99ab24bac4..f0b051a2b30 100644
--- a/COPYING
+++ b/COPYING
@@ -1,68 +1,72 @@
-Copyright and Licensing Information for ACE(TM) and TAO(TM)
 
-[1]ACE(TM) and [2]TAO(TM) are copyrighted by [3]Douglas C. Schmidt and
-his [4]research group at [5]Washington University, Copyright (c)
-1993-1999, all rights reserved. Since ACE and TAO are freely
-available, [6]open source software, you are free to do anything you
-like with the ACE and TAO source code and object code produced from
-the source, as long as you include this copyright statement along with
-code built using ACE and TAO.
-
-In particular, you can use ACE and TAO in commercial software and are
-under no obligation to redistribute any of your source code that is
-built using ACE and TAO. Please note, however, that you may not do
-anything to the ACE and TAO code, such as copyrighting it yourself or
-claiming authorship of the ACE and TAO code, that will prevent it from
-being distributed freely using an open source development model.
-
-ACE and TAO are provided as is with no warranties of any kind,
-including the warranties of design, merchantibility and fitness for a
-particular purpose, noninfringement, or arising from a course of
-dealing, usage or trade practice. Moreover, ACE and TAO are provided
-with no support and without any obligation on the part of Washington
-University, its employees, or students to assist in its use,
-correction, modification, or enhancement. However, commercial support
-for ACE and TAO are available from [7]Riverace and [8]OCI,
-respectively.
-
-Washington University, its employees, and students shall have no
-liability with respect to the infringement of copyrights, trade
-secrets or any patents by ACE and TAO or any part thereof. Moreover,
-in no event will Washington University, its employees, or students be
-liable for any lost revenue or profits or other special, indirect and
-consequential damages.
-
-The [1]ACE and [2]TAO web sites are maintained by the [9]Center for
-Distributed Object Computing of Washington University for the
-development of open source software as part of the [10]open source
-software community. By submitting comments, suggestions, code, code
-snippets, techniques (including that of usage), and algorithms,
-submitters acknowledge that they have the right to do so, that any
-such submissions are given freely and unreservedly, and that they
-waive any claims to copyright or ownership. In addition, submitters
-acknowledge that any such submission might become part of the
-copyright maintained on the overall body of code, which comprises the
-[11]ACE and [12]TAO software. By making a submission, submitter agree
-to these terms. Furthermore, submitters acknowledge that the
-incorporation or modification of such submissions is entirely at the
-discretion of the moderators of the open source ACE and TAO projects
-or their designees.
-
-The names ACE(TM), TAO(TM), and Washington University may not be used
-to endorse or promote products or services derived from this source
-without express written permission from Washington University.
-Further, products or services derived from this source may not be
-called ACE(TM) or TAO(TM), nor may the name Washington University
-appear in their names, without express written permission from
-Washington University.
-
-If you have any suggestions, additions, comments, or questions, please
-let [13]me know.
-
-[14]Douglas C. Schmidt
-_________________________________________________________________
-
-Back to the [15]ACE home page.
+     _________________________________________________________________
+   
+  Copyright and Licensing Information for ACE(TM) and TAO(TM)
+  
+   [1]ACE(TM) and [2]TAO(TM) are copyrighted by [3]Douglas C. Schmidt and
+   his [4]research group at [5]Washington University, Copyright (c)
+   1993-1999, all rights reserved. Since ACE and TAO are [6]open source,
+   [7]free software, you are free to do anything you like with the ACE
+   and TAO source code and object code produced from the source, as long
+   as you include this copyright statement along with code built using
+   ACE and TAO.
+   
+   In particular, you can use ACE and TAO in proprietary software and are
+   under no obligation to redistribute any of your source code that is
+   built using ACE and TAO. Please note, however, that you may not do
+   anything to the ACE and TAO code, such as copyrighting it yourself or
+   claiming authorship of the ACE and TAO code, that will prevent it from
+   being distributed freely using an open source development model.
+   
+   ACE and TAO are provided as is with no warranties of any kind,
+   including the warranties of design, merchantibility and fitness for a
+   particular purpose, noninfringement, or arising from a course of
+   dealing, usage or trade practice. Moreover, ACE and TAO are provided
+   with no support and without any obligation on the part of Washington
+   University, its employees, or students to assist in its use,
+   correction, modification, or enhancement. However, commercial support
+   for ACE and TAO are available from [8]Riverace and [9]OCI,
+   respectively. Moreover, both ACE and TAO are Y2K-compliant, as long as
+   the underlying OS platform is Y2K-compliant.
+   
+   Washington University, its employees, and students shall have no
+   liability with respect to the infringement of copyrights, trade
+   secrets or any patents by ACE and TAO or any part thereof. Moreover,
+   in no event will Washington University, its employees, or students be
+   liable for any lost revenue or profits or other special, indirect and
+   consequential damages.
+   
+   The [10]ACE and [11]TAO web sites are maintained by the [12]Center for
+   Distributed Object Computing of Washington University for the
+   development of open source software as part of the [13]open source
+   software community. By submitting comments, suggestions, code, code
+   snippets, techniques (including that of usage), and algorithms,
+   submitters acknowledge that they have the right to do so, that any
+   such submissions are given freely and unreservedly, and that they
+   waive any claims to copyright or ownership. In addition, submitters
+   acknowledge that any such submission might become part of the
+   copyright maintained on the overall body of code, which comprises the
+   [14]ACE and [15]TAO software. By making a submission, submitter agree
+   to these terms. Furthermore, submitters acknowledge that the
+   incorporation or modification of such submissions is entirely at the
+   discretion of the moderators of the open source ACE and TAO projects
+   or their designees.
+   
+   The names ACE
+   (TM), TAO(TM), and Washington University may not be used to endorse or
+   promote products or services derived from this source without express
+   written permission from Washington University. Further, products or
+   services derived from this source may not be called ACE(TM) or
+   TAO(TM), nor may the name Washington University appear in their names,
+   without express written permission from Washington University.
+   
+   If you have any suggestions, additions, comments, or questions, please
+   let [16]me know.
+   
+   [17]Douglas C. Schmidt
+     _________________________________________________________________
+   
+   Back to the [18]ACE home page.
 
 References
 
@@ -72,12 +76,15 @@ References
    4. http://www.cs.wustl.edu/~schmidt/ACE-members.html
    5. http://www.wustl.edu/
    6. http://www.opensource.org/
-   7. http://www.riverace.com/
-   8. file://localhost/project/adaptive/.www-docs/www.ociweb.com
-   9. http://www.cs.wustl.edu/~schmidt/doc-center.html
-  10. http://www.opensource.org/
-  11. http://www.cs.wustl.edu/~schmidt/ACE-obtain.html
-  12. http://www.cs.wustl.edu/~schmidt/TAO-obtain.html
-  13. mailto:schmidt@cs.wustl.edu
-  14. http://www.cs.wustl.edu/~schmidt/
-  15. file://localhost/project/adaptive/.www-docs/ACE.html
+   7. http://www.gnu.org/
+   8. http://www.riverace.com/
+   9. file://localhost/home/cs/faculty/schmidt/.www-docs/www.ociweb.com
+  10. http://www.cs.wustl.edu/~schmidt/ACE.html
+  11. http://www.cs.wustl.edu/~schmidt/TAO.html
+  12. http://www.cs.wustl.edu/~schmidt/doc-center.html
+  13. http://www.opensource.org/
+  14. http://www.cs.wustl.edu/~schmidt/ACE-obtain.html
+  15. http://www.cs.wustl.edu/~schmidt/TAO-obtain.html
+  16. mailto:schmidt@cs.wustl.edu
+  17. http://www.cs.wustl.edu/~schmidt/
+  18. file://localhost/home/cs/faculty/schmidt/.www-docs/ACE.html