Commit 712aabd0 authored by Kai Koehne's avatar Kai Koehne
Browse files

Adapt wording of documentation license


Change-Id: Ic4f12efece736362e3d5196ad7d2ee6848c45746
Reviewed-by: default avatarLeena Miettinen <riitta-leena.miettinen@qt.io>
 
Showing with 5 additions and 6 deletions
......@@ -30,10 +30,9 @@
\title GNU Free Documentation License (FDL)
\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.
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
licensed under a \l{BSD 3-Clause "New" or "Revised" License}.
......
......@@ -55,10 +55,10 @@
licensees, all modules are available under a single, commercial Qt
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
Foundation. Alternatively, you may use the documentation in accordance with
the terms contained in a written agreement between you and The Qt Company.
Foundation.
\e {Qt examples} are available under commercial licenses from The Qt Company,
and under a \l{License of Qt examples}{BSD-3-clause} license.
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment