diff --git a/COPYING.MIT b/COPYING.MIT index 6188bf3a9a..1bf98523e3 100644 --- a/COPYING.MIT +++ b/COPYING.MIT @@ -6,6 +6,9 @@ distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions: +The above copyright notice and this permission notice shall be +included in all copies or substantial portions of the Software. + THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. diff --git a/README b/README index e52679abba..0455521ba5 100644 --- a/README +++ b/README @@ -61,7 +61,8 @@ Various JavaScript libraries/snippets are included under www/js/: licence, see COPYING.MIT. - jscolor.js: copyright Jan Odvarko, licenced under the GNU LGPL. - tabber.js: copyright Patrick Fitzgerald, licenced under the MIT licence. -- ace editor: licenced under BSD licence, see COPYING.BSD. +- Ace editor: licenced under BSD licence, see COPYING.BSD. +- Flot/jQuery: licenced under MIT licence, see COPYING.MIT. The M4 autoconf macros are licenced under all-permissive and GPL3+ licences; see the respective files under m4/ for details. diff --git a/doc/domjudge-overview-inc.sgml b/doc/domjudge-overview-inc.sgml index 17eda5e0f3..663f3b37a5 100644 --- a/doc/domjudge-overview-inc.sgml +++ b/doc/domjudge-overview-inc.sgml @@ -103,6 +103,7 @@ to name them here too: jscolor.js by Jan Odvarko. tabber.js by Patrick Fitzgerald. Ace code editor. + Flot/jQuery JavaScript libraries. The DOMjudge logo is based on the NKP 2004 logo made by Erik van Sebille. Several icons have been taken from the phpMyAdmin project. @@ -121,15 +122,23 @@ see COPYING.BSD and doc/dash.copyright for more details. Sources can be downloaded from: . -The sorttable.js script is copyright by Stuart Langridge and -licenced under the MIT licence, see COPYING.MIT. This -software was downloaded from -. -The jscolor.js script is copyright by Jan Odvarko and licenced -under the GNU LGPL. It was obtained at . -The tabber.js script is copyright by Patrick Fitzgerald and +The following JavaScript snippets/libraries are included: + + The sorttable.js script is copyright by Stuart +Langridge and licenced under the MIT licence, see COPYING.MIT. +It was downloaded from . + The jscolor.js script is copyright by Jan Odvarko and +licenced under the GNU LGPL. It was obtained at . + The tabber.js script is copyright by Patrick +Fitzgerald and licenced under the MIT licence, see COPYING.MIT. +It was downloaded from . +The Ace code editor is copyright by Ajax.org B.V. and licenced +under the BSD licence, see COPYING.BSD. It was downloaded +from . +The Flot/jQuery libraries are copyright by various people and licenced under the MIT licence, see COPYING.MIT. It was -downloaded from . +downloaded from . + The M4 autoconf macros are licenced under all-permissive and GPL3+ licences; see the respective files for details.