4 commits

Author	SHA1	Message	Date
Dan McGee	5162e69732	Documentation: rename gitlink macro to linkgit ... Between AsciiDoc 8.2.2 and 8.2.3, the following change was made to the stock Asciidoc configuration: @@ -149,7 +153,10 @@ # Inline macros. # Backslash prefix required for escape processing. # (?s) re flag for line spanning. -(?su)[\\]?(?P<name>\w(\w|-)*?):(?P<target>\S*?)(\[(?P<attrlist>.*?)\])= + +# Explicit so they can be nested. +(?su)[\\]?(?P<name>(http|https|ftp|file|mailto|callto|image|link)):(?P<target>\S*?)(\[(?P<attrlist>.*?)\])= + # Anchor: [[[id]]]. Bibliographic anchor. (?su)[\\]?\[\[\[(?P<attrlist>[\w][\w-]*?)\]\]\]=anchor3 # Anchor: [[id,xreflabel]] This default regex now matches explicit values, and unfortunately in this case gitlink was being matched by just 'link', causing the wrong inline macro template to be applied. By renaming the macro, we can avoid being matched by the wrong regex. Signed-off-by: Dan McGee <dpmcgee@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>	2008-01-06 18:41:44 -08:00
Junio C Hamano	c3f0baacad	Documentation: sync git.txt command list and manual page title ... Also reorders a handful entries to make each list sorted alphabetically. Signed-off-by: Junio C Hamano <junkio@cox.net>	2007-01-18 15:53:37 -08:00
Junio C Hamano	38477d9e60	Fix mis-mark-up in git-merge-file.txt documentation ... Signed-off-by: Junio C Hamano <junkio@cox.net>	2006-12-17 01:14:44 -08:00
Johannes Schindelin	9abaa7f033	Document git-merge-file ... Most of this is derived from the documentation of RCS merge. Signed-off-by: Johannes Schindelin <Johannes.Schindelin@gmx.de> Signed-off-by: Junio C Hamano <junkio@cox.net>	2006-12-16 05:15:28 -08:00