summaryrefslogtreecommitdiffstats
path: root/doc/src
diff options
context:
space:
mode:
authorJason McDonald <jason.mcdonald@nokia.com>2009-08-12 05:35:40 (GMT)
committerJason McDonald <jason.mcdonald@nokia.com>2009-08-12 05:35:40 (GMT)
commit26a9bcd7aa2be43329d2c89301612de20ec7a838 (patch)
tree0c821e8a16c34ff8aa074ca7feb5ed3ef52e08c9 /doc/src
parent168ebe84e7b7234a4f51e7b3b6ac4f14b6766c20 (diff)
downloadQt-26a9bcd7aa2be43329d2c89301612de20ec7a838.zip
Qt-26a9bcd7aa2be43329d2c89301612de20ec7a838.tar.gz
Qt-26a9bcd7aa2be43329d2c89301612de20ec7a838.tar.bz2
Eliminate last mentions of "Qt Software".
Reviewed-by: Trust Me
Diffstat (limited to 'doc/src')
-rw-r--r--doc/src/examples/moveblocks.qdoc2
-rw-r--r--doc/src/examples/schema.qdoc2
-rw-r--r--doc/src/snippets/qxmlschema/main.cpp2
-rw-r--r--doc/src/snippets/qxmlschemavalidator/main.cpp2
-rw-r--r--doc/src/supported-platforms.qdoc4
5 files changed, 6 insertions, 6 deletions
diff --git a/doc/src/examples/moveblocks.qdoc b/doc/src/examples/moveblocks.qdoc
index 16ed46f..97fbe77 100644
--- a/doc/src/examples/moveblocks.qdoc
+++ b/doc/src/examples/moveblocks.qdoc
@@ -1,7 +1,7 @@
/****************************************************************************
**
** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
-** Contact: Qt Software Information (qt-info@nokia.com)
+** Contact: Nokia Corporation (qt-info@nokia.com)
**
** This file is part of the documentation of the Qt Toolkit.
**
diff --git a/doc/src/examples/schema.qdoc b/doc/src/examples/schema.qdoc
index 8f567e7..4cd80c2 100644
--- a/doc/src/examples/schema.qdoc
+++ b/doc/src/examples/schema.qdoc
@@ -1,7 +1,7 @@
/****************************************************************************
**
** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
-** Contact: Qt Software Information (qt-info@nokia.com)
+** Contact: Nokia Corporation (qt-info@nokia.com)
**
** This file is part of the documentation of the Qt Toolkit.
**
diff --git a/doc/src/snippets/qxmlschema/main.cpp b/doc/src/snippets/qxmlschema/main.cpp
index 7f433a6..d3c043e 100644
--- a/doc/src/snippets/qxmlschema/main.cpp
+++ b/doc/src/snippets/qxmlschema/main.cpp
@@ -1,7 +1,7 @@
/****************************************************************************
**
** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
-** Contact: Qt Software Information (qt-info@nokia.com)
+** Contact: Nokia Corporation (qt-info@nokia.com)
**
** This file is part of the documentation of the Qt Toolkit.
**
diff --git a/doc/src/snippets/qxmlschemavalidator/main.cpp b/doc/src/snippets/qxmlschemavalidator/main.cpp
index b5a8a0b..a4de7f4 100644
--- a/doc/src/snippets/qxmlschemavalidator/main.cpp
+++ b/doc/src/snippets/qxmlschemavalidator/main.cpp
@@ -1,7 +1,7 @@
/****************************************************************************
**
** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
-** Contact: Qt Software Information (qt-info@nokia.com)
+** Contact: Nokia Corporation (qt-info@nokia.com)
**
** This file is part of the documentation of the Qt Toolkit.
**
diff --git a/doc/src/supported-platforms.qdoc b/doc/src/supported-platforms.qdoc
index 1ef869d..6f63c87 100644
--- a/doc/src/supported-platforms.qdoc
+++ b/doc/src/supported-platforms.qdoc
@@ -45,7 +45,7 @@
\brief The platforms supported by Nokia for Qt.
\ingroup platform-notes
- Qt Software strives to provide support for the platforms most
+ The Qt team strives to provide support for the platforms most
frequently used by Qt users. We have designed our internal testing procedure to
divide platforms into three test categories (Tier 1, Tier 2 and Tier 3) in order
to prioritize internal testing and development resources so that the most
@@ -132,7 +132,7 @@
\section1 General Legal Disclaimer
- Please note that Qt Software’s products are offered on an "as is" basis without warranty
+ Please note that Qt is offered on an "as is" basis without warranty
of any kind and that our products are not error or bug free. To the maximum extent
permitted by applicable law, Nokia on behalf of itself and its suppliers, disclaims all
warranties and conditions, either express or implied, including, but not limited to,