From 2306795864f55198fea72ab49f66ccde359851b7 Mon Sep 17 00:00:00 2001
From: David Tolnay <dtolnay@gmail.com>
Date: Sat, 15 Aug 2015 11:09:03 -0700
Subject: [PATCH] Canonical URL and redirect to https site (fix #908)

---
 docs/site.yml                      | 2 +-
 docs/templates/shared/_head.liquid | 5 +++++
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/docs/site.yml b/docs/site.yml
index b9277337..92cdbe4c 100644
--- a/docs/site.yml
+++ b/docs/site.yml
@@ -1,6 +1,6 @@
 # The key value pairs found below are available within the templates.
 
-:url: http://stedolan.github.io/jq
+:url: https://stedolan.github.io/jq
 
 # This line is modified by the Makefile. To change the version number,
 # edit the Autoconf version number at the top of configure.ac
diff --git a/docs/templates/shared/_head.liquid b/docs/templates/shared/_head.liquid
index 5e71c7c9..b25c35e7 100644
--- a/docs/templates/shared/_head.liquid
+++ b/docs/templates/shared/_head.liquid
@@ -1,8 +1,13 @@
   <head>
+    <script>
+      if ((window.location.host == "stedolan.github.io") && (window.location.protocol != "https:"))
+        window.location.protocol = "https";
+    </script>
     <meta charset="utf-8">
     <title>{{headline}}</title>
     <meta name="viewport" content="width=device-width, initial-scale=1">
     <meta http-equiv="X-UA-Compatible" content="IE=edge" />
+    <link rel="canonical" href="{{url}}{{permalink | remove:'/index'}}" />
     <link rel="stylesheet" href="{{root}}/bootstrap/css/bootstrap.css" type="text/css">
     <link rel="stylesheet" href="{{root}}/css/base.css" type="text/css">
     <!--[if lt IE 9]>