Skip to content

Commit eaaf4c5

Browse files
committed
Update license info everywhere
1 parent 3b53d06 commit eaaf4c5

File tree

7 files changed

+110
-14
lines changed

7 files changed

+110
-14
lines changed

LICENSE

+15-2
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,21 @@
11

22
All book related files are
3-
(C) 2021-2023 http://robertwinkler.com[Robert Winkler]
3+
(C) 2021-2024 http://robertwinkler.com[Robert Winkler]
44

5-
Licensed under https://creativecommons.org/licenses/by-nc-sa/4.0/[Creative Commons].
5+
Licensed under https://creativecommons.org/licenses/by-nc-sa/4.0/[Creative Commons BY-NC-SA 4.0].
6+
7+
You are free to:
8+
9+
* *Share* — copy and redistribute the material in any medium or format
10+
* *Adapt* — remix, transform, and build upon the material
11+
* The licensor cannot revoke these freedoms as long as you follow the license terms.
12+
13+
Under the following terms:
14+
15+
* *Attribution* — You must give appropriate credit, provide a link to the license, and indicate if changes were made. You may do so in any reasonable manner, but not in any way that suggests the licensor endorses you or your use.
16+
* *NonCommercial* — You may not use the material for commercial purposes .
17+
* *ShareAlike* — If you remix, transform, or build upon the material, you must distribute your contributions under the same license as the original.
18+
* *No additional restrictions* — You may not apply legal terms or technological measures that legally restrict others from doing anything the license permits.
619

720
You can read the full legalese here:
821

README.adoc

+16-1
Original file line numberDiff line numberDiff line change
@@ -29,9 +29,24 @@ business request related to the book, you can reach me at books at robertwinkler
2929
== License
3030

3131
The book (all adoc files and final generated pdf/html) is under a
32-
https://creativecommons.org/licenses/by-nc-sa/4.0/[Creative Commons License].
32+
https://creativecommons.org/licenses/by-nc-sa/4.0/[Creative Commons License BY-NC-SA 4.0]
33+
which means that:
34+
35+
You are free to:
36+
37+
* *Share* — copy and redistribute the material in any medium or format
38+
* *Adapt* — remix, transform, and build upon the material
39+
* The licensor cannot revoke these freedoms as long as you follow the license terms.
40+
41+
Under the following terms:
42+
43+
* *Attribution* — You must give appropriate credit, provide a link to the license, and indicate if changes were made. You may do so in any reasonable manner, but not in any way that suggests the licensor endorses you or your use.
44+
* *NonCommercial* — You may not use the material for commercial purposes .
45+
* *ShareAlike* — If you remix, transform, or build upon the material, you must distribute your contributions under the same license as the original.
46+
* *No additional restrictions* — You may not apply legal terms or technological measures that legally restrict others from doing anything the license permits.
3347

3448
The separate code files in the code subdirectory are under the MIT license.
3549

3650

3751

52+

book.adoc

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
= MIPS Assembly Programmming
44
Robert Winkler <books@robertwinkler.com>
5-
v1.0.4, 2023-12-15
5+
v1.0.5, 2024-07-01
66
:toc:
77

88
include::info.adoc[]

code/LICENSE

+18
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,18 @@
1+
The MIT License (MIT)
2+
3+
Copyright (c) 2021-2024 Robert Winkler
4+
5+
Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated
6+
documentation files (the "Software"), to deal in the Software without restriction, including without limitation
7+
the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and
8+
to permit persons to whom the Software is furnished to do so, subject to the following conditions:
9+
10+
The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
11+
12+
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED
13+
TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
14+
THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF
15+
CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
16+
IN THE SOFTWARE.
17+
18+

info.adoc

+17-3
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,22 @@
11
== Info
22

3-
Copyright (C) 2021-2023 http://robertwinkler.com[Robert Winkler]
3+
Copyright (C) 2021-2024 http://robertwinkler.com[Robert Winkler]
44

5-
Licensed under https://creativecommons.org/licenses/by-nc-sa/4.0/[Creative Commons].
5+
This book is licensed under the https://creativecommons.org/licenses/by-nc-sa/4.0/[Creative Commons BY-NC-SA 4.0]
6+
which summarized means:
7+
8+
You are free to:
9+
10+
* *Share* — copy and redistribute the material in any medium or format
11+
* *Adapt* — remix, transform, and build upon the material
12+
* The licensor cannot revoke these freedoms as long as you follow the license terms.
13+
14+
Under the following terms:
15+
16+
* *Attribution* — You must give appropriate credit, provide a link to the license, and indicate if changes were made. You may do so in any reasonable manner, but not in any way that suggests the licensor endorses you or your use.
17+
* *NonCommercial* — You may not use the material for commercial purposes.
18+
* *ShareAlike* — If you remix, transform, or build upon the material, you must distribute your contributions under the same license as the original.
19+
* *No additional restrictions* — You may not apply legal terms or technological measures that legally restrict others from doing anything the license permits.
620
721
This book is available online in both
822
http://www.robertwinkler.com/projects/mips_book/mips_book.html[HTML] and
@@ -12,7 +26,7 @@ include::support.adoc[]
1226

1327
The repo for the book, where you can get the code referenced and report
1428
any errors (submit an issue or even a pull request) is
15-
https://github.com/rswinkle/mips_book[here].
29+
https://github.com/rswinkle/mips_book[here]. The code is MIT licensed.
1630

1731
If you're interested in contacting me regarding MIPS tutoring or any other
1832
business request related to the book, you can reach me at books@robertwinkler.com.

mips_book.html

+43-7
Original file line numberDiff line numberDiff line change
@@ -511,8 +511,8 @@ <h1>MIPS Assembly Programmming</h1>
511511
<div class="details">
512512
<span id="author" class="author">Robert Winkler</span><br>
513513
<span id="email" class="email"><a href="mailto:books@robertwinkler.com">books@robertwinkler.com</a></span><br>
514-
<span id="revnumber">version 1.0.4,</span>
515-
<span id="revdate">2023-12-15</span>
514+
<span id="revnumber">version 1.0.5,</span>
515+
<span id="revdate">2024-07-01</span>
516516
</div>
517517
<div id="toc" class="toc">
518518
<div id="toctitle">Table of Contents</div>
@@ -602,10 +602,46 @@ <h1>MIPS Assembly Programmming</h1>
602602
<h2 id="_info">Info</h2>
603603
<div class="sectionbody">
604604
<div class="paragraph">
605-
<p>Copyright &#169; 2021-2023 <a href="http://robertwinkler.com">Robert Winkler</a></p>
605+
<p>Copyright &#169; 2021-2024 <a href="http://robertwinkler.com">Robert Winkler</a></p>
606606
</div>
607607
<div class="paragraph">
608-
<p>Licensed under <a href="https://creativecommons.org/licenses/by-nc-sa/4.0/">Creative Commons</a>.</p>
608+
<p>This book is licensed under the <a href="https://creativecommons.org/licenses/by-nc-sa/4.0/">Creative Commons BY-NC-SA 4.0</a>
609+
which summarized means:</p>
610+
</div>
611+
<div class="paragraph">
612+
<p>You are free to:</p>
613+
</div>
614+
<div class="ulist">
615+
<ul>
616+
<li>
617+
<p><strong>Share</strong> — copy and redistribute the material in any medium or format</p>
618+
</li>
619+
<li>
620+
<p><strong>Adapt</strong> — remix, transform, and build upon the material</p>
621+
</li>
622+
<li>
623+
<p>The licensor cannot revoke these freedoms as long as you follow the license terms.</p>
624+
</li>
625+
</ul>
626+
</div>
627+
<div class="paragraph">
628+
<p>Under the following terms:</p>
629+
</div>
630+
<div class="ulist">
631+
<ul>
632+
<li>
633+
<p><strong>Attribution</strong> — You must give appropriate credit, provide a link to the license, and indicate if changes were made. You may do so in any reasonable manner, but not in any way that suggests the licensor endorses you or your use.</p>
634+
</li>
635+
<li>
636+
<p><strong>NonCommercial</strong> — You may not use the material for commercial purposes.</p>
637+
</li>
638+
<li>
639+
<p><strong>ShareAlike</strong> — If you remix, transform, or build upon the material, you must distribute your contributions under the same license as the original.</p>
640+
</li>
641+
<li>
642+
<p><strong>No additional restrictions</strong> — You may not apply legal terms or technological measures that legally restrict others from doing anything the license permits.</p>
643+
</li>
644+
</ul>
609645
</div>
610646
<div class="paragraph">
611647
<p>This book is available online in both
@@ -619,7 +655,7 @@ <h2 id="_info">Info</h2>
619655
<div class="paragraph">
620656
<p>The repo for the book, where you can get the code referenced and report
621657
any errors (submit an issue or even a pull request) is
622-
<a href="https://github.com/rswinkle/mips_book">here</a>.</p>
658+
<a href="https://github.com/rswinkle/mips_book">here</a>. The code is MIT licensed.</p>
623659
</div>
624660
<div class="paragraph">
625661
<p>If you&#8217;re interested in contacting me regarding MIPS tutoring or any other
@@ -6428,8 +6464,8 @@ <h5 id="_bronze">Bronze</h5>
64286464
</div>
64296465
<div id="footer">
64306466
<div id="footer-text">
6431-
Version 1.0.4<br>
6432-
Last updated 2023-12-15 00:51:02 -0700
6467+
Version 1.0.5<br>
6468+
Last updated 2024-07-01 20:48:22 -0700
64336469
</div>
64346470
</div>
64356471
</body>

mips_book.pdf

5.57 KB
Binary file not shown.

0 commit comments

Comments
 (0)