Adjust markup to match current conventions, and make it formattable.
2 files changed