summaryrefslogtreecommitdiffstats
path: root/doc
diff options
context:
space:
mode:
authorDan McGee <dan@archlinux.org>2008-08-27 03:11:25 +0200
committerDan McGee <dan@archlinux.org>2008-08-27 03:11:25 +0200
commit1c47500ea6d41bf9354155fca2e7c83fca368e1d (patch)
tree37ae5ea6d92a71aba7dd767b25f3c2fc6eb69a2c /doc
parentd05882db9e417244fa580c4697b45333faffcc79 (diff)
parentafac773d1936cbd0ea18ea94155f21dcf9411fb7 (diff)
downloadpacman-1c47500ea6d41bf9354155fca2e7c83fca368e1d.tar.gz
pacman-1c47500ea6d41bf9354155fca2e7c83fca368e1d.tar.xz
Merge branch 'maint'
Diffstat (limited to 'doc')
-rw-r--r--doc/PKGBUILD.5.txt4
-rw-r--r--doc/makepkg.conf.5.txt13
2 files changed, 11 insertions, 6 deletions
diff --git a/doc/PKGBUILD.5.txt b/doc/PKGBUILD.5.txt
index cf6eb23a..081c35b3 100644
--- a/doc/PKGBUILD.5.txt
+++ b/doc/PKGBUILD.5.txt
@@ -87,6 +87,10 @@ similar to `$_basekernver`.
variables if possible when specifying the download location. Any files
that are compressed will automatically be extracted, unless found in
the noextract array listed below.
++
+It is also possible to specify an optional filename, which is helpful
+with weird URLs and for handling multiple source files with the same
+name. The syntax is: `source=('filename::url')`
*noextract (array)*::
An array of filenames corresponding to those from the source array. Files
diff --git a/doc/makepkg.conf.5.txt b/doc/makepkg.conf.5.txt
index a8190038..ca9df025 100644
--- a/doc/makepkg.conf.5.txt
+++ b/doc/makepkg.conf.5.txt
@@ -34,12 +34,13 @@ Options
**DLAGENTS=(**\'protocol::/path/to/command [options]' ...**)**::
Sets the download agents used to fetch source files specified with a URL in
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.
- All instances of `%u` will be replaced with the download URL. If present,
- instances of `%o` will be replaced with the local filename, plus a ``.part''
- extension, which allows to do file resumes properly.
+ well, and any protocol can have a download agent. Several examples are provided
+ in the default makepkg.conf.
+ +
+ If present, `%u` will be replaced with the download URL. Otherwise, the
+ download URL will be placed on the end of the command. If present, `%o` will
+ be replaced with the local filename, plus a ``.part'' extension, which allows
+ makepkg to handle resuming file downloads.
**CARCH=**"carch"::
Specifies your computer architecture; possible values include such things