cziegeler    01/09/26 05:52:28

  Modified:    .        Tag: cocoon_20_branch LICENSE
               xdocs    Tag: cocoon_20_branch license.xml
  Log:
  [C2][Patch] license text differs between LICENSE and xdocs/license.xml
  Submitted by: Hans Ulrich Niedermann [[EMAIL PROTECTED]]
  
  Revision  Changes    Path
  No                   revision
  
  
  No                   revision
  
  
  1.1.1.1.2.1 +3 -3      xml-cocoon2/LICENSE
  
  Index: LICENSE
  ===================================================================
  RCS file: /home/cvs/xml-cocoon2/LICENSE,v
  retrieving revision 1.1.1.1
  retrieving revision 1.1.1.1.2.1
  diff -u -r1.1.1.1 -r1.1.1.1.2.1
  --- LICENSE   2001/05/09 20:49:26     1.1.1.1
  +++ LICENSE   2001/09/26 12:52:28     1.1.1.1.2.1
  @@ -22,9 +22,9 @@
       Alternately, this  acknowledgment may  appear in the software itself,  if
       and wherever such third-party acknowledgments normally appear.
    
  - 4. The names "Cocoon" and  "Apache Software Foundation"  must not be used to
  -    endorse  or promote  products derived  from this  software without  prior
  -    written permission. For written permission, please contact
  + 4. The names "Apache Cocoon" and  "Apache Software Foundation" must  not  be
  +    used to  endorse or promote  products derived from  this software without
  +    prior written permission. For written permission, please contact
       [EMAIL PROTECTED]
    
    5. Products  derived from this software may not  be called "Apache", nor may
  
  
  
  No                   revision
  
  
  No                   revision
  
  
  1.1.1.1.2.3 +3 -3      xml-cocoon2/xdocs/license.xml
  
  Index: license.xml
  ===================================================================
  RCS file: /home/cvs/xml-cocoon2/xdocs/license.xml,v
  retrieving revision 1.1.1.1.2.2
  retrieving revision 1.1.1.1.2.3
  diff -u -r1.1.1.1.2.2 -r1.1.1.1.2.3
  --- license.xml       2001/09/26 12:49:57     1.1.1.1.2.2
  +++ license.xml       2001/09/26 12:52:28     1.1.1.1.2.3
  @@ -34,9 +34,9 @@
       Alternately, this  acknowledgment may  appear in the software itself,  if
       and wherever such third-party acknowledgments normally appear.
    
  - 4. The names "@docname@" and  "Apache Software Foundation"  must not be used to
  -    endorse  or promote  products derived  from this  software without  prior
  -    written permission. For written permission, please contact
  + 4. The names "@docname@" and  "Apache Software Foundation"  must  not be
  +    used to  endorse or promote  products derived from  this software without
  +    prior written permission. For written permission, please contact
       [EMAIL PROTECTED]
    
    5. Products  derived from this software may not  be called "Apache", nor may
  
  
  

----------------------------------------------------------------------
In case of troubles, e-mail:     [EMAIL PROTECTED]
To unsubscribe, e-mail:          [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]

Reply via email to