Merge branch 'kcgthb-master'

CHANGELOG

@@ -1,3 +1,8 @@
+mkdocs-material-3.2.0 (2018-12-28)
+
+  * Added support for redirects using metadata refresh
+  * Fixed #921: Load Google Analytics snippet asynchronously
+
 mkdocs-material-3.1.0 (2018-11-17)
 
   * Added support for Progressive Web App Manifest

docs/extensions/metadata.md

@@ -48,6 +48,21 @@ see on the current page when you scroll to the top. It's as simple as:
 ``` markdown
 hero: Metadata enables hero teaser texts
 ```
+### Redirects
+
+It's sometimes necessary to move documents around in the navigation tree and
+redirect user from the old URL to the new one. The `redirect:` meta-tag allows
+to create a redirection from the current document to the address specified in
+the tag.
+
+For instance, if your document contains:
+
+``` markdown
+redirect: /new/url
+
+```
+accessing that document's URL will automatically redirect to `/new/url`.
+
 
 ### Linking sources
 

material/base.html

@@ -14,7 +14,12 @@
       {% elif config.site_description %}
         <meta name="description" content="{{ config.site_description }}">
       {% endif %}
-      {% if page.canonical_url %}
+      {% if page and page.meta and page.meta.redirect %}
+        <script>var anchor=window.location.hash.substr(1);location.href="{{ page.meta.redirect }}"+(anchor?"#"+anchor:"")</script>
+        <meta http-equiv="refresh" content="0; url={{ page.meta.redirect }}">
+        <meta name="robots" content="noindex">
+        <link rel="canonical" href="{{ page.meta.redirect }}">
+      {% elif page.canonical_url %}
         <link rel="canonical" href="{{ page.canonical_url }}">
       {% endif %}
       {% if page and page.meta and page.meta.author %}

src/base.html

@@ -47,8 +47,21 @@
         <meta name="description" content="{{ config.site_description }}" />
       {% endif %}
 
+      <!-- Redirect -->
+      {% if page and page.meta and page.meta.redirect %}
+        <script>
+          var anchor = window.location.hash.substr(1)
+          location.href = '{{ page.meta.redirect }}' +
+            (anchor ? '#' + anchor : '')
+        </script>
+
+        <!-- no-js fallback -->
+        <meta http-equiv="refresh" content="0; url={{ page.meta.redirect }}" />
+        <meta name="robots" content="noindex" />
+        <link rel="canonical" href="{{ page.meta.redirect }}" />
+
       <!-- Canonical -->
-      {% if page.canonical_url %}
+      {% elif page.canonical_url %}
         <link rel="canonical" href="{{ page.canonical_url }}" />
       {% endif %}