From cd7ed12292aef11d9062b64f61215174e8cc1860 Mon Sep 17 00:00:00 2001
From: Daniel Baumann <daniel.baumann@progress-linux.org>
Date: Tue, 3 Sep 2019 12:23:48 +0200
Subject: Merging upstream version 1.17.0.

Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>
---
 docs/generator/buildyaml.sh           | 21 +++++++++++++++++----
 docs/generator/checklinks.sh          |  2 +-
 docs/generator/custom/css/netdata.css | 25 +++++++++++++++++++++++--
 3 files changed, 41 insertions(+), 7 deletions(-)

(limited to 'docs/generator')

diff --git a/docs/generator/buildyaml.sh b/docs/generator/buildyaml.sh
index f887c695d..95e11c5a5 100755
--- a/docs/generator/buildyaml.sh
+++ b/docs/generator/buildyaml.sh
@@ -104,7 +104,8 @@ markdown_extensions:
  - pymdownx.details
  - pymdownx.highlight:
     pygments_style: manni
-    noclasses: true
+    css_class: "highlight codehilite"
+    linenums_style: pymdownx-inline
  - pymdownx.inlinehilite
  - pymdownx.magiclink
  - pymdownx.mark
@@ -135,7 +136,6 @@ echo -ne "    - 'docs/what-is-netdata.md'
     - 'docs/a-github-star-is-important.md'
     - REDISTRIBUTED.md
     - CHANGELOG.md
-    - CONTRIBUTING.md
     - SECURITY.md
 - Why Netdata:
     - 'docs/why-netdata/README.md'
@@ -175,6 +175,13 @@ echo -ne "    - 'docs/Performance.md'
     - 'docs/high-performance-netdata.md'
 "
 
+navpart 1 . netdata-cloud "Netdata Cloud"
+echo -ne "
+    - 'docs/netdata-cloud/README.md'
+    - 'docs/netdata-cloud/signing-in.md'
+    - 'docs/netdata-cloud/nodes-view.md'
+"
+
 navpart 1 collectors "" "Data collection" 1
 echo -ne "    - 'docs/Add-more-charts-to-netdata.md'
     - Internal plugins:
@@ -264,13 +271,19 @@ navpart 2 web/api/badges "" "" 2
 navpart 2 web/api/health "" "" 2
 navpart 2 web/api/queries "" "Queries" 2
 
-echo -ne "- Additional Info:
+echo -ne "- Contributing to Netdata:
+    - CONTRIBUTING.md
+    - 'docs/contributing/contributing-documentation.md'
+    - 'docs/contributing/style-guide.md'
     - CODE_OF_CONDUCT.md
     - CONTRIBUTORS.md
     - packaging/maintainers/README.md
 "
+
+echo -ne "- Additional information:
+"
 navpart 2 packaging/makeself "" "" 4
 navpart 2 libnetdata "" "libnetdata" 4
 navpart 2 contrib
 navpart 2 tests "" "" 2
-navpart 2 diagrams/data_structures
+navpart 2 diagrams/data_structures
\ No newline at end of file
diff --git a/docs/generator/checklinks.sh b/docs/generator/checklinks.sh
index 5012ad17d..6521ca9ad 100755
--- a/docs/generator/checklinks.sh
+++ b/docs/generator/checklinks.sh
@@ -227,7 +227,7 @@ checklinks () {
 	while read -r l ; do
 		for word in $l ; do
 			if [[ $word =~ .*\]\(([^\(\) ]*)\).* ]] ; then
-				lnk="${BASH_REMATCH[1]}"
+				lnk=$(echo "${BASH_REMATCH[1]}" | tr -d '<>')
 				if [ -z "$lnk" ] ; then continue ; fi
 				dbg "-$lnk"
 				case "$lnk" in
diff --git a/docs/generator/custom/css/netdata.css b/docs/generator/custom/css/netdata.css
index 27f1b08cc..7b1934db4 100644
--- a/docs/generator/custom/css/netdata.css
+++ b/docs/generator/custom/css/netdata.css
@@ -14,7 +14,6 @@
 
 /*  Custom styling for the new documentation homepage.
     In particular, the three buttons for install/getting started/configuration. */
-
 .homepage-nav {
     display: flex;
     margin-top: 1.4rem;
@@ -64,11 +63,33 @@
     margin-bottom: 6rem;
 }
 
-/* Make sure inline code in tables doesn't break. */
+/* Make sure inline code in tables don't break. */
 .md-typeset__table code {
     word-break: normal;
 }
 
+/* Give code blocks a little more line height */
+.md-typeset pre {
+    line-height: 1.6;
+}
+
+/* Show line numbers. */
+[data-linenos]:before {
+    border-right: .0625rem solid #ddd;
+    color: #999;
+    content: attr(data-linenos);
+    display: inline-block;
+    margin-left: -1.2rem;
+    margin-right: .7rem;
+    padding-left: 1.2rem;
+}
+
+.md-typeset .highlight .hll {
+    display: inline;
+    margin: 0;
+    padding: 0;
+}
+
 /* Bold the first item on the docs sidebar: Netdata Documentation */
 .md-nav--primary > .md-nav__list > .md-nav__item:first-of-type {
     font-weight: 700;
-- 
cgit v1.2.3