Merge pull request #1336 from Daniel15/making-zpao-happy

[Docs] Consistent use of self-closing tags in layout