diff options
| author | Jerome Pasion <jerome.pasion@digia.com> | 2013-01-24 11:51:46 +0100 |
|---|---|---|
| committer | Jerome Pasion <jerome.pasion@digia.com> | 2013-01-24 12:41:37 +0100 |
| commit | f4f4e83740ab0217d04e14d025160a1497f96012 (patch) | |
| tree | f86a3e1e7f833a1e0e24847e0a52e028ddd040cf /doc | |
| parent | 9093201505a07a6b4aeae99ccf2199ce1277e1b8 (diff) | |
Doc: Updated HTML footer's license information.
-replaced with Digia Plc and Qt Project information
Change-Id: I1bdcbfbdbe818a10c7b2770e99e102b1daa5ff9b
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@digia.com>
Diffstat (limited to 'doc')
| -rw-r--r-- | doc/config/qt-html-templates-online.qdocconf | 10 | ||||
| -rw-r--r-- | doc/config/qt-html-templates.qdocconf | 6 |
2 files changed, 8 insertions, 8 deletions
diff --git a/doc/config/qt-html-templates-online.qdocconf b/doc/config/qt-html-templates-online.qdocconf index 3d96e457e..68dd2bea5 100644 --- a/doc/config/qt-html-templates-online.qdocconf +++ b/doc/config/qt-html-templates-online.qdocconf @@ -103,9 +103,9 @@ HTML.footer = \ " <span></span>\n" \ " </div>\n" \ " </div> \n" \ - " <div class=\"footer\">\n" \ + "<div class=\"footer\">\n" \ " <p>\n" \ - " <acronym title=\"Copyright\">©</acronym> 2012 Nokia Corporation and/or its\n" \ + " <acronym title=\"Copyright\">©</acronym> 2013 Digia Plc and/or its\n" \ " subsidiaries. Documentation contributions included herein are the copyrights of\n" \ " their respective owners.</p>\n" \ " <br />\n" \ @@ -118,12 +118,12 @@ 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" \ - " </div>\n" \ - "\n" \ + "</div>\n" \ + "\n" \ " <script src=\"scripts/functions.js\" type=\"text/javascript\"></script>\n" \ " <script type=\"text/javascript\">\n" \ " var _gaq = _gaq || [];\n" \ diff --git a/doc/config/qt-html-templates.qdocconf b/doc/config/qt-html-templates.qdocconf index cbdae8df6..53215b761 100644 --- a/doc/config/qt-html-templates.qdocconf +++ b/doc/config/qt-html-templates.qdocconf @@ -23,8 +23,8 @@ HTML.footer = \ " </div>\n" \ "</div> \n" \ "<div class=\"footer\">\n" \ - " <p>\n" \ - " <acronym title=\"Copyright\">©</acronym> 2012 Nokia Corporation and/or its\n" \ + " <p>\n" \ + " <acronym title=\"Copyright\">©</acronym> 2013 Digia Plc and/or its\n" \ " subsidiaries. Documentation contributions included herein are the copyrights of\n" \ " their respective owners.</p>\n" \ " <br />\n" \ @@ -37,7 +37,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" \ |