Merge branch '6-dev' into contributing-plone-core-code

Author: stevepiercy

.github/workflows/test.yml

@@ -1,12 +1,9 @@
 name: Test Plone 6 documentation
 
-on:
-  push:
-    branches-ignore:
-      - "master"
-
+on: [push, pull_request]
 jobs:
   test:
+    if: github.event_name != 'pull_request' || github.event.pull_request.head.repo.full_name != github.event.pull_request.base.repo.full_name
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v1

Makefile

@@ -10,7 +10,7 @@ PAPER           ?=
 SPHINXBUILD     = $(realpath bin/sphinx-build)
 SPHINXAUTOBUILD = $(realpath bin/sphinx-autobuild)
 DOCS_DIR        = ./docs/
-BUILDDIR        = ../_build/
+BUILDDIR        = ../_build
 PAPEROPT_a4     = -D latex_paper_size=a4
 PAPEROPT_letter = -D latex_paper_size=letter
 ALLSPHINXOPTS   = -d $(BUILDDIR)/doctrees $(PAPEROPT_$(PAPER)) $(SPHINXOPTS) .

docs/install/index.md

@@ -26,7 +26,7 @@ In this part of the documentation, you can find how to try Plone and how to choo
 Choose a version.
 
 -   [Plone 6 with Volto frontend](https://demo.plone.org/)
--   [Plone 6 Classic UI (nightly build)](https://classic.demo.plone.org/en)
+-   [Plone 6 Classic UI (nightly build)](https://classic.demo.plone.org/login?came_from=/en)
 -   [Plone 5.2.x (stable) with Barceloneta frontend](https://52.demo.plone.org/)
 :::
 

styles/Vocab/Plone/accept.txt

@@ -15,3 +15,5 @@ unregister
 viewlet
 Volto
 Zope
+JavaScript
+NodeJS

styles/Vocab/Plone/reject.txt

@@ -0,0 +1,5 @@
+node
+nodejs
+javscript
+js
+Javascript