Merge branch 'ma/asciidoctor-more-fixes'
commit314fcd32d79c2c9ccf471f5a84f1407393d1a1fc
authorJunio C Hamano <gitster@pobox.com>
Sun, 6 Oct 2019 03:25:16 +0000 (6 12:25 +0900)
committerJunio C Hamano <gitster@pobox.com>
Sun, 6 Oct 2019 03:25:16 +0000 (6 12:25 +0900)
tree34554f785a46c32da6490d7f249ed5a9bad69d4c
parent70c1cbf51535fc0d8ee55809646d95610f3dd558
parent4414e837fcd9cc4e68e1540af04bb6db1533f302
Merge branch 'ma/asciidoctor-more-fixes'

Doc formatting updates.

* ma/asciidoctor-more-fixes:
  gitweb.conf.txt: switch pluses to backticks to help Asciidoctor
  git-merge-index.txt: wrap shell listing in "----"
  git-receive-pack.txt: wrap shell [script] listing in "----"
  git-ls-remote.txt: wrap shell listing in "----"
  Documentation: wrap config listings in "----"
  git-merge-base.txt: render indentations correctly under Asciidoctor
  Documentation: wrap blocks with "--"
Documentation/config.txt