Move tags so that tag and content are on the same line in most cases. Also reflowed paragraphs to finish changes from commit fc000493. Remove whitespaces and tabs.