Send patches - preferably formatted by git format-patch - to patches at archlinux32 dot org.
summaryrefslogtreecommitdiff
path: root/doc/makepkg.conf.5.txt
diff options
context:
space:
mode:
authorDan McGee <dan@archlinux.org>2007-12-29 00:24:15 -0600
committerDan McGee <dan@archlinux.org>2007-12-29 00:24:15 -0600
commitb3c6bdda38f7e370e1f80f02a61f1d3f08c1b57d (patch)
treee030a3034424cbdae122029738c9b0d9a53e375f /doc/makepkg.conf.5.txt
parent26c05b1c8c6fe639cd4eea5decac694c86cc7c00 (diff)
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<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 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 <dan@archlinux.org>
Diffstat (limited to 'doc/makepkg.conf.5.txt')
-rw-r--r--doc/makepkg.conf.5.txt6
1 files changed, 3 insertions, 3 deletions
diff --git a/doc/makepkg.conf.5.txt b/doc/makepkg.conf.5.txt
index 17e4bd87..f6e4b382 100644
--- a/doc/makepkg.conf.5.txt
+++ b/doc/makepkg.conf.5.txt
@@ -33,7 +33,7 @@ Options
-------
**DLAGENTS=(**\'protocol::/path/to/command [options]' ...**)**::
Sets the download agents used to fetch source files specified with a URL in
- the manlink:PKGBUILD[5] file. Options can be specified for each command as
+ the linkman:PKGBUILD[5] file. Options can be specified for each command as
well; the download URL is placed on the end of the command. This is more
flexible than the former `FTPAGENT` variable, as any protocol can have a
download agent. Several examples are provided in the default makepkg.conf.
@@ -130,7 +130,7 @@ Options
**PKGDEST=**"/path/to/folder"::
If this value is not set, packages will by default be placed in the
- current directory (location of the manlink:PKGBUILD[5]). Many people
+ current directory (location of the linkman:PKGBUILD[5]). Many people
like to keep all their packages in one place so this option allows
this behavior. A common location is ``/home/packages''.
@@ -149,6 +149,6 @@ Options
See Also
--------
-manlink:makepkg[8], manlink:pacman[8], manlink:PKGBUILD[5]
+linkman:makepkg[8], linkman:pacman[8], linkman:PKGBUILD[5]
include::footer.txt[]