From 712aabd0742913546a0b26495134faf901b4b8db Mon Sep 17 00:00:00 2001
From: Kai Koehne <kai.koehne@qt.io>
Date: Wed, 16 May 2018 14:36:27 +0200
Subject: [PATCH] Adapt wording of documentation license
Change-Id: Ic4f12efece736362e3d5196ad7d2ee6848c45746
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@qt.io>
---
doc/src/legal/fdl.qdoc | 5 ++---
doc/src/legal/licenses.qdoc | 6 +++---
2 files changed, 5 insertions(+), 6 deletions(-)
diff --git a/doc/src/legal/fdl.qdoc b/doc/src/legal/fdl.qdoc
index 84f36260..365f46ce 100644
--- a/doc/src/legal/fdl.qdoc
+++ b/doc/src/legal/fdl.qdoc
@@ -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}.
diff --git a/doc/src/legal/licenses.qdoc b/doc/src/legal/licenses.qdoc
index 00ff4588..f6b2299d 100644
--- a/doc/src/legal/licenses.qdoc
+++ b/doc/src/legal/licenses.qdoc
@@ -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.
--
GitLab