Merge branch '6-dev' of github.com:plone/documentation into 6-dev

stevepiercy · stevepiercy · commit 34b21b5e034d · 2022-06-23T16:11:20.000-07:00
diff --git a/docs/_templates/layout.html b/docs/_templates/layout.html
@@ -9,4 +9,9 @@
 g.async=true; g.src='https://stats.plone.org/js/container_d3bIlNkY.js'; s.parentNode.insertBefore(g,s);
 </script>
 <!-- End Matomo Tag Manager -->
-{% endblock %}
+{% endblock %}
+
+
+{% block body_tag %}
+  <body data-spy="scroll" data-target="#bd-toc-nav" data-offset="100">
+{%- endblock %}
diff --git a/docs/conf.py b/docs/conf.py
@@ -183,9 +183,9 @@
 
 # -- OpenGraph configuration ----------------------------------
 
-ogp_site_url = "https://docs.plone.org/"
+ogp_site_url = "https://6.dev-docs.plone.org/"
 ogp_description_length = 200
-ogp_image = "https://docs.plone.org/_static/Plone_logo_square.png"
+ogp_image = "https://6.dev-docs.plone.org/_static/Plone_logo_square.png"
 ogp_site_name = "Plone Documentation"
 ogp_type = "website"
 ogp_custom_meta_tags = [
diff --git a/docs/install/containers/examples/nginx-volto-plone-postgresql.md b/docs/install/containers/examples/nginx-volto-plone-postgresql.md
@@ -61,12 +61,6 @@ server {
           proxy_pass http://frontend;
       }
 
-      location ~ /(@@download|@@images|@@ical_view) {
-          rewrite ^(.*) /VirtualHostBase/http/$server_name/Plone/VirtualHostRoot$1 break;
-          proxy_pass http://backend;
-          break;
-      }
-
       proxy_set_header        Host $host;
       proxy_set_header        X-Real-IP $remote_addr;
       proxy_set_header        X-Forwarded-For $proxy_add_x_forwarded_for;
diff --git a/docs/install/containers/examples/nginx-volto-plone-zeo.md b/docs/install/containers/examples/nginx-volto-plone-zeo.md
@@ -61,12 +61,6 @@ server {
           proxy_pass http://frontend;
       }
 
-      location ~ /(@@download|@@images|@@ical_view) {
-          rewrite ^(.*) /VirtualHostBase/http/$server_name/Plone/VirtualHostRoot$1 break;
-          proxy_pass http://backend;
-          break;
-      }
-
       proxy_set_header        Host $host;
       proxy_set_header        X-Real-IP $remote_addr;
       proxy_set_header        X-Forwarded-For $proxy_add_x_forwarded_for;
diff --git a/docs/install/containers/examples/nginx-volto-plone.md b/docs/install/containers/examples/nginx-volto-plone.md
@@ -60,12 +60,6 @@ server {
           proxy_pass http://frontend;
       }
 
-      location ~ /(@@download|@@images|@@ical_view) {
-          rewrite ^(.*) /VirtualHostBase/http/$server_name/Plone/VirtualHostRoot$1 break;
-          proxy_pass http://backend;
-          break;
-      }
-
       proxy_set_header        Host $host;
       proxy_set_header        X-Real-IP $remote_addr;
       proxy_set_header        X-Forwarded-For $proxy_add_x_forwarded_for;
diff --git a/docs/install/containers/images/backend.md b/docs/install/containers/images/backend.md
@@ -81,7 +81,7 @@ We advise against using this feature on production environments.
 ### ZOPE variables
 
 | Environment variable | Description | Default value |
-| --- | --- | --- | --- |
+| --- | --- | --- |
 | `ZODB_CACHE_SIZE` | database cache size | `50000` |
 
 
