From 70378a2159bc5b33c0efc14673dc13501aa5d407 Mon Sep 17 00:00:00 2001
From: Oliver Davies <oliver@oliverdavies.uk>
Date: Wed, 6 Mar 2019 21:21:16 +0000
Subject: [PATCH 1/6] Change /blog.xml to /feed

---
 source/_redirects                 | 1 +
 source/articles/archive.html.twig | 9 ++++++++-
 source/{blog.xml => feed.xml}     | 2 +-
 3 files changed, 10 insertions(+), 2 deletions(-)
 rename source/{blog.xml => feed.xml} (98%)

diff --git a/source/_redirects b/source/_redirects
index c05f879f..651a2d21 100644
--- a/source/_redirects
+++ b/source/_redirects
@@ -104,6 +104,7 @@
 /articles/system-users-null-users /articles/null-users-and-system-users-in-drupal
 /articles/tweets-from-drupalcamp-london /articles/tweets-drupalcamp-london
 /blog /articles
+/blog.xml /feed
 /blog/* /articles/:splat
 /book /test-driven-drupal
 /consulting /
diff --git a/source/articles/archive.html.twig b/source/articles/archive.html.twig
index 411922c0..92a897d4 100644
--- a/source/articles/archive.html.twig
+++ b/source/articles/archive.html.twig
@@ -10,7 +10,14 @@ use: [posts]
 {% endblock %}
 
 {% block content %}
-    <div class="-mt-4 -mx-4 spaced-y-4">
+    <header class="mb-6">
+        <p class="text-lg">
+            Everything I've ever published on my site, in reverse chronological order.
+            You can also subscribe to my articles via <a href="/articles/feed">the RSS feed</a>.
+        </p>
+    </header>
+
+    <div class="-mx-4 spaced-y-4">
         {% for post in data.posts %}
             <article class="p-4 {{ post.draft ? 'bg-blue-lighter' }}">
                 {% include 'blog/post-summary' %}
diff --git a/source/blog.xml b/source/feed.xml
similarity index 98%
rename from source/blog.xml
rename to source/feed.xml
index a99ba174..8711e78c 100644
--- a/source/blog.xml
+++ b/source/feed.xml
@@ -1,5 +1,5 @@
 ---
-permalink: blog.xml
+permalink: /feed.xml
 use: [posts]
 ---
 <?xml version="1.0" encoding="utf-8"?>

From 2650b7b9febbe5082bbd6777358f1212016d4a0d Mon Sep 17 00:00:00 2001
From: Oliver Davies <oliver@oliverdavies.uk>
Date: Wed, 6 Mar 2019 21:24:33 +0000
Subject: [PATCH 2/6] Remove file extension

---
 source/feed.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/source/feed.xml b/source/feed.xml
index 8711e78c..e3ea97c3 100644
--- a/source/feed.xml
+++ b/source/feed.xml
@@ -1,5 +1,5 @@
 ---
-permalink: /feed.xml
+permalink: /feed
 use: [posts]
 ---
 <?xml version="1.0" encoding="utf-8"?>

From 9f7f57a613de8898632bce42dfe3bff2b0cccbd0 Mon Sep 17 00:00:00 2001
From: Oliver Davies <oliver@oliverdavies.uk>
Date: Wed, 6 Mar 2019 21:27:59 +0000
Subject: [PATCH 3/6] Add _headers

---
 source/_headers | 2 ++
 1 file changed, 2 insertions(+)
 create mode 100644 source/_headers

diff --git a/source/_headers b/source/_headers
new file mode 100644
index 00000000..7d381ec4
--- /dev/null
+++ b/source/_headers
@@ -0,0 +1,2 @@
+/feed:
+    Content-Type: application/xml

From dde35077640440b86f6ed79e52095512e3f946bc Mon Sep 17 00:00:00 2001
From: Oliver Davies <oliver@oliverdavies.uk>
Date: Wed, 6 Mar 2019 21:33:32 +0000
Subject: [PATCH 4/6] Fix syntax

---
 source/_headers | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/source/_headers b/source/_headers
index 7d381ec4..bd8b72ee 100644
--- a/source/_headers
+++ b/source/_headers
@@ -1,2 +1,2 @@
-/feed:
+/feed
     Content-Type: application/xml

From 0928194ca17b237010c4cf49160a8cf0cabbc7dc Mon Sep 17 00:00:00 2001
From: Oliver Davies <oliver@oliverdavies.uk>
Date: Wed, 6 Mar 2019 21:35:57 +0000
Subject: [PATCH 5/6] Update link on archive page

---
 source/articles/archive.html.twig | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/source/articles/archive.html.twig b/source/articles/archive.html.twig
index 92a897d4..86ef22c3 100644
--- a/source/articles/archive.html.twig
+++ b/source/articles/archive.html.twig
@@ -13,7 +13,7 @@ use: [posts]
     <header class="mb-6">
         <p class="text-lg">
             Everything I've ever published on my site, in reverse chronological order.
-            You can also subscribe to my articles via <a href="/articles/feed">the RSS feed</a>.
+            You can also subscribe to my articles via <a href="/feed">the RSS feed</a>.
         </p>
     </header>
 

From b375f0a16aec1a63ddbf4a24effbb48473346775 Mon Sep 17 00:00:00 2001
From: Oliver Davies <oliver@oliverdavies.uk>
Date: Wed, 6 Mar 2019 21:57:32 +0000
Subject: [PATCH 6/6] Update intro text

---
 source/articles/archive.html.twig | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

diff --git a/source/articles/archive.html.twig b/source/articles/archive.html.twig
index 86ef22c3..5c74d938 100644
--- a/source/articles/archive.html.twig
+++ b/source/articles/archive.html.twig
@@ -10,11 +10,9 @@ use: [posts]
 {% endblock %}
 
 {% block content %}
-    <header class="mb-6">
-        <p class="text-lg">
-            Everything I've ever published on my site, in reverse chronological order.
-            You can also subscribe to my articles via <a href="/feed">the RSS feed</a>.
-        </p>
+    <header class="spaced-y-4 mb-6">
+        <p class="text-lg">Everything I've ever published on my site, in reverse chronological order.</p>
+        <p class="text-lg">You can also subscribe via <a href="/feed">the RSS feed</a>.</p>
     </header>
 
     <div class="-mx-4 spaced-y-4">