summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJerome Pasion <jerome.pasion@digia.com>2012-09-25 12:11:12 +0200
committerThe Qt Project <gerrit-noreply@qt-project.org>2012-09-26 12:01:39 +0200
commit03143da00f27512376c75d346bfe2965cd73f13e (patch)
tree18035fcae18a996f2b7afd75adbe280e4bef36f9
parent1ecb9cbdc40dc177fcb906f983f6b47714f0c521 (diff)
downloadqtgraphicaleffects-03143da00f27512376c75d346bfe2965cd73f13e.tar.gz
HTML template: Updated copyright notice from Nokia to Digia Plc
Change-Id: If06ef2a81e9af6384562c605df8485980e864f08 Reviewed-by: Martin Smith <martin.smith@digia.com>
-rw-r--r--doc/global/qt-html-templates-offline.qdocconf19
-rw-r--r--doc/global/qt-module-defaults.qdocconf14
2 files changed, 4 insertions, 29 deletions
diff --git a/doc/global/qt-html-templates-offline.qdocconf b/doc/global/qt-html-templates-offline.qdocconf
index 135d0ab..9f2d28f 100644
--- a/doc/global/qt-html-templates-offline.qdocconf
+++ b/doc/global/qt-html-templates-offline.qdocconf
@@ -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\">&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" \
@@ -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" \
+
diff --git a/doc/global/qt-module-defaults.qdocconf b/doc/global/qt-module-defaults.qdocconf
index 48e9ae7..4532af5 100644
--- a/doc/global/qt-module-defaults.qdocconf
+++ b/doc/global/qt-module-defaults.qdocconf
@@ -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