diff options
author | Junio C Hamano <gitster@pobox.com> | 2007-07-18 17:00:36 -0700 |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2007-07-18 17:00:36 -0700 |
commit | c1c10a3f272ec0908e63bc105a5ffe94c1279fba (patch) | |
tree | e81e4266bdc05f7015507d89aa357e8cc2005308 /Documentation/asciidoc.conf | |
parent | 726f9bced9717fb8b3c1e91228be1cdce514a98e (diff) | |
parent | 281a53bb79786a6d7e54f9715cc8ad46fc2bdb0e (diff) | |
download | git-c1c10a3f272ec0908e63bc105a5ffe94c1279fba.tar.gz |
Merge branch 'maint'
* maint:
Force listingblocks to be monospaced in manpages
Do not expect unlink(2) to fail on a directory.
Diffstat (limited to 'Documentation/asciidoc.conf')
-rw-r--r-- | Documentation/asciidoc.conf | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/Documentation/asciidoc.conf b/Documentation/asciidoc.conf index 6b6220dfdb..af5b1558a6 100644 --- a/Documentation/asciidoc.conf +++ b/Documentation/asciidoc.conf @@ -27,7 +27,13 @@ ifdef::backend-docbook[] [listingblock] <example><title>{title}</title> <literallayout> +ifdef::doctype-manpage[] + .ft C +endif::doctype-manpage[] | +ifdef::doctype-manpage[] + .ft +endif::doctype-manpage[] </literallayout> {title#}</example> endif::backend-docbook[] |