From 8ac05adca706094f0cdeb997e6bb89945f8917b8 Mon Sep 17 00:00:00 2001
From: Casper van Donderen <casper.vandonderen@nokia.com>
Date: Tue, 13 Mar 2012 16:51:53 +0100
Subject: [PATCH] Update the footer for qdoc output for qt-project.

Change-Id: I418ac4e754aac96220d14948ce066c982c4b8054
Reviewed-by: Jerome Pasion <jerome.pasion@nokia.com>
---
 .../doc/config/qt-html-templates-online.qdocconf   | 24 ++++++++-------
 .../qdoc/doc/config/qt-html-templates.qdocconf     | 34 ++++++++++++----------
 2 files changed, 31 insertions(+), 27 deletions(-)

diff --git a/src/tools/qdoc/doc/config/qt-html-templates-online.qdocconf b/src/tools/qdoc/doc/config/qt-html-templates-online.qdocconf
index af186f0..f799fb3 100644
--- a/src/tools/qdoc/doc/config/qt-html-templates-online.qdocconf
+++ b/src/tools/qdoc/doc/config/qt-html-templates-online.qdocconf
@@ -64,20 +64,22 @@ HTML.footer = \
     "  <div class=\"footer\">\n" \
     "    <p>\n" \
     "      <acronym title=\"Copyright\">&copy;</acronym> 2012 Nokia Corporation and/or its\n" \
-    "      subsidiaries. Nokia, Qt and their respective logos are trademarks of Nokia Corporation \n" \
-    "      in Finland and/or other countries worldwide.</p>\n" \
-    "    <p>\n" \
-    "      All other trademarks are property of their respective owners. <a title=\"Privacy Policy\"\n" \
-    "        href=\"http://qt.nokia.com/about/privacy-policy\">Privacy Policy</a></p>\n" \
+    "      subsidiaries. Documentation contributions included herein are the copyrights of\n" \
+    "      their respective owners.</p>\n" \
     "    <br />\n" \
     "    <p>\n" \
-    "      Licensees holding valid Qt Commercial licenses may use this document in accordance with the" \
-    "      Qt Commercial License Agreement provided with the Software or, alternatively, in accordance" \
-    "      with the terms contained in a written agreement between you and Nokia.</p>\n" \
+    "      The documentation provided herein is licensed under the terms of the\n" \
+    "      <a href=\"http://www.gnu.org/licenses/fdl.html\">GNU Free Documentation\n" \
+    "      License version 1.3</a> as published by the Free Software Foundation.</p>\n" \
+    "    <p>\n" \
+    "      Documentation sources may be obtained from <a href=\"http://www.qt-project.org\">\n" \
+    "      www.qt-project.org</a>.</p>\n" \
+    "    <br />\n" \
     "    <p>\n" \
-    "      Alternatively, this document may be used under the terms of the <a href=\"http://www.gnu.org/licenses/fdl.html\">GNU\n" \
-    "      Free Documentation License version 1.3</a>\n" \
-    "      as published by the Free Software Foundation.</p>\n" \
+    "      Nokia, Qt and their respective logos are trademarks of Nokia Corporation \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/src/tools/qdoc/doc/config/qt-html-templates.qdocconf b/src/tools/qdoc/doc/config/qt-html-templates.qdocconf
index 2e15140..5172c2f 100644
--- a/src/tools/qdoc/doc/config/qt-html-templates.qdocconf
+++ b/src/tools/qdoc/doc/config/qt-html-templates.qdocconf
@@ -22,22 +22,24 @@ HTML.footer = \
     "  </div>\n" \
     "</div> \n" \
     "<div class=\"footer\">\n" \
-    "  <p>\n" \
-    "     <acronym title=\"Copyright\">&copy;</acronym> 2012 Nokia Corporation and/or its\n" \
-    "     subsidiaries. Nokia, Qt and their respective logos are trademarks of Nokia Corporation \n" \
-    "     in Finland and/or other countries worldwide.</p>\n" \
-    "  <p>\n" \
-    "     All other trademarks are property of their respective owners. <a title=\"Privacy Policy\"\n" \
-    "     href=\"http://qt.nokia.com/about/privacy-policy\">Privacy Policy</a></p>\n" \
-    "  <br />\n" \
-    "  <p>\n" \
-    "    Licensees holding valid Qt Commercial licenses may use this document in accordance with the" \
-    "    Qt Commercial License Agreement provided with the Software or, alternatively, in accordance" \
-    "    with the terms contained in a written agreement between you and Nokia.</p>\n" \
-    "  <p>\n" \
-    "    Alternatively, this document may be used under the terms of the <a href=\"http://www.gnu.org/licenses/fdl.html\">GNU\n" \
-    "    Free Documentation License version 1.3</a>\n" \
-    "    as published by the Free Software Foundation.</p>\n" \
+    "    <p>\n" \
+    "      <acronym title=\"Copyright\">&copy;</acronym> 2012 Nokia Corporation and/or its\n" \
+    "      subsidiaries. Documentation contributions included herein are the copyrights of\n" \
+    "      their respective owners.</p>\n" \
+    "    <br />\n" \
+    "    <p>\n" \
+    "      The documentation provided herein is licensed under the terms of the\n" \
+    "      <a href=\"http://www.gnu.org/licenses/fdl.html\">GNU Free Documentation\n" \
+    "      License version 1.3</a> as published by the Free Software Foundation.</p>\n" \
+    "    <p>\n" \
+    "      Documentation sources may be obtained from <a href=\"http://www.qt-project.org\">\n" \
+    "      www.qt-project.org</a>.</p>\n" \
+    "    <br />\n" \
+    "    <p>\n" \
+    "      Nokia, Qt and their respective logos are trademarks of Nokia Corporation \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" \
 
 # Files not referenced in any qdoc file.
-- 
2.7.4