summaryrefslogtreecommitdiff
path: root/doc/config
diff options
context:
space:
mode:
Diffstat (limited to 'doc/config')
-rw-r--r--doc/config/qt-html-templates-online.qdocconf6
-rw-r--r--doc/config/qt-html-templates.qdocconf6
-rw-r--r--doc/config/qtsensors.qdocconf2
3 files changed, 7 insertions, 7 deletions
diff --git a/doc/config/qt-html-templates-online.qdocconf b/doc/config/qt-html-templates-online.qdocconf
index 73b2d9f..ac1ea9c 100644
--- a/doc/config/qt-html-templates-online.qdocconf
+++ b/doc/config/qt-html-templates-online.qdocconf
@@ -99,8 +99,8 @@ HTML.footer = \
" </div> \n" \
" <div class=\"footer\">\n" \
" <p>\n" \
- " <acronym title=\"Copyright\">&copy;</acronym> 2012 Nokia Corporation and/or its\n" \
- " subsidiaries. Nokia, Qt and their respective logos are trademarks of Nokia Corporation \n" \
+ " <acronym title=\"Copyright\">&copy;</acronym> 2012 Digia Plc and/or its\n" \
+ " subsidiaries. Digia, Qt and their respective logos are trademarks of Digia Plc \n" \
" in Finland and/or other countries worldwide.</p>\n" \
" <p>\n" \
" All other trademarks are property of their respective owners. <a title=\"Privacy Policy\"\n" \
@@ -109,7 +109,7 @@ HTML.footer = \
" <p>\n" \
" Licensees holding valid Qt Commercial licenses may use this document in accordance with the" \
" Qt Commercial License Agreement provided with the Software or, alternatively, in accordance" \
- " with the terms contained in a written agreement between you and Nokia.</p>\n" \
+ " with the terms contained in a written agreement between you and Digia.</p>\n" \
" <p>\n" \
" Alternatively, this document may be used under the terms of the <a href=\"http://www.gnu.org/licenses/fdl.html\">GNU\n" \
" Free Documentation License version 1.3</a>\n" \
diff --git a/doc/config/qt-html-templates.qdocconf b/doc/config/qt-html-templates.qdocconf
index b1c171d..74afea3 100644
--- a/doc/config/qt-html-templates.qdocconf
+++ b/doc/config/qt-html-templates.qdocconf
@@ -23,8 +23,8 @@ HTML.footer = \
"</div> \n" \
"<div class=\"footer\">\n" \
" <p>\n" \
- " <acronym title=\"Copyright\">&copy;</acronym> 2012 Nokia Corporation and/or its\n" \
- " subsidiaries. Nokia, Qt and their respective logos are trademarks of Nokia Corporation \n" \
+ " <acronym title=\"Copyright\">&copy;</acronym> 2012 Digia Plc and/or its\n" \
+ " subsidiaries. Digia, Qt and their respective logos are trademarks of Digia Plc \n" \
" in Finland and/or other countries worldwide.</p>\n" \
" <p>\n" \
" All other trademarks are property of their respective owners. <a title=\"Privacy Policy\"\n" \
@@ -33,7 +33,7 @@ HTML.footer = \
" <p>\n" \
" Licensees holding valid Qt Commercial licenses may use this document in accordance with the" \
" Qt Commercial License Agreement provided with the Software or, alternatively, in accordance" \
- " with the terms contained in a written agreement between you and Nokia.</p>\n" \
+ " with the terms contained in a written agreement between you and Digia.</p>\n" \
" <p>\n" \
" Alternatively, this document may be used under the terms of the <a href=\"http://www.gnu.org/licenses/fdl.html\">GNU\n" \
" Free Documentation License version 1.3</a>\n" \
diff --git a/doc/config/qtsensors.qdocconf b/doc/config/qtsensors.qdocconf
index e6bb1a5..bd5c823 100644
--- a/doc/config/qtsensors.qdocconf
+++ b/doc/config/qtsensors.qdocconf
@@ -86,4 +86,4 @@ HTML.stylesheets = style/common.css
HTML.headerstyles = " <link rel=\"stylesheet\" type=\"text/css\" href=\"style/common.css\" />\n"
HTML.endheader = "</head>\n<body>\n"
-HTML.footer = "<div class=\"footer\">Copyright (c) 2012 Nokia Corporation and/or its subsidiaries. All rights reserved.</div>\n"
+HTML.footer = "<div class=\"footer\">Copyright (c) 2012 Digia Plc and/or its subsidiaries. All rights reserved.</div>\n"