From 992d04d9cbd51bea6d51956c9a15904812d72546 Mon Sep 17 00:00:00 2001
From: "J. Ryan Stinnett" <jryans@gmail.com>
Date: Tue, 11 Feb 2025 17:40:12 +0000
Subject: [PATCH] Switch to a single site feed covering all post categories

This changes the existing `index.xml` feed to include all posts to the
site regardless of category. This also removes the `blog.xml` feed, as
that only covered one category that is mostly unused.

Fixes https://github.com/scala/scala-lang/issues/1467
Fixes https://github.com/scala/scala-lang/issues/849
---
 _includes/headertop.html |  3 +--
 feed/blog.xml            | 25 -------------------------
 feed/index.xml           |  4 ++--
 3 files changed, 3 insertions(+), 29 deletions(-)
 delete mode 100644 feed/blog.xml

diff --git a/_includes/headertop.html b/_includes/headertop.html
index 318e96f36..209184b7f 100644
--- a/_includes/headertop.html
+++ b/_includes/headertop.html
@@ -56,5 +56,4 @@
     <script type="text/javascript">try{Typekit.load();}catch(e){}</script> -->
 
     <!-- Atom feeds -->
-    <link rel="alternate" type="application/atom+xml" title="News Feed" href="{{ site.baseurl }}/feed/index.xml" />
-    <link rel="alternate" type="application/atom+xml" title="Blog Feed" href="{{ site.baseurl }}/feed/blog.xml" />
+    <link rel="alternate" type="application/atom+xml" title="Feed" href="{{ site.baseurl }}/feed/index.xml" />
diff --git a/feed/blog.xml b/feed/blog.xml
deleted file mode 100644
index 33531390e..000000000
--- a/feed/blog.xml
+++ /dev/null
@@ -1,25 +0,0 @@
----
----
-<?xml version="1.0" encoding="utf-8"?>
-<feed xmlns="http://www.w3.org/2005/Atom">
-  <id>https://www.scala-lang.org/blog/</id>
-  <title type="text" xml:lang="en">{{ site.title }} :: Blog</title>
-  <link type="application/atom+xml" href="https://www.scala-lang.org/feed/blog.xml" rel="self"/>
-  <link type="text/html" href="https://www.scala-lang.org/blog/" rel="alternate"/>
-
-  <updated>{{ site.time | date_to_xmlschema }}</updated>
-  <author>
-    <name>École Polytechnique Fédérale de Lausanne</name>
-  </author>
-  <rights>Copyright (c) 2002-{{ site.time | date:"%Y" }} École Polytechnique Fédérale de Lausanne (EPFL), Lausanne, Switzerland</rights>
-
-  {% for post in site.categories.blog limit:20 %}
-  <entry>
-    <title>{{ post.title }}</title>
-    <link href="https://www.scala-lang.org{{ post.url }}"/>
-    <updated>{{ post.date | date_to_xmlschema }}</updated>
-    <id>https://www.scala-lang.org{{ post.id }}</id>
-    <content type="html">{{ post.content | xml_escape }}</content>
-  </entry>
-  {% endfor %}
-</feed>
diff --git a/feed/index.xml b/feed/index.xml
index 65b7afcef..6629571c8 100644
--- a/feed/index.xml
+++ b/feed/index.xml
@@ -3,7 +3,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <feed xmlns="http://www.w3.org/2005/Atom">
   <id>https://www.scala-lang.org/</id>
-  <title type="text" xml:lang="en">{{ site.title }} :: News</title>
+  <title type="text" xml:lang="en">{{ site.title }}</title>
   <link type="application/atom+xml" href="https://www.scala-lang.org/feed/index.xml" rel="self"/>
   <link type="text/html" href="https://www.scala-lang.org/news/" rel="alternate"/>
 
@@ -13,7 +13,7 @@
   </author>
   <rights>Copyright (c) 2002-{{ site.time | date:"%Y" }} École Polytechnique Fédérale de Lausanne (EPFL), Lausanne, Switzerland</rights>
 
-  {% for post in site.categories.news limit:20 %}
+  {% for post in site.posts limit:20 %}
   <entry>
     <title>{{ post.title }}</title>
     <link href="https://www.scala-lang.org{{ post.url }}"/>