Skip to content

Commit

Permalink
HTML template: Updated copyright notice from Nokia to Digia Plc
Browse files Browse the repository at this point in the history
Change-Id: I123b97e1b2e59b55ce43ff1463cd9acb28cc9c71
Reviewed-by: Martin Smith <[email protected]>
  • Loading branch information
jeromepasion authored and The Qt Project committed Sep 26, 2012
1 parent 23ec442 commit f979060
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 29 deletions.
19 changes: 3 additions & 16 deletions doc/global/qt-html-templates-offline.qdocconf
Original file line number Diff line number Diff line change
@@ -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
Expand All @@ -25,7 +11,7 @@ HTML.endheader = \
HTML.footer = \
"<div class=\"footer\">\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" \
" their respective owners.</p>\n" \
" <br />\n" \
Expand All @@ -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" \

14 changes: 1 addition & 13 deletions doc/global/qt-module-defaults.qdocconf
Original file line number Diff line number Diff line change
@@ -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 = \
Expand Down Expand Up @@ -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
Expand Down

0 comments on commit f979060

Please sign in to comment.