Merge from master branch of upstream repository

.github/workflows/build_deploy.yml

@@ -0,0 +1,46 @@
+
+name: Build and deploy training documentation to training.plone.org
+
+on:
+  push:
+    branches:
+      - 'master'
+
+jobs:
+  build_deploy:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v1
+
+      - name: Set up Python ${{ matrix.python-version }}
+        uses: actions/setup-python@v2
+        with:
+          python-version: 3.8
+
+      - name: Install dependencies
+        run: |
+          python -m pip install --upgrade pip
+          pip install -q -r requirements.txt -c constraints.txt
+
+      - name: Run tests with make test
+        run: |
+          make test
+
+      - name: Prepare deploy
+        run: |
+          make deploy
+
+      - name: Deploy to server
+        id: deploy
+        uses: Pendect/action-rsyncer@v1.1.0
+        env:
+          DEPLOY_KEY: ${{secrets.DEPLOY_KEY_TRAINING}}
+        with:
+          flags: '-avzr --delete'
+          options: ''
+          ssh_options: '-p ${{secrets.DEPLOY_PORT}}'
+          src: '_build/html/'
+          dest: '${{secrets.DEPLOY_USER_TRAINING}}@${{secrets.DEPLOY_SERVER_TRAINING}}:${{secrets.DEPLOY_PATH_TRAINING}}/5'
+
+      - name: Display status from deploy
+        run: echo "${{ steps.deploy.outputs.status }}"

.github/workflows/test.yml

@@ -0,0 +1,27 @@
+
+name: Test training documentation
+
+on:
+  push:
+    branches-ignore:
+      - 'master'
+
+jobs:
+  test:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v1
+
+      - name: Set up Python ${{ matrix.python-version }}
+        uses: actions/setup-python@v2
+        with:
+          python-version: 3.8
+
+      - name: Install dependencies
+        run: |
+          python -m pip install --upgrade pip
+          pip install -q -r requirements.txt -c constraints.txt
+
+      - name: Run tests with make test
+        run: |
+          make test

.gitignore

@@ -11,10 +11,16 @@ bin/
 build/
 include/
 lib/
-lib64
+lib64/
 local/
-pip-selfcheck.json
 plone_training_config/training/
 presentation/
 log/
+node_modules/
+/pip-selfcheck.json
+/pyvenv.cfg
 /training.sublime-workspace
+/.idea
+.python-version
+package-lock.json
+.vscode/settings.json

CHANGES.rst

@@ -5,7 +5,30 @@ This changelog is only very rough. For the full changelog please refer to https:
 
 1.2.5 (unreleased)
 ------------------
-=======
+
+- Language tweaks to WSGI training [polyester]
+
+- Minor fixes, like using implementer and provider decorators [jensens]
+
+- Use behavior shortnames as best practice. [jensens]
+
+- Refine misleading explanation of IFormFieldProvider [jensens]
+
+- Tweaks to Mastering Plone testing page [tkimnguyen]
+
+- Fix React and Volto bootstrapping information. [jensens]
+
+- Fix a typo in Volto redux section and format according to style guide. [jensens]
+
+- Fix AGX links. [jensens]
+
+- Get rid of Grok, it is dead. No need any more to mention it here [jensens]
+
+- Fix a bunch of errors and links-check failure popping up in ``make test`` [jensens]
+
+- Fix Travis setup, use stages now. See #410. [jensens]
+
+- Explanation about less variables and development/production mode in the theming training first chapter. [fredvd]
 
 - Fixes to Advanced Python Training [oz123]
 
@@ -175,6 +198,9 @@ This changelog is only very rough. For the full changelog please refer to https:
 - Add support for translations on transifex
   [macagua]
 
+- Upgrade Vagrant setup to Ubuntu 18.04 LTS
+  [tschorr]
+
 
 1.2.3 (2014-07-11)
 ------------------

Makefile

@@ -15,6 +15,8 @@ ALLSPHINXOPTS   = -d $(BUILDDIR)/doctrees $(PAPEROPT_$(PAPER)) $(SPHINXOPTS) .
 # the i18n builder cannot share the environment and doctrees with the others
 I18NSPHINXOPTS  = $(PAPEROPT_$(PAPER)) $(SPHINXOPTS) .
 
+all: build
+
 .PHONY: help
 help:
 	@echo "Please use \`make <target>' where <target> is one of"
@@ -46,6 +48,13 @@ help:
 clean:
 	-rm -rf $(BUILDDIR)/*
 
+bin/python bin/pip:
+	python3 -m venv . || virtualenv --clear --python=python3 .
+
+.PHONY: build
+build: bin/pip
+	bin/pip install -r requirements.txt
+
 .PHONY: html
 html:
 	$(SPHINXBUILD) -b html $(ALLSPHINXOPTS) $(BUILDDIR)/html
@@ -192,7 +201,7 @@ doctest:
 	      "results in $(BUILDDIR)/doctest/output.txt."
 
 .PHONY: test
-test: clean linkcheck
+test: clean
 
 .PHONY: deploy
 deploy: clean html

README.rst

@@ -1,19 +1,22 @@
+.. image:: https://travis-ci.com/plone/training.svg?branch=master
+    :target: https://travis-ci.com/plone/training
+
 ========
 Training
 ========
 
 `Training <https://gihub.com/plone/training>`_ is a collection of different trainings,
 developed and created by the Plone Community.
 
-For a HTML version, please browse to our `Training Website <https://training.plone.org>`_.
+For a HTML version, please browse to our `Training Website <https://training.plone.org/5/>`_.
 
 Overview
 ========
 
 Different Plone Trainings:
 
 - `How to work with content and manage site settings in Plone. <https://training.plone.org/5/>`_
-- `How to get you Plone site up and running. <https://training.plone.org/5/deployment/index.html>`_
+- `How to get your Plone site up and running. <https://training.plone.org/5/deployment/index.html>`_
 - `How to develop customized solutions with Plone. <https://training.plone.org/5/mastering_plone/index.html#mastering-plone-label>`_
 - `How to add enterprise grade search to your Plone site. <https://training.plone.org/5/solr-training/index.html>`_
 - `How to style your Plone site. <https://training.plone.org/5/theming/index.html>`_
@@ -22,7 +25,14 @@ Different Plone Trainings:
 Documentation
 =============
 
-Documentation on how to use, build and contribute to the trainings can be found on the `About page <https://training.plone.org/about/>`_ at Training Website.
+Documentation on how to use, build and contribute to the trainings can be found on the `Training Website <https://training.plone.org/5/mastering-plone/about_mastering.html>`_ .
+
+
+The landing page
+================
+
+The code for the landing page at https://training.plone.org is in another repository: https://github.com/plone/training.plone.org.
+
 
 Contribute
 ==========