[PATCH v2 09/14] doc: Tidy up the format docs to be more generic