HTML template: Updated copyright notice from Nokia to Digia Plc
Change-Id: Ia1a5cbe98eaeca91121f0fbd394419f8ff1c82f7 Reviewed-by: Martin Smith <martin.smith@digia.com>
This commit is contained in:
parent
1e036655df
commit
67d8c67712
|
@ -1,17 +1,3 @@
|
|||
#
|
||||
# W A R N I N G
|
||||
# -------------
|
||||
#
|
||||
# A common HTML template for modules in this repository.
|
||||
# This template is common among the Qt 5 modules.
|
||||
#
|
||||
# A change in this template must be replicated in all of the repositories.
|
||||
#
|
||||
# We mean it.
|
||||
#
|
||||
|
||||
HTML.templatedir = ../../../doc
|
||||
|
||||
HTML.nobreadcrumbs = "true"
|
||||
|
||||
HTML.stylesheets = global/style/offline.css
|
||||
|
@ -25,7 +11,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,8 +24,9 @@ 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" \
|
||||
|
||||
|
|
|
@ -1,15 +1,3 @@
|
|||
#
|
||||
# W A R N I N G
|
||||
# -------------
|
||||
#
|
||||
# A common template for modules in this repository.
|
||||
# This template is common among the Qt 5 modules.
|
||||
#
|
||||
# A change in this template must be replicated in all of the repositories.
|
||||
#
|
||||
# We mean it.
|
||||
#
|
||||
|
||||
codeindent = 1
|
||||
|
||||
Cpp.ignoretokens = \
|
||||
|
@ -92,7 +80,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 Plc
|
||||
dita.metadata.default.audience = programmer
|
||||
|
||||
naturallanguage = en_US
|
||||
|
|
Loading…
Reference in New Issue