From 39e6453d1201a9d04a7b8216e118a46b55c4ed0a Mon Sep 17 00:00:00 2001
From: davidtsadler <davidtsadler@googlemail.com>
Date: Sat, 7 Jan 2012 14:28:55 +0000
Subject: Add various meta tags.

---
 _site_build/_includes/head.html   | 5 ++++-
 _site_build/_includes/header.html | 4 +---
 2 files changed, 5 insertions(+), 4 deletions(-)

(limited to '_site_build/_includes')

diff --git a/_site_build/_includes/head.html b/_site_build/_includes/head.html
index b573f7c..33ea474 100644
--- a/_site_build/_includes/head.html
+++ b/_site_build/_includes/head.html
@@ -1,8 +1,11 @@
 <meta charset="utf-8">
 <title>{{ page.title }} - {{ site.title }}</title>
-<meta name="description" content="{{ site.description }}">
+<meta name="author" content="{% if page.author %}{{ page.author }}{% else %}{{ site.author }}{% endif %}">
+<meta name="description" content="{% if page.description %}{{ page.description }}{% else %}{{ site.description }}{% endif %}">
+<meta name="copyright" content="Copyright &copy; {{ site.copyright_year }} by {% if page.author %}{{ page.author }}{% else %}{{ site.author }}{% endif %}. All Rights Reserved.">
 {% if page.robots %}<meta name="robots" content="{{ page.robots }}">{% endif %}
 <meta name="viewport" content="width=device-width,initial-scale=1">
+<link rel="canonical" href="{{ site.url}}{{ page.url | chomp_url }}">
 <link rel="stylesheet" href="/css/style.css?v=1">
 <link rel="alternate" type="application/rss+xml" href="/rss/" title="{{ site.title }}">
 <script src="/js/modernizr-2.0.6.min.js"></script>
diff --git a/_site_build/_includes/header.html b/_site_build/_includes/header.html
index 7a3c22e..4f9d01e 100644
--- a/_site_build/_includes/header.html
+++ b/_site_build/_includes/header.html
@@ -1,8 +1,6 @@
 <header>
   <hgroup>
     <h1><a href="/" rel="home" target="_self" title="{{ site.title }}">{{ site.title }}</a></h1>
-    {% if site.subtitle %}
-    <h2>{{ site.subtitle }}</h2>
-    {% endif %}
+    {% if site.subtitle %}<h2>{{ site.subtitle }}</h2>{% endif %}
   </hgroup>
 </header>
-- 
cgit v1.2.3-13-gbd6f