From 1a15acc2e74ab767f1244c2b8cce1fb10a5eb8ac Mon Sep 17 00:00:00 2001
From: squidfunk <martin.donath@squidfunk.com>
Date: Sun, 11 Feb 2018 19:58:14 +0100
Subject: [PATCH] Prepare 2.6.1 release
---
CHANGELOG | 7 +++++++
docs/release-notes.md | 14 +++++++++++++-
material/base.html | 2 +-
package.json | 2 +-
4 files changed, 22 insertions(+), 3 deletions(-)
diff --git a/CHANGELOG b/CHANGELOG
index d3ba1aa9..3e0b1736 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,3 +1,10 @@
+mkdocs-material-2.6.1 (2018-02-11)
+
+ * Fixed #690: Duplicate slashes in source file URLs
+ * Fixed #696: Active page highlight not working with default palette
+ * Added ability to override Disqus integration using metadata
+ * Adjusted German translations
+
mkdocs-material-2.6.0 (2018-02-02)
* Moved default search configuration to default translation (English)
diff --git a/docs/release-notes.md b/docs/release-notes.md
index c38b9212..5db6b745 100644
--- a/docs/release-notes.md
+++ b/docs/release-notes.md
@@ -37,6 +37,16 @@ pip show mkdocs-material
## Changelog
+### 2.6.1 <small>_ February 11, 2018</small>
+
+* Fixed [#690][690]: Duplicate slashes in source file URLs
+* Fixed [#696][696]: Active page highlight not working with default palette
+* Added ability to override Disqus integration using metadata
+* Adjusted German translations
+
+ [690]: https://github.com/squidfunk/mkdocs-material/issues/690
+ [696]: https://github.com/squidfunk/mkdocs-material/issues/696
+
### 2.6.0 <small>_ February 2, 2018</small>
* Moved default search configuration to default translation (English)
@@ -53,7 +63,9 @@ pip show mkdocs-material
### 2.5.4 <small>_ January 29, 2018</small>
-* Fixed #683: `gh-deploy` fails inside Docker
+* Fixed [#683][683]: `gh-deploy` fails inside Docker
+
+ [683]: https://github.com/squidfunk/mkdocs-material/issues/683
### 2.5.3 <small>_ January 25, 2018</small>
diff --git a/material/base.html b/material/base.html
index 3c947341..e1e9fb55 100644
--- a/material/base.html
+++ b/material/base.html
@@ -36,7 +36,7 @@
<meta name="lang:{{ key }}" content="{{ lang.t(key) }}">
{% endfor %}
<link rel="shortcut icon" href="{{ base_url }}/{{ config.theme.favicon }}">
- <meta name="generator" content="mkdocs-{{ mkdocs_version }}, mkdocs-material-2.6.0">
+ <meta name="generator" content="mkdocs-{{ mkdocs_version }}, mkdocs-material-2.6.1">
{% endblock %}
{% block htmltitle %}
{% if page and page.meta and page.meta.title %}
diff --git a/package.json b/package.json
index 640efa8c..f92b1d95 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
{
"name": "mkdocs-material",
- "version": "2.6.0",
+ "version": "2.6.1",
"description": "A Material Design theme for MkDocs",
"keywords": [
"mkdocs",
--
GitLab