Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

the manual contained wrong licence wording inconsistent with any other sources, including licence.txt; fixed

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/branches/WX_2_4_BRANCH@33925 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Václav Slavík
2005-05-01 22:39:52 +00:00
parent 9c8efca00a
commit c8ca71e4cd
1 changed files with 43 additions and 35 deletions
Download Patch File Download Diff File Expand all files Collapse all files

44
docs/latex/wx/manual.tex
View File

@@ -97,48 +97,55 @@ 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\\ WXWINDOWS LIBRARY LICENCE \\
TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION 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 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 under the terms of the GNU Library General Public Licence as published by
the Free Software Foundation; either version 2 of the License, or (at the Free Software Foundation; either version 2 of the Licence, or (at
your option) any later version. your option) any later version.
This library is distributed in the hope that it will be useful, but This library is distributed in the hope that it will be useful, but
WITHOUT ANY WARRANTY; without even the implied warranty of WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Library MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Library
General Public License for more details. General Public Licence for more details.
You should have received a copy of the GNU Library General Public License 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, 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. Boston, MA 02111-1307 USA.
EXCEPTION NOTICE EXCEPTION NOTICE
1. As a special exception, the copyright holders of this library give 1. As a special exception, the copyright holders of this library give
permission for additional uses of the text contained in this release of permission for additional uses of the text contained in this release of
the library as licensed under the wxWidgets Library License, applying the library as licenced under the wxWindows Library Licence, applying
either version 3 of the License, or (at your option) any later version of either version 3 of the Licence, or (at your option) any later version of
the License as published by the copyright holders of version 3 of the the Licence as published by the copyright holders of version 3 of the
License document. Licence document.
2. The exception is that you may create binary object code versions of any 2. The exception is that you may use, copy, link, modify and distribute
works using this library or based on this library, and use, copy, modify, under the user's own terms, binary object code versions of works based
link and distribute such binary object code files unrestricted under terms on the Library.
of your choice.
3. If you copy code from files distributed under the terms of the GNU 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 General Public Licence or the GNU Library General Public Licence into a
copy of this library, as this license permits, the exception does not 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 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 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
@@ -149,6 +156,7 @@ 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 If you do not wish that, you must delete the exception notice from such
code and/or adjust the licensing conditions notice accordingly. 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}
Copyright (C) 1991 Free Software Foundation, Inc. Copyright (C) 1991 Free Software Foundation, Inc.