You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@logging.apache.org by gr...@apache.org on 2022/03/28 10:19:11 UTC
[logging-site] branch asf-staging updated: added link to the new privacy policy
This is an automated email from the ASF dual-hosted git repository.
grobmeier pushed a commit to branch asf-staging
in repository https://gitbox.apache.org/repos/asf/logging-site.git
The following commit(s) were added to refs/heads/asf-staging by this push:
new d327278 added link to the new privacy policy
d327278 is described below
commit d3272782379d6168a551de8e13fcb15440345695
Author: Christian Grobmeier <cg...@grobmeier.de>
AuthorDate: Mon Mar 28 12:19:04 2022 +0200
added link to the new privacy policy
---
content/charter.html | 3 ++-
content/dormant.html | 3 ++-
content/guidelines.html | 3 ++-
content/index.html | 3 ++-
content/mailing-lists.html | 11 ++++++-----
content/privacy-policy.html | 24 +++---------------------
content/security.html | 3 ++-
content/team-list.html | 3 ++-
sources/src/main/jbake/content/privacy-policy.md | 24 +-----------------------
sources/src/main/jbake/templates/footer.ftl | 2 +-
sources/src/main/jbake/templates/navbar.ftl | 1 +
11 files changed, 24 insertions(+), 56 deletions(-)
diff --git a/content/charter.html b/content/charter.html
index 24331e3..44331b4 100644
--- a/content/charter.html
+++ b/content/charter.html
@@ -67,6 +67,7 @@
<li><a target="_blank" href="https://www.apache.org/foundation/thanks.html">Thanks</a></li>
<li><a target="_blank" href="https://www.apache.org/events/current-event.html">Current Events</a></li>
<li><a target="_blank" href="https://www.apache.org/security/">Security</a></li>
+ <li><a target="_blank" href="https://privacy.apache.org/policies/privacy-policy-public.html">Privacy</a></li>
</ul>
</li>
</ul>
@@ -108,7 +109,7 @@
<p>
Copyright © 2017-2022 <a href="https://www.apache.org" target="external">The Apache Software Foundation</a>.
Licensed under the <a href="https://www.apache.org/licenses/LICENSE-2.0"
- target="external">Apache Software License, Version 2.0</a> Please read our <a href="/privacy-policy.html">privacy policy</a>.
+ target="external">Apache Software License, Version 2.0</a> Please read our <a href="https://privacy.apache.org/policies/privacy-policy-public.html">privacy policy</a>.
</p><p>
Apache, Apache chainsaw, Apache log4cxx, Apache log4j, Apache log4net, Apache log4php and the Apache
feather logo are trademarks of The Apache Software Foundation. Oracle and Java are registered trademarks
diff --git a/content/dormant.html b/content/dormant.html
index b8a3a5c..97a6938 100644
--- a/content/dormant.html
+++ b/content/dormant.html
@@ -67,6 +67,7 @@
<li><a target="_blank" href="https://www.apache.org/foundation/thanks.html">Thanks</a></li>
<li><a target="_blank" href="https://www.apache.org/events/current-event.html">Current Events</a></li>
<li><a target="_blank" href="https://www.apache.org/security/">Security</a></li>
+ <li><a target="_blank" href="https://privacy.apache.org/policies/privacy-policy-public.html">Privacy</a></li>
</ul>
</li>
</ul>
@@ -106,7 +107,7 @@ future.</p>
<p>
Copyright © 2017-2022 <a href="https://www.apache.org" target="external">The Apache Software Foundation</a>.
Licensed under the <a href="https://www.apache.org/licenses/LICENSE-2.0"
- target="external">Apache Software License, Version 2.0</a> Please read our <a href="/privacy-policy.html">privacy policy</a>.
+ target="external">Apache Software License, Version 2.0</a> Please read our <a href="https://privacy.apache.org/policies/privacy-policy-public.html">privacy policy</a>.
</p><p>
Apache, Apache chainsaw, Apache log4cxx, Apache log4j, Apache log4net, Apache log4php and the Apache
feather logo are trademarks of The Apache Software Foundation. Oracle and Java are registered trademarks
diff --git a/content/guidelines.html b/content/guidelines.html
index 50f8090..d97f453 100644
--- a/content/guidelines.html
+++ b/content/guidelines.html
@@ -67,6 +67,7 @@
<li><a target="_blank" href="https://www.apache.org/foundation/thanks.html">Thanks</a></li>
<li><a target="_blank" href="https://www.apache.org/events/current-event.html">Current Events</a></li>
<li><a target="_blank" href="https://www.apache.org/security/">Security</a></li>
+ <li><a target="_blank" href="https://privacy.apache.org/policies/privacy-policy-public.html">Privacy</a></li>
</ul>
</li>
</ul>
@@ -193,7 +194,7 @@
<p>
Copyright © 2017-2022 <a href="https://www.apache.org" target="external">The Apache Software Foundation</a>.
Licensed under the <a href="https://www.apache.org/licenses/LICENSE-2.0"
- target="external">Apache Software License, Version 2.0</a> Please read our <a href="/privacy-policy.html">privacy policy</a>.
+ target="external">Apache Software License, Version 2.0</a> Please read our <a href="https://privacy.apache.org/policies/privacy-policy-public.html">privacy policy</a>.
</p><p>
Apache, Apache chainsaw, Apache log4cxx, Apache log4j, Apache log4net, Apache log4php and the Apache
feather logo are trademarks of The Apache Software Foundation. Oracle and Java are registered trademarks
diff --git a/content/index.html b/content/index.html
index 8df026a..e31b6d5 100644
--- a/content/index.html
+++ b/content/index.html
@@ -67,6 +67,7 @@
<li><a target="_blank" href="https://www.apache.org/foundation/thanks.html">Thanks</a></li>
<li><a target="_blank" href="https://www.apache.org/events/current-event.html">Current Events</a></li>
<li><a target="_blank" href="https://www.apache.org/security/">Security</a></li>
+ <li><a target="_blank" href="https://privacy.apache.org/policies/privacy-policy-public.html">Privacy</a></li>
</ul>
</li>
</ul>
@@ -141,7 +142,7 @@
<p>
Copyright © 2017-2022 <a href="https://www.apache.org" target="external">The Apache Software Foundation</a>.
Licensed under the <a href="https://www.apache.org/licenses/LICENSE-2.0"
- target="external">Apache Software License, Version 2.0</a> Please read our <a href="/privacy-policy.html">privacy policy</a>.
+ target="external">Apache Software License, Version 2.0</a> Please read our <a href="https://privacy.apache.org/policies/privacy-policy-public.html">privacy policy</a>.
</p><p>
Apache, Apache chainsaw, Apache log4cxx, Apache log4j, Apache log4net, Apache log4php and the Apache
feather logo are trademarks of The Apache Software Foundation. Oracle and Java are registered trademarks
diff --git a/content/mailing-lists.html b/content/mailing-lists.html
index 0f32662..c46f9dc 100644
--- a/content/mailing-lists.html
+++ b/content/mailing-lists.html
@@ -67,6 +67,7 @@
<li><a target="_blank" href="https://www.apache.org/foundation/thanks.html">Thanks</a></li>
<li><a target="_blank" href="https://www.apache.org/events/current-event.html">Current Events</a></li>
<li><a target="_blank" href="https://www.apache.org/security/">Security</a></li>
+ <li><a target="_blank" href="https://privacy.apache.org/policies/privacy-policy-public.html">Privacy</a></li>
</ul>
</li>
</ul>
@@ -80,7 +81,7 @@
<p>These are the mailing lists that have been established for the Apache Logging Services project.</p>
<p>For questions regarding individual logging projects, please find use the mailing lists defined<br />
on the project site.</p>
-<h3><a href="mailto:general@logging.apache.org">general@logging.apache.org</a></h3>
+<h3><a href="mailto:general@logging.apache.org">general@logging.apache.org</a></h3>
<p>General and public discussion related to the Logging project and it's children. Anyone may<br />
subscribe; only subscribers may post.</p>
<ul>
@@ -93,7 +94,7 @@ subscribe; only subscribers may post.</p>
<li><a href="http://mail-archives.apache.org/mod_mbox/logging-general/">Apache archive</a></li>
<li><a href="http://markmail.org/search/?q=list%3Aorg.apache.logging.general">Markmail archive</a></li>
</ul>
-<h3><a href="mailto:dev@logging.apache.org">dev@logging.apache.org</a></h3>
+<h3><a href="mailto:dev@logging.apache.org">dev@logging.apache.org</a></h3>
<p>All logging projects share a common mailing list where development of each project is discussed.<br />
Please use subject tags like [log4j] when starting a new thread.</p>
<ul>
@@ -106,7 +107,7 @@ Please use subject tags like [log4j] when starting a new thread.</p>
<li><a href="http://mail-archives.apache.org/mod_mbox/logging-dev/">Apache archive</a></li>
<li><a href="http://markmail.org/search/?q=list%3Aorg.apache.logging.dev">Markmail archive</a></li>
</ul>
-<h3><a href="mailto:commits@logging.apache.org">commits@logging.apache.org</a></h3>
+<h3><a href="mailto:commits@logging.apache.org">commits@logging.apache.org</a></h3>
<p>When changes are made to the source code repository, the commit messages are automatically sent to<br />
this list. Anyone may subscribe; posting is not allowed. The Reply-To is set to the<br />
logging-general list, so if you reply to a message that's where your reply is going to end up.</p>
@@ -119,7 +120,7 @@ logging-general list, so if you reply to a message that's where your reply is go
<li><a href="http://mail-archives.apache.org/mod_mbox/logging-commits/">Apache archive</a></li>
<li><a href="http://markmail.org/search/?q=list%3Aorg.apache.logging.commits">Markmail archive</a></li>
</ul>
-<h3><a href="mailto:private@logging.apache.org">private@logging.apache.org</a></h3>
+<h3><a href="mailto:private@logging.apache.org">private@logging.apache.org</a></h3>
<p>Private list for the project management committee. It is not open to public subscription. This list should be used<br />
only for the discussion of confidential topics. As much business as possible should be conducted in public on<br />
the general list.</p>
@@ -134,7 +135,7 @@ the general list.</p>
<p>
Copyright © 2017-2022 <a href="https://www.apache.org" target="external">The Apache Software Foundation</a>.
Licensed under the <a href="https://www.apache.org/licenses/LICENSE-2.0"
- target="external">Apache Software License, Version 2.0</a> Please read our <a href="/privacy-policy.html">privacy policy</a>.
+ target="external">Apache Software License, Version 2.0</a> Please read our <a href="https://privacy.apache.org/policies/privacy-policy-public.html">privacy policy</a>.
</p><p>
Apache, Apache chainsaw, Apache log4cxx, Apache log4j, Apache log4net, Apache log4php and the Apache
feather logo are trademarks of The Apache Software Foundation. Oracle and Java are registered trademarks
diff --git a/content/privacy-policy.html b/content/privacy-policy.html
index cf2860b..73fa2d4 100644
--- a/content/privacy-policy.html
+++ b/content/privacy-policy.html
@@ -67,6 +67,7 @@
<li><a target="_blank" href="https://www.apache.org/foundation/thanks.html">Thanks</a></li>
<li><a target="_blank" href="https://www.apache.org/events/current-event.html">Current Events</a></li>
<li><a target="_blank" href="https://www.apache.org/security/">Security</a></li>
+ <li><a target="_blank" href="https://privacy.apache.org/policies/privacy-policy-public.html">Privacy</a></li>
</ul>
</li>
</ul>
@@ -77,26 +78,7 @@
<div class="container">
<div class="content">
<h1>Privacy policy</h1>
-<p>Information about your use of this web site is collected using server access logs and a tracking<br />
-cookie. The collected information consists of the following:</p>
-<ul>
-<li>The IP address from which you access the web site;</li>
-<li>The type of browser and operating system you use to access our site;</li>
-<li>The date and time you access our site;</li>
-<li>The pages you visit; and</li>
-<li>The addresses of pages from where you followed a link to our site.</li>
-</ul>
-<p>Part of this information is gathered using a tracking cookie set by the<br />
-<a href="http://www.google.com/analytics">GoogleAnalytics</a> service and handled by Google as<br />
-described in their <a href="http://www.google.com/privacy.html">privacy policy</a>. See your<br />
-browser documentation for instructions on how to disable the cookie if you prefer not to share<br />
-this data with Google.</p>
-<p>We use the gathered information to help us make our site more useful to visitors and to better<br />
-understand how and when our site is used. We do not track or collect personally identifiable<br />
-information or associate gathered data with any personally identifying information from other<br />
-sources.</p>
-<p>By using this web site, you consent to the collection of this data in the manner and for the<br />
-purpose described above.</p>
+<p>This document was moved <a href="https://privacy.apache.org/policies/privacy-policy-public.html">here</a></p>
</div>
@@ -104,7 +86,7 @@ purpose described above.</p>
<p>
Copyright © 2017-2022 <a href="https://www.apache.org" target="external">The Apache Software Foundation</a>.
Licensed under the <a href="https://www.apache.org/licenses/LICENSE-2.0"
- target="external">Apache Software License, Version 2.0</a> Please read our <a href="/privacy-policy.html">privacy policy</a>.
+ target="external">Apache Software License, Version 2.0</a> Please read our <a href="https://privacy.apache.org/policies/privacy-policy-public.html">privacy policy</a>.
</p><p>
Apache, Apache chainsaw, Apache log4cxx, Apache log4j, Apache log4net, Apache log4php and the Apache
feather logo are trademarks of The Apache Software Foundation. Oracle and Java are registered trademarks
diff --git a/content/security.html b/content/security.html
index 9c73443..7775227 100644
--- a/content/security.html
+++ b/content/security.html
@@ -67,6 +67,7 @@
<li><a target="_blank" href="https://www.apache.org/foundation/thanks.html">Thanks</a></li>
<li><a target="_blank" href="https://www.apache.org/events/current-event.html">Current Events</a></li>
<li><a target="_blank" href="https://www.apache.org/security/">Security</a></li>
+ <li><a target="_blank" href="https://privacy.apache.org/policies/privacy-policy-public.html">Privacy</a></li>
</ul>
</li>
</ul>
@@ -112,7 +113,7 @@ privately to the Apache Security Team. Thank you.</p>
<p>
Copyright © 2017-2022 <a href="https://www.apache.org" target="external">The Apache Software Foundation</a>.
Licensed under the <a href="https://www.apache.org/licenses/LICENSE-2.0"
- target="external">Apache Software License, Version 2.0</a> Please read our <a href="/privacy-policy.html">privacy policy</a>.
+ target="external">Apache Software License, Version 2.0</a> Please read our <a href="https://privacy.apache.org/policies/privacy-policy-public.html">privacy policy</a>.
</p><p>
Apache, Apache chainsaw, Apache log4cxx, Apache log4j, Apache log4net, Apache log4php and the Apache
feather logo are trademarks of The Apache Software Foundation. Oracle and Java are registered trademarks
diff --git a/content/team-list.html b/content/team-list.html
index 5307fe1..2a9d252 100644
--- a/content/team-list.html
+++ b/content/team-list.html
@@ -67,6 +67,7 @@
<li><a target="_blank" href="https://www.apache.org/foundation/thanks.html">Thanks</a></li>
<li><a target="_blank" href="https://www.apache.org/events/current-event.html">Current Events</a></li>
<li><a target="_blank" href="https://www.apache.org/security/">Security</a></li>
+ <li><a target="_blank" href="https://privacy.apache.org/policies/privacy-policy-public.html">Privacy</a></li>
</ul>
</li>
</ul>
@@ -335,7 +336,7 @@ in the last few years. Inactive members are welcome to continue participating at
<p>
Copyright © 2017-2022 <a href="https://www.apache.org" target="external">The Apache Software Foundation</a>.
Licensed under the <a href="https://www.apache.org/licenses/LICENSE-2.0"
- target="external">Apache Software License, Version 2.0</a> Please read our <a href="/privacy-policy.html">privacy policy</a>.
+ target="external">Apache Software License, Version 2.0</a> Please read our <a href="https://privacy.apache.org/policies/privacy-policy-public.html">privacy policy</a>.
</p><p>
Apache, Apache chainsaw, Apache log4cxx, Apache log4j, Apache log4net, Apache log4php and the Apache
feather logo are trademarks of The Apache Software Foundation. Oracle and Java are registered trademarks
diff --git a/sources/src/main/jbake/content/privacy-policy.md b/sources/src/main/jbake/content/privacy-policy.md
index 5da9665..ec7743a 100644
--- a/sources/src/main/jbake/content/privacy-policy.md
+++ b/sources/src/main/jbake/content/privacy-policy.md
@@ -5,26 +5,4 @@ type=page
# Privacy policy
-Information about your use of this web site 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 web site;
-- 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
-[GoogleAnalytics](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 used. We do not track or collect personally identifiable
-information or associate gathered data with any personally identifying information from other
-sources.
-
-By using this web site, you consent to the collection of this data in the manner and for the
-purpose described above.
-
+This document was moved [here](https://privacy.apache.org/policies/privacy-policy-public.html)
diff --git a/sources/src/main/jbake/templates/footer.ftl b/sources/src/main/jbake/templates/footer.ftl
index 01c906e..87b6a3f 100644
--- a/sources/src/main/jbake/templates/footer.ftl
+++ b/sources/src/main/jbake/templates/footer.ftl
@@ -3,7 +3,7 @@
<p>
Copyright © 2017-2022 <a href="https://www.apache.org" target="external">The Apache Software Foundation</a>.
Licensed under the <a href="https://www.apache.org/licenses/LICENSE-2.0"
- target="external">Apache Software License, Version 2.0</a> Please read our <a href="/privacy-policy.html">privacy policy</a>.
+ target="external">Apache Software License, Version 2.0</a> Please read our <a href="https://privacy.apache.org/policies/privacy-policy-public.html">privacy policy</a>.
</p><p>
Apache, Apache chainsaw, Apache log4cxx, Apache log4j, Apache log4net, Apache log4php and the Apache
feather logo are trademarks of The Apache Software Foundation. Oracle and Java are registered trademarks
diff --git a/sources/src/main/jbake/templates/navbar.ftl b/sources/src/main/jbake/templates/navbar.ftl
index d820cc1..b9755d0 100644
--- a/sources/src/main/jbake/templates/navbar.ftl
+++ b/sources/src/main/jbake/templates/navbar.ftl
@@ -50,6 +50,7 @@
<li><a target="_blank" href="https://www.apache.org/foundation/thanks.html">Thanks</a></li>
<li><a target="_blank" href="https://www.apache.org/events/current-event.html">Current Events</a></li>
<li><a target="_blank" href="https://www.apache.org/security/">Security</a></li>
+ <li><a target="_blank" href="https://privacy.apache.org/policies/privacy-policy-public.html">Privacy</a></li>
</ul>
</li>
</ul>