[lucene-site] branch main/solr updated: Styled privacy page and linked to it from footer. Also added links for ASF trademark policy and license

[ja...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

janhoy pushed a commit to branch main/solr
in repository https://gitbox.apache.org/repos/asf/lucene-site.git


The following commit(s) were added to refs/heads/main/solr by this push:
     new 6ed49f2  Styled privacy page and linked to it from footer. Also added links for ASF trademark policy and license
6ed49f2 is described below

commit 6ed49f2a76b8a294a2b9efffc8d5f7de74171f22
Author: Jan Høydahl <ja...@cominvent.com>
AuthorDate: Wed Feb 24 10:30:28 2021 +0100

    Styled privacy page and linked to it from footer.
    Also added links for ASF trademark policy and license
---
 content/pages/privacy.md              | 16 ++++++++++------
 themes/solr/templates/_copyright.html |  7 ++++++-
 2 files changed, 16 insertions(+), 7 deletions(-)

diff --git a/content/pages/privacy.md b/content/pages/privacy.md
index 412c2df..a168eaf 100644
--- a/content/pages/privacy.md
+++ b/content/pages/privacy.md
@@ -3,13 +3,17 @@ URL: privacy.html
 save_as: privacy.html
 template: page
 
-Information about your use of this website is collected using server access logs and a tracking cookie. The collected information consists of the following:
+# Privacy Policy for Apache Solr website
+
+Information about your use of this website is collected using server access logs and a tracking cookie. 
+The collected information consists of the following:
+
+* The IP address from which you access the website;
+* The type of browser and operating system you use to access our site;
+* The date and time you access our site;
+* The pages you visit; and
+* The addresses of pages from where you followed a link to our site.
 
-The IP address from which you access the website;
-The type of browser and operating system you use to access our site;
-The date and time you access our site;
-The pages you visit; and
-The addresses of pages from where you followed a link to our site.
 Part of this information is gathered using a tracking cookie set by the [Google Analytics](http://www.google.com/analytics) service and handled by Google as described in their [privacy policy](http://www.google.com/privacy.html). See your browser documentation for instructions on how to disable the cookie if you prefer not to share this data with Google.
 
 We use the gathered information to help us make our site more useful to visitors and to better understand how and when our site is
diff --git a/themes/solr/templates/_copyright.html b/themes/solr/templates/_copyright.html
index 0a6f9de..103a8b1 100644
--- a/themes/solr/templates/_copyright.html
+++ b/themes/solr/templates/_copyright.html
@@ -1,3 +1,8 @@
 <div class="large-centered columns">
-  <p>Copyright © {{ CURRENTYEAR }} The Apache Software Foundation, Licensed under the Apache License, Version 2.0. Privacy Policy<br/>Apache and the Apache feather logo are trademarks of The Apache Software Foundation. Apache Lucene, Apache Solr and their respective logos are trademarks of the Apache Software Foundation. Please see the Apache Trademark Policy for more information.  All non-Apache logos are the trademarks of their respective owners.</p>
+  <p>Copyright © {{ CURRENTYEAR }} The Apache Software Foundation, Licensed under the
+    <a href="https://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a>. <a href="/privacy.html">Privacy Policy</a><br/>
+    Apache and the Apache feather logo are trademarks of The Apache Software Foundation. Apache Lucene,
+    Apache Solr and their respective logos are trademarks of the Apache Software Foundation.
+    Please see the <a href="https://www.apache.org/foundation/marks/">Apache Trademark Policy</a> for more information.
+    All non-Apache logos are the trademarks of their respective owners.</p>
 </div>