From 58ca81524000b6e9ccd7e1de8bcba477dc6b9bc4 Mon Sep 17 00:00:00 2001
From: Patrick Spek <p.spek@tyil.nl>
Date: Mon, 16 Jul 2018 16:23:51 +0200
Subject: Update feed.xml to atom.xml

---
 _includes/head.html |  2 +-
 _pages/index.md     |  2 +-
 atom.xml            | 31 +++++++++++++++++++++++++++++++
 feed.xml            | 26 --------------------------
 4 files changed, 33 insertions(+), 28 deletions(-)
 create mode 100644 atom.xml
 delete mode 100644 feed.xml

diff --git a/_includes/head.html b/_includes/head.html
index 61c8c2d..4301775 100644
--- a/_includes/head.html
+++ b/_includes/head.html
@@ -15,7 +15,7 @@
   {% endif %}
 
   <link rel="canonical" href="{{ page.url | replace:'index.html','' | prepend: site.baseurl | prepend: site.url }}">
-  <link rel="alternate" type="application/rss+xml" title="{{ site.title }}" href="{{ "/feed.xml" | prepend: site.baseurl | prepend: site.url }}">
+  <link rel="alternate" type="application/atom+xml" title="{{ site.title }}" href="{{ "/atom.xml" | prepend: site.baseurl | prepend: site.url }}">
 
   <script src="https://cdn.tyil.nl/analytics.js"></script>
 </head>
diff --git a/_pages/index.md b/_pages/index.md
index e525dc1..bb130f5 100644
--- a/_pages/index.md
+++ b/_pages/index.md
@@ -87,4 +87,4 @@ feed][rss].
 [mastodon]: https://mastodon.social/web/accounts/34234
 [pubkey]: https://pgp.mit.edu/pks/lookup?op=vindex&search=0x9ACFE193FFBC1F50
 [rizon]: https://rizon.net
-[rss]: https://www.tyil.nl/feed.xml
+[rss]: https://www.tyil.nl/atom.xml
diff --git a/atom.xml b/atom.xml
new file mode 100644
index 0000000..e3395a1
--- /dev/null
+++ b/atom.xml
@@ -0,0 +1,31 @@
+---
+layout: null
+---
+{% assign documents = site.documents | where: 'feed', true | sort: 'date' | reverse %}<?xml version="1.0" encoding="UTF-8"?>
+<feed xmlns="http://www.w3.org/2005/Atom">
+	<id>{{ site.url }}{{ site.baseurl }}/</id>
+	<title>{{ site.title | xml_escape }}</title>
+	<subtitle>{{ site.description | strip | xml_escape }}</subtitle>
+	<updated>{{ site.time | date_to_xmlschema }}</updated>
+	<link rel="alternate" type="text/html" href="{{ site.url }}{{ site.baseurl }}"/>
+	<link rel="self" type="application/atom+xml" href="{{ site.url }}{{ site.baseurl }}/atom.xml"/>
+	<author>
+		<name>{{ site.author }}</name>
+		<email>{{ site.email }}</email>
+	</author>
+	<generator version="{{ jekyll.version }}">Jekyll</generator>{% for post in documents limit:10 %}
+	<entry>
+		<id>{{ site.url }}{{ site.baseurl }}{{ post.url }}</id>
+		<title>{{ post.title | xml_escape }}</title>
+		<author>
+			<name>{{ site.author }}</name>
+			<email>{{ site.email }}</email>
+		</author>
+		<updated>{{ post.date | date_to_xmlschema }}</updated>
+		<link rel="alternate" type="text/html" href="{{ post.url | prepend: site.baseurl | prepend: site.url }}" />{% if post.description %}
+		<summary>{{ post.description | strip | xml_escape }}</summary>{% endif %}
+		<content>{{ post.content | strip_html }}</content>{% for tag in post.tags %}
+		<category term="{{ tag | xml_escape }}" />{% endfor %}{% for cat in post.categories %}
+		<category term="{{ cat | xml_escape }}" />{% endfor %}
+	</entry>{% endfor %}
+</feed>
diff --git a/feed.xml b/feed.xml
deleted file mode 100644
index d7f77cc..0000000
--- a/feed.xml
+++ /dev/null
@@ -1,26 +0,0 @@
----
-layout: null
----
-{% assign documents = site.documents | where: 'feed', true | sort: 'date' | reverse %}<?xml version="1.0" encoding="UTF-8"?>
-<rss version="2.0" xmlns="http://www.w3.org/2005/Atom">
-	<id>{{ site.url }}{{ site.baseurl }}</id>
-	<title>{{ site.title | xml_escape }}</title>
-	<description>{{ site.description | strip | xml_escape }}</description>
-	<updated>{{ site.time | date_to_xmlschema }}</updated>
-	<link href="{{ site.url }}{{ site.baseurl }}" />
-	<author>
-		<name>{{ site.author }}</name>
-		<email>{{ site.email }}</email>
-	</author>
-	<generator version="{{ jekyll.version }}">Jekyll</generator>{% for post in documents limit:25 %}
-	<entry>
-		<id>{{ post.id }}</id>
-		<title>{{ post.title | xml_escape }}</title>
-		<updated>{{ post.date | date_to_xmlschema }}</updated>
-		<link rel="alternate" href="{{ post.url | prepend: site.baseurl | prepend: site.url }}" />{% if post.description %}
-		<summary>{{ post.description | strip | xml_escape }}</summary>{% endif %}
-		<guid isPermaLink="true">{{ post.url | prepend: site.baseurl | prepend: site.url }}</guid>{% for tag in post.tags %}
-		<category term="{{ tag | xml_escape }}" />{% endfor %}{% for cat in post.categories %}
-		<category term="{{ cat | xml_escape }}" />{% endfor %}
-	</entry>{% endfor %}
-</rss>
-- 
cgit v1.1