1berry/qtbase
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

HTML template: Updated copyright information from Nokia to Digia Plc

Browse Source 
Change-Id: Ib4315aa0a7a92e3b36da855c2787b60cc3c332fe
Reviewed-by: Lars Knoll <lars.knoll@digia.com>
Reviewed-by: Sami Makkonen <sami.makkonen@digia.com>
Reviewed-by: Iikka Eklund <iikka.eklund@digia.com>
This commit is contained in:
Jerome Pasion 2012-09-24 17:16:47 +02:00 committed by The Qt Project
parent 87f25de7c3
commit 1933b711b6
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
doc/global/qt-html-templates-offline.qdocconf
View File

@ -11,7 +11,7 @@ HTML.endheader = \
HTML.footer = \ HTML.footer = \
"<div class=\"footer\">\n" \ "<div class=\"footer\">\n" \
" <p>\n" \ " <p>\n" \
" <acronym title=\"Copyright\">&copy;</acronym> 2012 Nokia Corporation and/or its\n" \ " <acronym title=\"Copyright\">&copy;</acronym> 2012 Digia Plc and/or its\n" \
" subsidiaries. Documentation contributions included herein are the copyrights of\n" \ " subsidiaries. Documentation contributions included herein are the copyrights of\n" \
" their respective owners.</p>\n" \ " their respective owners.</p>\n" \
" <br />\n" \ " <br />\n" \
@ -24,7 +24,7 @@ HTML.footer = \
" www.qt-project.org</a>.</p>\n" \ " www.qt-project.org</a>.</p>\n" \
" <br />\n" \ " <br />\n" \
" <p>\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" \ " in Finland and/or other countries worldwide. All other trademarks are property\n" \
" of their respective owners. <a title=\"Privacy Policy\"\n" \ " of their respective owners. <a title=\"Privacy Policy\"\n" \
" href=\"http://en.gitorious.org/privacy_policy/\">Privacy Policy</a></p>\n" \ " href=\"http://en.gitorious.org/privacy_policy/\">Privacy Policy</a></p>\n" \

2
doc/global/qt-module-defaults.qdocconf
View File

@ -80,7 +80,7 @@ dita.metadata.default.author = Qt Project
dita.metadata.default.permissions = all dita.metadata.default.permissions = all
dita.metadata.default.publisher = Qt Project dita.metadata.default.publisher = Qt Project
dita.metadata.default.copyryear = 2012 dita.metadata.default.copyryear = 2012
dita.metadata.default.copyrholder = Nokia dita.metadata.default.copyrholder = Digia Plc
dita.metadata.default.audience = programmer dita.metadata.default.audience = programmer
naturallanguage = en_US naturallanguage = en_US