diff options
| author | Sergio Ahumada <sergio.ahumada@digia.com> | 2012-09-23 11:14:21 +0200 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2012-09-23 12:00:56 +0200 |
| commit | 57b63625b9da0693f8305c2a37b006655fbf1730 (patch) | |
| tree | b6b0796e33135f3689c5584023bbf6dbe51d8c06 | |
| parent | c676667a31cf9cf7e57a741e5ad1d8d001a873bd (diff) | |
doc: Change copyrights from Nokia to Digia
Change-Id: Id157b2dbb6cf5826424544761e7e084ff3f85215
Reviewed-by: Lars Knoll <lars.knoll@digia.com>
| -rw-r--r-- | doc/config/qtdocgallery.qdocconf | 2 | ||||
| -rw-r--r-- | doc/global/qt-html-templates-offline.qdocconf | 4 | ||||
| -rw-r--r-- | doc/global/qt-module-defaults.qdocconf | 2 |
3 files changed, 4 insertions, 4 deletions
diff --git a/doc/config/qtdocgallery.qdocconf b/doc/config/qtdocgallery.qdocconf index f59f593..f5720cb 100644 --- a/doc/config/qtdocgallery.qdocconf +++ b/doc/config/qtdocgallery.qdocconf @@ -76,4 +76,4 @@ HTML.stylesheets = style/qtdocgallery.css HTML.headerstyles = " <link rel=\"stylesheet\" type=\"text/css\" href=\"style/qtdocgallery.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 subsidiary(-ies).</div>\n" diff --git a/doc/global/qt-html-templates-offline.qdocconf b/doc/global/qt-html-templates-offline.qdocconf index 135d0ab..6e3177f 100644 --- a/doc/global/qt-html-templates-offline.qdocconf +++ b/doc/global/qt-html-templates-offline.qdocconf @@ -25,7 +25,7 @@ HTML.endheader = \ HTML.footer = \ "<div class=\"footer\">\n" \ " <p>\n" \ - " <acronym title=\"Copyright\">©</acronym> 2012 Nokia Corporation and/or its\n" \ + " <acronym title=\"Copyright\">©</acronym> 2012 Digia Plc and/or its\n" \ " subsidiaries. Documentation contributions included herein are the copyrights of\n" \ " their respective owners.</p>\n" \ " <br />\n" \ @@ -38,7 +38,7 @@ HTML.footer = \ " www.qt-project.org</a>.</p>\n" \ " <br />\n" \ " <p>\n" \ - " Nokia, Qt and their respective logos are trademarks of Nokia Corporation \n" \ + " Digia, Qt and their respective logos are trademarks of Digia Plc \n" \ " in Finland and/or other countries worldwide. All other trademarks are property\n" \ " of their respective owners. <a title=\"Privacy Policy\"\n" \ " href=\"http://en.gitorious.org/privacy_policy/\">Privacy Policy</a></p>\n" \ diff --git a/doc/global/qt-module-defaults.qdocconf b/doc/global/qt-module-defaults.qdocconf index 48e9ae7..784eaf4 100644 --- a/doc/global/qt-module-defaults.qdocconf +++ b/doc/global/qt-module-defaults.qdocconf @@ -92,7 +92,7 @@ dita.metadata.default.author = Qt Project dita.metadata.default.permissions = all dita.metadata.default.publisher = Qt Project dita.metadata.default.copyryear = 2012 -dita.metadata.default.copyrholder = Nokia +dita.metadata.default.copyrholder = Digia dita.metadata.default.audience = programmer naturallanguage = en_US |