You are viewing a plain text version of this content. The canonical link for it is here.
Posted to legal-discuss@apache.org by se...@apache.org on 2023/06/08 09:33:31 UTC
[www-site] branch preview/tagversion updated (8b405a91b -> 2c5e440bb)
This is an automated email from the ASF dual-hosted git repository.
sebb pushed a change to branch preview/tagversion
in repository https://gitbox.apache.org/repos/asf/www-site.git
from 8b405a91b Replace search with pagefind
add 1af70cb6f Use https endpoint for struts.apache.org and developer references
add 6a2fc6863 Merge pull request #203 from jogep/main
add 5aad1cc1d Privacy policy now on the privacy.a.o website
add 21771a2b7 Merge pull request #200 from apache/obsolete
add e6e57381a Moving release-policy.md under /legal/ as per LEGAL-644
add e74418a07 Merge pull request #202 from rvs/main
add f48f981c9 The page is back here
add 62f48d635 Merge pull request #205 from apache/legal-644-redirect
add 0bb85ce79 OF: redirect does not work correctly
add e68a4d7ce Add project-specific security pages for Druid and PDFBox
add 52914b6c9 Merge pull request #204 from raboof/druid-pdfbox-security-pages
add da0deddb1 Fix SpamAssassin security page link
add 8d5a134b3 Merge pull request #209 from raboof/fix-spamassassin-security-page-link
add 5db3e8e2f Rename project security page column heading
add 96d39aedc Merge pull request #210 from raboof/project-security-page-column-heading
add 66043c438 Update index.md updated link to apply-license info
add 84ec6254e Update index.md fixed typo
new 6fbd1e651 Merge branch 'main' into preview/tagversion
new 3b30033d9 Irrelevant changes
new 2c5e440bb Drop debug
The 3 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
content/dev/.htaccess | 8 +--
content/dev/index.md | 2 +-
content/foundation/members.md | 10 ++--
content/foundation/policies/anti-harassment.md | 1 -
content/foundation/policies/privacy.md | 31 ----------
content/legal/3party.md | 1 -
content/legal/apply-license.md | 79 ++++++++++++++++++++++++++
content/legal/release-policy.md | 3 +-
content/search.md | 14 -----
content/security/projects.md | 6 +-
pagefind.sh | 21 +------
pelicanconf.yaml | 2 +-
theme/apache/templates/tag.html | 7 ---
theme/apache/templates/tags.html | 21 -------
14 files changed, 98 insertions(+), 108 deletions(-)
delete mode 100644 content/foundation/policies/privacy.md
create mode 100644 content/legal/apply-license.md
delete mode 100644 content/search.md
delete mode 100644 theme/apache/templates/tag.html
delete mode 100644 theme/apache/templates/tags.html
---------------------------------------------------------------------
To unsubscribe, e-mail: legal-discuss-unsubscribe@apache.org
For additional commands, e-mail: legal-discuss-help@apache.org
[www-site] 02/03: Irrelevant changes
Posted by se...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
sebb pushed a commit to branch preview/tagversion
in repository https://gitbox.apache.org/repos/asf/www-site.git
commit 3b30033d9cac2f2db344ceb92407c64773077290
Author: Sebb <se...@apache.org>
AuthorDate: Thu Jun 8 10:20:33 2023 +0100
Irrelevant changes
---
content/foundation/policies/anti-harassment.md | 1 -
content/legal/3party.md | 1 -
content/legal/release-policy.md | 1 -
content/search.md | 14 --------------
pelicanconf.yaml | 2 +-
theme/apache/templates/tag.html | 7 -------
theme/apache/templates/tags.html | 21 ---------------------
7 files changed, 1 insertion(+), 46 deletions(-)
diff --git a/content/foundation/policies/anti-harassment.md b/content/foundation/policies/anti-harassment.md
index 2953486d7..95179f4cc 100644
--- a/content/foundation/policies/anti-harassment.md
+++ b/content/foundation/policies/anti-harassment.md
@@ -1,5 +1,4 @@
Title: Anti-Harassment Policy
-Tags: policy
license: https://www.apache.org/licenses/LICENSE-2.0
diff --git a/content/legal/3party.md b/content/legal/3party.md
index 05cb1afea..506ef0856 100644
--- a/content/legal/3party.md
+++ b/content/legal/3party.md
@@ -1,7 +1,6 @@
Title: Third-Party Licensing Policy - The Apache Software Foundation
Atom: http://mail-archives.apache.org/mod_mbox/www-legal-discuss/?format=atom
Notice: http://www.apache.org/licenses/LICENSE-2.0
-Tags: policy
# Third-Party Licensing Policy #
diff --git a/content/legal/release-policy.md b/content/legal/release-policy.md
index b2f39190d..1945b7537 100644
--- a/content/legal/release-policy.md
+++ b/content/legal/release-policy.md
@@ -1,5 +1,4 @@
Title: Release Policy
-Tags: policy
license: https://www.apache.org/licenses/LICENSE-2.0
diff --git a/content/search.md b/content/search.md
deleted file mode 100644
index 90bc48619..000000000
--- a/content/search.md
+++ /dev/null
@@ -1,14 +0,0 @@
-Title: Apache Search
-license: https://www.apache.org/licenses/LICENSE-2.0
-
-
-<link href="/_pagefind/pagefind-ui.css" rel="stylesheet">
-<script src="/_pagefind/pagefind-ui.js" type="text/javascript"></script>
-
-<div id="search"></div>
-<script>
- window.addEventListener('DOMContentLoaded', (event) => {
- new PagefindUI({ element: "#search" });
- });
-</script>
-
diff --git a/pelicanconf.yaml b/pelicanconf.yaml
index 7f22a861a..2fad5f327 100644
--- a/pelicanconf.yaml
+++ b/pelicanconf.yaml
@@ -1,6 +1,6 @@
site:
name: Apache Software Foundation
- description: The main website of the ASF
+ description: The main website of the ASF
domain: www.apache.org
logo: images/logo.png
repository: https://github.com/apache/www-site/blob/main/content/
diff --git a/theme/apache/templates/tag.html b/theme/apache/templates/tag.html
deleted file mode 100644
index 938781348..000000000
--- a/theme/apache/templates/tag.html
+++ /dev/null
@@ -1,7 +0,0 @@
-{% extends "index.html" %}
-
-{% block title %}{{ SITENAME }} - {{ tag }} tag{% endblock %}
-
-{% block content_title %}
-<h1>Articles tagged with {{ tag }}</h1>
-{% endblock %}
diff --git a/theme/apache/templates/tags.html b/theme/apache/templates/tags.html
deleted file mode 100644
index 835a8e18b..000000000
--- a/theme/apache/templates/tags.html
+++ /dev/null
@@ -1,21 +0,0 @@
-{# extends "base.html" - need to fix that first #}
-
-{% block title %}{{ SITENAME }} - Tags{% endblock %}
-
-{% block content %}
- <h1>Tags for {{ SITENAME }}</h1>
- <ul>
- {% for tag, articles in tags|sort %}
- <li><a href="{{ SITEURL }}/{{ tag.url }}">{{ tag }}</a> ({{ articles|count }})</li>
- {% endfor %}
- </ul>
- {% for page in pages %}
- {% if page.tags %}
- {% for tag in page.tags.split(",") %}
- {{ tag }} {{ page.url }} {{ page.title}}
- <br>
- {% endfor %}
- {% endif %}
- {% endfor %}
-{% endblock %}
-
---------------------------------------------------------------------
To unsubscribe, e-mail: legal-discuss-unsubscribe@apache.org
For additional commands, e-mail: legal-discuss-help@apache.org
[www-site] 01/03: Merge branch 'main' into preview/tagversion
Posted by se...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
sebb pushed a commit to branch preview/tagversion
in repository https://gitbox.apache.org/repos/asf/www-site.git
commit 6fbd1e6511af6e3b318aa14bc244b7cebcf85126
Merge: 8b405a91b 84ec6254e
Author: Sebb <se...@apache.org>
AuthorDate: Thu Jun 8 10:11:27 2023 +0100
Merge branch 'main' into preview/tagversion
content/dev/.htaccess | 8 ++--
content/dev/index.md | 2 +-
content/foundation/members.md | 10 ++---
content/foundation/policies/privacy.md | 31 -------------
content/legal/apply-license.md | 79 ++++++++++++++++++++++++++++++++++
content/legal/release-policy.md | 2 +-
content/security/projects.md | 6 ++-
7 files changed, 94 insertions(+), 44 deletions(-)
---------------------------------------------------------------------
To unsubscribe, e-mail: legal-discuss-unsubscribe@apache.org
For additional commands, e-mail: legal-discuss-help@apache.org
[www-site] 03/03: Drop debug
Posted by se...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
sebb pushed a commit to branch preview/tagversion
in repository https://gitbox.apache.org/repos/asf/www-site.git
commit 2c5e440bb37b0a0a7a56c046fb1ae800588dc5b3
Author: Sebb <se...@apache.org>
AuthorDate: Thu Jun 8 10:22:50 2023 +0100
Drop debug
---
pagefind.sh | 21 +++------------------
1 file changed, 3 insertions(+), 18 deletions(-)
diff --git a/pagefind.sh b/pagefind.sh
index d47328a49..631057b22 100644
--- a/pagefind.sh
+++ b/pagefind.sh
@@ -19,29 +19,14 @@
#
#
-# Download and run pagefind
-
-echo "Debug"
-python --version
-pelican --version
-
-ls -l
-ls -l bin
-
-source bin/activate
-pip3 list
-
-pwd
-env
-
-#
+# Run pagefind (downloading if necessary)
# Is there already a copy of pagefind?
PAGEFIND=$(PATH=$PATH:. which pagefind)
-set -e # fast exit
+set -e # fast exit (must be done after 'which' invocation)
-if [ -z "$PAGEFIND" ]
+if [ -z "$PAGEFIND" ] # could not find pagefind
then
echo "Download pagefind"
PAGEFIND_VERSION='0.12.0'
---------------------------------------------------------------------
To unsubscribe, e-mail: legal-discuss-unsubscribe@apache.org
For additional commands, e-mail: legal-discuss-help@apache.org