summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJerome Pasion <jerome.pasion@digia.com>2012-09-25 12:09:27 +0200
committerThe Qt Project <gerrit-noreply@qt-project.org>2012-09-26 12:01:32 +0200
commit98586524877c23208996447a38e464d4cd8d108b (patch)
tree976815758c7a9fce7118631df09deff84eb63991
parent57b63625b9da0693f8305c2a37b006655fbf1730 (diff)
HTML template: Updated copyright notice from Nokia to Digia Plc
Change-Id: I119c15eed70ea48b8f2ed119cdde38f42a9784f9 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 784eaf4..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 = Digia
+dita.metadata.default.copyrholder = Digia Plc
dita.metadata.default.audience = programmer
naturallanguage = en_US