ChangeLogTag:Tue

2 files changed, 21 insertions, 14 deletions

diff --git a/CIAO/COPYING b/CIAO/COPYING
index 1645f46c517..95a2a227c50 100644
--- a/CIAO/COPYING
+++ b/CIAO/COPYING
@@ -1,9 +1,9 @@
 
      _________________________________________________________________
-
+   
   Copyright and Licensing Information for ACE(TM), TAO(TM), CIAO(TM), and
   CoSMIC(TM)
-
+  
    [1]ACE(TM), [2]TAO(TM), [3]CIAO(TM), and [4]CoSMIC(TM) (henceforth
    referred to as "DOC software") are copyrighted by [5]Douglas C.
    Schmidt and his [6]research group at [7]Washington University,
@@ -13,9 +13,9 @@
    copy, and distribute--perpetually and irrevocably--the DOC software
    source code and object code produced from the source, as well as copy
    and distribute modified versions of this software. You must, however,
-   include this copyright statement along with code built using DOC
-   software.
-
+   include this copyright statement along with any code built using DOC
+   software that you release.
+   
    You can use DOC software in commercial and/or binary software releases
    and are under no obligation to redistribute any of your source code
    that is built using DOC software. Note, however, that you may not do
@@ -26,7 +26,7 @@
    software in your software, though we encourage you to let [10]us know
    so we can promote your project in the [11]DOC software success
    stories.
-
+   
    The [12]ACE, [13]TAO, [14]CIAO, and [15]CoSMIC web sites are
    maintained by the [16]DOC Group at the [17]Institute for Software
    Integrated Systems (ISIS) and the [18]Center for Distributed Object
@@ -44,7 +44,7 @@
    modification of such Submissions is entirely at the discretion of the
    moderators of the open-source DOC software projects or their
    designees.
-
+   
    Submissions are provided by the submitter ``as is'' with no warranties
    whatsoever, including any warranty of merchantability, noninfringement
    of third party intellectual property, or fitness for any particular
@@ -62,13 +62,13 @@
    University, UC Irvine, or Vanderbilt University, their employees, or
    students be liable for any lost revenue or profits or other special,
    indirect and consequential damages.
-
+   
    DOC software is provided with no support and without any obligation on
    the part of Washington University, UC Irvine, Vanderbilt University,
    their employees, or students to assist in its use, correction,
    modification, or enhancement. A [19]number of companies around the
    world provide commercial support for DOC software, however.
-
+   
    DOC software is Y2K-compliant, as long as the underlying OS platform
    is Y2K-compliant. Likewise, DOC software is compliant with the new US
    daylight savings rule passed by Congress as "The Energy Policy Act of
@@ -77,7 +77,7 @@
    obtains time/date and calendaring information from operating systems
    users will not be affected by the new DST rules as long as they
    upgrade their operating systems accordingly.
-
+   
    The names ACE(TM), TAO(TM), CIAO(TM), CoSMIC(TM), Washington
    University, UC Irvine, and Vanderbilt University, may not be used to
    endorse or promote products or services derived from this source
@@ -88,13 +88,13 @@
    Vanderbilt University appear in their names, without express written
    permission from Washington University, UC Irvine, and Vanderbilt
    University.
-
+   
    If you have any suggestions, additions, comments, or questions, please
    let [20]me know.
-
+   
    [21]Douglas C. Schmidt
      _________________________________________________________________
-
+   
    Back to the [22]ACE home page.
 
 References
@@ -120,4 +120,4 @@ References
   19. http://www.cs.wustl.edu/~schmidt/commercial-support.html
   20. mailto:d.schmidt@vanderbilt.edu
   21. http://www.dre.vanderbilt.edu/~schmidt/
-  22. http://www.cs.wustl.edu/~schmidt/ACE.html
+  22. http://www.cs.wustl.edu/ACE.html
diff --git a/CIAO/ChangeLog b/CIAO/ChangeLog
index e97ebae1880..a18ec681124 100644
--- a/CIAO/ChangeLog
+++ b/CIAO/ChangeLog
@@ -1,3 +1,9 @@
+Tue Feb 20 17:56:25 UTC 2007  Douglas C. Schmidt  <schmidt@dre.vanderbilt.edu>
+
+        * COPYING: Clarified how the COPYING file need to be included with
+          any code released.  Thanks to Scott Mark <sjm at pobox dot com>
+          for helping clarify this.
+  
 Tue Feb 20 17:59:51 UTC 2007  William R. Otte  <wotte@dre.vanderbilt.edu>
 
         * DAnCE/Deployment/Deployment_TargetManager.idl
@@ -313,6 +319,7 @@ Tue Feb 20 16:17:46 UTC 2007  William R. Otte  <wotte@dre.vanderbilt.edu>
          Added DomainApplication interface, completely missing from our IDL.
 
 
+>>>>>>> .r77261
 Tue Feb 20 14:15:14 UTC 2007  Johnny Willemsen  <jwillemsen@remedy.nl>
 
         * CIDLC/OperationHeaderEmitters.cpp: