Skip to content

Commit

Permalink
update license to cc by-sa 4.0
Browse files Browse the repository at this point in the history
  • Loading branch information
sarabander committed Sep 15, 2015
1 parent 7ddafbc commit 0f2974b
Show file tree
Hide file tree
Showing 5 changed files with 13 additions and 16 deletions.
4 changes: 2 additions & 2 deletions LICENSE
Original file line number Diff line number Diff line change
Expand Up @@ -2,5 +2,5 @@ LICENSING TERMS

The HTML files of the book and illustrations in
directory 'html/fig' are licensed under Creative Commons
Attribution-NonCommercial-ShareAlike 3.0 Unported License
(http://creativecommons.org/licenses/by-nc-sa/3.0/).
Attribution-ShareAlike 4.0 International License
(http://creativecommons.org/licenses/by-sa/4.0/).
8 changes: 4 additions & 4 deletions LICENSE.src
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@

LICENSING TERMS

1. sicp-pocket.texi, the HTML files of the book, and illustrations in
directory 'html/fig' are licensed under Creative Commons
Attribution-NonCommercial-ShareAlike 3.0 Unported License
(http://creativecommons.org/licenses/by-nc-sa/3.0/).
1. sicp-pocket.texi, the HTML files of the book, and illustrations in
directory 'html/fig' are licensed under Creative Commons
Attribution-ShareAlike 4.0 International License
(http://creativecommons.org/licenses/by-sa/4.0/).

2. Javascript libraries have their own individual licenses.

Expand Down
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ Acknowledgements
License
-------

The source file `sicp-pocket.texi,` HTML content of the book, and diagrams in directory `html/fig` are licensed under Creative Commons Attribution-NonCommercial-ShareAlike 3.0 Unported License ([cc by-nc-sa](http://creativecommons.org/licenses/by-nc-sa/3.0/)).
The source file `sicp-pocket.texi,` HTML content of the book, and diagrams in directory `html/fig` are licensed under Creative Commons Attribution-ShareAlike 4.0 International License ([cc by-sa](http://creativecommons.org/licenses/by-sa/4.0/)).

Most of the scripts are licensed under GNU General Public License version 3 (for details, see LICENSE.src).

Expand Down
6 changes: 2 additions & 4 deletions html/index.xhtml
Original file line number Diff line number Diff line change
Expand Up @@ -39,12 +39,10 @@

<object style="width: 2.42ex; height: 2.42ex;" data="fig/icons/by.std.svg" type="image/svg+xml">SVG</object>

<object style="width: 2.42ex; height: 2.42ex;" data="fig/icons/nc.std.svg" type="image/svg+xml">SVG</object>

<object style="width: 2.42ex; height: 2.42ex;" data="fig/icons/sa.std.svg" type="image/svg+xml">SVG</object>

<p>This work is licensed under a Creative Commons Attribution-NonCommercial-ShareAlike 3.0
Unported License (<a href="http://creativecommons.org/licenses/by-nc-sa/3.0/"><abbr>CC BY-NC-SA 3.0</abbr></a>).
<p>This work is licensed under a Creative Commons Attribution-ShareAlike 4.0
International License (<a href="http://creativecommons.org/licenses/by-sa/4.0/"><abbr>CC BY-SA 4.0</abbr></a>).
Based on a work at <a href="http://mitpress.mit.edu/sicp/">mitpress.mit.edu</a>.
</p>
<p>The <abbr>MIT</abbr> Press<br />
Expand Down
9 changes: 4 additions & 5 deletions sicp-pocket.texi
Original file line number Diff line number Diff line change
Expand Up @@ -11,8 +11,8 @@
@set utfversiondate January 29, 2015
@comment
@comment This file is licensed under a Creative Commons
@comment Attribution-NonCommercial-ShareAlike 3.0 Unported License
@comment http://creativecommons.org/licenses/by-nc-sa/3.0/
@comment Attribution-ShareAlike 4.0 International License
@comment http://creativecommons.org/licenses/by-sa/4.0/
@comment
@comment This is a Texinfo file. To convert it to Info hypertext
@comment format, you will need the `makeinfo' program from the GNU
Expand Down Expand Up @@ -129,12 +129,11 @@
@noindent
@image{fig/icons/cc, 6mm,,,.std.svg}
@image{fig/icons/by, 6mm,,,.std.svg}
@image{fig/icons/nc, 6mm,,,.std.svg}
@image{fig/icons/sa, 6mm,,,.std.svg}

@noindent
This work is licensed under a Creative Commons Attribution-NonCommercial-ShareAlike 3.0
Unported License (@url{http://creativecommons.org/licenses/by-nc-sa/3.0/, @abbr{CC BY-NC-SA 3.0}}).
This work is licensed under a Creative Commons Attribution-ShareAlike 4.0
International License (@url{http://creativecommons.org/licenses/by-sa/4.0/, @abbr{CC BY-SA 4.0}}).
Based on a work at @url{http://mitpress.mit.edu/sicp/, mitpress.mit.edu}.

@noindent
Expand Down

0 comments on commit 0f2974b

Please sign in to comment.