summaryrefslogtreecommitdiff
path: root/doc/api
diff options
context:
space:
mode:
authorhjk <qtc-committer@nokia.com>2011-04-13 08:42:33 +0200
committerhjk <qtc-committer@nokia.com>2011-04-13 11:49:28 +0200
commit839766396489249c541c60c92f717f77814dcf8b (patch)
tree3e937237a26bdd8ef9ca5f5ee369d1dcec5f5891 /doc/api
parent61790e54e8155e1e57bfdd372726dfb2117c4563 (diff)
downloadqt-creator-839766396489249c541c60c92f717f77814dcf8b.tar.gz
Update license.
Diffstat (limited to 'doc/api')
-rw-r--r--doc/api/coding-style.qdoc8
-rw-r--r--doc/api/qtcreator-api.qdoc8
2 files changed, 2 insertions, 14 deletions
diff --git a/doc/api/coding-style.qdoc b/doc/api/coding-style.qdoc
index 0f6673b5a2..619c1a04a9 100644
--- a/doc/api/coding-style.qdoc
+++ b/doc/api/coding-style.qdoc
@@ -4,14 +4,8 @@
**
** Copyright (c) 2011 Nokia Corporation and/or its subsidiary(-ies).
**
-** Contact: Nokia Corporation (qt-info@nokia.com)
+** Contact: Nokia Corporation (info@qt.nokia.com)
**
-** No Commercial Usage
-**
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
**
** GNU Free Documentation License
**
diff --git a/doc/api/qtcreator-api.qdoc b/doc/api/qtcreator-api.qdoc
index e3efc3f59a..bf2e14f460 100644
--- a/doc/api/qtcreator-api.qdoc
+++ b/doc/api/qtcreator-api.qdoc
@@ -4,14 +4,8 @@
**
** Copyright (c) 2011 Nokia Corporation and/or its subsidiary(-ies).
**
-** Contact: Nokia Corporation (qt-info@nokia.com)
+** Contact: Nokia Corporation (info@qt.nokia.com)
**
-** No Commercial Usage
-**
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
**
** GNU Free Documentation License
**