r3524 tlsa - /trunk/netsurfweb/index.en
by netsurf＠semichrome.net
Author: tlsa
Date: Wed Aug 15 22:48:44 2007
New Revision: 3524
URL: http://source.netsurf-browser.org?rev=3524&view=rev
Log:
Correct news item date.
Modified:
trunk/netsurfweb/index.en
Modified: trunk/netsurfweb/index.en
URL: http://source.netsurf-browser.org/trunk/netsurfweb/index.en?rev=3524&r1=3...
==============================================================================
--- trunk/netsurfweb/index.en (original)
+++ trunk/netsurfweb/index.en Wed Aug 15 22:48:44 2007
@@ -25,7 +25,7 @@
<h2>News</h2>
<div class="newsitem">
-<p>19 May 2007 - <em>NetSurf 1.1 released!</em></p>
+<p>13 Aug 2007 - <em>NetSurf 1.1 released!</em></p>
<p>Recommended upgrade featuring several important bug fixes to the stable NetSurf release</p>
<p class="more"><a href="download/">Download NetSurf 1.1...</a></p>
</div>
15 years, 7 months
r3523 tlsa - in /trunk/netsurfweb: download/index.de download/index.en index.en
by netsurf＠semichrome.net
Author: tlsa
Date: Wed Aug 15 22:42:53 2007
New Revision: 3523
URL: http://source.netsurf-browser.org?rev=3523&view=rev
Log:
Update front page with 1.1 release news. Update English download page and add link to release notes. Correct source version number on German download page.
Modified:
trunk/netsurfweb/download/index.de
trunk/netsurfweb/download/index.en
trunk/netsurfweb/index.en
Modified: trunk/netsurfweb/download/index.de
URL: http://source.netsurf-browser.org/trunk/netsurfweb/download/index.de?rev=...
==============================================================================
--- trunk/netsurfweb/download/index.de (original)
+++ trunk/netsurfweb/download/index.de Wed Aug 15 22:42:53 2007
@@ -21,21 +21,14 @@
alt=""><br>NetSurf 1.1</a></th>
<td>2.6M</td>
<td>13 Aug 2007</td>
-<td>NetSurf Browser für RISC OS, Vollversion.
-<strong>Empfohlen für die Mehrzahl der Nutzer.</strong></td>
+<td>NetSurf Browser für RISC OS.</td>
</tr>
-<tr><th><a href="netsurf-1.1-src.tar.gz"><img border="0" src="/builds/netsurf.png" alt=""><br>NetSurf 1.0 Quellcode</a></th>
+<tr><th><a href="netsurf-1.1-src.tar.gz"><img border="0" src="/builds/netsurf.png" alt=""><br>NetSurf 1.1 Quellcode</a></th>
<td>964kB</td>
<td>13 Aug 2007</td>
<td>NetSurf Quellcode, geeignet zum Erstellen des Browsers unter RISC OS oder Linux/GTK.</td>
</tr>
-
-<!--tr><th><a href="unetsurf.zip"><img src="unetsurf.png" alt=""><br>Small NetSurf</a></th>
-<td>SIZE_UNETSURF</td>
-<td>DATE_UNETSURF</td>
-<td>Small NetSurf browser for RISC OS. This has support for http: and file: only (no https:). It is more suitable for machines with small amounts of RAM (8MB or less).</td>
-</tr-->
</table>
<!--p>A <a href="http://www.riscpkg.org/">RiscPkg</a> package of NetSurf is
Modified: trunk/netsurfweb/download/index.en
URL: http://source.netsurf-browser.org/trunk/netsurfweb/download/index.en?rev=...
==============================================================================
--- trunk/netsurfweb/download/index.en (original)
+++ trunk/netsurfweb/download/index.en Wed Aug 15 22:42:53 2007
@@ -21,8 +21,7 @@
alt=""><br>NetSurf 1.1</a></th>
<td>2.3M</td>
<td>13 Aug 2007</td>
-<td>NetSurf browser for RISC OS, full version.
-<strong>Recommended for most users.</strong></td>
+<td>NetSurf browser for RISC OS.</td>
</tr>
<tr><th><a href="netsurf-1.1-src.tar.gz"><img border="0" src="/builds/netsurf.png" alt=""><br>NetSurf 1.1 Source Code</a></th>
@@ -30,20 +29,16 @@
<td>13 Aug 2007</td>
<td>NetSurf browser source code, suitable for building under RISC OS or Linux/GTK.</td>
</tr>
+</table>
-<!--tr><th><a href="unetsurf.zip"><img src="unetsurf.png" alt=""><br>Small NetSurf</a></th>
-<td>SIZE_UNETSURF</td>
-<td>DATE_UNETSURF</td>
-<td>Small NetSurf browser for RISC OS. This has support for http: and file: only (no https:). It is more suitable for machines with small amounts of RAM (8MB or less).</td>
-</tr-->
-</table>
+<p>Read the <a href="http://vlists.pepperfish.net/pipermail/netsurf-users-netsurf-browser.org/...">NetSurf 1.1 release notes</a> (includes change log).</p>
<h3>Older versions</h3>
<table class="download">
<tr><th><a href="netsurf-1.0.zip"><img border="0" src="/builds/netsurf.png" alt=""><br>NetSurf 1.0</a></th>
<td>2.4M</td>
<td>17 May 2007</td>
-<td>NetSurf browser for RISC OS, full version.</td>
+<td>NetSurf browser for RISC OS.</td>
</tr>
<tr><th><a href="netsurf-1.0-src.tar.gz"><img border="0" src="/builds/netsurf.png" alt=""><br>NetSurf 1.0 Source Code</a></th>
Modified: trunk/netsurfweb/index.en
URL: http://source.netsurf-browser.org/trunk/netsurfweb/index.en?rev=3523&r1=3...
==============================================================================
--- trunk/netsurfweb/index.en (original)
+++ trunk/netsurfweb/index.en Wed Aug 15 22:42:53 2007
@@ -23,6 +23,12 @@
<p>Please try NetSurf out regularly and <a href="info#ContactDevelopers">send us feedback</a>. The <a href="progress">progress</a> page provides an overview of NetSurf's current status.</p>
<h2>News</h2>
+
+<div class="newsitem">
+<p>19 May 2007 - <em>NetSurf 1.1 released!</em></p>
+<p>Recommended upgrade featuring several important bug fixes to the stable NetSurf release</p>
+<p class="more"><a href="download/">Download NetSurf 1.1...</a></p>
+</div>
<div class="newsitem">
<p>11 Jun 2007 - <em>User mailing list moving</em></p>
15 years, 7 months
r3522 tlsa - in /trunk/netsurfweb: index.de index.en index.fr index.nl
by netsurf＠semichrome.net
Author: tlsa
Date: Wed Aug 15 22:04:23 2007
New Revision: 3522
URL: http://source.netsurf-browser.org?rev=3522&view=rev
Log:
Ensure space between sentences in NetSurf.
Modified:
trunk/netsurfweb/index.de
trunk/netsurfweb/index.en
trunk/netsurfweb/index.fr
trunk/netsurfweb/index.nl
Modified: trunk/netsurfweb/index.de
URL: http://source.netsurf-browser.org/trunk/netsurfweb/index.de?rev=3522&r1=3...
==============================================================================
--- trunk/netsurfweb/index.de (original)
+++ trunk/netsurfweb/index.de Wed Aug 15 22:04:23 2007
@@ -16,8 +16,7 @@
<p>NetSurf ist ein Open-Source Web-Browser für RISC OS und wird unter der <a href="licence">GPL</a> lizensiert. Ziel dieses Projektes ist es, die Standards HTML 4 und CSS auf der RISC OS Plattform zur Verfügung zu stellen. NetSurf ist ein schlankes, schnelles und einfach zu bedienendes Programm.</p>
-<p>Die aktuelle Programmversion ist Version 1.1.<strong>
-<a href="download/">Herunterladen von NetSurf 1.1 für RISC OS</a>.</strong></p>
+<p>Die aktuelle Programmversion ist Version 1.1. <strong><a href="download/">Herunterladen von NetSurf 1.1 für RISC OS</a>.</strong></p>
<p><a href="builds/">Testversionen</a> stehen ebenfalls zum Download bereit. Diese werden automatisch aller 15 Minuten aus dem Quellcode auf <a href="http://source.netsurf-browser.org/trunk/netsurf/">Subversion</a> erzeugt.</p>
Modified: trunk/netsurfweb/index.en
URL: http://source.netsurf-browser.org/trunk/netsurfweb/index.en?rev=3522&r1=3...
==============================================================================
--- trunk/netsurfweb/index.en (original)
+++ trunk/netsurfweb/index.en Wed Aug 15 22:04:23 2007
@@ -16,8 +16,7 @@
<p>NetSurf is an open-source web browser for RISC OS, <a href="licence">licensed under the GPL</a>. Its aim is to bring the HTML 4 and CSS standards to the RISC OS platform and provide a small, fast and comprehensive web browsing solution.</p>
-<p>The latest release is 1.1.<strong>
-<a href="download/">Download NetSurf 1.1 for RISC OS</a>.</strong></p>
+<p>The latest release is 1.1. <strong><a href="download/">Download NetSurf 1.1 for RISC OS</a>.</strong></p>
<p>Test builds are also available for <a href="builds/">download</a>. These are built every 15 minutes from the latest source code in <a href="http://source.netsurf-browser.org/trunk/netsurf/">Subversion</a>.</p>
Modified: trunk/netsurfweb/index.fr
URL: http://source.netsurf-browser.org/trunk/netsurfweb/index.fr?rev=3522&r1=3...
==============================================================================
--- trunk/netsurfweb/index.fr (original)
+++ trunk/netsurfweb/index.fr Wed Aug 15 22:04:23 2007
@@ -13,8 +13,7 @@
<div class="main">
<p>NetSurf est un navigateur web open source pour RISC OS. Son but est d'apporter les standards HTML 4 et CSS à la plateforme RISC OS.</p>
-<p>The latest release is 1.1.<strong>
-<a href="download/">Download NetSurf 1.1 for RISC OS</a>.</strong></p>
+<p>The latest release is 1.1. <strong><a href="download/">Download NetSurf 1.1 for RISC OS</a>.</strong></p>
<h2>État actuel</h2>
<p><strong>NetSurf est en cours de développement.</strong> Des versions test sont <a href="builds/">disponibles en téléchargement</a>.
Modified: trunk/netsurfweb/index.nl
URL: http://source.netsurf-browser.org/trunk/netsurfweb/index.nl?rev=3522&r1=3...
==============================================================================
--- trunk/netsurfweb/index.nl (original)
+++ trunk/netsurfweb/index.nl Wed Aug 15 22:04:23 2007
@@ -16,8 +16,7 @@
<p>NetSurf is een open-source web bladeraar voor RISC OS, en heeft een <a href="licence">GPL</a> licentie. Het doel van het project is om de HTML 4 en CSS standaarden aan het RISC OS platform ter beschikking te stellen, en het verschaft een kleine, snelle en eenvoudig te bedienen web bladeraar.</p>
-<p>The latest release is 1.1.<strong>
-<a href="download/">Download NetSurf 1.1 for RISC OS</a>.</strong></p>
+<p>The latest release is 1.1. <strong><a href="download/">Download NetSurf 1.1 for RISC OS</a>.</strong></p>
<p>NetSurf wordt voortdurend verder ontwikkeld, al is er nog geen volledige versie uitgebracht. Er zijn test versies beschikbaar die <a href="builds/">opgehaald</a> kunnen worden, deze worden elke 15 minuten aangemaakt als de broncode in <a href="http://source.netsurf-browser.org/trunk/netsurf/">Subversion</a> veranderd is.</p>
15 years, 7 months
r3521 tlsa - in /branches/1/netsurf: !NetSurf/Docs/intro_en, faf ChangeLog
by netsurf＠semichrome.net
Author: tlsa
Date: Wed Aug 15 21:59:55 2007
New Revision: 3521
URL: http://source.netsurf-browser.org?rev=3521&view=rev
Log:
Minor documentation fixes.
Modified:
branches/1/netsurf/!NetSurf/Docs/intro_en,faf
branches/1/netsurf/ChangeLog
Modified: branches/1/netsurf/!NetSurf/Docs/intro_en,faf
URL: http://source.netsurf-browser.org/branches/1/netsurf/%21NetSurf/Docs/intr...
==============================================================================
--- branches/1/netsurf/!NetSurf/Docs/intro_en,faf (original)
+++ branches/1/netsurf/!NetSurf/Docs/intro_en,faf Wed Aug 15 21:59:55 2007
@@ -12,7 +12,7 @@
<div class="main">
-<p>Welcome to <strong>NetSurf 1.0</strong>! This is first stable release of
+<p>Welcome to <strong>NetSurf 1.1</strong>! This is first stable release of
the open source web browser for RISC OS. Its aim has been to bring the
HTML 4 and CSS standards to the RISC OS platform.</p>
Modified: branches/1/netsurf/ChangeLog
URL: http://source.netsurf-browser.org/branches/1/netsurf/ChangeLog?rev=3521&r...
==============================================================================
--- branches/1/netsurf/ChangeLog (original)
+++ branches/1/netsurf/ChangeLog Wed Aug 15 21:59:55 2007
@@ -60,5 +60,6 @@
* Fix issues with scrolling from the keyboard.
* Add simple SSL certificate verification window.
-Also included are many and various smaller bug fixes, documation enhancements
-and updated translations. Thanks to everybody involved in this release!
+Also included are many and various smaller bug fixes, documentation
+enhancements and updated translations. Thanks to everybody involved in
+this release!
15 years, 7 months
r3520 rjek - in /trunk/netsurfweb: download/index.de download/index.en index.de index.en index.fr index.nl
by netsurf＠semichrome.net
Author: rjek
Date: Wed Aug 15 21:27:20 2007
New Revision: 3520
URL: http://source.netsurf-browser.org?rev=3520&view=rev
Log:
Update website to include links to 1.1
Modified:
trunk/netsurfweb/download/index.de
trunk/netsurfweb/download/index.en
trunk/netsurfweb/index.de
trunk/netsurfweb/index.en
trunk/netsurfweb/index.fr
trunk/netsurfweb/index.nl
Modified: trunk/netsurfweb/download/index.de
URL: http://source.netsurf-browser.org/trunk/netsurfweb/download/index.de?rev=...
==============================================================================
--- trunk/netsurfweb/download/index.de (original)
+++ trunk/netsurfweb/download/index.de Wed Aug 15 21:27:20 2007
@@ -17,17 +17,17 @@
href="/info#GettingStartedInstallation">Installationsanweisungen</a>.</p>
<table class="download">
-<tr><th class="highlight"><a href="netsurf-1.0.zip"><img src="/builds/netsurf.png"
-alt=""><br>NetSurf 1.0</a></th>
-<td>2.4M</td>
-<td>17 May 2007</td>
+<tr><th class="highlight"><a href="netsurf-1.1.zip"><img border="0" src="/builds/netsurf.png"
+alt=""><br>NetSurf 1.1</a></th>
+<td>2.6M</td>
+<td>13 Aug 2007</td>
<td>NetSurf Browser für RISC OS, Vollversion.
<strong>Empfohlen für die Mehrzahl der Nutzer.</strong></td>
</tr>
-<tr><th><a href="netsurf-1.0-src.tar.gz"><img src="/builds/netsurf.png" alt=""><br>NetSurf 1.0 Quellcode</a></th>
-<td>946kB</td>
-<td>17 May 2007</td>
+<tr><th><a href="netsurf-1.1-src.tar.gz"><img border="0" src="/builds/netsurf.png" alt=""><br>NetSurf 1.0 Quellcode</a></th>
+<td>964kB</td>
+<td>13 Aug 2007</td>
<td>NetSurf Quellcode, geeignet zum Erstellen des Browsers unter RISC OS oder Linux/GTK.</td>
</tr>
Modified: trunk/netsurfweb/download/index.en
URL: http://source.netsurf-browser.org/trunk/netsurfweb/download/index.en?rev=...
==============================================================================
--- trunk/netsurfweb/download/index.en (original)
+++ trunk/netsurfweb/download/index.en Wed Aug 15 21:27:20 2007
@@ -17,17 +17,17 @@
href="/info#GettingStartedInstallation">installation instructions</a>.</p>
<table class="download">
-<tr><th class="highlight"><a href="netsurf-1.0.zip"><img src="/builds/netsurf.png"
-alt=""><br>NetSurf 1.0</a></th>
-<td>2.4M</td>
-<td>17 May 2007</td>
+<tr><th class="highlight"><a href="netsurf-1.1.zip"><img border="0" src="/builds/netsurf.png"
+alt=""><br>NetSurf 1.1</a></th>
+<td>2.3M</td>
+<td>13 Aug 2007</td>
<td>NetSurf browser for RISC OS, full version.
<strong>Recommended for most users.</strong></td>
</tr>
-<tr><th><a href="netsurf-1.0-src.tar.gz"><img src="/builds/netsurf.png" alt=""><br>NetSurf 1.0 Source Code</a></th>
-<td>946kB</td>
-<td>17 May 2007</td>
+<tr><th><a href="netsurf-1.1-src.tar.gz"><img border="0" src="/builds/netsurf.png" alt=""><br>NetSurf 1.1 Source Code</a></th>
+<td>964kB</td>
+<td>13 Aug 2007</td>
<td>NetSurf browser source code, suitable for building under RISC OS or Linux/GTK.</td>
</tr>
@@ -36,6 +36,21 @@
<td>DATE_UNETSURF</td>
<td>Small NetSurf browser for RISC OS. This has support for http: and file: only (no https:). It is more suitable for machines with small amounts of RAM (8MB or less).</td>
</tr-->
+</table>
+
+<h3>Older versions</h3>
+<table class="download">
+<tr><th><a href="netsurf-1.0.zip"><img border="0" src="/builds/netsurf.png" alt=""><br>NetSurf 1.0</a></th>
+<td>2.4M</td>
+<td>17 May 2007</td>
+<td>NetSurf browser for RISC OS, full version.</td>
+</tr>
+
+<tr><th><a href="netsurf-1.0-src.tar.gz"><img border="0" src="/builds/netsurf.png" alt=""><br>NetSurf 1.0 Source Code</a></th>
+<td>946kB</td>
+<td>17 May 2007</td>
+<td>NetSurf browser source code, suitable for building under RISC OS or Linux/GTK.</td>
+</tr>
</table>
<!--p>A <a href="http://www.riscpkg.org/">RiscPkg</a> package of NetSurf is
Modified: trunk/netsurfweb/index.de
URL: http://source.netsurf-browser.org/trunk/netsurfweb/index.de?rev=3520&r1=3...
==============================================================================
--- trunk/netsurfweb/index.de (original)
+++ trunk/netsurfweb/index.de Wed Aug 15 21:27:20 2007
@@ -16,8 +16,8 @@
<p>NetSurf ist ein Open-Source Web-Browser für RISC OS und wird unter der <a href="licence">GPL</a> lizensiert. Ziel dieses Projektes ist es, die Standards HTML 4 und CSS auf der RISC OS Plattform zur Verfügung zu stellen. NetSurf ist ein schlankes, schnelles und einfach zu bedienendes Programm.</p>
-<p>Die aktuelle Programmversion ist Version 1.0.<strong>
-<a href="download/">Herunterladen von NetSurf 1.0 für RISC OS</a>.</strong></p>
+<p>Die aktuelle Programmversion ist Version 1.1.<strong>
+<a href="download/">Herunterladen von NetSurf 1.1 für RISC OS</a>.</strong></p>
<p><a href="builds/">Testversionen</a> stehen ebenfalls zum Download bereit. Diese werden automatisch aller 15 Minuten aus dem Quellcode auf <a href="http://source.netsurf-browser.org/trunk/netsurf/">Subversion</a> erzeugt.</p>
Modified: trunk/netsurfweb/index.en
URL: http://source.netsurf-browser.org/trunk/netsurfweb/index.en?rev=3520&r1=3...
==============================================================================
--- trunk/netsurfweb/index.en (original)
+++ trunk/netsurfweb/index.en Wed Aug 15 21:27:20 2007
@@ -16,8 +16,8 @@
<p>NetSurf is an open-source web browser for RISC OS, <a href="licence">licensed under the GPL</a>. Its aim is to bring the HTML 4 and CSS standards to the RISC OS platform and provide a small, fast and comprehensive web browsing solution.</p>
-<p>The latest release is 1.0.<strong>
-<a href="download/">Download NetSurf 1.0 for RISC OS</a>.</strong></p>
+<p>The latest release is 1.1.<strong>
+<a href="download/">Download NetSurf 1.1 for RISC OS</a>.</strong></p>
<p>Test builds are also available for <a href="builds/">download</a>. These are built every 15 minutes from the latest source code in <a href="http://source.netsurf-browser.org/trunk/netsurf/">Subversion</a>.</p>
Modified: trunk/netsurfweb/index.fr
URL: http://source.netsurf-browser.org/trunk/netsurfweb/index.fr?rev=3520&r1=3...
==============================================================================
--- trunk/netsurfweb/index.fr (original)
+++ trunk/netsurfweb/index.fr Wed Aug 15 21:27:20 2007
@@ -13,8 +13,8 @@
<div class="main">
<p>NetSurf est un navigateur web open source pour RISC OS. Son but est d'apporter les standards HTML 4 et CSS à la plateforme RISC OS.</p>
-<p>The latest release is 1.0.<strong>
-<a href="download/">Download NetSurf 1.0 for RISC OS</a>.</strong></p>
+<p>The latest release is 1.1.<strong>
+<a href="download/">Download NetSurf 1.1 for RISC OS</a>.</strong></p>
<h2>État actuel</h2>
<p><strong>NetSurf est en cours de développement.</strong> Des versions test sont <a href="builds/">disponibles en téléchargement</a>.
Modified: trunk/netsurfweb/index.nl
URL: http://source.netsurf-browser.org/trunk/netsurfweb/index.nl?rev=3520&r1=3...
==============================================================================
--- trunk/netsurfweb/index.nl (original)
+++ trunk/netsurfweb/index.nl Wed Aug 15 21:27:20 2007
@@ -16,8 +16,8 @@
<p>NetSurf is een open-source web bladeraar voor RISC OS, en heeft een <a href="licence">GPL</a> licentie. Het doel van het project is om de HTML 4 en CSS standaarden aan het RISC OS platform ter beschikking te stellen, en het verschaft een kleine, snelle en eenvoudig te bedienen web bladeraar.</p>
-<p>The latest release is 1.0.<strong>
-<a href="download/">Download NetSurf 1.0 for RISC OS</a>.</strong></p>
+<p>The latest release is 1.1.<strong>
+<a href="download/">Download NetSurf 1.1 for RISC OS</a>.</strong></p>
<p>NetSurf wordt voortdurend verder ontwikkeld, al is er nog geen volledige versie uitgebracht. Er zijn test versies beschikbaar die <a href="builds/">opgehaald</a> kunnen worden, deze worden elke 15 minuten aangemaakt als de broncode in <a href="http://source.netsurf-browser.org/trunk/netsurf/">Subversion</a> veranderd is.</p>
15 years, 7 months
r3519 tlsa - /trunk/netsurfweb/licence.en
by netsurf＠semichrome.net
Author: tlsa
Date: Tue Aug 14 22:58:14 2007
New Revision: 3519
URL: http://source.netsurf-browser.org?rev=3519&view=rev
Log:
Move artwork paragraph out of DIV.
Modified:
trunk/netsurfweb/licence.en
Modified: trunk/netsurfweb/licence.en
URL: http://source.netsurf-browser.org/trunk/netsurfweb/licence.en?rev=3519&r1...
==============================================================================
--- trunk/netsurfweb/licence.en (original)
+++ trunk/netsurfweb/licence.en Tue Aug 14 22:58:14 2007
@@ -19,9 +19,9 @@
<p>In addition, as a special exception, permission is granted to link the code of this release of NetSurf with the OpenSSL project's "OpenSSL" library (or with modified versions of it that use the same licence as the "OpenSSL" library), and distribute the linked executables. You must obey the GNU General Public License version 2 in all respects for all of the code used other than "OpenSSL". If you modify the code, you may 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.</p>
+</div>
+
<p>All visual artwork contained within NetSurf is licensed under the terms of the MIT License.</p>
-
-</div>
<p>The full text of the MIT and GPL licenses are provided in Annex A and Annex B of this document.</p>
15 years, 7 months
r3518 tlsa - /trunk/netsurfweb/licence.en
by netsurf＠semichrome.net
Author: tlsa
Date: Tue Aug 14 20:23:53 2007
New Revision: 3518
URL: http://source.netsurf-browser.org?rev=3518&view=rev
Log:
Update licence page.
Modified:
trunk/netsurfweb/licence.en
Modified: trunk/netsurfweb/licence.en
URL: http://source.netsurf-browser.org/trunk/netsurfweb/licence.en?rev=3518&r1...
==============================================================================
--- trunk/netsurfweb/licence.en (original)
+++ trunk/netsurfweb/licence.en Tue Aug 14 20:23:53 2007
@@ -11,511 +11,163 @@
<h1>NetSurf Licence</h1>
-<p>NetSurf is free open-source software licensed under the
-<strong><a href="http://www.gnu.org/">GNU</a> General Public License</strong>
-(<abbr>GPL</abbr>). This means that</p>
+<p>The source code, documentation, translatable messages files and UI definitions contained within NetSurf are licensed under the following terms:</p>
-<ul>
-<li>You can copy and share it.</li>
-<li>You can view and modify the source code.</li>
-</ul>
+<div style="background: #ddd; border: solid 1px black; margin: 10mm; padding: 1em 0.5em">
-<p>For more information see the
-<a href="http://www.gnu.org/licenses/gpl-faq"><abbr>GPL</abbr> FAQ</a>.</p>
+<p>NetSurf is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; version 2 of the License.</p>
+
+<p>In addition, as a special exception, permission is granted to link the code of this release of NetSurf with the OpenSSL project's "OpenSSL" library (or with modified versions of it that use the same licence as the "OpenSSL" library), and distribute the linked executables. You must obey the GNU General Public License version 2 in all respects for all of the code used other than "OpenSSL". If you modify the code, you may 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.</p>
+
+<p>All visual artwork contained within NetSurf is licensed under the terms of the MIT License.</p>
+
+</div>
+
+<p>The full text of the MIT and GPL licenses are provided in Annex A and Annex B of this document.</p>
+
+<h2 style="border: none;">Annex A: The MIT License</h2>
+
+<div style="background: #ddd; border: solid 1px black; margin: 10mm; padding: 1em 0.5em">
+
+<p>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 copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:</p>
+
+<p>The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.</p>
+
+<p>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. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.</p>
+
+</div>
+
+<h2 style="border: none;">Annex B: The GNU General Public License</h2>
+
+<div style="background: #ddd; border: solid 1px black; margin: 10mm; padding: 1em 0.5em">
+
+<!-- from http://www.gnu.org/licenses/gpl.html, only formatting modified -->
+<h3>GNU GENERAL PUBLIC LICENSE</h3>
+<p>Version 2, June 1991</p>
+
+<p style="font-family: monospace;">Copyright (C) 1989, 1991 Free Software Foundation, Inc. 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA</p>
+
+<p style="font-family: monospace;">
+Everyone is permitted to copy and distribute verbatim copies of this
+license document, but changing it is not allowed.</p>
-<div style="background: #ddd; border: solid 1px black; margin: 10mm;
-padding: 0.5em">
+<h4>Preamble</h4>
-<!-- from http://www.gnu.org/licenses/gpl.html, only formatting modified -->
-<H2 style="border: none">GNU GENERAL PUBLIC LICENSE</H2>
-<P>
-Version 2, June 1991
+<p>The licenses for most software are designed to take away your freedom to share and change it. By contrast, the GNU General Public License is intended to guarantee your freedom to share and change free software--to make sure the software is free for all its users. This General Public License applies to most of the Free Software Foundation's software and to any other program whose authors commit to using it. (Some other Free Software Foundation software is covered by the GNU Lesser General Public License instead.) You can apply it to your programs, too.</p>
-</P>
+<p>When we speak of free software, we are referring to freedom, not price. Our General Public Licenses are designed to make sure that you have the freedom to distribute copies of free software (and charge for this service if you wish), that you receive source code or can get it if you want it, that you can change the software or use pieces of it in new free programs; and that you know you can do these things.</p>
-<P style="font-family: monospace;">
-Copyright (C) 1989, 1991 Free Software Foundation, Inc. 51 Franklin
-Street, Fifth Floor, Boston, MA 02110-1301, USA
-</P>
+<p>To protect your rights, we need to make restrictions that forbid anyone to deny you these rights or to ask you to surrender the rights. These restrictions translate to certain responsibilities for you if you distribute copies of the software, or if you modify it.</p>
-<P style="font-family: monospace;">
-Everyone is permitted to copy and distribute verbatim copies of this
-license document, but changing it is not allowed.
-</P>
+<p>For example, if you distribute copies of such a program, whether gratis or for a fee, you must give the recipients all the rights that you have. You must make sure that they, too, receive or can get the source code. And you must show them these terms so they know their rights.</p>
+
+<p>We protect your rights with two steps: (1) copyright the software, and (2) offer you this license which gives you legal permission to copy, distribute and/or modify the software.</p>
+
+<p>Also, for each author's protection and ours, we want to make certain that everyone understands that there is no warranty for this free software. If the software is modified by someone else and passed on, we want its recipients to know that what they have is not the original, so that any problems introduced by others will not reflect on the original authors' reputations.</p>
+
+<p>Finally, any free program is threatened constantly by software patents. We wish to avoid the danger that redistributors of a free program will individually obtain patent licenses, in effect making the program proprietary. To prevent this, we have made it clear that any patent must be licensed for everyone's free use or not licensed at all.</p>
+
+<p>The precise terms and conditions for copying, distribution and modification follow.</p>
+
+<h4>TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION</h4>
+
+<p><strong>0.</strong> This License applies to any program or other work which contains a notice placed by the copyright holder saying it may be distributed under the terms of this General Public License. The "Program", below, refers to any such program or work, and a "work based on the Program" means either the Program or any derivative work under copyright law: that is to say, a work containing the Program or a portion of it, either verbatim or with modifications and/or translated into another language. (Hereinafter, translation is included without limitation in the term "modification".) Each licensee is addressed as "you".</p>
+
+<P>Activities other than copying, distribution and modification are not covered by this License; they are outside its scope. The act of running the Program is not restricted, and the output from the Program is covered only if its contents constitute a work based on the Program (independent of having been made by running the Program). Whether that is true depends on what the Program does.</p>
+
+<p><strong>1.</strong> You may copy and distribute verbatim copies of the Program's source code as you receive it, in any medium, provided that you conspicuously and appropriately publish on each copy an appropriate copyright notice and disclaimer of warranty; keep intact all the notices that refer to this License and to the absence of any warranty; and give any other recipients of the Program a copy of this License along with the Program.</p>
+
+<p>You may charge a fee for the physical act of transferring a copy, and you may at your option offer warranty protection in exchange for a fee.</p>
+
+<p><strong>2.</strong> You may modify your copy or copies of the Program or any portion of it, thus forming a work based on the Program, and copy and distribute such modifications or work under the terms of Section 1 above, provided that you also meet all of these conditions:</p>
+
+<dl>
+<dd><strong>a)</strong> You must cause the modified files to carry prominent notices stating that you changed the files and the date of any change.</dd>
+<dd><strong>b)</strong> You must cause any work that you distribute or publish, that in whole or in part contains or is derived from the Program or any part thereof, to be licensed as a whole at no charge to all third parties under the terms of this License.</dd>
+<dd><strong>c)</strong> If the modified program normally reads commands interactively when run, you must cause it, when started running for such interactive use in the most ordinary way, to print or display an announcement including an appropriate copyright notice and a notice that there is no warranty (or else, saying that you provide a warranty) and that users may redistribute the program under these conditions, and telling the user how to view a copy of this License. (Exception: if the Program itself is interactive but does not normally print such an announcement, your work based on the Program is not required to print an announcement.)</dd>
+</dl>
+
+<p>These requirements apply to the modified work as a whole. If identifiable sections of that work are not derived from the Program, and can be reasonably considered independent and separate works in themselves, then this License, and its terms, do not apply to those sections when you distribute them as separate works. But when you distribute the same sections as part of a whole which is a work based on the Program, the distribution of the whole must be on the terms of this License, whose permissions for other licensees extend to the entire whole, and thus to each and every part regardless of who wrote it.</p>
+
+<p>Thus, it is not the intent of this section to claim rights or contest your rights to work written entirely by you; rather, the intent is to exercise the right to control the distribution of derivative or collective works based on the Program.</p>
+
+<p>In addition, mere aggregation of another work not based on the Program with the Program (or with a work based on the Program) on a volume of a storage or distribution medium does not bring the other work under the scope of this License.</p>
+
+<p><strong>3.</strong> You may copy and distribute the Program (or a work based on it, under Section 2) in object code or executable form under the terms of Sections 1 and 2 above provided that you also do one of the following:</p>
-<H3>Preamble</H3>
+<dl>
+<dd><strong>a)</strong> Accompany it with the complete corresponding machine-readable source code, which must be distributed under the terms of Sections 1 and 2 above on a medium customarily used for software interchange; or,</dd>
+<dd><strong>b)</strong> Accompany it with a written offer, valid for at least three years, to give any third party, for a charge no more than your cost of physically performing source distribution, a complete machine-readable copy of the corresponding source code, to be distributed under the terms of Sections 1 and 2 above on a medium customarily used for software interchange; or,</dd>
+<dd><strong>c)</strong> Accompany it with the information you received as to the offer to distribute corresponding source code. (This alternative is allowed only for noncommercial distribution and only if you received the program in object code or executable form with such an offer, in accord with Subsection b above.)</dd>
+</dl>
-<P>
- The licenses for most software are designed to take away your
-freedom to share and change it. By contrast, the GNU General Public
-License is intended to guarantee your freedom to share and change free
-software--to make sure the software is free for all its users. This
-General Public License applies to most of the Free Software
-Foundation's software and to any other program whose authors commit to
-using it. (Some other Free Software Foundation software is covered by
-the GNU Lesser General Public License instead.) You can apply it to
-your programs, too.
+<p>The source code for a work means the preferred form of the work for making modifications to it. For an executable work, complete source code means all the source code for all modules it contains, plus any associated interface definition files, plus the scripts used to control compilation and installation of the executable. However, as a special exception, the source code distributed need not include anything that is normally distributed (in either source or binary form) with the major components (compiler, kernel, and so on) of the operating system on which the executable runs, unless that component itself accompanies the executable.</p>
-</P>
-<P>
- When we speak of free software, we are referring to freedom, not
-price. Our General Public Licenses are designed to make sure that you
-have the freedom to distribute copies of free software (and charge for
-this service if you wish), that you receive source code or can get it
-if you want it, that you can change the software or use pieces of it
-in new free programs; and that you know you can do these things.
+<p>If distribution of executable or object code is made by offering access to copy from a designated place, then offering equivalent access to copy the source code from the same place counts as distribution of the source code, even though third parties are not compelled to copy the source along with the object code.</p>
-</P>
-<P>
- To protect your rights, we need to make restrictions that forbid
-anyone to deny you these rights or to ask you to surrender the rights.
-These restrictions translate to certain responsibilities for you if you
-distribute copies of the software, or if you modify it.
+<p><strong>4.</strong> You may not copy, modify, sublicense, or distribute the Program except as expressly provided under this License. Any attempt otherwise to copy, modify, sublicense or distribute the Program is void, and will automatically terminate your rights under this License. However, parties who have received copies, or rights, from you under this License will not have their licenses terminated so long as such parties remain in full compliance.</p>
-</P>
-<P>
- For example, if you distribute copies of such a program, whether
-gratis or for a fee, you must give the recipients all the rights that
-you have. You must make sure that they, too, receive or can get the
-source code. And you must show them these terms so they know their
-rights.
+<p><strong>5.</strong> You are not required to accept this License, since you have not signed it. However, nothing else grants you permission to modify or distribute the Program or its derivative works. These actions are prohibited by law if you do not accept this License. Therefore, by modifying or distributing the Program (or any work based on the Program), you indicate your acceptance of this License to do so, and all its terms and conditions for copying, distributing or modifying the Program or works based on it.</p>
-</P>
-<P>
- We protect your rights with two steps: (1) copyright the software, and
-(2) offer you this license which gives you legal permission to copy,
-distribute and/or modify the software.
+<P><strong>6.</strong> Each time you redistribute the Program (or any work based on the Program), the recipient automatically receives a license from the original licensor to copy, distribute or modify the Program subject to these terms and conditions. You may not impose any further restrictions on the recipients' exercise of the rights granted herein. You are not responsible for enforcing compliance by third parties to this License.</p>
-</P>
-<P>
- Also, for each author's protection and ours, we want to make certain
-that everyone understands that there is no warranty for this free
-software. If the software is modified by someone else and passed on, we
-want its recipients to know that what they have is not the original, so
-that any problems introduced by others will not reflect on the original
-authors' reputations.
+<p><strong>7.</strong> If, as a consequence of a court judgment or allegation of patent infringement or for any other reason (not limited to patent issues), conditions are imposed on you (whether by court order, agreement or otherwise) that contradict the conditions of this License, they do not excuse you from the conditions of this License. If you cannot distribute so as to satisfy simultaneously your obligations under this License and any other pertinent obligations, then as a consequence you may not distribute the Program at all. For example, if a patent license would not permit royalty-free redistribution of the Program by all those who receive copies directly or indirectly through you, then the only way you could satisfy both it and this License would be to refrain entirely from distribution of the Program.</p>
-</P>
-<P>
- Finally, any free program is threatened constantly by software
-patents. We wish to avoid the danger that redistributors of a free
-program will individually obtain patent licenses, in effect making the
-program proprietary. To prevent this, we have made it clear that any
-patent must be licensed for everyone's free use or not licensed at all.
+<P>If any portion of this section is held invalid or unenforceable under any particular circumstance, the balance of the section is intended to apply and the section as a whole is intended to apply in other circumstances.</p>
-</P>
-<P>
- The precise terms and conditions for copying, distribution and
-modification follow.
+<P>It is not the purpose of this section to induce you to infringe any patents or other property right claims or to contest validity of any such claims; this section has the sole purpose of protecting the integrity of the free software distribution system, which is implemented by public license practices. Many people have made generous contributions to the wide range of software distributed through that system in reliance on consistent application of that system; it is up to the author/donor to decide if he or she is willing to distribute software through any other system and a licensee cannot impose that choice.</p>
-</P>
+<p>This section is intended to make thoroughly clear what is believed to be a consequence of the rest of this License.</p>
+<p><strong>8.</strong> If the distribution and/or use of the Program is restricted in certain countries either by patents or by copyrighted interfaces, the original copyright holder who places the Program under this License may add an explicit geographical distribution limitation excluding those countries, so that distribution is permitted only in or among countries not thus excluded. In such case, this License incorporates the limitation as if written in the body of this License.</p>
-<H3>TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION</H3>
+<p><strong>9.</strong> The Free Software Foundation may publish revised and/or new versions of the General Public License from time to time. Such new versions will be similar in spirit to the present version, but may differ in detail to address new problems or concerns.</p>
+<P>Each version is given a distinguishing version number. If the Program specifies a version number of this License which applies to it and "any later version", you have the option of following the terms and conditions either of that version or of any later version published by the Free Software Foundation. If the Program does not specify a version number of this License, you may choose any version ever published by the Free Software Foundation.</p>
-<P>
+<p><strong>10.</strong> If you wish to incorporate parts of the Program into other free programs whose distribution conditions are different, write to the author to ask for permission. For software which is copyrighted by the Free Software Foundation, write to the Free Software Foundation; we sometimes make exceptions for this. Our decision will be guided by the two goals of preserving the free status of all derivatives of our free software and of promoting the sharing and reuse of software generally.</p>
-<STRONG>0.</STRONG>
- This License applies to any program or other work which contains
-a notice placed by the copyright holder saying it may be distributed
-under the terms of this General Public License. The "Program", below,
-refers to any such program or work, and a "work based on the Program"
-means either the Program or any derivative work under copyright law:
-that is to say, a work containing the Program or a portion of it,
-either verbatim or with modifications and/or translated into another
-language. (Hereinafter, translation is included without limitation in
-the term "modification".) Each licensee is addressed as "you".
-<P>
+<p><strong>NO WARRANTY</strong></p>
-Activities other than copying, distribution and modification are not
-covered by this License; they are outside its scope. The act of
-running the Program is not restricted, and the output from the Program
-is covered only if its contents constitute a work based on the
-Program (independent of having been made by running the Program).
-Whether that is true depends on what the Program does.
+<p><strong>11.</strong> BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW. EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM IS WITH YOU. SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING, REPAIR OR CORRECTION.</p>
-<P>
-
-<STRONG>1.</STRONG>
- You may copy and distribute verbatim copies of the Program's
-source code as you receive it, in any medium, provided that you
-conspicuously and appropriately publish on each copy an appropriate
-copyright notice and disclaimer of warranty; keep intact all the
-notices that refer to this License and to the absence of any warranty;
-and give any other recipients of the Program a copy of this License
-along with the Program.
-<P>
-
-You may charge a fee for the physical act of transferring a copy, and
-you may at your option offer warranty protection in exchange for a fee.
-<P>
-
-<STRONG>2.</STRONG>
- You may modify your copy or copies of the Program or any portion
-of it, thus forming a work based on the Program, and copy and
-distribute such modifications or work under the terms of Section 1
-above, provided that you also meet all of these conditions:
-<P>
-
-<DL>
-<DD>
-<STRONG>a)</STRONG>
- You must cause the modified files to carry prominent notices
- stating that you changed the files and the date of any change.
-</DD>
-</DL>
-<P>
-<DL>
-<DD>
-<STRONG>b)</STRONG>
- You must cause any work that you distribute or publish, that in
- whole or in part contains or is derived from the Program or any
- part thereof, to be licensed as a whole at no charge to all third
- parties under the terms of this License.
-</DD>
-</DL>
-<P>
-<DL>
-<DD>
-<STRONG>c)</STRONG>
- If the modified program normally reads commands interactively
- when run, you must cause it, when started running for such
- interactive use in the most ordinary way, to print or display an
- announcement including an appropriate copyright notice and a
- notice that there is no warranty (or else, saying that you provide
- a warranty) and that users may redistribute the program under
- these conditions, and telling the user how to view a copy of this
- License. (Exception: if the Program itself is interactive but
- does not normally print such an announcement, your work based on
- the Program is not required to print an announcement.)
-</DD>
-</DL>
-<P>
-
-These requirements apply to the modified work as a whole. If
-identifiable sections of that work are not derived from the Program,
-and can be reasonably considered independent and separate works in
-themselves, then this License, and its terms, do not apply to those
-sections when you distribute them as separate works. But when you
-distribute the same sections as part of a whole which is a work based
-on the Program, the distribution of the whole must be on the terms of
-this License, whose permissions for other licensees extend to the
-entire whole, and thus to each and every part regardless of who wrote it.
-<P>
-
-Thus, it is not the intent of this section to claim rights or contest
-your rights to work written entirely by you; rather, the intent is to
-exercise the right to control the distribution of derivative or
-collective works based on the Program.
-<P>
-
-In addition, mere aggregation of another work not based on the Program
-with the Program (or with a work based on the Program) on a volume of
-a storage or distribution medium does not bring the other work under
-the scope of this License.
-
-<P>
-
-<STRONG>3.</STRONG>
- You may copy and distribute the Program (or a work based on it,
-under Section 2) in object code or executable form under the terms of
-Sections 1 and 2 above provided that you also do one of the following:
-
-
-<DL>
-<DD>
-<STRONG>a)</STRONG>
- Accompany it with the complete corresponding machine-readable
- source code, which must be distributed under the terms of Sections
- 1 and 2 above on a medium customarily used for software interchange; or,
-</DD>
-</DL>
-<P>
-<DL>
-<DD>
-<STRONG>b)</STRONG>
- Accompany it with a written offer, valid for at least three
- years, to give any third party, for a charge no more than your
- cost of physically performing source distribution, a complete
- machine-readable copy of the corresponding source code, to be
- distributed under the terms of Sections 1 and 2 above on a medium
- customarily used for software interchange; or,
-</DD>
-</DL>
-<P>
-<DL>
-<DD>
-<STRONG>c)</STRONG>
- Accompany it with the information you received as to the offer
- to distribute corresponding source code. (This alternative is
- allowed only for noncommercial distribution and only if you
- received the program in object code or executable form with such
- an offer, in accord with Subsection b above.)
-</DD>
-</DL>
-<P>
-
-The source code for a work means the preferred form of the work for
-making modifications to it. For an executable work, complete source
-code means all the source code for all modules it contains, plus any
-associated interface definition files, plus the scripts used to
-control compilation and installation of the executable. However, as a
-special exception, the source code distributed need not include
-anything that is normally distributed (in either source or binary
-form) with the major components (compiler, kernel, and so on) of the
-operating system on which the executable runs, unless that component
-itself accompanies the executable.
-<P>
-
-If distribution of executable or object code is made by offering
-access to copy from a designated place, then offering equivalent
-access to copy the source code from the same place counts as
-distribution of the source code, even though third parties are not
-compelled to copy the source along with the object code.
-<P>
-
-<STRONG>4.</STRONG>
- You may not copy, modify, sublicense, or distribute the Program
-except as expressly provided under this License. Any attempt
-otherwise to copy, modify, sublicense or distribute the Program is
-void, and will automatically terminate your rights under this License.
-However, parties who have received copies, or rights, from you under
-this License will not have their licenses terminated so long as such
-parties remain in full compliance.
-
-<P>
-
-<STRONG>5.</STRONG>
- You are not required to accept this License, since you have not
-signed it. However, nothing else grants you permission to modify or
-distribute the Program or its derivative works. These actions are
-prohibited by law if you do not accept this License. Therefore, by
-modifying or distributing the Program (or any work based on the
-Program), you indicate your acceptance of this License to do so, and
-all its terms and conditions for copying, distributing or modifying
-the Program or works based on it.
-
-<P>
-
-<STRONG>6.</STRONG>
- Each time you redistribute the Program (or any work based on the
-Program), the recipient automatically receives a license from the
-original licensor to copy, distribute or modify the Program subject to
-these terms and conditions. You may not impose any further
-restrictions on the recipients' exercise of the rights granted herein.
-You are not responsible for enforcing compliance by third parties to
-this License.
-
-<P>
-
-<STRONG>7.</STRONG>
- If, as a consequence of a court judgment or allegation of patent
-infringement or for any other reason (not limited to patent issues),
-conditions are imposed on you (whether by court order, agreement or
-otherwise) that contradict the conditions of this License, they do not
-excuse you from the conditions of this License. If you cannot
-distribute so as to satisfy simultaneously your obligations under this
-License and any other pertinent obligations, then as a consequence you
-may not distribute the Program at all. For example, if a patent
-license would not permit royalty-free redistribution of the Program by
-all those who receive copies directly or indirectly through you, then
-the only way you could satisfy both it and this License would be to
-refrain entirely from distribution of the Program.
-<P>
-
-If any portion of this section is held invalid or unenforceable under
-any particular circumstance, the balance of the section is intended to
-apply and the section as a whole is intended to apply in other
-circumstances.
-<P>
-
-It is not the purpose of this section to induce you to infringe any
-patents or other property right claims or to contest validity of any
-such claims; this section has the sole purpose of protecting the
-integrity of the free software distribution system, which is
-implemented by public license practices. Many people have made
-generous contributions to the wide range of software distributed
-through that system in reliance on consistent application of that
-system; it is up to the author/donor to decide if he or she is willing
-to distribute software through any other system and a licensee cannot
-impose that choice.
-<P>
-
-This section is intended to make thoroughly clear what is believed to
-be a consequence of the rest of this License.
-
-<P>
-
-<STRONG>8.</STRONG>
- If the distribution and/or use of the Program is restricted in
-certain countries either by patents or by copyrighted interfaces, the
-original copyright holder who places the Program under this License
-may add an explicit geographical distribution limitation excluding
-those countries, so that distribution is permitted only in or among
-countries not thus excluded. In such case, this License incorporates
-the limitation as if written in the body of this License.
-
-<P>
-
-<STRONG>9.</STRONG>
- The Free Software Foundation may publish revised and/or new versions
-of the General Public License from time to time. Such new versions will
-be similar in spirit to the present version, but may differ in detail to
-address new problems or concerns.
-<P>
-
-Each version is given a distinguishing version number. If the Program
-specifies a version number of this License which applies to it and "any
-later version", you have the option of following the terms and conditions
-either of that version or of any later version published by the Free
-Software Foundation. If the Program does not specify a version number of
-this License, you may choose any version ever published by the Free Software
-Foundation.
-
-<P>
-
-
-<STRONG>10.</STRONG>
- If you wish to incorporate parts of the Program into other free
-programs whose distribution conditions are different, write to the author
-to ask for permission. For software which is copyrighted by the Free
-Software Foundation, write to the Free Software Foundation; we sometimes
-make exceptions for this. Our decision will be guided by the two goals
-of preserving the free status of all derivatives of our free software and
-of promoting the sharing and reuse of software generally.
-
-
-
-<P><STRONG>NO WARRANTY</STRONG></P>
-
-<P>
-
-<STRONG>11.</STRONG>
- BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY
-FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW. EXCEPT WHEN
-OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES
-PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED
-OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
-MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. THE ENTIRE RISK AS
-TO THE QUALITY AND PERFORMANCE OF THE PROGRAM IS WITH YOU. SHOULD THE
-PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING,
-REPAIR OR CORRECTION.
-
-<P>
-
-<STRONG>12.</STRONG>
- IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
-WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR
-REDISTRIBUTE THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES,
-INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING
-OUT OF THE USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED
-TO LOSS OF DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY
-YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER
-PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE
-POSSIBILITY OF SUCH DAMAGES.
-
-<P>
-
+<P><strong>12.</strong> IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR REDISTRIBUTE THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.</p>
<p>END OF TERMS AND CONDITIONS</p>
+<h4>How to Apply These Terms to Your New Programs</h4>
+
+<p>If you develop a new program, and you want it to be of the greatest possible use to the public, the best way to achieve this is to make it free software which everyone can redistribute and change under these terms.</p>
+
+<p>To do so, attach the following notices to the program. It is safest to attach them to the start of each source file to most effectively convey the exclusion of warranty; and each file should have at least the "copyright" line and a pointer to where the full notice is found.</p>
+
+<p style="font-family: monospace;"><one line to give the program's name and an idea of what it does.><br>Copyright (C) <yyyy> <name of author></p>
+
+<p style="font-family: monospace;">This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 2 of the License, or (at your option) any later version.</p>
+
+<p style="font-family: monospace;">This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.</p>
+
+<p style="font-family: monospace;">You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.</p>
+
+<p>Also add information on how to contact you by electronic and paper mail.</p>
+
+<p>If the program is interactive, make it output a short notice like this when it starts in an interactive mode:</p>
+
+<p style="font-family: monospace;">Gnomovision version 69, Copyright (C) <year> <name of author><br>Gnomovision comes with ABSOLUTELY NO WARRANTY; for details type `show w'. This is free software, and you are welcome to redistribute it under certain conditions; type `show c' for details.</p>
+
+<p>The hypothetical commands <samp>`show w'</samp> and <samp>`show c'</samp> should show the appropriate parts of the General Public License. Of course, the commands you use may be called something other than <samp>`show w'</samp> and <samp>`show c'</samp>; they could even be mouse-clicks or menu items--whatever suits your program.</p>
+
+<p>You should also get your employer (if you work as a programmer) or your school, if any, to sign a "copyright disclaimer" for the program, if necessary. Here is a sample; alter the names:</p>
+
+<p style="font-family: monospace;">Yoyodyne, Inc., hereby disclaims all copyright interest in the program `Gnomovision' (which makes passes at compilers) written by James Hacker.<br><br><signature of Ty Coon>, 1 April 1989<br> Ty Coon, President of Vice</p>
+
+<p>This General Public License does not permit incorporating your program into proprietary programs. If your program is a subroutine library, you may consider it more useful to permit linking proprietary applications with the library. If this is what you want to do, use the GNU Lesser General Public License instead of this License.</p>
+
+</div>
-<H3>How to Apply These Terms to Your New Programs</H3>
-
-<P>
- If you develop a new program, and you want it to be of the greatest
-possible use to the public, the best way to achieve this is to make it
-free software which everyone can redistribute and change under these terms.
-
-</P>
-<P>
- To do so, attach the following notices to the program. It is safest
-to attach them to the start of each source file to most effectively
-convey the exclusion of warranty; and each file should have at least
-the "copyright" line and a pointer to where the full notice is found.
-
-</P>
-
-<P style="font-family: monospace;">
-<VAR>one line to give the program's name and an idea of what it does.</VAR><BR>
-Copyright (C) <VAR>yyyy</VAR> <VAR>name of author</VAR>
-</P>
-
-<P style="font-family: monospace;">
-This program is free software; you can redistribute it and/or
-modify it under the terms of the GNU General Public License
-as published by the Free Software Foundation; either version 2
-of the License, or (at your option) any later version.
-</P>
-
-<P style="font-family: monospace;">
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-GNU General Public License for more details.
-</P>
-
-<P style="font-family: monospace;">
-You should have received a copy of the GNU General Public License
-along with this program; if not, write to the Free Software
-Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
-</P>
-
-<P>
-Also add information on how to contact you by electronic and paper mail.
-
-</P>
-<P>
-If the program is interactive, make it output a short notice like this
-when it starts in an interactive mode:
-
-</P>
-
-<P style="font-family: monospace;">
-Gnomovision version 69, Copyright (C) <VAR>year</VAR> <VAR>name of author</VAR><BR>
-Gnomovision comes with ABSOLUTELY NO WARRANTY; for details
-type `show w'. This is free software, and you are welcome
-to redistribute it under certain conditions; type `show c'
-for details.
-</P>
-
-<P>
-The hypothetical commands <SAMP>`show w'</SAMP> and <SAMP>`show c'</SAMP> should show
-the appropriate parts of the General Public License. Of course, the
-commands you use may be called something other than <SAMP>`show w'</SAMP> and
-<SAMP>`show c'</SAMP>; they could even be mouse-clicks or menu items--whatever
-suits your program.
-</P>
-
-<P>
-You should also get your employer (if you work as a programmer) or your
-school, if any, to sign a "copyright disclaimer" for the program, if
-necessary. Here is a sample; alter the names:
-
-</P>
-
-<P style="font-family: monospace;">
-Yoyodyne, Inc., hereby disclaims all copyright interest in the program
-`Gnomovision' (which makes passes at compilers) written by James Hacker.
-<br><br>
-<VAR>signature of Ty Coon</VAR>, 1 April 1989<br>
-Ty Coon, President of Vice
-</P>
-
-<P>
-This General Public License does not permit incorporating your program into
-proprietary programs. If your program is a subroutine library, you may
-consider it more useful to permit linking proprietary applications with the
-library. If this is what you want to do, use the
-GNU Lesser General Public License
-instead of this License.
-</P>
-
-</div>
<div class="footer">
<p class="breadcrumbs"><a href="/">NetSurf</a> » Licence</p>
15 years, 7 months