mx4j/src/docs/english license.xml,1.4,1.5

Update of /cvsroot/mx4j/mx4j/src/docs/english
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv24155/src/docs/english

Modified Files:
	license.xml 
Log Message:
Fixed license showed in documentation to reflect LICENSE document

Index: license.xml
===================================================================
RCS file: /cvsroot/mx4j/mx4j/src/docs/english/license.xml,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** license.xml	7 Oct 2003 21:19:50 -0000	1.4
--- license.xml	25 Oct 2004 20:47:17 -0000	1.5
***************
*** 4,8 ****
        MX4J is released under an Apache-style license. In practice this means
        that you can do almost anything you want with the code, including its
!       use in commercial software. <sbr/>
        The actual text of the license is included below:
     </para>
--- 4,9 ----
        MX4J is released under an Apache-style license. In practice this means
        that you can do almost anything you want with the code, including its
!       use in commercial software.
!       <sbr/>
        The actual text of the license is included below:
     </para>
***************
*** 12,16 ****
           The MX4J License, Version 1.0
  
!          Copyright (c) 2001 MX4J.  All rights reserved.
  
           Redistribution and use in source and binary forms, with or without
--- 13,17 ----
           The MX4J License, Version 1.0
  
!          Copyright (c) 2001-2004 by the MX4J contributors.  All rights reserved.
  
           Redistribution and use in source and binary forms, with or without
***************
*** 28,41 ****
           3. The end-user documentation included with the redistribution,
              if any, must include the following acknowledgment:
!             "This product includes software developed by the
!             <ulink url="http://mx4j.sourceforge.net">MX4J project</ulink>."
              Alternately, this acknowledgment may appear in the software itself,
              if and wherever such third-party acknowledgments normally appear.
  
!          4. The names "MX4J" and "mx4j" must not be used to endorse or promote
              products derived from this software without prior written
!             permission. For written permission, please contact
!             <ulink url="mailto:[email protected]">Simone Bordet</ulink> or
!             <ulink url="mailto:[email protected]">Carlos Quiroz</ulink>
  
           5. Products derived from this software may not be called "MX4J",
--- 29,42 ----
           3. The end-user documentation included with the redistribution,
              if any, must include the following acknowledgment:
!                "This product includes software developed by the
!                 MX4J project (http://mx4j.sourceforge.net)."
              Alternately, this acknowledgment may appear in the software itself,
              if and wherever such third-party acknowledgments normally appear.
  
!          4. The name "MX4J" must not be used to endorse or promote
              products derived from this software without prior written
!             permission.
!             For written permission, please contact
!             biorn_steedom [at] users [dot] sourceforge [dot] net
  
           5. Products derived from this software may not be called "MX4J",
***************
*** 43,51 ****
              permission of Simone Bordet.
  
!          THIS SOFTWARE IS PROVIDED "AS IS" AND ANY EXPRESSED 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 CHRIS SEGUIN OR
!          ITS 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
--- 44,52 ----
              permission of Simone Bordet.
  
!          THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED 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 MX4J 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
***************
*** 55,63 ****
           OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
           SUCH DAMAGE.
! 
  
           This software consists of voluntary contributions made by many
!          individuals on behalf of MX4J.  For more information on
!          MX4J, please see <ulink url="http://mx4j.sourceforge.net">http://mx4j.sourceforge.net</ulink>
        </literallayout>
     </para>
--- 56,66 ----
           OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
           SUCH DAMAGE.
!          ====================================================================
  
           This software consists of voluntary contributions made by many
!          individuals on behalf of the MX4J project.  For more information on
!          MX4J, please see
!          <ulink url="http://mx4j.sourceforge.net">the MX4J website</ulink>.
! 
        </literallayout>
     </para>



-------------------------------------------------------
This SF.net email is sponsored by: IT Product Guide on ITManagersJournal
Use IT products in your business? Tell us what you think of them. Give us
Your Opinions, Get Free ThinkGeek Gift Certificates! Click to find out more
http://productguide.itmanagersjournal.com/guidepromo.tmpl