Merge branch 'master' of https://vcs.fsf.org/git/enc

diff --cc en/confirmation.html
Simple merge

diff --cc en/index.html
Simple merge

diff --cc en/infographic.html
Simple merge

diff --cc en/next_steps.html
Simple merge

diff --cc en/workshops.html
Simple merge