diff options
| author | Joerg Bornemann <joerg.bornemann@digia.com> | 2012-10-08 13:48:10 +0200 |
|---|---|---|
| committer | Joerg Bornemann <joerg.bornemann@digia.com> | 2012-10-08 15:48:48 +0200 |
| commit | c07bbf6e74bb8ddc8a8498b0c6baae8c8af547be (patch) | |
| tree | e6dcd26b2a7f3241f053c1bac78f58b282b393cc /doc/config | |
| parent | f3db5fc729a088a7fba799fa7689b5f42a9680b7 (diff) | |
license and copyright updated
Change-Id: I0c0b3035514ee6b735e85c098029fa2f41edb6ff
Reviewed-by: Christian Kandeler <christian.kandeler@digia.com>
Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
Diffstat (limited to 'doc/config')
| -rw-r--r-- | doc/config/qt-html-templates-online.qdocconf | 6 | ||||
| -rw-r--r-- | doc/config/qt-html-templates.qdocconf | 6 |
2 files changed, 6 insertions, 6 deletions
diff --git a/doc/config/qt-html-templates-online.qdocconf b/doc/config/qt-html-templates-online.qdocconf index 872ba2754..900401942 100644 --- a/doc/config/qt-html-templates-online.qdocconf +++ b/doc/config/qt-html-templates-online.qdocconf @@ -106,8 +106,8 @@ HTML.footer = \ " </div> \n" \ " <div class=\"footer\">\n" \ " <p>\n" \ - " <acronym title=\"Copyright\">©</acronym> 2008-2012 Nokia Corporation and/or its\n" \ - " subsidiaries. Nokia, Qt and their respective logos are trademarks of Nokia Corporation \n" \ + " <acronym title=\"Copyright\">©</acronym> 2008-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" \ @@ -116,7 +116,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 80f964f36..9c58d0341 100644 --- a/doc/config/qt-html-templates.qdocconf +++ b/doc/config/qt-html-templates.qdocconf @@ -24,8 +24,8 @@ HTML.footer = \ "</div> \n" \ "<div class=\"footer\">\n" \ " <p>\n" \ - " <acronym title=\"Copyright\">©</acronym> 2008-2012 Nokia Corporation and/or its\n" \ - " subsidiaries. Nokia, Qt and their respective logos are trademarks of Nokia Corporation \n" \ + " <acronym title=\"Copyright\">©</acronym> 2008-2012 Digia Plc and/or its\n" \ + " subsidiaries. Digia, Qt and their respective logos are trademarks of Digia Corporation \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" \ @@ -34,7 +34,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" \ |