summaryrefslogtreecommitdiff
path: root/doc
diff options
context:
space:
mode:
authorXavier Chantry <shiningxc@gmail.com>2009-07-21 23:03:25 -0500
committerDan McGee <dan@archlinux.org>2009-09-06 15:50:42 -0500
commit594621cbeb2f27ce8d36e652c4fdd9a9d4385ec3 (patch)
tree78041ce99beafb27918a52b6398db92e3386cfd6 /doc
parent92f0775e76c75ebe9e30355cc99bb40cf365abcb (diff)
Add Architecture and --arch option
Signed-off-by: Xavier Chantry <shiningxc@gmail.com> Signed-off-by: Dan McGee <dan@archlinux.org>
Diffstat (limited to 'doc')
-rw-r--r--doc/pacman.8.txt2
-rw-r--r--doc/pacman.conf.5.txt8
2 files changed, 10 insertions, 0 deletions
diff --git a/doc/pacman.8.txt b/doc/pacman.8.txt
index b288a592..a534e057 100644
--- a/doc/pacman.8.txt
+++ b/doc/pacman.8.txt
@@ -166,6 +166,8 @@ Options
If an install scriptlet exists, do not execute it. Do not use this
unless you know what you are doing.
+*\--arch* <'arch'>::
+ Specify an alternate architecture.
Query Options[[QO]]
-------------------
diff --git a/doc/pacman.conf.5.txt b/doc/pacman.conf.5.txt
index 46a0b3de..59bed156 100644
--- a/doc/pacman.conf.5.txt
+++ b/doc/pacman.conf.5.txt
@@ -97,6 +97,14 @@ Options
Include another config file. This file can include repositories or
general configuration options.
+*Architecture =* auto | i686 | x86_64 | ...::
+ If set, pacman will only allow installation of packages of the given
+ architecture (e.g. 'i686', 'x86_64', etc). The special value 'auto' will
+ use the system architecture, provided by in ``uname -m''. If unset, no
+ architecture checks are made. *NOTE*: packages with the special
+ architecture 'any' can always be installed, as they are meant to be
+ architecture independent.
+
*XferCommand =* /path/to/command %u::
If set, an external program will be used to download all remote files.
All instances of `%u` will be replaced with the download URL. If present,