From f90bd77934a28a8479dabfc3930381bd88b26e51 Mon Sep 17 00:00:00 2001
From: Thomas Jensen <boxes@thomasjensen.com>
Date: Thu, 25 Dec 2014 19:39:38 +0100
Subject: [PATCH] Added canonical link elements to all pages; new variable
 'page.sitehost'

---
 _config.yml           | 1 +
 _includes/header.html | 6 +++++-
 docs/boxes-man-1.html | 2 +-
 3 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/_config.yml b/_config.yml
index 3c97773..914e1a0 100644
--- a/_config.yml
+++ b/_config.yml
@@ -49,3 +49,4 @@ defaults:
       path: ""   # everywhere
     values:
       bxemail: '&lt;boxes(at)thomasjensen.com&gt;'
+      sitehost: 'boxes.thomasjensen.com'
diff --git a/_includes/header.html b/_includes/header.html
index bec4bbf..bfeb5f2 100644
--- a/_includes/header.html
+++ b/_includes/header.html
@@ -12,8 +12,12 @@
     <meta name="author" content="Thomas Jensen" />
     <meta name="robots" content="index,follow" />
 	{% if page.sedesc %}
+	<!-- start page -->
 	<meta name="description" content="{{ page.sedesc }}" />
     <meta name="keywords" content="software, ascii, ascii art, filter, command line, box, boxes, box drawing" />
+	<link rel="canonical" href="http://{{ page.sitehost }}/" />
+	{% else %}
+	<link rel="canonical" href="http://{{ page.sitehost }}{{ page.url }}" />
 	{% endif %}
     <script type="text/javascript">
         if (window.location.hostname == "ascii-boxes.github.io") {
@@ -25,7 +29,7 @@
 			else if (targetPath.indexOf(prjNamePrefix + "/") == 0) {
 			    targetPath = targetPath.substring(prjNamePrefix.length);
             }
-            window.location = window.location.protocol + "//boxes.thomasjensen.com"
+            window.location = window.location.protocol + "//{{ page.sitehost }}"
                     + targetPath + window.location.hash;
         }
     </script>
diff --git a/docs/boxes-man-1.html b/docs/boxes-man-1.html
index 1a46e41..67a0c89 100644
--- a/docs/boxes-man-1.html
+++ b/docs/boxes-man-1.html
@@ -429,7 +429,7 @@ self-explanatory, though.
 <I>Boxes</I>
 
 is available from its website at
-<A HREF="http://boxes.thomasjensen.com/">http://boxes.thomasjensen.com/</A>.
+<A HREF="http://{{ page.sitehost }}/">http://{{ page.sitehost }}/</A>.
 The website also features a number
 of examples illustrating this manual page as well as more in-depth
 documentation.