summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJerome Pasion <jerome.pasion@digia.com>2012-09-25 12:24:30 +0200
committerThe Qt Project <gerrit-noreply@qt-project.org>2012-09-26 12:02:27 +0200
commit31b5b8b4ee429856622af4fdd6fedbb11229a9af (patch)
tree411ff945d3fa58e604177dafc42f53afe3670209
parent5f240454d39d60b6dda71c41c86c853f3bfab305 (diff)
downloadqtscript-31b5b8b4ee429856622af4fdd6fedbb11229a9af.tar.gz
HTML template: Updated copyright notice from Nokia to Digia Plc
Change-Id: I3bd323c9ff89feadc9a8efa1f04a91124e03d3ec Reviewed-by: Martin Smith <martin.smith@digia.com>
-rw-r--r--doc/global/qt-html-templates-offline.qdocconf15
-rw-r--r--doc/global/qt-module-defaults.qdocconf14
2 files changed, 2 insertions, 27 deletions
diff --git a/doc/global/qt-html-templates-offline.qdocconf b/doc/global/qt-html-templates-offline.qdocconf
index 6e3177f..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
@@ -43,3 +29,4 @@ HTML.footer = \
" 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