Add --format to man and fix some typos Upstream-commit: 9ddbaddedc13ce8be238331176a22be55eb1808f Component: engine