aboutsummaryrefslogtreecommitdiff
path: root/Doc
diff options
context:
space:
mode:
authorWilliam S Fulton <wsf@fultondesigns.co.uk>2013-05-01 22:26:52 +0100
committerWilliam S Fulton <wsf@fultondesigns.co.uk>2013-05-03 19:55:41 +0100
commite9b76e4c85e230cefff90128e80881499eb98d14 (patch)
treee35348c544be21adafdc12ce303b706b8df66c33 /Doc
parent067b883813a2e324931a2d689b5c0ff6ae63c598 (diff)
downloadswig-e9b76e4c85e230cefff90128e80881499eb98d14.tar.gz
Add more references about the SWIG license to the legal.html website page
Also add in references to the release notes.
Diffstat (limited to 'Doc')
-rw-r--r--Doc/Manual/Contents.html2
-rw-r--r--Doc/Manual/Preface.html44
2 files changed, 36 insertions, 10 deletions
diff --git a/Doc/Manual/Contents.html b/Doc/Manual/Contents.html
index 8ef413fcb..3e9c844ed 100644
--- a/Doc/Manual/Contents.html
+++ b/Doc/Manual/Contents.html
@@ -16,11 +16,13 @@
<ul>
<li><a href="Preface.html#Preface_nn2">Introduction</a>
<li><a href="Preface.html#Preface_nn4">SWIG Versions</a>
+<li><a href="Preface.html#Preface_license">SWIG License</a>
<li><a href="Preface.html#Preface_nn5">SWIG resources</a>
<li><a href="Preface.html#Preface_nn6">Prerequisites</a>
<li><a href="Preface.html#Preface_nn7">Organization of this manual</a>
<li><a href="Preface.html#Preface_nn8">How to avoid reading the manual</a>
<li><a href="Preface.html#Preface_nn9">Backwards compatibility</a>
+<li><a href="Preface.html#Preface_release_notes">Release notes</a>
<li><a href="Preface.html#Preface_nn10">Credits</a>
<li><a href="Preface.html#Preface_nn11">Bug reports</a>
</ul>
diff --git a/Doc/Manual/Preface.html b/Doc/Manual/Preface.html
index e1fcfbbd8..d489912bd 100644
--- a/Doc/Manual/Preface.html
+++ b/Doc/Manual/Preface.html
@@ -12,11 +12,13 @@
<ul>
<li><a href="#Preface_nn2">Introduction</a>
<li><a href="#Preface_nn4">SWIG Versions</a>
+<li><a href="#Preface_license">SWIG License</a>
<li><a href="#Preface_nn5">SWIG resources</a>
<li><a href="#Preface_nn6">Prerequisites</a>
<li><a href="#Preface_nn7">Organization of this manual</a>
<li><a href="#Preface_nn8">How to avoid reading the manual</a>
<li><a href="#Preface_nn9">Backwards compatibility</a>
+<li><a href="#Preface_release_notes">Release notes</a>
<li><a href="#Preface_nn10">Credits</a>
<li><a href="#Preface_nn11">Bug reports</a>
</ul>
@@ -57,13 +59,26 @@ In the late 1990's, the most stable version of SWIG was release
over a period of 10 years starting from the year 2000. The final version in the 1.3.x
series was 1.3.40, but in truth the 1.3.x series had been stable for many years.
An official stable version was released along with the decision to make SWIG
-license changes and this gave rise to version 2.0.0 in 2010. The license was clarified
+license changes and this gave rise to version 2.0.0 in 2010.
+</p>
+
+<H2><a name="Preface_license"></a>1.3 SWIG License</H2>
+
+
+<p>
+The LICENSE file shipped with SWIG in the top level directory contains the SWIG license.
+For further insight into the license including the license of SWIG's output code, please visit
+the SWIG legal page - <a href="http://www.swig.org/legal.html">http://www.swig.org/legal.html</a>.
+</p>
+
+<p>
+The license was clarified in version 2.0.0
so that the code that SWIG generated could be distributed
under license terms of the user's choice/requirements and at the same time the SWIG
source was placed under the GNU General Public License version 3.
</p>
-<H2><a name="Preface_nn5"></a>1.3 SWIG resources</H2>
+<H2><a name="Preface_nn5"></a>1.4 SWIG resources</H2>
<p>
@@ -102,7 +117,7 @@ about this can be obtained at:
</pre></div>
-<H2><a name="Preface_nn6"></a>1.4 Prerequisites</H2>
+<H2><a name="Preface_nn6"></a>1.5 Prerequisites</H2>
<p>
@@ -127,7 +142,7 @@ However, this isn't meant to be a tutorial on C++ programming. For many
of the gory details, you will almost certainly want to consult a good C++ reference. If you don't program
in C++, you may just want to skip those parts of the manual.
-<H2><a name="Preface_nn7"></a>1.5 Organization of this manual</H2>
+<H2><a name="Preface_nn7"></a>1.6 Organization of this manual</H2>
<p>
@@ -139,7 +154,7 @@ can probably skip to that chapter and find almost everything you need
to know.
</p>
-<H2><a name="Preface_nn8"></a>1.6 How to avoid reading the manual</H2>
+<H2><a name="Preface_nn8"></a>1.7 How to avoid reading the manual</H2>
<p>
@@ -151,7 +166,7 @@ The SWIG distribution also comes with a large directory of
examples that illustrate different topics.
</p>
-<H2><a name="Preface_nn9"></a>1.7 Backwards compatibility</H2>
+<H2><a name="Preface_nn9"></a>1.8 Backwards compatibility</H2>
<p>
@@ -162,8 +177,8 @@ this isn't always possible as the
primary goal over time is to make SWIG
better---a process that would simply be impossible if the developers
are constantly bogged down with backwards compatibility issues.
-Potential incompatibilities are clearly marked in the detailed release notes
-(CHANGES files).
+Potential incompatibilities are clearly marked in the detailed
+<a href="#Preface_release_notes">release notes</a>.
</p>
@@ -187,7 +202,16 @@ Note: The version symbol is not defined in the generated SWIG
wrapper file. The SWIG preprocessor has defined SWIG_VERSION since SWIG-1.3.11.
</p>
-<H2><a name="Preface_nn10"></a>1.8 Credits</H2>
+<H2><a name="Preface_release_notes"></a>1.9 Release notes</H2>
+
+
+<p>
+The CHANGES.current, CHANGES and RELEASENOTES files shipped with SWIG in the top level directory
+contain, respectively, detailed release notes for the current version,
+detailed release notes for previous releases and summary release notes from SWIG-1.3.22 onwards.
+</p>
+
+<H2><a name="Preface_nn10"></a>1.10 Credits</H2>
<p>
@@ -200,7 +224,7 @@ who have made contributions at all levels over time. Contributors
are mentioned either in the COPYRIGHT file or CHANGES files shipped with SWIG or in submitted bugs.
</p>
-<H2><a name="Preface_nn11"></a>1.9 Bug reports</H2>
+<H2><a name="Preface_nn11"></a>1.11 Bug reports</H2>
<p>