fix mismatch underscore v dash in shortcode sample output, remove nasty whitespace for wpautop