From: Junio C Hamano <gitster@pobox.com>
Date: Tue, 11 Sep 2012 18:08:40 +0000 (-0700)
Subject: Merge branch 'jk/docs-docbook-monospace-display' into maint-1.7.11
X-Git-Tag: v1.7.11.6~9
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/515cd1913c17c0fca2e52434d118257ea105c3ec?ds=inline;hp=-c

Merge branch 'jk/docs-docbook-monospace-display' into maint-1.7.11

* jk/docs-docbook-monospace-display:
docs: monospace listings in docbook output
---

515cd1913c17c0fca2e52434d118257ea105c3ec
diff --combined Documentation/asciidoc.conf
index a26d245ab4,8befd1de6e..1273a85c8a
--- a/Documentation/asciidoc.conf
+++ b/Documentation/asciidoc.conf
@@@ -36,7 -36,7 +36,7 @@@ ifndef::git-asciidoc-no-roff[
  # v1.72 breaks with this because it replaces dots not in roff requests.
  [listingblock]
  <example><title>{title}</title>
- <literallayout>
+ <literallayout class="monospaced">
  ifdef::doctype-manpage[]
  &#10;.ft C&#10;
  endif::doctype-manpage[]
@@@ -53,7 -53,7 +53,7 @@@ ifdef::doctype-manpage[
  # The following two small workarounds insert a simple paragraph after screen
  [listingblock]
  <example><title>{title}</title>
- <literallayout>
+ <literallayout class="monospaced">
  |
  </literallayout><simpara></simpara>
  {title#}</example>
@@@ -90,8 -90,6 +90,8 @@@ endif::backend-docbook[
  endif::doctype-manpage[]
  
  ifdef::backend-xhtml11[]
 +[attributes]
 +git-relative-html-prefix=
  [linkgit-inlinemacro]
 -<a href="{target}.html">{target}{0?({0})}</a>
 +<a href="{git-relative-html-prefix}{target}.html">{target}{0?({0})}</a>
  endif::backend-xhtml11[]