diff options
author | Topi Reinio <topi.reinio@digia.com> | 2015-01-14 10:04:53 +0100 |
---|---|---|
committer | Topi Reiniƶ <topi.reinio@digia.com> | 2015-02-26 12:26:01 +0000 |
commit | 04e313d7084e3704649e81fc89436f79d09a810e (patch) | |
tree | 93b9bef7bf02a213f39bab6e47cfa5e4ff364ae5 /doc/global | |
parent | 68762151dbf45fbb44e140ac2ad13dbe8d357352 (diff) |
Doc: Update Copyright information in template/footer
This change updates the copyright information as it appears
in the footer for both offline and online documentation
templates.
- Update copyright year to 2015
- Update copyright holder to The Qt Company Ltd
Change-Id: I82fef6067dee42ec9db561aef9c3c506beafb3c6
Reviewed-by: Venugopal Shivashankar <venugopal.shivashankar@digia.com>
Diffstat (limited to 'doc/global')
-rw-r--r-- | doc/global/html-footer.qdocconf | 6 | ||||
-rw-r--r-- | doc/global/qt-module-defaults-online.qdocconf | 6 |
2 files changed, 6 insertions, 6 deletions
diff --git a/doc/global/html-footer.qdocconf b/doc/global/html-footer.qdocconf index 217494575f..e41f6dc5c5 100644 --- a/doc/global/html-footer.qdocconf +++ b/doc/global/html-footer.qdocconf @@ -8,13 +8,13 @@ HTML.footer = \ "</div>\n" \ "<div class=\"footer\">\n" \ " <p>\n" \ - " <acronym title=\"Copyright\">©</acronym> 2015 Digia Plc and/or its\n" \ - " subsidiaries. Documentation contributions included herein are the copyrights of\n" \ + " <acronym title=\"Copyright\">©</acronym> 2015 The Qt Company Ltd.\n" \ + " Documentation contributions included herein are the copyrights of\n" \ " their respective owners.<br>" \ " The documentation provided herein is licensed under the terms of the" \ " <a href=\"http://www.gnu.org/licenses/fdl.html\">GNU Free Documentation" \ " License version 1.3</a> as published by the Free Software Foundation.<br>" \ - " Digia, Qt and their respective logos are trademarks of Digia Plc " \ + " Qt and respective logos are trademarks of The Qt Company Ltd. " \ " in Finland and/or other countries worldwide. All other trademarks are property\n" \ " of their respective owners. </p>\n" \ "</div>\n" \ diff --git a/doc/global/qt-module-defaults-online.qdocconf b/doc/global/qt-module-defaults-online.qdocconf index 6e6854ff82..3085b493fe 100644 --- a/doc/global/qt-module-defaults-online.qdocconf +++ b/doc/global/qt-module-defaults-online.qdocconf @@ -5,13 +5,13 @@ HTML.footer = \ " </div>\n" \ " <p class=\"copy-notice\">\n" \ - " <acronym title=\"Copyright\">©</acronym> 2015 Digia Plc and/or its\n" \ - " subsidiaries. Documentation contributions included herein are the copyrights of\n" \ + " <acronym title=\"Copyright\">©</acronym> 2015 The Qt Company Ltd.\n" \ + " Documentation contributions included herein are the copyrights of\n" \ " their respective owners. " \ " The documentation provided herein is licensed under the terms of the" \ " <a href=\"http://www.gnu.org/licenses/fdl.html\">GNU Free Documentation" \ " License version 1.3</a> as published by the Free Software Foundation. " \ - " Digia, Qt and their respective logos are trademarks of Digia Plc " \ + " Qt and respective logos are trademarks of The Qt Company Ltd. " \ " in Finland and/or other countries worldwide. All other trademarks are property\n" \ " of their respective owners. </p>\n" |