summaryrefslogtreecommitdiff
path: root/doc
diff options
context:
space:
mode:
authorDan McGee <dan@archlinux.org>2008-01-14 22:58:44 -0600
committerDan McGee <dan@archlinux.org>2008-01-14 22:58:44 -0600
commit38e981fab3f901e6c932e2f2913790ef0b96c6c2 (patch)
tree1dcf8610529b51626780b3666455f72858361828 /doc
parent521de7ceedc6e4f5df52c0380f536a6f13a7f578 (diff)
parenta0ac72b42219fbcf17dd7cf2ee992b71a6a1375a (diff)
downloadpacman-38e981fab3f901e6c932e2f2913790ef0b96c6c2.tar.xz
Merge branch 'maint'
Diffstat (limited to 'doc')
-rw-r--r--doc/PKGBUILD.5.txt5
-rw-r--r--doc/makepkg.8.txt20
-rw-r--r--doc/pacman.8.txt18
3 files changed, 28 insertions, 15 deletions
diff --git a/doc/PKGBUILD.5.txt b/doc/PKGBUILD.5.txt
index 3ef9d04e..ac394729 100644
--- a/doc/PKGBUILD.5.txt
+++ b/doc/PKGBUILD.5.txt
@@ -145,8 +145,9 @@ Options and Directives
a package to provide dependencies other than its own package name. For
example, the dcron package can provide 'cron', which allows packages to
depend on 'cron' rather than 'dcron OR fcron'.
- Versioned provisions are also possible. For example, dcron can provide
- 'cron 2.0' to satisfy the 'cron>=2.0' dependency of other packages.
+ Versioned provisions are also possible, in the 'name=version' format.
+ For example, dcron can provide 'cron=2.0' to satisfy the 'cron>=2.0'
+ dependency of other packages.
*replaces (array)*::
An array of packages that this package should replace, and can be used
diff --git a/doc/makepkg.8.txt b/doc/makepkg.8.txt
index 689556d4..8f166a55 100644
--- a/doc/makepkg.8.txt
+++ b/doc/makepkg.8.txt
@@ -30,6 +30,11 @@ to use.
Options
-------
+*\--asroot*::
+ Allow makepkg to run as root. This is for security purposes as it is
+ normally dangerous to do so. This will also disable use of fakeroot and
+ sudo.
+
*-A, \--ignorearch*::
Ignore a missing or incomplete arch field in the build script. This is
for rebuilding packages from source when the PKGBUILD may be slightly
@@ -68,6 +73,11 @@ Options
default to the current directory. This allows the built package to be
overwritten.
+*-forcever*::
+ This is a hidden option that should *not* be used unless you really know
+ what you are doing. makepkg uses this internally when calling itself to
+ set the new development pkgver of the package.
+
*-g, \--geninteg*::
For each source file in the source array of PKGBUILD, download the file
if required and generate integrity checks. The integrity checks
@@ -78,6 +88,11 @@ Options
*-h, \--help*::
Output syntax and command line options.
+*\--holdver*::
+ Useful when building development versions of packages. Prevents makepkg
+ from automatically bumping the pkgver to the latest revision number in
+ the package's development tree.
+
*-i, \--install*::
Install or upgrade the package after a successful build using
linkman:pacman[8].
@@ -108,11 +123,6 @@ Options
dependencies are not found, pacman will try to resolve them. If
successful, the missing packages will be downloaded and installed.
-*\--asroot*::
- Allow makepkg to run as root. This is for security purposes as it is
- normally dangerous to do so. This will also disable use of fakeroot and
- sudo.
-
*\--source*::
Do not actually build the package, but build a source-only tarball. This
is useful for passing a single tarball to another program such as a
diff --git a/doc/pacman.8.txt b/doc/pacman.8.txt
index 0da83a67..c47af65e 100644
--- a/doc/pacman.8.txt
+++ b/doc/pacman.8.txt
@@ -120,9 +120,9 @@ Options
*\--cachedir* <'dir'>::
Specify an alternative package cache location (a typical default is
``/var/cache/pacman/pkg''). Multiple cache directories can be specified,
- and they are tried in the order they are passed to pacman. *NOTE*: if
- specified, this is an absolute path and the root path is not automatically
- prepended. This behavior changed in pacman 3.1.0.
+ and they are tried in the order they are passed to pacman. *NOTE*: this
+ is an absolute path, the root path is not automatically prepended. This
+ behavior changed in pacman 3.1.0.
*\--config* <'file'>::
Specify an alternate configuration file.
@@ -207,7 +207,8 @@ Remove Options[[RO]]
--------------------
*-c, \--cascade*::
Remove all target packages, as well as all packages that depend on one
- or more target packages. This operation is recursive.
+ or more target packages. This operation is recursive, and must be used
+ with care since it can remove many potentially needed packages.
*-k, \--keep*::
Removes the database entry only. Leaves all files in place.
@@ -218,10 +219,11 @@ Remove Options[[RO]]
file should be renamed with a ``.pacsave'' extension.
*-s, \--recursive*::
- Remove each target specified including all dependencies, provided that
- (A) they are not required by other packages; and (B) they were not
- explicitly installed by the user. This option is analogous to a
- backwards '\--sync' operation.
+ Remove each target specified including all of their dependencies, provided
+ that (A) they are not required by other packages; and (B) they were not
+ explicitly installed by the user. This operation is recursive and analogous
+ to a backwards '\--sync' operation, and helps keep a clean system without
+ orphans.
Sync Options[[SO]]