diff options
| author | Junio C Hamano <gitster@pobox.com> | 2012-09-11 11:08:40 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2012-09-11 11:08:40 -0700 |
| commit | 515cd1913c17c0fca2e52434d118257ea105c3ec (patch) | |
| tree | cff3130dc8a8dc926abd81b837e02ba405495df0 | |
| parent | d9b983fc268bd749c947bcf88b977dc24782353b (diff) | |
| parent | c2a7f5d43843d16850a460e7f202affb0d24dc48 (diff) | |
| download | git-515cd1913c17c0fca2e52434d118257ea105c3ec.tar.gz git-515cd1913c17c0fca2e52434d118257ea105c3ec.tar.xz | |
Merge branch 'jk/docs-docbook-monospace-display' into maint-1.7.11
* jk/docs-docbook-monospace-display:
docs: monospace listings in docbook output
| -rw-r--r-- | Documentation/asciidoc.conf | 4 | ||||
| -rw-r--r-- | Documentation/user-manual.conf | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/Documentation/asciidoc.conf b/Documentation/asciidoc.conf index a26d245ab..1273a85c8 100644 --- a/Documentation/asciidoc.conf +++ b/Documentation/asciidoc.conf @@ -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[] .ft C endif::doctype-manpage[] @@ -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> diff --git a/Documentation/user-manual.conf b/Documentation/user-manual.conf index 339b30919..d87294de2 100644 --- a/Documentation/user-manual.conf +++ b/Documentation/user-manual.conf @@ -14,7 +14,7 @@ ifdef::backend-docbook[] # "unbreak" docbook-xsl v1.68 for manpages. v1.69 works with or without this. [listingblock] <example><title>{title}</title> -<literallayout> +<literallayout class="monospaced"> | </literallayout> {title#}</example> |