Add trademark info.

diff --git a/template/base.html b/template/base.html
index 99418b056ce3e9caeb5e95260c5e56263584d98c..d8611fd3580e08f9d3a98d22bcfc8b370c87e471 100644 (file)
--- a/template/base.html
+++ b/template/base.html
@@ -47,7 +47,8 @@
     </div> <!-- pgContent -->
        <div id="pgFooter">
          <a class="navFooter" href="/about/privacypolicy">Privacy Policy</a> |
-         <a class="navFooter" href="/about/website">About the website</a><br/>
+         <a class="navFooter" href="/about/trademarks">Trademarks</a>|
+         <a class="navFooter" href="/about/website">About the website</a><br/><br/>
         Copyright &copy; 2008-2018 PostgreSQL Europe
        </div> <!-- pgFooter -->
    </div>

diff --git a/template/nav_about.html b/template/nav_about.html
index f0f109f0041634622c5da92af1ac089f06185947..5a638c6a060389df688665a0849b036833aa7f74 100644 (file)
--- a/template/nav_about.html
+++ b/template/nav_about.html
@@ -12,5 +12,6 @@
 <li><a href="/about/board">Board</a></li>
 <li><a href="/about/history">History</a></li>
 <li><a href="/about/privacypolicy">Privacy Policy</a></li>
+<li><a href="/about/trademarks">Trademarks</a></li>
 <li class="last-child"><a href="/about/website">Website</a></li>
 {%endblock%}

diff --git a/template/pages/about/trademarks.html b/template/pages/about/trademarks.html
new file mode 100644 (file)
index 0000000..94e7b9c
--- /dev/null
+++ b/template/pages/about/trademarks.html
@@ -0,0 +1,41 @@
+{%extends "nav_about.html"%}
+{%block title%}Trademarks{%endblock%}
+{%block content%}
+<h1>Trademarks</h1>
+
+<p>
+The following phrases are registered trademarks owned by PostgreSQL Europe:
+</p>
+<ul>
+    <li>PGConf</li>
+    <li>PGDay</li>
+    <li>Postgres Conference</li>
+    <li>PostgreSQL Conference</li>
+</ul>
+
+<p>
+PostgreSQL Europe allows these trademarks to be used at zero cost under the
+    following conditions:
+</p>
+
+<ol>
+    <li>The mark or marks must be used in relation to a conference or event
+        intended to promote, educate on and generally further the
+        <a href="https://www.postgresql.org/">PostgreSQL Database project</a>,
+        and the community supporting it.</li>
+    <li>Events must comply with the
+        <a href="https://www.postgresql.org/community/recognition/#conferences">
+            Community Conference Recognition</a> guidelines, as published on
+        the PostgreSQL website.</li>
+    <li>Event websites and any printed programmes, proceedings or prospectuses
+        should include an acknowledgement of the marks used. For example;
+        <i>"PGConf" and "PostgreSQL Conference" are registered trademarks of
+            PostgreSQL Europe.</i></li>
+</ol>
+
+<p>A notification of the use of any of the marks and the purpose would be
+    appreciated to <b>board(at)postgresql.org</b>. This will help us understand
+    the usage of the marks and give an opportunity for further publicity and
+    engagement around your event.
+</p>
+{%endblock%}