Next load of docs validation fixes
(cherry picked from commit bb330cd6

)
Signed-off-by: Sven Dowideit <SvenDowideit@home.org.au>