diff options
| author | Jerome Pasion <jerome.pasion@digia.com> | 2012-09-25 12:29:21 +0200 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2012-09-26 12:02:12 +0200 |
| commit | 641eb19618986b2857fd2282833d0c11df4e2a1b (patch) | |
| tree | dea0b8f3eabc48ddbbc949cde2121b3c53e45db3 | |
| parent | 78ec5bdc91d62bf3cea2db6d42ab431726be4fd3 (diff) | |
| download | qtxmlpatterns-641eb19618986b2857fd2282833d0c11df4e2a1b.tar.gz | |
HTML template: Updated copyright notice from Nokia to Digia Plc
Change-Id: I37e2b67f1f3a0d26c7b2d5a873a1c1acd0e71a55
Reviewed-by: Martin Smith <martin.smith@digia.com>
| -rw-r--r-- | doc/global/qt-html-templates-offline.qdocconf | 17 | ||||
| -rw-r--r-- | doc/global/qt-module-defaults.qdocconf | 14 |
2 files changed, 3 insertions, 28 deletions
diff --git a/doc/global/qt-html-templates-offline.qdocconf b/doc/global/qt-html-templates-offline.qdocconf index 305de14..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 @@ -38,8 +24,9 @@ HTML.footer = \ " www.qt-project.org</a>.</p>\n" \ " <br />\n" \ " <p>\n" \ - " Digia, Qt and their respective logos are trademarks of Digia 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 |