Merge branch 'ks/doc-fixes' into maint

Doc clean-up. * ks/doc-fixes: doc: reformat the paragraph containing the 'cut-line' doc: camelCase the i18n config variables to improve readability

Junio C Hamano committed Jul 31, 2017 at 13:51 UTC 0baf0b839b45ed06ef560e3b035315ecff0d4bef

No changes.