From ac475a334466f6e369d6eb68e122c0f952828c43 Mon Sep 17 00:00:00 2001
From: Jerome Pasion <jerome.pasion@digia.com>
Date: Tue, 25 Sep 2012 12:07:34 +0200
Subject: HTML template: Updated copyright notice from Nokia to Digia Plc

Change-Id: I0656a4331e3a6f6a6a527500565c73f50b61f8d1
Reviewed-by: Martin Smith <martin.smith@digia.com>
---
 doc/global/qt-html-templates-offline.qdocconf | 17 ++---------------
 doc/global/qt-module-defaults.qdocconf        | 14 +-------------
 2 files changed, 3 insertions(+), 28 deletions(-)

(limited to 'doc/global')

diff --git a/doc/global/qt-html-templates-offline.qdocconf b/doc/global/qt-html-templates-offline.qdocconf
index 5469bee49d..9f2d28fa28 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
@@ -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 784eaf469a..4532af5264 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
-- 
cgit v1.2.3