Revert "Revert changes since v1.21 in pereparation for hotfix release."

This reverts commit e2874320fc027f7ab51ab3e115d5b1889b8fd747.

6 files changed, 10 insertions, 6 deletions

diff --git a/docs/generator/requirements.txt b/docs/generator/requirements.txt
index ac01be7aef..b68297aa6a 100644
--- a/docs/generator/requirements.txt
+++ b/docs/generator/requirements.txt
@@ -1,2 +1,2 @@
 mkdocs>=1.0.1
-mkdocs-material
+mkdocs-material==4.6.3
diff --git a/docs/netdata-security.md b/docs/netdata-security.md
index f149f2d453..821aaf3646 100644
--- a/docs/netdata-security.md
+++ b/docs/netdata-security.md
@@ -81,7 +81,7 @@ You can bind Netdata to multiple IPs and ports. If you use hostnames, Netdata wi
 
 For cloud based installations, if your cloud provider does not provide such a private LAN (or if you use multiple providers), you can create a virtual management and administration LAN with tools like `tincd` or `gvpe`. These tools create a mesh VPN allowing all servers to communicate securely and privately. Your administration stations join this mesh VPN to get access to management and administration tasks on all your cloud servers.
 
-For `gvpe` we have developed a [simple provisioning tool](https://github.com/netdata/netdata-demo-site/tree/master/gvpe) you may find handy (it includes statically compiled `gvpe` binaries for Linux and FreeBSD, and also a script to compile `gvpe` on your Mac). We use this to create a management and administration LAN for all Netdata demo sites (spread all over the internet using multiple hosting providers).
+For `gvpe` we have developed a [simple provisioning tool](https://github.com/netdata/netdata-demo-site/tree/master/gvpe) you may find handy (it includes statically compiled `gvpe` binaries for Linux and FreeBSD, and also a script to compile `gvpe` on your macOS system). We use this to create a management and administration LAN for all Netdata demo sites (spread all over the internet using multiple hosting providers).
 
 ---
 
diff --git a/docs/step-by-step/step-00.md b/docs/step-by-step/step-00.md
index f01dcb6532..2ff5cced58 100644
--- a/docs/step-by-step/step-00.md
+++ b/docs/step-by-step/step-00.md
@@ -1,6 +1,7 @@
 <!--
 ---
 title: "The step-by-step Netdata tutorial"
+date: 2020-03-31
 custom_edit_url: https://github.com/netdata/netdata/edit/master/docs/step-by-step/step-00.md
 ---
 -->
@@ -21,7 +22,7 @@ If you have monitoring experience, or would rather get straight into configuring
 straight into code and configurations with our [getting started guide](../getting-started.md).
 
 > This tutorial contains instructions for Netdata installed on a Linux system. Many of the instructions will work on
-> other supported operating systems, like FreeBSD and MacOS, but we can't make any guarantees.
+> other supported operating systems, like FreeBSD and macOS, but we can't make any guarantees.
 
 ## Where to go if you need help
 
diff --git a/docs/step-by-step/step-04.md b/docs/step-by-step/step-04.md
index d403e208d7..8b63be34cd 100644
--- a/docs/step-by-step/step-04.md
+++ b/docs/step-by-step/step-04.md
@@ -1,6 +1,7 @@
 <!--
 ---
 title: "Step 4. The basics of configuring Netdata"
+date: 2020-03-31
 custom_edit_url: https://github.com/netdata/netdata/edit/master/docs/step-by-step/step-04.md
 ---
 -->
@@ -61,7 +62,7 @@ an example file to your Netdata config directory and then allow you to edit it b
 > change permanent](https://stackoverflow.com/questions/13046624/how-to-permanently-export-a-variable-in-linux).
 
 Let's give it a shot. Navigate to your Netdata config directory. To use `edit-config` on `netdata.conf`, you need to
-have permissions to edit the file. On Linux/MacOS systems, you can usually use `sudo` to elevate your permissions.
+have permissions to edit the file. On Linux/macOS systems, you can usually use `sudo` to elevate your permissions.
 
 ```bash
 cd /etc/netdata   # Replace this path with your Netdata config directory, if different as found in the steps above
diff --git a/docs/tutorials/collect-unbound-metrics.md b/docs/tutorials/collect-unbound-metrics.md
index 4fc7242d68..410bda84ce 100644
--- a/docs/tutorials/collect-unbound-metrics.md
+++ b/docs/tutorials/collect-unbound-metrics.md
@@ -1,6 +1,7 @@
 <!--
 ---
 title: "Monitor Unbound DNS servers with Netdata"
+date: 2020-03-31
 custom_edit_url: https://github.com/netdata/netdata/edit/master/docs/tutorials/collect-unbound-metrics.md
 ---
 -->
@@ -11,7 +12,7 @@ custom_edit_url: https://github.com/netdata/netdata/edit/master/docs/tutorials/c
 Labs. In v1.19 of Netdata, we release a completely refactored collector for collecting real-time metrics from Unbound
 servers and displaying them in Netdata dashboards.
 
-Unbound runs on FreeBSD, OpenBSD, NetBSD, MacOS, Linux, and Windows, and supports DNS-over-TLS, which ensures that DNS
+Unbound runs on FreeBSD, OpenBSD, NetBSD, macOS, Linux, and Windows, and supports DNS-over-TLS, which ensures that DNS
 queries and answers are all encrypted with TLS. In theory, that should reduce the risk of eavesdropping or
 man-in-the-middle attacks when communicating to DNS servers.
 
diff --git a/docs/what-is-netdata.md b/docs/what-is-netdata.md
index 0504efa1d1..2a30124ef6 100644
--- a/docs/what-is-netdata.md
+++ b/docs/what-is-netdata.md
@@ -1,6 +1,7 @@
 <!--
 ---
 title: "What is Netdata?"
+date: 2020-03-31
 custom_edit_url: https://github.com/netdata/netdata/edit/master/docs/what-is-netdata.md
 ---
 -->
@@ -19,7 +20,7 @@ Netdata provides **unparalleled insights**, **in real-time**, of everything happ
 
 _Netdata is **fast** and **efficient**, designed to permanently run on all systems (**physical** & **virtual** servers, **containers**, **IoT** devices), without disrupting their core function._
 
-Netdata is **free, open-source software** and it currently runs on **Linux**, **FreeBSD**, and **MacOS**.
+Netdata is **free, open-source software** and it currently runs on **Linux**, **FreeBSD**, and **macOS**.
 
 ---