qiurui
/
qtdoc
mirror of https://github.com/qt/qtdoc.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Adapt wording of documentation license 

Change-Id: Ic4f12efece736362e3d5196ad7d2ee6848c45746
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@qt.io>
This commit is contained in:
Kai Koehne 2018-05-16 14:36:27 +02:00
parent 31beb2498d
commit 712aabd074
2 changed files with 5 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
doc/src/legal/fdl.qdoc
View File

@ -30,10 +30,9 @@
\title GNU Free Documentation License (FDL) \title GNU Free Documentation License (FDL)
\brief About the GPL license used for Qt documentation \brief About the GPL license used for Qt documentation
Qt documentation is licensed under the terms of the GNU Free Documentation Qt documentation is available under commercial licenses from The Qt Company.
In addition, is is available under the terms of the GNU Free Documentation
License version 1.3, as published by the Free Software Foundation. License version 1.3, as published by the Free Software Foundation.
Alternatively, you may use the documentation in accordance with the terms
contained in a written agreement between you and The Qt Company.
Example code embedded in the Qt documentation is also Example code embedded in the Qt documentation is also
licensed under a \l{BSD 3-Clause "New" or "Revised" License}. licensed under a \l{BSD 3-Clause "New" or "Revised" License}.

6
doc/src/legal/licenses.qdoc
View File

@ -55,10 +55,10 @@
licensees, all modules are available under a single, commercial Qt licensees, all modules are available under a single, commercial Qt
license. license.
\e {Qt documentation} is licensed under the terms of the \l{GNU Free \e {Qt documentation} is available under commercial licenses from
The Qt Company, and under the terms of the \l{GNU Free
Documentation License (FDL)} version 1.3, as published by the Free Software Documentation License (FDL)} version 1.3, as published by the Free Software
Foundation. Alternatively, you may use the documentation in accordance with Foundation.
the terms contained in a written agreement between you and The Qt Company.
\e {Qt examples} are available under commercial licenses from The Qt Company, \e {Qt examples} are available under commercial licenses from The Qt Company,
and under a \l{License of Qt examples}{BSD-3-clause} license. and under a \l{License of Qt examples}{BSD-3-clause} license.