diff --git a/_vendor/github.com/gohugoio/gohugoioTheme/layouts/_default/baseof.html b/_vendor/github.com/gohugoio/gohugoioTheme/layouts/_default/baseof.html
index 04261a886..527547428 100644
--- a/_vendor/github.com/gohugoio/gohugoioTheme/layouts/_default/baseof.html
+++ b/_vendor/github.com/gohugoio/gohugoioTheme/layouts/_default/baseof.html
@@ -70,6 +70,14 @@
   {{ partial "hooks/before-body-end" . }}
   
 
+  {{ if .Page.Store.Get "hasMermaid" }}
+  <script src="https://cdn.jsdelivr.net/npm/mermaid/dist/mermaid.min.js"></script>
+  <script>
+    mermaid.initialize({ startOnLoad: true });
+  </script>
+{{ end }}
+
+
 </body>
 
 </html>
diff --git a/content/en/commands/hugo_server.md b/content/en/commands/hugo_server.md
index cd9a85cac..044b5ece4 100644
--- a/content/en/commands/hugo_server.md
+++ b/content/en/commands/hugo_server.md
@@ -64,7 +64,8 @@ hugo server [flags]
       --printMemoryUsage       print memory usage to screen at intervals
       --printPathWarnings      print warnings on duplicate target paths etc.
       --printUnusedTemplates   print warnings on unused templates.
-      --renderToDisk           render to Destination path (default is render to memory & serve from there)
+      --renderStaticToDisk     serve static files from disk and dynamic files from memory
+      --renderToDisk           serve all files from disk (default is from memory)
       --templateMetrics        display metrics about template executions
       --templateMetricsHints   calculate some improvement hints when combined with --templateMetrics
   -t, --theme strings          themes to use (located in /themes/THEMENAME/)
diff --git a/data/docs.json b/data/docs.json
index b38edc86a..7f85c6d1a 100644
--- a/data/docs.json
+++ b/data/docs.json
@@ -1724,6 +1724,7 @@
           "table": true,
           "strikethrough": true,
           "linkify": true,
+          "linkifyProtocol": "https",
           "taskList": true
         }
       },
@@ -1843,7 +1844,7 @@
           "keepDocumentTags": true,
           "keepEndTags": true,
           "keepQuotes": false,
-          "keepWhitespace": true
+          "keepWhitespace": false
         },
         "css": {
           "keepCSS2": true,
@@ -3299,6 +3300,7 @@
         "Apply": {
           "Description": "Apply takes a map, array, or slice and returns a new slice with the function fname applied over it.",
           "Args": [
+            "ctx",
             "seq",
             "fname",
             "args"