This is an automated email from the ASF dual-hosted git repository. ntimofeev pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/cayenne-website.git
commit d7544492426e6652e5c5584f62853f5b12f97e19 Author: stariy95 <[email protected]> AuthorDate: Thu Nov 16 11:53:56 2023 +0400 Adjustments to comply with Apache privacy policy and content requirements: - correct link to the Apache privacy policy page - drop own privacy policy page --- src/main/site/content/privacy-policy.md | 27 --------------------------- src/main/site/layouts/partials/footer.html | 2 +- src/main/site/layouts/partials/header.html | 2 +- src/main/site/static/.htaccess | 1 + 4 files changed, 3 insertions(+), 29 deletions(-) diff --git a/src/main/site/content/privacy-policy.md b/src/main/site/content/privacy-policy.md deleted file mode 100644 index ad3e9ea90..000000000 --- a/src/main/site/content/privacy-policy.md +++ /dev/null @@ -1,27 +0,0 @@ ---- -title: Privacy Policy -url: privacy-policy.html ---- - -Information about your use of this website is collected using server access -logs and a tracking cookie. The collected information consists of the -following: - -1. The IP address from which you access the website; -1. The type of browser and operating system you use to access our site; -1. The date and time you access our site; -1. The pages you visit; and -1. 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 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 website, you consent to the collection of this data in the -manner and for the purpose described above. diff --git a/src/main/site/layouts/partials/footer.html b/src/main/site/layouts/partials/footer.html index 70b0be8c9..ef1e5fea3 100644 --- a/src/main/site/layouts/partials/footer.html +++ b/src/main/site/layouts/partials/footer.html @@ -33,7 +33,7 @@ <hr class="mt-0 mb-3" /> <p class="copy xsmall text-center mw-75 mx-auto mb-0"> Copyright © 2001-{{ now.Year }} Apache Software Foundation. Apache Cayenne, Cayenne, Apache, the Apache feather logo, and the Apache Cayenne project logo are trademarks of The Apache Software Foundation. - <a href="https://cayenne.apache.org/privacy-policy.html";>Privacy policy</a>. + <a href="https://privacy.apache.org/policies/privacy-policy-public.html";>Privacy policy</a>. <img class="d-block mx-auto mt-2" src="/img/logo_mono.svg" alt="Apache Cayenne" /> </p> </div> diff --git a/src/main/site/layouts/partials/header.html b/src/main/site/layouts/partials/header.html index 410e8b64d..63ac149e3 100644 --- a/src/main/site/layouts/partials/header.html +++ b/src/main/site/layouts/partials/header.html @@ -10,10 +10,10 @@ <a class="dropdown-item" href="https://www.apache.org/foundation/sponsorship.html";>Sponsorship</a> <a class="dropdown-item" href="https://www.apache.org/foundation/thanks.html";>Thanks</a> <a class="dropdown-item" href="https://www.apache.org/security/";>Security</a> + <a class="dropdown-item" href="https://privacy.apache.org/policies/privacy-policy-public.html";>Privacy</a> <a class="ml-1 mt-1 acevent" data-format="wide" data-mode="dark" data-width="120"></a> </div> </li> - <!--<li class="breadcrumb-item d-none d-lg-flex"><span>Apache Cayenne</span></li>--> </ul> </nav> <nav class="navbar navbar-expand-lg navbar-dark bg-primary"> diff --git a/src/main/site/static/.htaccess b/src/main/site/static/.htaccess index 7f2367da5..3a6a739c5 100644 --- a/src/main/site/static/.htaccess +++ b/src/main/site/static/.htaccess @@ -8,6 +8,7 @@ Redirect permanent /documentation.html /docs/index.html Redirect permanent /doc12/documentation.html /docs/1.2/index.html Redirect permanent /doc20/documentation.html /docs/2.0/index.html Redirect permanent /doc/documentation.html /docs/3.0/index.html +Redirect permanent /privacy-policy.html https://privacy.apache.org/policies/privacy-policy-public.html # Remaping legacy doc folders Redirect permanent /doc12/ /docs/1.2/
