Skip to content
This repository was archived by the owner on Aug 20, 2020. It is now read-only.

Commit 49cc333

Browse files
committed
fixed license references
1 parent c98c6db commit 49cc333

5 files changed

Lines changed: 17 additions & 32 deletions

File tree

LICENSE

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11

2-
Copyright (c) 2016, Caltech
2+
Copyright (c) 2018, Caltech
33
All rights not granted herein are expressly reserved by Caltech.
44

55
Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met:

cmd/rss2json/rss2json.go

Lines changed: 13 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
//
55
// @author R. S. Doiel, <rsdoiel@library.caltech.edu>
66
//
7-
// Copyright (c) 2016, Caltech
7+
// Copyright (c) 2018, Caltech
88
// All rights not granted herein are expressly reserved by Caltech.
99
//
1010
// Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met:
@@ -44,33 +44,18 @@ Convert *rss.xml* to *rss.json*.
4444
license = `
4545
%s %s
4646
47-
Copyright (c) 2018, R. S. Doiel
48-
All rights reserved.
49-
50-
Redistribution and use in source and binary forms, with or without
51-
modification, are permitted provided that the following conditions are met:
52-
53-
* Redistributions of source code must retain the above copyright notice, this
54-
list of conditions and the following disclaimer.
55-
56-
* Redistributions in binary form must reproduce the above copyright notice,
57-
this list of conditions and the following disclaimer in the documentation
58-
and/or other materials provided with the distribution.
59-
60-
* Neither the name of rss2 nor the names of its
61-
contributors may be used to endorse or promote products derived from
62-
this software without specific prior written permission.
63-
64-
THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
65-
AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
66-
IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
67-
DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE
68-
FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
69-
DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
70-
SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
71-
CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
72-
OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
73-
OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
47+
Copyright (c) 2016, Caltech
48+
All rights not granted herein are expressly reserved by Caltech.
49+
50+
Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met:
51+
52+
1. Redistributions of source code must retain the above copyright notice, this list of conditions and the following disclaimer.
53+
54+
2. Redistributions in binary form must reproduce the above copyright notice, this list of conditions and the following disclaimer in the documentation and/or other materials provided with the distribution.
55+
56+
3. Neither the name of the copyright holder nor the names of its contributors may be used to endorse or promote products derived from this software without specific prior written permission.
57+
58+
THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS 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 COPYRIGHT HOLDER OR 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 USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
7459
`
7560

7661
// Standard options

license.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@
2222
</nav>
2323

2424
<section>
25-
<p>Copyright &copy; 2016, Caltech
25+
<p>Copyright &copy; 2018, Caltech
2626
All rights not granted herein are expressly reserved by Caltech.</p>
2727

2828
<p>Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met:</p>

rss2.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
//
44
// @author R. S. Doiel, <rsdoiel@caltech.edu>
55
//
6-
// Copyright (c) 2016, Caltech
6+
// Copyright (c) 2018, Caltech
77
// All rights not granted herein are expressly reserved by Caltech.
88
//
99
// Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met:

rss2_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
//
44
// @author R. S. Doiel, <rsdoiel@caltech.edu>
55
//
6-
// Copyright (c) 2016, Caltech
6+
// Copyright (c) 2018, Caltech
77
// All rights not granted herein are expressly reserved by Caltech.
88
//
99
// Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met:

0 commit comments

Comments
 (0)