From: Roland Hieber Date: Wed, 26 Feb 2014 01:57:07 +0000 (+0100) Subject: on second thought, non-commercial licenses are evil. Change to CC-BY-SA and CC-BY... X-Git-Url: https://git.rohieb.name/skm-ma-ws1314.git/commitdiff_plain/8ed5089964f3857226d20ca74b94949c35b18975 on second thought, non-commercial licenses are evil. Change to CC-BY-SA and CC-BY-ND, and add license notes. --- diff --git a/biblio.bib b/biblio.bib index 6b21345..9565c53 100644 --- a/biblio.bib +++ b/biblio.bib @@ -298,7 +298,10 @@ year = 1995 } -@misc{tangoicons, - title = "{Figures were drawn using public domain icons from the Tango Desktop +@misc{license, + title = "{This work is licensed under the terms of the Creative Commons + Attribution-NoDerivs 3.0 Unported license, see + \url{https://creativecommons.org/licenses/by-nd/3.0/} for the license text. + Figures were drawn using public domain icons from the Tango Desktop Project, see \url{http://tango.freedesktop.org}}" } diff --git a/main.tex b/main.tex index 58f68d3..5bc7283 100644 --- a/main.tex +++ b/main.tex @@ -33,8 +33,8 @@ Masses with XMPP} \author{Roland Hieber} \date{Seminar Communications and Multimedia, TU~Braunschweig \\[1em] January 27, 2014 \\[1em] - CC-BY-NC-ND 3.0 \\ - \cc\byncnd + CC BY-ND 3.0 \\ + \cc\bynd } \begin{document} @@ -57,7 +57,7 @@ communication protocol used in Chatty Things. \input{sec-outlook.tex} \input{sec-discussion.tex} -\nocite{tangoicons} +\nocite{license} \bibliographystyle{plain} {\footnotesize \bibliography{biblio}} diff --git a/presentation.tex b/presentation.tex index 45fbf01..2ba07f8 100644 --- a/presentation.tex +++ b/presentation.tex @@ -425,9 +425,10 @@ Two-step process: \vfill \vfill \footnotesize -\cc\byncsa\\ -This presentation is licensed under CC-BY-NC-SA-3.0\\ -and builds on icons from the Tango Desktop Project +\cc\bysa\\ +This presentation is licensed under the terms of the \\ +Creative Commons Attribution-ShareAlike 3.0 Unported license\\ +and builds on public domain icons from the Tango Desktop Project \end{center} \end{frame}