From b3c6bdda38f7e370e1f80f02a61f1d3f08c1b57d Mon Sep 17 00:00:00 2001 From: Dan McGee Date: Sat, 29 Dec 2007 00:24:15 -0600 Subject: doc: rename manlink macro to linkman 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\w(\w|-)*?):(?P\S*?)(\[(?P.*?)\])= + +# Explicit so they can be nested. +(?su)[\\]?(?P(http|https|ftp|file|mailto|callto|image|link)):(?P\S*?)(\[(?P.*?)\])= + # Anchor: [[[id]]]. Bibliographic anchor. (?su)[\\]?\[\[\[(?P[\w][\w-]*?)\]\]\]=anchor3 # Anchor: [[id,xreflabel]] This default regex now matches explicit values, and unfortunately in this case manlink 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 --- doc/PKGBUILD.5.txt | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'doc/PKGBUILD.5.txt') diff --git a/doc/PKGBUILD.5.txt b/doc/PKGBUILD.5.txt index 743453db..e8aa4b01 100644 --- a/doc/PKGBUILD.5.txt +++ b/doc/PKGBUILD.5.txt @@ -111,7 +111,7 @@ Options and Directives A space-delimited array of filenames, without preceding slashes, that should be backed up if the package is removed or upgraded. This is commonly used for packages placing configuration files in /etc. See - Handling Config Files in manlink:pacman[8] for more information. + Handling Config Files in linkman:pacman[8] for more information. *depends (array)*:: An array of packages that this package depends on to run. Packages in @@ -152,8 +152,8 @@ Options and Directives when building packages. To set an option, just include the option name in the options array. To reverse the default behavior, place an ``!'' at the front of the option. Only specify the options you specifically want - to override, the rest will be taken from manlink:makepkg.conf[5]. - *NOTE:* 'force' is a special option only used in a manlink:PKGBUILD[5], + to override, the rest will be taken from linkman:makepkg.conf[5]. + *NOTE:* 'force' is a special option only used in a linkman:PKGBUILD[5], do not use it unless you know what you are doing. *strip*;; @@ -184,7 +184,7 @@ Options and Directives *makeflags*;; Allow the use of user-specific makeflags during build as specified - in manlink:makepkg.conf[5]. More useful in its negative form + in linkman:makepkg.conf[5]. More useful in its negative form `!makeflags` with select packages that have problems building with custom makeflags such as `-j2` (or higher). @@ -316,6 +316,6 @@ source~~~~~ See Also -------- -manlink:makepkg[8], manlink:pacman[8], manlink:makepkg.conf[5] +linkman:makepkg[8], linkman:pacman[8], linkman:makepkg.conf[5] include::footer.txt[] -- cgit v1.2.3-70-g09d2