Merge "Fix up formatting on devguide"