documents: merge into trunk, re #4235

git-svn-id: svn://develop.studip.de/studip/trunk@31099 c5b85792-5220-0410-ad23-ed5b6b8ad999