Merge branch 'master' into sass

[blog] / atom.xml

diff --git a/atom.xml b/atom.xml
index 2e355d85b0889a87caee4606f5f05a90f3149709..4dde6d8d34ad3cd3a2b8fbaf16e46ef78ec4dc33 100644 (file)
--- a/atom.xml
+++ b/atom.xml
@@ -1,12 +1,12 @@
 ---
-layout: nil
+layout: null
 ---
 
 <?xml version="1.0" encoding="utf-8"?>
 <feed xmlns="http://www.w3.org/2005/Atom">
 
  <title>{{ site.title }}</title>
- <link href="{{ site.url }}{{ site.baseurl }}atom.xml" rel="self"/>
+ <link href="{{ site.url }}{{ site.baseurl }}/atom.xml" rel="self"/>
  <link href="{{ site.url }}{{ site.baseurl }}"/>
  <updated>{{ site.time | date_to_xmlschema }}</updated>
  <id>{{ site.url }}</id>
@@ -18,7 +18,7 @@ layout: nil
  {% for post in site.posts %}
  <entry>
    <title>{{ post.title }}</title>
-   <link href="{{ site.url }}{{ site.baseurl }}{{ post.url }}"/>
+   <link href="{{ site.url }}{{ site.baseurl }}/{{ post.url }}"/>
    <updated>{{ post.date | date_to_xmlschema }}</updated>
    <id>{{ site.url }}{{ post.id }}</id>
    <content type="html">{{ post.content | xml_escape }}</content>