doc: merge announcements and blogs into news (envoyproxy#3417)

* merge announcements and blogs into news Signed-off-by: shawnh2 <[email protected]> * fix doc-lint Signed-off-by: shawnh2 <[email protected]> --------- Signed-off-by: shawnh2 <[email protected]>
shahar-h · May 17, 2024 · fe862e8 · fe862e8
1 parent 02ff9eb
commit fe862e8
Show file tree

Hide file tree

Showing 23 changed files with 41 additions and 31 deletions.
diff --git a/site/content/en/blog/_index.md b/site/content/en/blog/_index.md
diff --git a/site/content/en/blog/news/_index.md b/site/content/en/blog/news/_index.md
diff --git a/site/content/en/blog/presentations/_index.md b/site/content/en/blog/presentations/_index.md
diff --git a/site/content/en/contributions/DOCS.md b/site/content/en/contributions/DOCS.md
@@ -7,7 +7,7 @@ description: "This section tells the development of
 {{% alert title="Note" color="warning" %}}
 We migrated from ***Sphinx*** to ***Hugo*** for Envoy Gateway Documents.
 
-Read blog: [Welcome to new website!](/blog/2023/10/08/welcome-to-new-website/)
+Read blog: [Welcome to new website!](/news/blogs/new-website/new-website)
 {{% /alert %}}
 
 The documentation for the Envoy Gateway lives in the `site/content/en` directory (the Chinese content in the `site/content/zh` directory).

diff --git a/site/content/en/news/_index.md b/site/content/en/news/_index.md
@@ -0,0 +1,12 @@
++++
+title = "News"
+linktitle = "News"
+description = "News about Envoy Gateway"
+
+[[cascade]]
+type = "docs"
++++
+
+This is the **news** section. It has three categories: Blogs, Presentations and Releases.
+
+Files in these directories will be listed in reverse chronological order.
diff --git a/...t/en/blog/news/1.0-release/1.0-release.md → .../en/news/blogs/1.0-release/1.0-release.md b/...t/en/blog/news/1.0-release/1.0-release.md → .../en/news/blogs/1.0-release/1.0-release.md
@@ -1,7 +1,7 @@
 ---
 date: 2024-03-14
 title: Announcing Envoy Gateway’s 1.0 Release!
-linkTitle: 1.0 Release
+linkTitle: Announcing Envoy Gateway’s 1.0 Release
 description: >
   v1.0.0 is here !
 author:  Alice Wasko (Ambassador Labs), Arko Dasgupta (Tetrate), Congqi Zhu (CECloud), Guy Daich (SAP), Huabing Zhao (Tetrate), Jianpeng He (Tetrate), Xunzhuo Liu (Tencent)

diff --git a/site/content/en/news/blogs/_index.md b/site/content/en/news/blogs/_index.md
@@ -0,0 +1,8 @@
++++
+title = "Blogs"
+description = "Blogs about Envoy Gateway"
+linktitle = "Blogs"
+
+[[cascade]]
+type = "docs"
++++
diff --git a/...t/en/blog/news/new-website/new-website.md → .../en/news/blogs/new-website/new-website.md b/...t/en/blog/news/new-website/new-website.md → .../en/news/blogs/new-website/new-website.md
diff --git a/site/content/en/news/presentations/_index.md b/site/content/en/news/presentations/_index.md
@@ -0,0 +1,8 @@
++++
+title = "Presentations"
+description = "Presentations, Talks and Events about Envoy Gateway"
+linktitle = "Presentations"
+
+[[cascade]]
+type = "docs"
++++
diff --git a/...ations/kubecon-cn-2023/kubecon-cn-2023.md → ...ations/kubecon-cn-2023/kubecon-cn-2023.md b/...ations/kubecon-cn-2023/kubecon-cn-2023.md → ...ations/kubecon-cn-2023/kubecon-cn-2023.md
@@ -1,5 +1,6 @@
 ---
 title: "KubeCon China 2023"
+description: "Envoy Gateway: The API Gateway in the Cloud Native Era"
 date: 2023-09-28
 ---
 

diff --git a/...ations/kubecon-eu-2023/kubecon-eu-2023.md → ...ations/kubecon-eu-2023/kubecon-eu-2023.md b/...ations/kubecon-eu-2023/kubecon-eu-2023.md → ...ations/kubecon-eu-2023/kubecon-eu-2023.md
@@ -1,5 +1,6 @@
 ---
 title: "KubeCon Europe 2023"
+description: "Envoy Gateway Update"
 date: 2023-05-01
 ---
 

diff --git a/...ations/kubecon-na-2022/kubecon-na-2022.md → ...ations/kubecon-na-2022/kubecon-na-2022.md b/...ations/kubecon-na-2022/kubecon-na-2022.md → ...ations/kubecon-na-2022/kubecon-na-2022.md
@@ -1,5 +1,6 @@
 ---
 title: "KubeCon North America 2022"
+description: "Envoy Gateway Update"
 date: 2022-10-28
 ---
 

diff --git a/site/content/en/announcements/_index.md → site/content/en/news/releases/_index.md b/site/content/en/announcements/_index.md → site/content/en/news/releases/_index.md
@@ -1,7 +1,7 @@
 +++
-title = "Release Announcement"
-description = "Envoy Gateway Release Announcement"
-linktitle = "Announcement"
+title = "Release Announcements"
+description = "Envoy Gateway Release Announcements"
+linktitle = "Releases"
 
 [[cascade]]
 type = "docs"
@@ -51,5 +51,5 @@ In order to align with the Envoy Proxy [release schedule][], Envoy Gateway relea
 |  0.6.0  | 2023/10/22  | 2023/11/02  |   +10 days  |  2024/05/02 |
 
 [v2.0.0 spec]: https://semver.org/spec/v2.0.0.html
-[release guide]: ../contributions/releasing
+[release guide]: ../../contributions/releasing
 [release schedule]: https://github.com/envoyproxy/envoy/blob/main/RELEASES.md#major-release-schedule
diff --git a/site/content/en/announcements/v0.2.md → site/content/en/news/releases/v0.2.md b/site/content/en/announcements/v0.2.md → site/content/en/news/releases/v0.2.md
diff --git a/site/content/en/announcements/v0.3.md → site/content/en/news/releases/v0.3.md b/site/content/en/announcements/v0.3.md → site/content/en/news/releases/v0.3.md
diff --git a/site/content/en/announcements/v0.4.md → site/content/en/news/releases/v0.4.md b/site/content/en/announcements/v0.4.md → site/content/en/news/releases/v0.4.md
diff --git a/site/content/en/announcements/v0.5.md → site/content/en/news/releases/v0.5.md b/site/content/en/announcements/v0.5.md → site/content/en/news/releases/v0.5.md
diff --git a/site/content/en/announcements/v0.6.md → site/content/en/news/releases/v0.6.md b/site/content/en/announcements/v0.6.md → site/content/en/news/releases/v0.6.md
diff --git a/site/content/en/announcements/v1.0.md → site/content/en/news/releases/v1.0.md b/site/content/en/announcements/v1.0.md → site/content/en/news/releases/v1.0.md
diff --git a/site/content/en/v0.5.0/contributions/DOCS.md b/site/content/en/v0.5.0/contributions/DOCS.md
@@ -7,7 +7,7 @@ description: "This section tells the development of
 {{% alert title="Note" color="warning" %}}
 We migrated from ***Sphinx*** to ***Hugo*** for Envoy Gateway Documents.
 
-Read blog: [Welcome to new website!](/blog/2023/10/08/welcome-to-new-website/)
+Read blog: [Welcome to new website!](/news/blogs/new-website/new-website)
 {{% /alert %}}
 
 The documentation for the Envoy Gateway lives in the `site/content/en` directory. Any

diff --git a/site/content/en/v0.6.0/contributions/DOCS.md b/site/content/en/v0.6.0/contributions/DOCS.md
@@ -7,7 +7,7 @@ description: "This section tells the development of
 {{% alert title="Note" color="warning" %}}
 We migrated from ***Sphinx*** to ***Hugo*** for Envoy Gateway Documents.
 
-Read blog: [Welcome to new website!](/blog/2023/10/08/welcome-to-new-website/)
+Read blog: [Welcome to new website!](/news/blogs/new-website/new-website)
 {{% /alert %}}
 
 The documentation for the Envoy Gateway lives in the `site/content/en` directory. Any

diff --git a/site/content/zh/contributions/DOCS.md b/site/content/zh/contributions/DOCS.md
@@ -5,8 +5,6 @@ description: "本节讲述 Envoy Gateway 文档的开发工作。"
 
 {{% alert title="注意" color="warning" %}}
 我们已将 Envoy Gateway 文档从 **Sphinx** 迁移到 **Hugo**。
-
-阅读博客：[Welcome to new website!](/blog/2023/10/08/welcome-to-new-website/)
 {{% /alert %}}
 
 Envoy Gateway 的文档位于 `site/content/en` 目录中（中文内容位于 `site/content/zh` 目录中）。

diff --git a/site/hugo.toml b/site/hugo.toml
@@ -242,18 +242,14 @@ enable = true
     name = "Contributions"
     weight = -98
     url = "/contributions"
-  [[menu.main]]
-    name = "Blog"
-    weight = -99
-    url = "/blog"
   [[menu.main]]
     name = "About"
     weight = -100
     url = "/about"
   [[menu.main]]
-    name = "Announcements"
+    name = "News"
     weight = -101
-    url = "/announcements"
+    url = "/news"
   [[menu.main]]
     name = "Documentation"
     weight = -102