the manual contained wrong licence wording inconsistent with any other sources, inclu...

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

diff --git a/docs/latex/wx/manual.tex b/docs/latex/wx/manual.tex
index 43c32b56191481a6e01a1dca2328f18e2024703d..73e9413e27ac26a08e6465e9e8231d4f9761f0f6 100644 (file)
--- a/docs/latex/wx/manual.tex
+++ b/docs/latex/wx/manual.tex
@@ -99,57 +99,64 @@ recognition of the new name by OSI.
 
 \section*{wxWindows Library License, Version 3}\label{wxlicense}
 
 
 \section*{wxWindows Library License, Version 3}\label{wxlicense}
 

-Copyright (c) 1992-2004 Julian Smart, Robert Roebling, Vadim Zeitlin et al. 
+% !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
+%
+% NB: this is exact copy of docs/licence.txt file. DO NOT modify this
+%     section, it MUST be identical to docs/licence.txt!
+%
+% !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
+
+Copyright (c) 1998 Julian Smart, Robert Roebling et al

 
 Everyone is permitted to copy and distribute verbatim copies
 
 Everyone is permitted to copy and distribute verbatim copies

-of this license document, but changing it is not allowed. 
+of this licence document, but changing it is not allowed.

 
 \begin{center}
 
 \begin{center}

-WXWINDOWS LIBRARY LICENSE\\
-TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION 
+WXWINDOWS LIBRARY LICENCE \\
+TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION

 \end{center}
 
 \end{center}
 

-This library is free software; you can redistribute it and/or modify it 
-under the terms of the GNU Library General Public License as published by 
-the Free Software Foundation; either version 2 of the License, or (at 
-your option) any later version. 
+This library is free software; you can redistribute it and/or modify it
+under the terms of the GNU Library General Public Licence as published by
+the Free Software Foundation; either version 2 of the Licence, or (at
+your option) any later version.

 
 

-This library 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 Library 
-General Public License for more details. 
+This library 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 Library
+General Public Licence for more details.

 
 

-You should have received a copy of the GNU Library General Public License 
-along with this software, usually in a file named COPYING.LIB. If not, 
+You should have received a copy of the GNU Library General Public Licence
+along with this software, usually in a file named COPYING.LIB.  If not,

 write to the Free Software Foundation, Inc., 59 Temple Place, Suite 330,
 write to the Free Software Foundation, Inc., 59 Temple Place, Suite 330,

-Boston, MA~02111-1307 USA. 
-
-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 licensed under the wxWindows Library License, applying 
-either version 3 of the License, or (at your option) any later version of 
-the License as published by the copyright holders of version 3 of the 
-License document. 
-
-2. The exception is that you may create binary object code versions of any 
-works using this library or based on this library, and use, copy, modify, 
-link and distribute such binary object code files unrestricted under terms 
-of your choice. 
-
-3. If you copy code from files distributed under the terms of the GNU 
-General Public License or the GNU Library General Public License into a 
-copy of this library, as this license permits, the exception does not 
-apply to the code that you add in this way. To avoid misleading anyone as 
-to the status of such modified files, you must delete this exception 
+Boston, MA 02111-1307 USA.
+
+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
+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
+on the Library.
+
+3. If you copy code from files distributed under the terms of the GNU
+General Public Licence or the GNU Library General Public Licence into a
+copy of this library, as this licence permits, the exception does not
+apply to the code that you add in this way.  To avoid misleading anyone as
+to the status of such modified files, you must delete this exception

 notice from such code and/or adjust the licensing conditions notice
 notice from such code and/or adjust the licensing conditions notice

-accordingly. 
+accordingly.

 
 

-4. If you write modifications of your own for this library, it is your 
+4. If you write modifications of your own for this library, it is your

 choice whether to permit this exception to apply to your modifications. 
 choice whether to permit this exception to apply to your modifications. 

-If you do not wish that, you must delete the exception notice from such 
-code and/or adjust the licensing conditions notice accordingly. 
+If you do not wish that, you must delete the exception notice from such
+code and/or adjust the licensing conditions notice accordingly.
+

 
 \section*{GNU Library General Public License, Version 2}\label{gnulicense}
 
 
 \section*{GNU Library General Public License, Version 2}\label{gnulicense}
 

diff --git a/docs/latex/wx/manual2e.tex b/docs/latex/wx/manual2e.tex
index c34155a810a44af594bf843a027fc4ec2c7c1737..71876c375fc953c8f22ec249cb243f77ddbbdf6b 100644 (file)
--- a/docs/latex/wx/manual2e.tex
+++ b/docs/latex/wx/manual2e.tex
@@ -102,57 +102,63 @@ licendoc.txt) for conditions of software and documentation use.
 
 \section*{wxWidgets Library License, Version 3}
 
 
 \section*{wxWidgets Library License, Version 3}
 

-Copyright (c) 1992-2002 Julian Smart, Robert Roebling, Vadim Zeitlin et al. 
+% !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
+%
+% NB: this is exact copy of docs/licence.txt file. DO NOT modify this
+%     section, it MUST be identical to docs/licence.txt!
+%
+% !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
+
+Copyright (c) 1998 Julian Smart, Robert Roebling et al

 
 Everyone is permitted to copy and distribute verbatim copies
 
 Everyone is permitted to copy and distribute verbatim copies

-of this license document, but changing it is not allowed. 
+of this licence document, but changing it is not allowed.

 
 \begin{center}
 
 \begin{center}

-WXWINDOWS LIBRARY LICENSE\\
-TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION 
+WXWINDOWS LIBRARY LICENCE \\
+TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION

 \end{center}
 
 \end{center}
 

-This library is free software; you can redistribute it and/or modify it 
-under the terms of the GNU Library General Public License as published by 
-the Free Software Foundation; either version 2 of the License, or (at 
-your option) any later version. 
+This library is free software; you can redistribute it and/or modify it
+under the terms of the GNU Library General Public Licence as published by
+the Free Software Foundation; either version 2 of the Licence, or (at
+your option) any later version.

 
 

-This library 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 Library 
-General Public License for more details. 
+This library 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 Library
+General Public Licence for more details.

 
 

-You should have received a copy of the GNU Library General Public License 
-along with this software, usually in a file named COPYING.LIB. If not, 
+You should have received a copy of the GNU Library General Public Licence
+along with this software, usually in a file named COPYING.LIB.  If not,

 write to the Free Software Foundation, Inc., 59 Temple Place, Suite 330,
 write to the Free Software Foundation, Inc., 59 Temple Place, Suite 330,

-Boston, MA~02111-1307 USA. 
-
-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 licensed under the wxWidgets Library License, applying 
-either version 3 of the License, or (at your option) any later version of 
-the License as published by the copyright holders of version 3 of the 
-License document. 
-
-2. The exception is that you may create binary object code versions of any 
-works using this library or based on this library, and use, copy, modify, 
-link and distribute such binary object code files unrestricted under terms 
-of your choice. 
-
-3. If you copy code from files distributed under the terms of the GNU 
-General Public License or the GNU Library General Public License into a 
-copy of this library, as this license permits, the exception does not 
-apply to the code that you add in this way. To avoid misleading anyone as 
-to the status of such modified files, you must delete this exception 
+Boston, MA 02111-1307 USA.
+
+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
+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
+on the Library.
+
+3. If you copy code from files distributed under the terms of the GNU
+General Public Licence or the GNU Library General Public Licence into a
+copy of this library, as this licence permits, the exception does not
+apply to the code that you add in this way.  To avoid misleading anyone as
+to the status of such modified files, you must delete this exception

 notice from such code and/or adjust the licensing conditions notice
 notice from such code and/or adjust the licensing conditions notice

-accordingly. 
+accordingly.

 
 

-4. If you write modifications of your own for this library, it is your 
+4. If you write modifications of your own for this library, it is your

 choice whether to permit this exception to apply to your modifications. 
 choice whether to permit this exception to apply to your modifications. 

-If you do not wish that, you must delete the exception notice from such 
-code and/or adjust the licensing conditions notice accordingly. 
+If you do not wish that, you must delete the exception notice from such
+code and/or adjust the licensing conditions notice accordingly.

 
 \section*{GNU Library General Public License, Version 2}
 
 
 \section*{GNU Library General Public License, Version 2}