From c71a4717ddc0db65fbdc3244f2bccf9b370de669 Mon Sep 17 00:00:00 2001
From: Parker Moore <parkrmoore@gmail.com>
Date: Wed, 7 May 2014 00:09:12 -0400
Subject: [PATCH 1/2] Prepend url, too, in feed.xml.

---
 lib/site_template/feed.xml | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/lib/site_template/feed.xml b/lib/site_template/feed.xml
index 252a0bd1..5d4d7402 100644
--- a/lib/site_template/feed.xml
+++ b/lib/site_template/feed.xml
@@ -6,15 +6,15 @@ layout: none
   <channel>
     <title>{{ site.name | xml_escape }}</title>
     <description>{{ site.description | xml_escape }}</description>
-    <link>{{ site.baseurl }}</link>
-    <atom:link href="{{ "/feed.xml" | prepend: site.baseurl }}" rel="self" type="application/rss+xml" />
+    <link>{{ site.url }}{{ site.baseurl }}</link>
+    <atom:link href="{{ "/feed.xml" | prepend: site.baseurl | prepend: site.url }}" rel="self" type="application/rss+xml" />
     {% for post in site.posts limit:10 %}
       <item>
         <title>{{ post.title | xml_escape }}</title>
         <description>{{ post.content | xml_escape }}</description>
         <pubDate>{{ post.date | date: "%a, %d %b %Y %H:%M:%S %z" }}</pubDate>
-        <link>{{ post.url | prepend: site.baseurl }}</link>
-        <guid isPermaLink="true">{{ post.url | prepend: site.baseurl }}</guid>
+        <link>{{ post.url | prepend: site.baseurl | prepend: site.url }}</link>
+        <guid isPermaLink="true">{{ post.url | prepend: site.baseurl | prepend: site.url }}</guid>
       </item>
     {% endfor %}
   </channel>

From 216f1150cde45f829e9b99e942dfe30c505b2b6e Mon Sep 17 00:00:00 2001
From: Parker Moore <parkrmoore@gmail.com>
Date: Wed, 7 May 2014 00:31:53 -0400
Subject: [PATCH 2/2] The last of the site template prepending.

---
 lib/site_template/_includes/head.html   | 2 +-
 lib/site_template/_includes/header.html | 2 +-
 lib/site_template/feed.xml              | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/lib/site_template/_includes/head.html b/lib/site_template/_includes/head.html
index d5475615..4d7400dd 100644
--- a/lib/site_template/_includes/head.html
+++ b/lib/site_template/_includes/head.html
@@ -4,7 +4,7 @@
     <title>{% if page.title %}{{ page.title }}{% else %}{{ site.name }}{% endif %}</title>
     <meta name="viewport" content="width=device-width">
     <meta name="description" content="{{ site.description }}">
-    <link rel="canonical" href="{{ page.url | replace:'index.html','' | prepend: site.baseurl }}">
+    <link rel="canonical" href="{{ page.url | replace:'index.html','' | prepend: site.baseurl | prepend: site.url }}">
 
     <!-- Custom CSS -->
     <link rel="stylesheet" href="{{ "/css/main.css" | prepend: site.baseurl }}">
diff --git a/lib/site_template/_includes/header.html b/lib/site_template/_includes/header.html
index f8045cbe..99dbec6a 100644
--- a/lib/site_template/_includes/header.html
+++ b/lib/site_template/_includes/header.html
@@ -2,7 +2,7 @@
 
   <div class="wrap">
 
-    <a class="site-title" href="{{ site.baseurl }}">{{ site.name }}</a>
+    <a class="site-title" href="{{ site.baseurl }}/">{{ site.name }}</a>
 
     <nav class="site-nav">
       <a href="#" class="menu-icon">
diff --git a/lib/site_template/feed.xml b/lib/site_template/feed.xml
index 5d4d7402..7e43fac4 100644
--- a/lib/site_template/feed.xml
+++ b/lib/site_template/feed.xml
@@ -6,7 +6,7 @@ layout: none
   <channel>
     <title>{{ site.name | xml_escape }}</title>
     <description>{{ site.description | xml_escape }}</description>
-    <link>{{ site.url }}{{ site.baseurl }}</link>
+    <link>{{ site.url }}{{ site.baseurl }}/</link>
     <atom:link href="{{ "/feed.xml" | prepend: site.baseurl | prepend: site.url }}" rel="self" type="application/rss+xml" />
     {% for post in site.posts limit:10 %}
       <item>