This is an automated email from the ASF dual-hosted git repository.

djwang pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/cloudberry-site.git


The following commit(s) were added to refs/heads/main by this push:
     new f07d022  Update files for ASF
f07d022 is described below

commit f07d022c2c353bde54080c6cde0e66557c87af06
Author: Dianjin Wang <wangdian...@gmail.com>
AuthorDate: Fri Nov 1 17:02:31 2024 +0800

    Update files for ASF
---
 .asf.yaml                                 | 71 ++++++++++++++++++++++++++
 README.md                                 |  2 +-
 docs/releases/release-1.5.0.md            |  6 +++
 docs/releases/release-1.5.1.md            |  6 +++
 docs/releases/release-1.5.2.md            |  6 +++
 docs/releases/release-1.5.3.md            |  6 +++
 docs/releases/release-1.5.4.md            |  6 +++
 docs/releases/release-1.6.0.md            |  6 +++
 docs/sys-utilities/gpfdist.md             |  2 +-
 docs/sys-utilities/gpload.md              |  8 +--
 docusaurus.config.ts                      | 82 ++++++++++++++++++++++++-------
 src/consts/homeContent.tsx                | 23 ++++-----
 src/pages/community/events.md             |  4 +-
 src/pages/contribute/code.md              | 24 ++++-----
 src/pages/contribute/doc.md               | 10 ++--
 src/pages/contribute/git.md               | 16 +++---
 src/pages/contribute/how-to-contribute.md | 20 ++++----
 src/pages/team.md                         | 54 +++++++++++++++-----
 src/theme/Footer/index.tsx                |  7 ++-
 src/theme/Footer/styles.module.scss       | 12 +++--
 static/img/apache-incubator.svg           |  1 +
 21 files changed, 283 insertions(+), 89 deletions(-)

diff --git a/.asf.yaml b/.asf.yaml
new file mode 100644
index 0000000..92548e8
--- /dev/null
+++ b/.asf.yaml
@@ -0,0 +1,71 @@
+#
+# 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.
+#
+
+github:
+  description: Website sources for Cloudberry Database
+  homepage: https://cloudberry.apache.org
+  labels:
+    - docusaurus
+    - database
+    - greenplum
+    - postgresql
+  features:
+    # Enable wiki for documentation
+    wiki: false
+    # Enable issues management
+    issues: true
+    # Enable projects for project management boards
+    projects: true
+  enabled_merge_buttons:
+    # enable squash button:
+    squash: true
+    # disable merge button:
+    merge: false
+    # enable rebase button:
+    rebase: true
+  protected_branches:
+    main:
+      required_status_checks:
+        # strict means "Require branches to be up to date before merging".
+        strict: true
+        # contexts are the names of checks that must pass.
+        contexts:
+          - cbdb external_fts pipeline/icw-test
+      required_pull_request_reviews:
+        dismiss_stale_reviews: false
+        required_approving_review_count: 1
+      # squash or rebase must be allowed in the repo for this setting to be 
set to true.
+      required_linear_history: true
+
+      required_signatures: false
+
+      # requires all conversations to be resolved before merging is possible
+      required_conversation_resolution: true
+  del_branch_on_merge: true
+  dependabot_alerts: true
+  dependabot_updates: false
+notifications:
+  commits: commits@cloudberry.apache.org
+  issues: commits@cloudberry.apache.org
+  pullrequests: commits@cloudberry.apache.org
+# Staging and publishing profile for yourproject-website.git:
+staging:
+  profile: ~
+  whoami:  asf-staging
+ 
+publish:
+  whoami:  asf-site
diff --git a/README.md b/README.md
index b42da79..44ec5ef 100644
--- a/README.md
+++ b/README.md
@@ -1,4 +1,4 @@
-## Cloudberry Database Website & Documentation
+## Apache Cloudberry (Incubating) Website & Documentation
 
 [![Netlify 
Status](https://api.netlify.com/api/v1/badges/6f2dcedf-68eb-479e-9cf6-5c788d173572/deploy-status)](https://app.netlify.com/sites/cloudberrydb/deploys)
 
[![Slack](https://img.shields.io/badge/Join_Slack-6a32c9)](https://communityinviter.com/apps/cloudberrydb/welcome)
diff --git a/docs/releases/release-1.5.0.md b/docs/releases/release-1.5.0.md
index ca7cadd..de9fb0d 100644
--- a/docs/releases/release-1.5.0.md
+++ b/docs/releases/release-1.5.0.md
@@ -2,6 +2,12 @@
 title: 1.5.0
 ---
 
+:::caution
+
+This is not an Apache release!
+
+:::
+
 # Cloudberry Database v1.5.0 Release Notes
 
 Version number: v1.5.0
diff --git a/docs/releases/release-1.5.1.md b/docs/releases/release-1.5.1.md
index c547577..f67e828 100644
--- a/docs/releases/release-1.5.1.md
+++ b/docs/releases/release-1.5.1.md
@@ -2,6 +2,12 @@
 title: 1.5.1
 ---
 
+:::caution
+
+This is not an Apache release!
+
+:::
+
 # Cloudberry Database v1.5.1 Release Notes
 
 Version number: v1.5.1
diff --git a/docs/releases/release-1.5.2.md b/docs/releases/release-1.5.2.md
index 60997af..a20af76 100644
--- a/docs/releases/release-1.5.2.md
+++ b/docs/releases/release-1.5.2.md
@@ -2,6 +2,12 @@
 title: 1.5.2
 ---
 
+:::caution
+
+This is not an Apache release!
+
+:::
+
 # Cloudberry Database v1.5.2 Release Notes
 
 Version number: v1.5.2
diff --git a/docs/releases/release-1.5.3.md b/docs/releases/release-1.5.3.md
index 0c0f904..f8073e4 100644
--- a/docs/releases/release-1.5.3.md
+++ b/docs/releases/release-1.5.3.md
@@ -2,6 +2,12 @@
 title: 1.5.3
 ---
 
+:::caution
+
+This is not an Apache release!
+
+:::
+
 # Cloudberry Database v1.5.3 Release Notes
 
 Version number: v1.5.3
diff --git a/docs/releases/release-1.5.4.md b/docs/releases/release-1.5.4.md
index 79c0a4b..2bcbc01 100644
--- a/docs/releases/release-1.5.4.md
+++ b/docs/releases/release-1.5.4.md
@@ -2,6 +2,12 @@
 title: 1.5.4
 ---
 
+:::caution
+
+This is not an Apache release!
+
+:::
+
 # Cloudberry Database v1.5.4 Release Notes
 
 Version number: v1.5.4
diff --git a/docs/releases/release-1.6.0.md b/docs/releases/release-1.6.0.md
index ab85de9..83dd36f 100644
--- a/docs/releases/release-1.6.0.md
+++ b/docs/releases/release-1.6.0.md
@@ -2,6 +2,12 @@
 title: 1.6.0
 ---
 
+:::caution
+
+This is not an Apache release!
+
+:::
+
 # Cloudberry Database v1.6.0 Release Notes
 
 Version number: v1.6.0
diff --git a/docs/sys-utilities/gpfdist.md b/docs/sys-utilities/gpfdist.md
index 8e18f16..b6f938e 100644
--- a/docs/sys-utilities/gpfdist.md
+++ b/docs/sys-utilities/gpfdist.md
@@ -90,7 +90,7 @@ For a Cloudberry Database with multiple segments, there might 
be a delay between
 
 **`--ssl certificate_path`**
 
-Adds SSL encryption to data transferred with `gpfdist`. After running 
`gpfdist` with the `--ssl certificate_path` option, the only way to load data 
from this file server is with the `gpfdist://` protocol. For information on the 
`gpfdist://` protocol, see [Loading and Unloading 
Data](/docs/import-data-into-cbdb.md).
+Adds SSL encryption to data transferred with `gpfdist`. After running 
`gpfdist` with the `--ssl certificate_path` option, the only way to load data 
from this file server is with the `gpfdist://` protocol. For information on the 
`gpfdist://` protocol, see [Loading and Unloading 
Data](../data-loading/load-data-using-gpfdist.md).
 
 The location specified in certificate_path must contain the following files:
 
diff --git a/docs/sys-utilities/gpload.md b/docs/sys-utilities/gpload.md
index 8c8547c..930377a 100644
--- a/docs/sys-utilities/gpload.md
+++ b/docs/sys-utilities/gpload.md
@@ -204,7 +204,7 @@ SOURCE**
 
 Required. The `SOURCE` block of an `INPUT` specification defines the location 
of a source file. An `INPUT` section can have more than one `SOURCE` block 
defined. Each `SOURCE` block defined corresponds to one instance of the 
[gpfdist](/docs/sys-utilities/gpfdist.md) file distribution program that will 
be started on the local machine. Each `SOURCE` block defined must have a `FILE` 
specification.
 
-For more information about using the `gpfdist` parallel file server and single 
and multiple `gpfdist` instances, see [Loading 
data](/docs/import-data-into-cbdb.md).
+For more information about using the `gpfdist` parallel file server and single 
and multiple `gpfdist` instances, see [Loading 
data](../data-loading/load-data-using-gpfdist.md).
 
 **`LOCAL_HOSTNAME`**
 
@@ -258,7 +258,7 @@ The default source-to-target mapping is based on a match of 
column names as defi
 
 **`TRANSFORM`**
 
-Optional. Specifies the name of the input transformation passed to `gpload`. 
For information about XML transformations, see [Loading and Unloading 
Data](/docs/import-data-into-cbdb.md).
+Optional. Specifies the name of the input transformation passed to `gpload`. 
For information about XML transformations, see [Loading and Unloading 
Data](../data-loading/load-data-using-gpload.md).
 
 **`TRANSFORM_CONFIG`**
 
@@ -270,7 +270,7 @@ Optional. An integer that specifies the maximum length of a 
line in the XML tran
 
 **`FORMAT`**
 
-Optional. Specifies the format of the source data file(s) - either plain text 
(`TEXT`) or comma separated values (`CSV`) format. Defaults to `TEXT` if not 
specified. For more information about the format of the source data, see 
[Loading data](/docs/import-data-into-cbdb.md).
+Optional. Specifies the format of the source data file(s) - either plain text 
(`TEXT`) or comma separated values (`CSV`) format. Defaults to `TEXT` if not 
specified. For more information about the format of the source data, see 
[Loading data](../data-loading/).
 
 **`DELIMITER`**
 
@@ -322,7 +322,7 @@ Optional. Character set encoding of the source data. 
Specify a string constant (
 
 **`ERROR_LIMIT`**
 
-Optional. Enables single row error isolation mode for this load operation. 
When enabled, input rows that have format errors will be discarded provided 
that the error limit count is not reached on any Cloudberry Database segment 
instance during input processing. If the error limit is not reached, all good 
rows will be loaded and any error rows will either be discarded or captured as 
part of error log information. The default is to cancel the load operation on 
the first error encountered.  [...]
+Optional. Enables single row error isolation mode for this load operation. 
When enabled, input rows that have format errors will be discarded provided 
that the error limit count is not reached on any Cloudberry Database segment 
instance during input processing. If the error limit is not reached, all good 
rows will be loaded and any error rows will either be discarded or captured as 
part of error log information. The default is to cancel the load operation on 
the first error encountered.  [...]
 
 **`LOG_ERRORS`**
 
diff --git a/docusaurus.config.ts b/docusaurus.config.ts
index 1f0199b..e1685e2 100644
--- a/docusaurus.config.ts
+++ b/docusaurus.config.ts
@@ -2,13 +2,13 @@ import type * as Preset from "@docusaurus/preset-classic";
 import type { Config } from "@docusaurus/types";
 import { themes as prismThemes } from "prism-react-renderer";
 const config: Config = {
-  title: "Cloudberry Database",
-  tagline: "Open Source Alternative to Greenplum Database. Next Generation 
Unified Database for Analytics and AI.",
+  title: "Apache Cloudberry (Incubating)",
+  tagline: "One advanced and mature open-source MPP (Massively Parallel 
Processing) databases available.",
   favicon: "/img/favicon.ico",
-  url: "https://cloudberrydb.org";,
+  url: "https://cloudberry.apache.org";,
   baseUrl: "/",
-  organizationName: "cloudberrydb", // Usually your GitHub org/user name.
-  projectName: "cloudberrydb-site", // Usually your repo name.
+  organizationName: "apache", // Usually your GitHub org/user name.
+  projectName: "cloudberry-site", // Usually your repo name.
 
   // onBrokenLinks: "throw",
   onBrokenLinks: "ignore",
@@ -39,7 +39,7 @@ const config: Config = {
         docs: {
           sidebarPath: "./sidebars.ts",
           editUrl:
-            "https://github.com/cloudberrydb/cloudberrydb-site/edit/main/";,
+            "https://github.com/apache/cloudberry-site/edit/main/";,
           editLocalizedFiles: true,
           showLastUpdateAuthor: true,
           showLastUpdateTime: true,
@@ -54,7 +54,7 @@ const config: Config = {
           feedOptions: {
             type: "all",
             title:
-              "Cloudberry Database: Open Source Alternative to Greenplum 
Database. Next Generation Unified Database for Analytics and AI",
+              "Apache Cloudberry (Incubating) is one advanced and mature 
open-source MPP (Massively Parallel Processing) databases available.",
           },
         },
         theme: {
@@ -73,13 +73,13 @@ const config: Config = {
   ],
 
   themeConfig: {
-    title: "Cloudberry Database",
-    tagline: "Open Source Alternative to Greenplum Database. Next Generation 
Unified Database for Analytics and AI",
+    title: "Apache Cloudberry (Incubating)",
+    tagline: "one advanced and mature open-source MPP (Massively Parallel 
Processing) databases available.",
     favicon: "/img/favicon.ico",
-    url: "https://cloudberrydb.org";,
+    url: "https://cloudberry.apache.org";,
     baseUrl: "/",
-    organizationName: "cloudberrydb", // Usually your GitHub org/user name.
-    projectName: "cloudberrydb-site", // Usually your repo name.
+    organizationName: "apache", // Usually your GitHub org/user name.
+    projectName: "cloudberry-site", // Usually your repo name.
     colorMode: {
       defaultMode: "dark",
       disableSwitch: false,
@@ -88,7 +88,7 @@ const config: Config = {
     navbar: {
       logo: {
         href: "/",
-        alt: "Cloudberry Database",
+        alt: "Apache Cloudberry (Incubating)",
         src: "/img/cloudberrydb_color_black.svg",
         srcDark: "/img/cloudberrydb_color_white.svg",
       },
@@ -141,16 +141,64 @@ const config: Config = {
               to: "/team",
             },
           ],
+        },
+             {
+          label: 'ASF',
+          position: 'right',
+          items: [
+            {
+              label: 'Foundation',
+              to: 'https://www.apache.org/'
+            },
+            {
+              label: 'License',
+              to: 'https://www.apache.org/licenses/'
+            },
+            {
+              label: 'Events',
+              to: 'https://www.apache.org/events/current-event.html'
+            },
+            {
+              label: 'Privacy',
+              to: 
'https://privacy.apache.org/policies/privacy-policy-public.html'
+            },
+            {
+              label: 'Security',
+              to: 'https://github.com/apache/cloudberry/blob/main/SECURITY.md'
+            },
+            {
+              label: 'Sponsorship',
+              to: 'https://www.apache.org/foundation/sponsorship.html'
+            },
+            {
+              label: 'Thanks',
+              to: 'https://www.apache.org/foundation/thanks.html'
+            },
+            {
+              label: 'Code of Conduct',
+              to: 'https://www.apache.org/foundation/policies/conduct'
+            },
+          ]
         },
       ],
     },
     footer: {
       logo: {
-        alt: "Cloudberry Database Logo",
-        src: "/img/cloudberrydb_color_white.svg",
-        srcDark: "/img/cloudberrydb_color_black.svg",
+        src: "/img/apache-incubator.svg",
+        srcDark: "/img/apache-incubator.svg",
+        href: "https://incubator.apache.org/";,
+        alt: "Apache Incubator logo",
       },
-      copyright: `Copyright © ${new Date().getFullYear()} HashData Technology 
Limited.`,
+      copyright: `
+      <p>
+        Apache Cloudberry is an effort undergoing incubation at The Apache 
Software Foundation (ASF), sponsored by the Apache Incubator. Incubation is 
required of all newly accepted projects until a further review indicates that 
the infrastructure, communications, and decision making process have stabilized 
in a manner consistent with other successful ASF projects. While incubation 
status is not necessarily a reflection of the completeness or stability of the 
code, it does indicate that  [...]
+      </p>
+      <p>
+        Copyright © ${new Date().getFullYear()} The Apache Software 
Foundation, Licensed under the Apache License, Version 2.0.</p>
+      <p>
+        Apache®, the names of Apache projects, and the feather logo are either 
registered trademarks or trademarks of the Apache Software Foundation in the 
United States and/or other countries.
+      </p>
+      `,
       links: [
         {
           title: "Support",
diff --git a/src/consts/homeContent.tsx b/src/consts/homeContent.tsx
index b256ef9..805af9b 100644
--- a/src/consts/homeContent.tsx
+++ b/src/consts/homeContent.tsx
@@ -5,7 +5,7 @@ import SystemSvg from "/img/home/try-it-out/system.svg";
 
 let TIPS_CONTENT = (
   <LinkWithBaseUrl href="https://github.com/cloudberrydb/cloudberrydb";>
-    <span>If you like Cloudberry Database, give it a star on GitHub! </span>
+    <span>If you like Apache Cloudberry (Incubating), give it a star on 
GitHub! </span>
     <img src="/img/home/hcard/star.svg" alt="" />
   </LinkWithBaseUrl>
 );
@@ -196,8 +196,7 @@ let WANT_TO_CONTRIBUTE = {
       title: "Want to Contribute?",
       content: (
         <span>
-          There are many ways to contribute to Cloudberry Database, and you can
-          easily find the ones that suit your skills and interests to 
+          There are many ways to contribute to Apache Cloudberry (Incubating), 
and you can easily find the ones that suit your skills and interests to 
           <LinkWithBaseUrl className={"light-active-color"} href="/contribute">
             begin your contribution
           </LinkWithBaseUrl>
@@ -231,12 +230,12 @@ let FREQUENTLY_ASKED_QUESTIONS = {
   ),
   list: [
     {
-      title: "Can I use the Cloudberry Database for commercial purposes?",
+      title: "Can I use the Apache Cloudberry (Incubating) for commercial 
purposes?",
       content:
-        "Cloudberry Database is open-source under Apache License V2.0, which 
permits commercial use, as long as following the license agreement.",
+        "Apache Cloudberry (Incubating) is open-source under Apache License 
V2.0, which permits commercial use, as long as following the license 
agreement.",
     },
     {
-      title: "What's the product plan for the Cloudberry Database?",
+      title: "What's the product plan for the Apache Cloudberry (Incubating)?",
       content: (
         <>
           You can check our{" "}
@@ -252,12 +251,10 @@ let FREQUENTLY_ASKED_QUESTIONS = {
     },
     {
       title:
-        "What's the difference between Cloudberry Database and Greenplum 
Database?",
+        "What's the difference between Apache Cloudberry (Incubating) and 
Greenplum Database?",
       content: (
         <>
-          Though Cloudberry Database takes the Greenplum Database 7 as its code
-          base, Cloudberry Database has a newer solid PostgreSQL kernel 
built-in
-          and has more features. You can check the 
+          Though Apache Cloudberry (Incubating) takes the Greenplum Database 7 
as its codebase, Cloudberry has a newer solid PostgreSQL kernel built-in and 
has more features. You can check the 
           <LinkWithBaseUrl
             className="active-color"
             href="https://cloudberrydb.org/docs/cbdb-vs-gp-features";
@@ -271,12 +268,12 @@ let FREQUENTLY_ASKED_QUESTIONS = {
     },
     {
       title:
-        "Can I use Cloudberry Database to replace our existing Greenplum 
Database clusters?",
+        "Can I use Apache Cloudberry (Incubating) to replace our existing 
Greenplum Database clusters?",
       content:
-        "Yes. One goal of Cloudberry Database is to be compatible with 
Greenplum to let users can use Cloudberry the way using Greenplum. You can 
migrate from Greenplum to Cloudberry using gpbackup or other migration tools.",
+        "Yes. One goal of Apache Cloudberry (Incubating) is to be compatible 
with Greenplum to let users can use Cloudberry the way using Greenplum. You can 
migrate from Greenplum to Cloudberry using gpbackup or other migration tools.",
     },
     {
-      title: "How can I contribute to the Cloudberry Database?",
+      title: "How can I contribute to the Apache Cloudberry (Incubating)?",
       content: (
         <>
           We welcome contributions from anyone, new and experienced! Welcome to
diff --git a/src/pages/community/events.md b/src/pages/community/events.md
index b804067..14c7ffd 100644
--- a/src/pages/community/events.md
+++ b/src/pages/community/events.md
@@ -3,14 +3,14 @@ title: Community Events
 description: Don't miss out on exciting community events! Subscribe to our 
events calendar for meetups, webinars, conferences, and more.
 ---
 
-You can [subscribe to Cloudberry Database Community
+You can [subscribe to Apache Cloudberry Community
 
Calendar](https://calendar.google.com/calendar/embed?src=cloudberrydb%40gmail.com&ctz=America%2FLos_Angeles)
 to get notified about community events, including meetups, webinars,
 summits, conferences, Office Hours, and more!
 
 :::note
 
-If you want to add your events related to the Cloudberry Database,
+If you want to add your events related to the Apache Cloudberry,
 welcome to email us: i...@cloudberrydb.org.
 
 :::
diff --git a/src/pages/contribute/code.md b/src/pages/contribute/code.md
index 4c96e7a..021c224 100644
--- a/src/pages/contribute/code.md
+++ b/src/pages/contribute/code.md
@@ -5,7 +5,7 @@ description: Learn the code conventions, contribution workflow, 
how to review co
 
 ## Code of Conduct
 
-Everyone who participates in Cloudberry Database, either as a user or
+Everyone who participates in Apache Cloudberry, either as a user or
 a contributor, is obliged to follow our [community Code of
 Conduct](../community/coc).
 
@@ -52,7 +52,7 @@ i...@cloudberrydb.org.
 
 :::
 
-To avoid duplicating work, please review the [Cloudberry Database
+To avoid duplicating work, please review the [Apache Cloudberry
 Proposals](./proposal) or ask directly in our Slack before
 you start work on a non-trivial feature.
 
@@ -71,7 +71,7 @@ in the PostgreSQL codebase we can `try to make your patch 
consistent
 with nearby code`(See discussions in [PostgreSQL mailing
 list](https://www.postgresql.org/message-id/16342.1221133325%40sss.pgh.pa.us).)
 
-We can use existing configurations for Cloudberry Database
+We can use existing configurations for Apache Cloudberry
 development, such as
 
[Vim](https://github.com/cloudberrydb/cloudberrydb/blob/main/src/tools/editors/vim.samples),
 
[Emacs](https://github.com/cloudberrydb/cloudberrydb/blob/main/src/tools/editors/emacs.samples),
@@ -87,13 +87,13 @@ 
Guide](https://www.postgresql.org/docs/current/error-style-guide.html).
 ## Contribution workflow
 
 The following will describe how to submit your code contribution as
-`Pull Request` to Cloudberry Database. If you still don't know well
+`Pull Request` to Apache Cloudberry. If you still don't know well
 how to work with Git and GitHub, please read [our
 guide](./git) again.
 
-To contribute to Cloudberry Database development:
+To contribute to Apache Cloudberry development:
 
-1. Fork the [Cloudberry Database
+1. Fork the [Apache Cloudberry
 repo](https://github.com/cloudberrydb/cloudberrydb) to your own GitHub
 account.
 
@@ -140,7 +140,7 @@ refer to [Commit Conventions](./git#commit-conventions).
 
 8. Open a PR(Pull Request).
 
-    Go to the Cloudberry Database repo on GitHub. There will be a message
+    Go to the Apache Cloudberry repo on GitHub. There will be a message
     about your recently pushed branch, asking if you would like to open a
     pull request. Follow the prompts, compare across repositories, and
     submit the PR.
@@ -152,7 +152,7 @@ refer to [Commit Conventions](./git#commit-conventions).
 
 9. Get your code reviewed.
 
-    Cloudberry Database maintainers and other contributors will review
+    Apache Cloudberry maintainers and other contributors will review
     your PR. Please participate in the conversation, and try to make any
     requested changes. If you get no review comments within two weeks,
     feel free to ask for feedback by mentioning @cloudberry/dev team in
@@ -221,9 +221,9 @@ to use.
 Here are some questions to keep in mind during the code review
 process:
 
-- Do we want this in Cloudberry Database? Is it likely to be used? Do
-  you, as a Cloudberry Database user, like the change and intend to
-  use it? Is this change in the scope of Cloudberry Database? Will the
+- Do we want this in Apache Cloudberry? Is it likely to be used? Do
+  you, as a Apache Cloudberry user, like the change and intend to
+  use it? Is this change in the scope of Apache Cloudberry? Will the
   cost of maintaining a new feature be worth its benefits?
 - Is it too large to review? Does it need to split into multi PR?
 - If it's a proposal, does it have been accepted and start to code?
@@ -260,7 +260,7 @@ For acronyms and abbreviations used in the code review, you 
can read
 * Read the Code of Conduct.
 * Ensure you have signed the Contributor License Agreement (CLA),
   especially for your first-time contribution.
-* Check if your changes are consistent with the Cloudberry Database
+* Check if your changes are consistent with the Apache Cloudberry
   coding style.
 * Make sure your Pull Request has a clear title and commit message.
 * List your communication in the [GitHub
diff --git a/src/pages/contribute/doc.md b/src/pages/contribute/doc.md
index 2376795..57f4f12 100644
--- a/src/pages/contribute/doc.md
+++ b/src/pages/contribute/doc.md
@@ -11,7 +11,7 @@ Conduct](https://cloudberrydb.io/community/coc).
 
 ## What contributors can do
 
-Contributors can help improve the Cloudberry Database documentation in
+Contributors can help improve the Apache Cloudberry documentation in
 the following ways:
 
 - Fix typos, wrong spelling, grammar mistakes, and broken links
@@ -42,7 +42,7 @@ create a Pull Request.
 
 For simple updates such as typo or link fixing in a single document:
 
-1. Navigate to the target page on the [Cloudberry Database
+1. Navigate to the target page on the [Apache Cloudberry
    documentation site](https://cloudberrydb.io/docs/) you
    wish to update.
 2. Click **Edit this page** at the left bottom of the page. This will
@@ -58,13 +58,13 @@ For simple updates such as typo or link fixing in a single 
document:
 
 For more complex updates or adding new content in multiple documents:
 
-1. Fork the [Cloudberry Database site
+1. Fork the [Apache Cloudberry site
    repository](https://github.com/cloudberrydb/cloudberrydb-site).
 2. Clone your forked repository to your local machine.
 3. Create a new branch for your changes.
 4. Make your changes in your local environment.
 5. Commit your changes and push them to your forked repository.
-6. Navigate to the original Cloudberry Database site repository.
+6. Navigate to the original Apache Cloudberry site repository.
 7. Click **New pull request**.
 8. Choose your forked repository's branch in the comparison, and
    choose the `main` branch for the `cloudberrydb/cloudberrydb-site`
@@ -116,7 +116,7 @@ If you are considering a major change to the documentation, 
such as
 adding a new section or rewriting a large part of it, we recommend the
 following process:
 
-1. Open an issue in the [Cloudberry Database site
+1. Open an issue in the [Apache Cloudberry site
    repository](https://github.com/cloudberrydb/cloudberrydb-site)
    describing your proposed changes. This allows the Cloudberry
    Database team and community to provide feedback before you invest a
diff --git a/src/pages/contribute/git.md b/src/pages/contribute/git.md
index c8e4747..2622303 100644
--- a/src/pages/contribute/git.md
+++ b/src/pages/contribute/git.md
@@ -3,7 +3,7 @@ title: Working with Git & GitHub
 description: Before starting, it's important to learn Git and GitHub to 
effectively contribute and communicate with other members.
 ---
 
-Cloudberry Database is hosted on GitHub. We use GitHub Issues as the
+Apache Cloudberry (Incubating) is hosted on GitHub. We use GitHub Issues as the
 bug report system, use GitHub Discussions for discussion and get
 feedback, and use Git as our version control system. Given these, it's
 important for community users and developers to learn how to work well
@@ -24,7 +24,7 @@ avatar, bio, social accounts, etc. to let other people know 
you.
 
 ### Step 2: Configure two-factor authentication
 
-This is required only for Cloudberry Database organization members,
+This is required only for Apache Cloudberry organization members,
 including committers, and PMC members. If you're an outside
 contributor, you can skip this step.
 
@@ -180,7 +180,7 @@ now. GitHub Discussions and GitHub Issues use the same 
label system.
 
 #Type
     type: Announcement - New Release, Events, Blog and more
-    type: Proposal - Proposals of major changes to Cloudberry Database
+    type: Proposal - Proposals of major changes to Apache Cloudberry
     type: Enhancement - New feature or request, ideas
     type: Question - Ask the community for help
     type: Documentation - Improvements or additions to documentation
@@ -208,9 +208,9 @@ If you add new labels, please follow the format 
`prefix-name: type`.
 
 We use GitHub Issues as a bug report system and work tracking, use
 GitHub Discussions for asking questions and answering, share ideas for
-new features, and share proposals for Cloudberry Database.
+new features, and share proposals for Apache Cloudberry.
 
-If you find problems and issues with code in Cloudberry Database core,
+If you find problems and issues with code in Apache Cloudberry core,
 welcome to report to [GitHub
 Issues](https://github.com/cloudberrydb/cloudberrydb/issues/new/choose).
 
@@ -223,7 +223,7 @@ directly.
 
|------------------------------|------------------------------------------------------------------|
 | Announcements                | New Release, events, blog and more (*Only 
maintainers can post*) |
 | Ideas / Feature Requests     | Share ideas for new features                  
                   |
-| Proposal                     | Share proposals of major changes to 
Cloudberry Database          |
+| Proposal                     | Share proposals of major changes to Apache 
Cloudberry          |
 | Q&A                          | Ask the community for help                    
                   |
 
 :::note
@@ -234,7 +234,7 @@ to learn more.
 
 ## GitHub Projects
 
-Now, our project is only public to the Cloudberry Database
+Now, our project is only public to the Apache Cloudberry
 organization members. If you're a member, you can open
 https://github.com/orgs/cloudberrydb/projects/5. We list the fields
 for your reference.
@@ -299,7 +299,7 @@ for details.
 We often use some acronyms and abbreviations for the code review, and
 comments in our daily GitHub communications. We collect some popular
 words to help you leverage them as part of an effective code review
-process in the Cloudberry Database community.
+process in the Apache Cloudberry community.
 
 | ****    |                                 | ****  |                          
               |
 
|---------|---------------------------------|-------|-----------------------------------------|
diff --git a/src/pages/contribute/how-to-contribute.md 
b/src/pages/contribute/how-to-contribute.md
index a28a457..31941a8 100644
--- a/src/pages/contribute/how-to-contribute.md
+++ b/src/pages/contribute/how-to-contribute.md
@@ -3,13 +3,13 @@ title: How to Contribute
 description: Check the contribution guide for information on how to 
contribute, request assistance, and the benefits of contributing.
 ---
 
-Cloudberry Database community welcomes contributions from anyone, new
+Apache Cloudberry (Incubating) community welcomes contributions from anyone, 
new
 and experienced! We appreciate your interest in contributing. This
 guide will help you get started with the contribution.
 
 ## Code of Conduct
 
-Everyone who participates in Cloudberry Database, either as a user or
+Everyone who participates in Apache Cloudberry, either as a user or
 a contributor, is obliged to follow our community [Code of
 Conduct](../community/coc). Every violation against it will be
 reviewed and investigated and will result in a response that is deemed
@@ -28,7 +28,7 @@ include:
 
 ## Find a Way to Contribute
 
-There are many ways to contribute to Cloudberry Database. Here are
+There are many ways to contribute to Apache Cloudberry. Here are
 some ways you need to get started. The most common contributions
 include code, documentation, and community support.
 
@@ -53,10 +53,10 @@ You can participate by:
 - [Reporting security issues](../community/security).
 - Testing code, testing releases.
 - Creating educational content (Blog posts, tutorials, videos, etc.)
-- Spreading the word about Cloudberry Database on social media(eg,
+- Spreading the word about Apache Cloudberry on social media(eg,
   Twitter, LinkedIn).
 - ...
-- More things to make Cloudberry Database better.
+- More things to make Apache Cloudberry better.
 
 ## Getting Help
 
@@ -66,22 +66,22 @@ 
Discussions](https://github.com/cloudberrydb/cloudberrydb/discussions)
 when your contribution is blocked, especially when making your first
 contribution. Don't be shy, we're happy to help.
 
-As the next-generation unified database, Cloudberry Database cannot
+As the next-generation unified database, Apache Cloudberry cannot
 grow without the support from the community. Hope to make our mission
 with you!
 
 ## Benefits of Contribution
 
-There are many reasons to contribute to Cloudberry Database and open
+There are many reasons to contribute to Apache Cloudberry and open
 source projects in general. Here are some of the benefits of
 participating:
 
-- Growing your network. Working with Cloudberry Database in open
+- Growing your network. Working with Apache Cloudberry in open
   source can help connect you with people working on similar things. You
   can get help or give help, and you might even make a real-life
   acquaintance!
 
-- Improving your skills. When you work on a Cloudberry Database issue
+- Improving your skills. When you work on a Apache Cloudberry issue
   or Pull Request, inevitably you'll learn more about how something
   works in our project; either by asking questions and gathering info or
   by digging deeper into the code yourself. There’s a skill-building
@@ -103,4 +103,4 @@ participating:
   Database team offers as a way to say thank you.
 
 There are undoubtedly more benefits than those listed here. Hope you
-enjoy your contribution to the Cloudberry Database community!
+enjoy your contribution to the Apache Cloudberry community!
diff --git a/src/pages/team.md b/src/pages/team.md
index 3a457a8..7c87133 100644
--- a/src/pages/team.md
+++ b/src/pages/team.md
@@ -3,45 +3,77 @@ title: Team
 description: Built On Open Source, By Open Source, For Open Source.
 ---
 
-The Cloudberry Database team works on developing the core database kernel, 
utilities, tools, as well as the documentation website. Our journey began in 
2022, and we have built our foundation on PostgreSQL and Greenplum Database. We 
would not be where we are today without the invaluable contributions of the two 
project contributors. We extend our heartfelt thanks to them.
-
-[![GitHub Contributor Over 
Time](https://contributor-overtime-api.git-contributor.com/contributors-svg?chart=contributorOverTime&repo=cloudberrydb/cloudberrydb)](https://git-contributor.com?chart=contributorOverTime&repo=cloudberrydb/cloudberrydb)
-
-We have several ecosystem projects available on GitHub in addition to our 
[main repository](https://github.com/cloudberrydb/cloudberrydb). To discover 
all of the contributors to Cloudberry Database, please visit our [GitHub 
homepage](https://github.com/cloudberrydb/). Please note that the images shown 
below highlight the avatars of our active and upstream contributors while not 
including anonymous contributors. To view all the contributors, you can click 
on the images.
+The Apache Cloudberry (Incubating) team works on developing the core database 
kernel, utilities, tools, as well as the documentation website. 
+
+## Podling PMC
+Each Podling Project Management Committee (PPMC) helps its Podling learn how 
to govern itself. It works like a PMC but reports to the Incubator PMC instead 
of to the ASF Board. Initially, it is composed of the Podling’s mentors and the 
initial committers. The PPMC is directly responsible for the oversight of the 
podling, and it also decides who to add as a PPMC member.
+
+|Name| Email | GitHub ID | Organization|
+|--|--|--|--|
+| Andrey Borodin | amboro...@acm.org | x4m |  Yandex Cloud |
+| Antonio Petrole | antoniopetr...@gmail.com | antoniopetrole | Individual |
+| Dianjin Wang | wangdian...@gmail.com | tuhaihe | HashData |
+| Ed Espino | esp...@apache.org | edespino | Individual |
+| Greg Spiegelberg | gspiegelb...@gmail.com | gspiegelberg | Individual |
+| Hao Wu | gfphoeni...@gmail.com | gfphoenix78 | HashData |
+| Hope Gao | gaoxueyu_h...@163.com | gaoxueyu | HighGo |
+| Jianghua Yang | yjhj...@gmail.com | yjhjstz | HashData |
+| Jiaqi Zhou | jiaqi...@163.com | jiaqizho | HashData |
+| Jinbao Chen | chenjinbao1...@gmail.com | oppenheimer01 | HashData |
+| Kirill Reshke | reshkekir...@gmail.com | reshke  | Yandex Cloud | Yandex 
Cloud |
+| Kent Yao *(Mentor)* | y...@apache.org | yaooqinn | Apache Member, NetEase |
+| Louis Mugnano | lmugnano...@gmail.com | lmugnano4537 | Individual |
+| Max Yang | maxyang...@gmail.com | my-ship-it | HashData |
+| Maxim Smyatkin | smyatkinma...@gmail.com | Smyatkin-Maxim | Yandex Cloud |
+| Roman Shaposhnik *(Mentor)* | r...@apache.org | rvs | Ainekko |
+| Sen Hu | husen.x...@gmail.com | HuSen8891 | HashData |
+| Shine Zhang | xinz...@hotmail.com | xinzweb | Individual |
+| Tushar Pednekar | tushar.pedne...@gmail.com | 2shar-p | Individual |
+| Weinan WANG | wang.wn...@gmail.com | weinan003 | HashData |
+| Willem Jiang *(Mentor)*|ningji...@apache.org | WillemJiang | Apache Member, 
ByteDance |
+| Xiaoran Wang | fanfuxiao...@gmail.com | fanfuxiaoran | HashData |
+| Xin (Alwin) Tang | xtang.c...@gmail.com | xtangcode | HashData |
+| Zhang Mingli | avamin...@gmail.com | avamingli | HashData |
+
+Our journey began in 2022, and we have built our foundation on PostgreSQL and 
Greenplum Database. We would not be where we are today without the invaluable 
contributions of the two project contributors. We extend our heartfelt thanks 
to them.
+
+## Contributor wall
+
+We have several ecosystem projects available on GitHub in addition to our 
[main repository](https://github.com/cloudberrydb/cloudberrydb). To discover 
all of the contributors to Apache Cloudberry, please visit our [GitHub 
homepage](https://github.com/cloudberrydb/). Please note that the images shown 
below highlight the avatars of our active and upstream contributors while not 
including anonymous contributors. To view all the contributors, you can click 
on the images.
 
 - 
**[cloudberrydb/cloudberrydb](https://github.com/cloudberrydb/cloudberrydb):**
 
 <a href="https://github.com/cloudberrydb/cloudberrydb/graphs/contributors";>
-  <img 
src="https://contrib.rocks/image?repo=cloudberrydb/cloudberrydb&max=800&columns=20&anon=0";
 />
+  <img 
src="https://contrib.rocks/image?repo=cloudberrydb/cloudberrydb&max=800&columns=25&anon=0";
 />
 </a>
 
 - 
**[cloudberrydb/cloudberrydb-site](https://github.com/cloudberrydb/cloudberrydb-site):**
 
 <a 
href="https://github.com/cloudberrydb/cloudberrydb-site/graphs/contributors";>
-  <img 
src="https://contrib.rocks/image?repo=cloudberrydb/cloudberrydb-site&max=800&columns=20&anon=0";
 />
+  <img 
src="https://contrib.rocks/image?repo=cloudberrydb/cloudberrydb-site&max=800&columns=25&anon=0";
 />
 </a>
 
 - **[cloudberrydb/bootcamp](https://github.com/cloudberrydb/bootcamp):**
 
 <a href="https://github.com/cloudberrydb/bootcamp/graphs/contributors";>
-  <img 
src="https://contrib.rocks/image?repo=cloudberrydb/bootcamp&max=800&columns=20&anon=0";
 />
+  <img 
src="https://contrib.rocks/image?repo=cloudberrydb/bootcamp&max=800&columns=25&anon=0";
 />
 </a>
 
 - **[cloudberrydb/gpbackup](https://github.com/cloudberrydb/gpbackup):**
 
 <a href="https://github.com/cloudberrydb/gpbackup/graphs/contributors";>
-  <img 
src="https://contrib.rocks/image?repo=cloudberrydb/gpbackup&max=800&columns=20&anon=0";
 />
+  <img 
src="https://contrib.rocks/image?repo=cloudberrydb/gpbackup&max=800&columns=25&anon=0";
 />
 </a>
 
 - 
**[cloudberrydb/gp-common-go-libs](https://github.com/cloudberrydb/gp-common-go-libs):**
 
 <a 
href="https://github.com/cloudberrydb/gp-common-go-libs/graphs/contributors";>
-  <img 
src="https://contrib.rocks/image?repo=cloudberrydb/gp-common-go-libs&max=800&columns=20&anon=0";
 />
+  <img 
src="https://contrib.rocks/image?repo=cloudberrydb/gp-common-go-libs&max=800&columns=25&anon=0";
 />
 </a>
 
 # Become a contributor
 
-The Cloudberry Database community welcomes everyone to contribute, regardless 
of their level of experience. We encourage all types of contributions, no 
matter how small. Our [contribution guide](/contribute) is available to help 
you get started with the process.
+The Apache Cloudberry community welcomes everyone to contribute, regardless of 
their level of experience. We encourage all types of contributions, no matter 
how small. Our [contribution guide](/contribute) is available to help you get 
started with the process.
 
 In addition, we offer various channels for community members to discuss, seek 
help, provide feedback, and chat. You can find [support](/support) here. Let us 
know if you have any questions or feedback - we're always here to help.
 
diff --git a/src/theme/Footer/index.tsx b/src/theme/Footer/index.tsx
index a7b3139..5a3db03 100644
--- a/src/theme/Footer/index.tsx
+++ b/src/theme/Footer/index.tsx
@@ -121,7 +121,12 @@ export default function Footer() {
           </div>
         </div>
       </div>
-      <div className={styles.copyright}>{(footerConfig as any).copyright}</div>
+      <div className={styles.copyrightWrap}>
+        <div
+          className={styles.copyright}
+          dangerouslySetInnerHTML={{ __html: (footerConfig as any).copyright }}
+        ></div>
+      </div>
     </div>
   );
 }
diff --git a/src/theme/Footer/styles.module.scss 
b/src/theme/Footer/styles.module.scss
index 2a14ea4..e33fba6 100644
--- a/src/theme/Footer/styles.module.scss
+++ b/src/theme/Footer/styles.module.scss
@@ -71,15 +71,19 @@
       }
     }
   }
-
-  .copyright {
+  .copyrightWrap {
     position: absolute;
-    bottom: 20px;
     top: 485px;
     text-align: center;
     width: 100%;
-    padding-bottom: 30px;
+    background-color: #000;
+    font-size: 12px;
+    .copyright {
+      width: 1440px;
+      margin: 0 auto;
+    }
   }
+  
   @media screen and (max-width: 1440px) {
     .linksWrap {
       width: 520px !important;
diff --git a/static/img/apache-incubator.svg b/static/img/apache-incubator.svg
new file mode 100644
index 0000000..1b4c364
--- /dev/null
+++ b/static/img/apache-incubator.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg"; viewBox="0 0 473.26 
110.22"><defs><style>.cls-1,.cls-2{fill:#fff;}.cls-1{fill-rule:evenodd;}</style></defs><g
 id="Layer_2" data-name="Layer 2"><g id="Layer_1-2" data-name="Layer 
1"><polygon class="cls-1" points="445.81 13.29 467.03 13.29 467.03 15.29 448.03 
15.29 448.03 27.09 465.11 27.09 465.11 29.09 448.03 29.09 448.03 41.1 467.24 
41.1 467.24 43.11 445.81 43.11 445.81 13.29"/><polygon class="cls-1" 
points="377.65 13.29 379.86 13.29 379.86 27.13 3 [...]
\ No newline at end of file


---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscr...@cloudberry.apache.org
For additional commands, e-mail: commits-h...@cloudberry.apache.org


Reply via email to