Merge branch 'ma/diff-doc-clarify-regexp-example'

Doc clarification. * ma/diff-doc-clarify-regexp-example: diff-options.txt: avoid "regex" overload in example