Merge branch 'main' of github.com:apache/privacy-website into main
diff --git a/_data/latest-changes.yml b/_data/latest-changes.yml
new file mode 100644
index 0000000..69514d7
--- /dev/null
+++ b/_data/latest-changes.yml
@@ -0,0 +1,6 @@
+- date: 2021-07-08
+ short: added latest changes documentation
+- date: 2021-07-05
+ short: added Microsoft Azure, Scaleway, Github, Fastly to terms
+- date: 2021-07-05
+ short: added mailing list policy (draft)
\ No newline at end of file
diff --git a/_includes/footer.html b/_includes/footer.html
index 849471d..4a9856e 100644
--- a/_includes/footer.html
+++ b/_includes/footer.html
@@ -1,3 +1,6 @@
<footer>
-
+ © 2021 The Apache Software Foundation under the terms of the Apache License 2.0.
+
+ Apache, the Apache feather logo, and the Apache logo are either registered trademarks or
+ trademarks of The Apache Software Foundation in the United States and other countries.
</footer>
diff --git a/_includes/header.html b/_includes/header.html
index cdcb403..7598d27 100644
--- a/_includes/header.html
+++ b/_includes/header.html
@@ -10,10 +10,10 @@
<li><a href="/">Home</a></li>
<li><a href="/policies">Policies</a></li>
<li>
- <a href="#">FAQ ▼</a>
+ <a href="#">Privacy FAQ ▼</a>
<ul class="hidden">
- <li><a href="/faq/committers.html">Committers' FAQ</a></li>
- <li><a href="/faq/infrastructure.html">Infrastructure FAQ</a></li>
+ <li><a href="/faq/committers.html">Committers' Privacy FAQ</a></li>
+ <li><a href="/faq/infrastructure.html">Infrastructure Privacy FAQ</a></li>
</ul>
</li>
<li><a href="http://www.apache.org/foundation/">About the ASF</a></li>
diff --git a/_sass/main.scss b/_sass/main.scss
index 095b2d2..3df1475 100644
--- a/_sass/main.scss
+++ b/_sass/main.scss
@@ -172,6 +172,8 @@
background-color: $color_nav_item;
color: white;
min-height: 100px;
+ font-family: $font;
+ padding: 1em;
}
main {
diff --git a/policies/index.md b/policies/index.md
index e8736e3..4d93e14 100644
--- a/policies/index.md
+++ b/policies/index.md
@@ -21,6 +21,8 @@
# Available Policies
+Please read about our [latest changes here](/policies/latest-changes.html).
+
## Privacy Policies
- [Privacy Policy for public services](/policies/privacy-policy-public.html)
diff --git a/policies/latest-changes.html b/policies/latest-changes.html
new file mode 100644
index 0000000..b67d699
--- /dev/null
+++ b/policies/latest-changes.html
@@ -0,0 +1,32 @@
+---
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements. See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership. The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License. You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied. See the License for the
+# specific language governing permissions and limitations
+# under the License.
+
+layout: default
+---
+
+<h2>Latest Changes</h2>
+
+<div>A detailled list of changes can be found in our <a href="https://github.com/apache/privacy-website/commits/main">GitHub source repository</a>.</div>
+
+<ul>
+ {% for change in site.data.latest-changes %}
+ <li>
+ {{change.date}}: {{change.short}}
+ </li>
+ {% endfor %}
+</ul>
\ No newline at end of file