Skip to content

Commit 928b1aa

Browse files
committed
some improvements
1 parent e030664 commit 928b1aa

File tree

3 files changed

+32
-7
lines changed

3 files changed

+32
-7
lines changed

LICENSE.md

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,18 @@
1+
This repository contains two types of material:
2+
Materials that I (Thomas Weise) have created by myself and such that have been created by others.
3+
4+
The vast majority of the material is teaching material created by me (Thomas Weise).
5+
This and only this material is released under the Attribution-NonCommercial-ShareAlike 4.0 International license (CC BY‑NC‑SA 4.0), see below and [http://creativecommons.org/licenses/by-nc-sa/4.0](http://creativecommons.org/licenses/by-nc-sa/4.0/) for a summary.
6+
7+
However, the repository also includes some images and figures created by others, which are marked explicitly and licensed under their authors' terms.
8+
For example, all logos and trademarks are under the copyright of their respective owners.
9+
The list of files not under the CC BY‑NC‑SA 4.0 license but under their individual owners' copyrights includes, but is not limited to:
10+
11+
+ the [Python](https://www.python.org) Logo, e.g.,
12+
- text/main/introduction/pythonLogo.pdf
13+
- text/main/introduction/pythonLogo.svg
14+
15+
116
## creative commons
217

318
# Attribution-NonCommercial-ShareAlike 4.0 International

README.md

Lines changed: 16 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -44,19 +44,29 @@ You may use these files under the licensing terms provided below.
4444

4545

4646
## 3. License
47-
All the course material is freely available.
48-
You can download its newest version from <https://thomasweise.github.io/programmingWithPython>.
47+
This repository contains two types of material:
48+
Materials that I (Thomas Weise) have created by myself and such that have been created by others.
49+
50+
The vast majority of the material is teaching material created by me (Thomas Weise).
51+
This and only this material is released under the Attribution-NonCommercial-ShareAlike 4.0 International license (CC&nbsp;BY&#8209;NC&#8209;SA&nbsp;4.0), see [http://creativecommons.org/licenses/by-nc-sa/4.0](http://creativecommons.org/licenses/by-nc-sa/4.0/) for a summary.
52+
53+
However, the repository also includes some images and figures created by others, which are marked explicitly and licensed under their authors' terms.
54+
For example, all logos and trademarks are under the copyright of their respective owners.
55+
The list of files not under the CC&nbsp;BY&#8209;NC&#8209;SA&nbsp;4.0 license but under their individual owners' copyrights includes, but is not limited to:
56+
57+
+ the [Python](https://www.python.org) Logo, e.g.,
58+
- text/main/introduction/pythonLogo.pdf
59+
- text/main/introduction/pythonLogo.svg
60+
61+
You can download its newest version of the course material from <https://thomasweise.github.io/databases>.
4962
This version may change since this course and book both are work in progress.
50-
You can freely share this.
51-
You can also copy text or figures under the license given below, as long as you cite the book as the original source, e.g., by using the following BibTeX:
63+
You can cite this book as follows:
5264

5365
<pre>@book{programmingWithPython,<br/>&nbsp;author&nbsp;=&nbsp;{Thomas&nbsp;Weise},<br/>&nbsp;title&nbsp;=&nbsp;{Programming&nbsp;with&nbsp;Python},<br/>&nbsp;year&nbsp;=&nbsp;{2024--2025},<br/>&nbsp;publisher&nbsp;=&nbsp;{Institute&nbsp;of&nbsp;Applied&nbsp;Optimization,<br/>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;<a href="http://www.hfuu.edu.cn/aibd">School&nbsp;of&nbsp;Artificial&nbsp;Intelligence&nbsp;and&nbsp;Big&nbsp;Data</a>,<br/>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;<a href="http://www.hfuu.edu.cn/">Hefei&nbsp;University</a>},<br/>&nbsp;address&nbsp;=&nbsp;{Hefei,&nbsp;Anhui,&nbsp;China},<br/>&nbsp;url&nbsp;=&nbsp;{<a href="https://thomasweise.github.io/programmingWithPython">https://thomasweise.github.io/programmingWithPython</a>}<br/>}</pre>
5466

5567
**If you have any comments or suggestions regarding the book, or if you spotted an error or typo, please feel free to submit an [issue here](https://github.com/thomasWeise/programmingWithPython/issues).**
5668
Your feedback would help us to improve the book.
5769

58-
This book is released under the Attribution-NonCommercial-ShareAlike 4.0 International license (CC&nbsp;BY&#8209;NC&#8209;SA&nbsp;4.0), see [http://creativecommons.org/licenses/by-nc-sa/4.0/](http://creativecommons.org/licenses/by-nc-sa/4.0/) for a summary.
59-
6070
We statically include the [pdfsizeopt](https://github.com/pts/pdfsizeopt) tool in the build process of our book via the [bookbase repository](https://github.com/thomasWeise/bookbase) and use it during the book compiling and building process to compress the book pdf file.
6171
This tool is excluded from the license mentioned above.
6272
It is under the GNU GENERAL PUBLIC LICENSE Version 2, June 1991 and the copyright belongs to its authors.

text/main/introduction/introduction.tex

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
\begin{figure}%
55
\centering%
66
\includegraphics[width=0.7\linewidth]{\currentDir/pythonLogo}%
7-
\caption{The logo of the programming language \python.}%
7+
\caption{The \href{https://www.python.org}{\python\ programming language} logo is under the copyright of its owners.}%
88
\label{fig:pythonLogo}%
99
\end{figure}%
1010
%

0 commit comments

Comments
 (0)