From: Julian Smart <julian@anthemion.co.uk>
Date: Tue, 2 Aug 2005 17:36:23 +0000 (+0000)
Subject: Small corrections to licence
X-Git-Url: https://git.saurik.com/wxWidgets.git/commitdiff_plain/d98c97a36afb9486018aea6b72ee3ba35b7e3b71

Small corrections to licence


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@35051 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
---

diff --git a/docs/latex/wx/manual.tex b/docs/latex/wx/manual.tex
index 7efc2e8d2f..9ba495bd02 100644
--- a/docs/latex/wx/manual.tex
+++ b/docs/latex/wx/manual.tex
@@ -97,7 +97,7 @@ licendoc.txt) for conditions of software and documentation use.
 Note that we use the old name wxWindows in the license, pending
 recognition of the new name by OSI.
 
-\section*{wxWindows Library License, Version 3}\label{wxlicense}
+\section*{wxWindows Library License, Version 3.1}\label{wxlicense}
 
 % !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
 %
@@ -106,7 +106,7 @@ recognition of the new name by OSI.
 %
 % !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
 
-Copyright (c) 1998 Julian Smart, Robert Roebling et al
+Copyright (c) 1998-2005 Julian Smart, Robert Roebling et al
 
 Everyone is permitted to copy and distribute verbatim copies
 of this licence document, but changing it is not allowed.
@@ -136,12 +136,12 @@ EXCEPTION NOTICE
 1. As a special exception, the copyright holders of this library give
 permission for additional uses of the text contained in this release of
 the library as licenced under the wxWindows Library Licence, applying
-either version 3 of the Licence, or (at your option) any later version of
-the Licence as published by the copyright holders of version 3 of the
+either version 3.1 of the Licence, or (at your option) any later version of
+the Licence as published by the copyright holders of version 3.1 of the
 Licence document.
 
 2. The exception is that you may use, copy, link, modify and distribute
-under the user's own terms, binary object code versions of works based
+under your own terms, binary object code versions of works based
 on the Library.
 
 3. If you copy code from files distributed under the terms of the GNU
diff --git a/docs/licence.txt b/docs/licence.txt
index c91deed0bc..95f18d034c 100644
--- a/docs/licence.txt
+++ b/docs/licence.txt
@@ -1,7 +1,7 @@
-                wxWindows Library Licence, Version 3
-                ====================================
+                wxWindows Library Licence, Version 3.1
+                ======================================
 
-  Copyright (c) 1998 Julian Smart, Robert Roebling et al
+  Copyright (c) 1998-2005 Julian Smart, Robert Roebling et al
 
   Everyone is permitted to copy and distribute verbatim copies
   of this licence document, but changing it is not allowed.
@@ -29,12 +29,12 @@
   1. As a special exception, the copyright holders of this library give
   permission for additional uses of the text contained in this release of
   the library as licenced under the wxWindows Library Licence, applying
-  either version 3 of the Licence, or (at your option) any later version of
-  the Licence as published by the copyright holders of version 3 of the
-  Licence document.
+  either version 3.1 of the Licence, or (at your option) any later version of
+  the Licence as published by the copyright holders of version
+  3.1 of the Licence document.
 
   2. The exception is that you may use, copy, link, modify and distribute
-  under the user's own terms, binary object code versions of works based
+  under your own terms, binary object code versions of works based
   on the Library.
 
   3. If you copy code from files distributed under the terms of the GNU