summaryrefslogtreecommitdiffstats
path: root/doc/src/opensourceedition.qdoc
diff options
context:
space:
mode:
authorJason McDonald <jason.mcdonald@nokia.com>2009-06-16 12:28:19 (GMT)
committerJason McDonald <jason.mcdonald@nokia.com>2009-06-16 12:37:09 (GMT)
commitbc0ad71e4d197c594e86cb2a1c27b5008a40f3b4 (patch)
tree1e412b5f831a77043a75205d0dc6bc7cc09b1c90 /doc/src/opensourceedition.qdoc
parent858c70f768eeb2d65cefd4115f4e9089b588b2d0 (diff)
downloadQt-bc0ad71e4d197c594e86cb2a1c27b5008a40f3b4.zip
Qt-bc0ad71e4d197c594e86cb2a1c27b5008a40f3b4.tar.gz
Qt-bc0ad71e4d197c594e86cb2a1c27b5008a40f3b4.tar.bz2
Cleanup our usage of the term "Qt Software".
Reviewed-by: Trust Me
Diffstat (limited to 'doc/src/opensourceedition.qdoc')
-rw-r--r--doc/src/opensourceedition.qdoc6
1 files changed, 3 insertions, 3 deletions
diff --git a/doc/src/opensourceedition.qdoc b/doc/src/opensourceedition.qdoc
index 46fdb99..e7bb26a 100644
--- a/doc/src/opensourceedition.qdoc
+++ b/doc/src/opensourceedition.qdoc
@@ -53,7 +53,7 @@
money. The Free Software Foundation (creators of the GNU GPL) speaks
of free in this context as in "free speech", not as in "no cost".
- Qt Software supports the free software concept by providing the Qt Open Source
+ Nokia supports the free software concept by providing the Qt Open Source
Edition, which is licensed under the \l{GNU General Public License (GPL)}
(version 3) and the \l{GNU Lesser General Public License (LGPL)} (version 2.1).
You can use this edition of Qt to create and distribute software with licenses
@@ -81,8 +81,8 @@
used in Qt.
Information about Qt Commercial License Agreements is available
- in the \l{Qt Licensing Overview} on the Qt website or by email
- from \l{mailto:qt-sales@nokia.com}{qt-sales@nokia.com}.
+ in the \l{Qt Licensing Overview} on the Qt website or by contacting
+ the sales department at http://www.qtsoftware.com/contact.
If you are in doubt what edition of Qt is right for your project,
please contact