From c4a18c2fddb2b640ae0d554c5444e9bffa3d256f Mon Sep 17 00:00:00 2001 From: Michael Drake Date: Tue, 7 Apr 2020 21:26:08 +0100 Subject: Resources: Update presentation to use nscolour. --- resources/en/credits.html | 15 +++++---- resources/en/licence.html | 78 +++++++++++++++++++++++------------------------ 2 files changed, 45 insertions(+), 48 deletions(-) (limited to 'resources/en') diff --git a/resources/en/credits.html b/resources/en/credits.html index 51139243a..3818c9c34 100644 --- a/resources/en/credits.html +++ b/resources/en/credits.html @@ -13,16 +13,15 @@ div#DevList ul { - - + -

NetSurf Credits

+

NetSurf Credits

NetSurf was brought to you by the following people:

-

Code

+

Code

John-Mark Bell
Michael Drake
Bo Yang

-

Documentation

+

Documentation

John-Mark Bell
James Bursa
Richard Wilson

-

Graphics

+

Graphics

Michael Drake
Andrew Duffell
Phil Mellor

-

Translations

+

Translations

Sebastian Barthel
Bruno D'Arcangeli

diff --git a/resources/en/licence.html b/resources/en/licence.html index afae90f2d..c0c9cbf02 100644 --- a/resources/en/licence.html +++ b/resources/en/licence.html @@ -6,23 +6,22 @@ - - + -

NetSurf Licence

+

NetSurf Licence

NetSurf, the source code, documentation, translatable messages files and UI definitions are licensed under the GNU General Public Licence, version 2.0. In @@ -49,7 +47,7 @@ extend this exception to your version of the code, but you are not obligated to do so. If you do not wish to do so, delete this exception statement from your version.

-

Component Licencing

+

Component Licencing

NetSurf's artwork resources are licensed under the MIT licence.

@@ -58,73 +56,73 @@ version.

NetSurf Project Components

© 2002–2019 The NetSurf Developers GPLv2

© 2007–2019 John-Mark Bell MIT

© 2007–2019 John-Mark Bell
© 2008–2009 Andrew Sidwell MIT

LibParserUtils

LibParserUtils

© 2007–2019 John-Mark Bell MIT

LibROSprite

LibROSprite

© 2008 James Shaw MIT

© 2005–2006 James Bursa MIT

© 2005–2009 James Bursa MIT

© 2008–2009 James Bursa
© 2017 Michael Drake MIT

© 2006 Richard Wilson
© 2008 Sean Fox
© 2017 Vincent Sanders MIT

© 2009–2017 Vincent Sanders
© 2009–2017 Michael Drake MIT

© 2004 Richard Wilson
© 2008 Sean Fox MIT

LibWapcaplet

LibWapcaplet

© 2009–2017 NetSurf Browser Project, Daniel Silverstone MIT @@ -134,49 +132,49 @@ version.

Third Party Components

cURL
cURL: © 1996–2010 Daniel Stenberg MIT
Haru PDF
Haru PDF: © 2000–2008 Takeshi Kanno ZLib
libjpeg
libjpeg: © 1991–2010 Thomas G. Lane, Guido Vollbeding IJG
liblcms
liblcms: © 1998–2007 Marti Maria Saguer MIT
OSLib
OSLib: © 1994–1998 Jonathan Coxhead and contributors OSLib
OpenSSL
OpenSSL: © 1995–1998 Eric A. Young, Tim J. Hudson
© 1998–2010 The OpenSSL Project OpenSSL
libpng
libpng: © 2004–2010 Glenn Randers-Pehrson PNG
UnixLib
UnixLib: © 1995–1999 Simon Callan, Nick Burrett, Nicholas Clark and Peter Burwood
© 1999–2009 Nick Burrett, John Tytgat, Peter Naulls, @@ -185,14 +183,14 @@ Graham Shaw, James Bursa and John-Mark Bell. UnixLib
ZLib
ZLib: © 1995–2010 Jean-loup Gailly and Mark Adler ZLib

-

Licence texts

+

Licence texts

Generic forms of the licence texts appear here where possible. Some components may vary the licence slightly, and our best effort has been made to @@ -201,7 +199,7 @@ white space, etc, were not considered.

GNU General Public Licence, Version 2

GNU GENERAL PUBLIC LICENSE +

GNU GENERAL PUBLIC LICENSE Version 2, June 1991 Copyright (C) 1989, 1991 Free Software Foundation, Inc., @@ -544,7 +542,7 @@ Public License instead of this License.

MIT/X Licence

Permission is hereby granted, free of charge, to any person obtaining a copy +

Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell @@ -565,7 +563,7 @@ THE SOFTWARE.

ZLib Licence

This software is provided 'as-is', without any express or implied +

This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages arising from the use of this software. @@ -584,7 +582,7 @@ THE SOFTWARE.

IJG Licence

The authors make NO WARRANTY or representation, either express or implied, +

The authors make NO WARRANTY or representation, either express or implied, with respect to this software, its quality, accuracy, merchantability, or fitness for a particular purpose. This software is provided "AS IS", and you, its user, assume the entire risk as to its quality and accuracy. @@ -639,7 +637,7 @@ but is also freely distributable.

OSLib Licence

The copyright holder has granted a small relaxation of the +

The copyright holder has granted a small relaxation of the conditions of the GNU Public Licence, in that OSLib is itself free software, but applications linked to it need not be. This means that any changes to OSLib itself (the contents of @@ -899,7 +897,7 @@ That's all there is to it!

OpenSSL Licence

The OpenSSL toolkit stays under a dual license, i.e. both the conditions of +

The OpenSSL toolkit stays under a dual license, i.e. both the conditions of the OpenSSL License and the original SSLeay license apply to the toolkit. See below for the actual license texts. Actually both licenses are BSD-style Open Source licenses. In case of any license issues related to OpenSSL @@ -1025,7 +1023,7 @@ That's all there is to it!

PNG Licence

* This code is released under the libpng license. +

* This code is released under the libpng license. * * libpng versions 1.2.6, August 15, 2004, through 1.4.1, February 25, 2010, are * Copyright (c) 2004, 2006-2010 Glenn Randers-Pehrson, and are @@ -1115,7 +1113,7 @@ That's all there is to it!

UnixLib Licence

In January 2005, permission was obtained from all relevant contributors +

In January 2005, permission was obtained from all relevant contributors by Peter Naulls to license all past and present contributions to UnixLib (where possible) under the revised BSD license. The license is included in the next section and is applicable to all code in UnixLib that does not @@ -1865,7 +1863,7 @@ PROVIDE MAINTENANCE, SUPPORT, UPDATES, ENHANCEMENTS, OR MODIFICATIONS.