From 941cff1d0c85037df4173ebdd36b5b77274c7114 Mon Sep 17 00:00:00 2001 From: Phillip LeBlanc Date: Tue, 23 Apr 2024 11:29:25 +0900 Subject: [PATCH 1/2] Update .asf.yaml to publish to root --- .asf.yaml | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/.asf.yaml b/.asf.yaml index 99fc4ac65a0e..6a7336735781 100644 --- a/.asf.yaml +++ b/.asf.yaml @@ -27,7 +27,7 @@ notifications: jira_options: link label worklog github: description: "Apache DataFusion SQL Query Engine" - homepage: https://arrow.apache.org/datafusion + homepage: https://datafusion.apache.org/ labels: - arrow - big-data @@ -50,7 +50,6 @@ github: required_approving_review_count: 1 # publishes the content of the `asf-site` branch to -# https://arrow.apache.org/datafusion/ +# https://datafusion.apache.org/ publish: whoami: asf-site - subdir: datafusion From 07113c4ce2c38a0044abea1804584be824a459b1 Mon Sep 17 00:00:00 2001 From: Phillip LeBlanc Date: Tue, 23 Apr 2024 11:41:04 +0900 Subject: [PATCH 2/2] Update website to have top-level ASF links --- docs/README.md | 8 ++++---- docs/source/index.rst | 11 +++++++++++ 2 files changed, 15 insertions(+), 4 deletions(-) diff --git a/docs/README.md b/docs/README.md index 32fe98466ce7..acf3cb754c00 100644 --- a/docs/README.md +++ b/docs/README.md @@ -21,7 +21,7 @@ This folder contains the source content of the [User Guide](./source/user-guide) and [Contributor Guide](./source/contributor-guide). These are both published to -https://arrow.apache.org/datafusion/ as part of the release process. +https://datafusion.apache.org/ as part of the release process. ## Dependencies @@ -55,7 +55,7 @@ automatically updated. ## Release Process -This documentation is hosted at https://arrow.apache.org/datafusion/ +This documentation is hosted at https://datafusion.apache.org/ When the PR is merged to the `main` branch of the DataFusion repository, a [github workflow](https://github.com/apache/datafusion/blob/main/.github/workflows/docs.yaml) which: @@ -63,7 +63,7 @@ repository, a [github workflow](https://github.com/apache/datafusion/blob/main/. 1. Builds the html content 2. Pushes the html content to the [`asf-site`](https://github.com/apache/datafusion/tree/asf-site) branch in this repository. -The Apache Software Foundation provides https://arrow.apache.org/, +The Apache Software Foundation provides https://datafusion.apache.org/, which serves content based on the configuration in [.asf.yaml](https://github.com/apache/datafusion/blob/main/.asf.yaml), -which specifies the target as https://arrow.apache.org/datafusion/. +which specifies the target as https://datafusion.apache.org/. diff --git a/docs/source/index.rst b/docs/source/index.rst index 41cd7d9aee2a..5944d346ca95 100644 --- a/docs/source/index.rst +++ b/docs/source/index.rst @@ -50,6 +50,17 @@ Please see the `developer’s guide`_ for contributing and `communication`_ for .. _developer’s guide: contributor-guide/index.html#developer-s-guide .. _communication: contributor-guide/communication.html +.. _toc.asf-links: +.. toctree:: + :maxdepth: 1 + :caption: ASF Links + + Apache Software Foundation + License + Donate + Thanks + Security + .. _toc.links: .. toctree:: :maxdepth: 1