Changeset 29857

Show
Ignore:
Timestamp:
06.05.2015 10:41:41 (4 years ago)
Author:
davidb
Message:

Minor text-formatting

Files:
1 modified

Legend:

Unmodified
Added
Removed
  • main/trunk/greenstone3/LICENSE.txt

    r6428 r29857  
    1 Copyright (c) 2003 New Zealand Digital Library Project, University of Waikato 
    2  
    3 Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, and distribute copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the GPL and the following conditions (where not in conflict with the GPL): 
    4  
    5 The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software, as will all other notices contained in the copyrights directory. 
    6  
    7 THE SOFTWARE IS PROVIDED ``AS IS'', WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE COPYRIGHT HOLDER (Greenstone Digital Libraries, University of Waikato), OR THEIR STAFF BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. 
    8  
    9 Except as contained in this notice, the name of New Zealand Digital Library Project, University of Waikato shall not be used in advertising or otherwise to promote the sale, use or other dealings in this Software without prior written authorization from the New Zealand Digital Library Project, University of Waikato. Distributed under GPL, as follows:  
     1        Copyright (c) 2003 New Zealand Digital Library Project,  
     2                      University of Waikato 
     3 
     4Permission is hereby granted, free of charge, to any person obtaining 
     5a copy of this software and associated documentation files (the 
     6"Software"), to deal in the Software without restriction, including 
     7without limitation the rights to use, copy, modify, merge, publish, 
     8and distribute copies of the Software, and to permit persons to whom 
     9the Software is furnished to do so, subject to the GPL and the 
     10following conditions (where not in conflict with the GPL): 
     11 
     12The above copyright notice and this permission notice shall be 
     13included in all copies or substantial portions of the Software, as 
     14will all other notices contained in the copyrights directory. 
     15 
     16THE SOFTWARE IS PROVIDED ``AS IS'', WITHOUT WARRANTY OF ANY KIND, 
     17EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF 
     18MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND 
     19NONINFRINGEMENT. IN NO EVENT SHALL THE COPYRIGHT HOLDER (Greenstone 
     20Digital Libraries, University of Waikato), OR THEIR STAFF BE LIABLE 
     21FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF 
     22CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION 
     23WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. 
     24 
     25Except as contained in this notice, the name of New Zealand Digital 
     26Library Project, University of Waikato shall not be used in 
     27advertising or otherwise to promote the sale, use or other dealings in 
     28this Software without prior written authorization from the New Zealand 
     29Digital Library Project, University of Waikato. Distributed under GPL, 
     30as follows: 
    1031 
    1132