Send patches - preferably formatted by git format-patch - to patches at archlinux32 dot org.
summaryrefslogtreecommitdiff
path: root/doc
diff options
context:
space:
mode:
authorDan McGee <dan@archlinux.org>2011-04-29 16:05:59 -0500
committerDan McGee <dan@archlinux.org>2011-04-29 16:05:59 -0500
commit4758cfe33f9a8473312a9fee718c45bf72f555f5 (patch)
tree098bd86df5e57037ac85f9882eac23c885b4e851 /doc
parent9c552272e83905703ad0cbcfc92883ebd1eff6f9 (diff)
parentda24324e2dad434bc6d868d9815efc9c2517a769 (diff)
Merge branch 'maint'
Diffstat (limited to 'doc')
-rw-r--r--doc/pacman.8.txt12
1 files changed, 6 insertions, 6 deletions
diff --git a/doc/pacman.8.txt b/doc/pacman.8.txt
index d1b8a731..6270dbd8 100644
--- a/doc/pacman.8.txt
+++ b/doc/pacman.8.txt
@@ -35,7 +35,7 @@ read from stdin.
Operations
----------
*-D, \--database*::
- Modify the package database. This options allows you to modify certain
+ Modify the package database. This operation allows you to modify certain
attributes of the installed packages in pacman's database. At the
moment, you can only change the install reason using '\--asdeps' and
'\--asexplicit' options.
@@ -72,8 +72,8 @@ In addition to packages, groups can be specified as well. For example, if
gnome is a defined package group, then `pacman -S gnome` will install every
package in the gnome group, as well as the dependencies of those packages.
+
-Packages which provide other packages are also handled. For example, `pacman -S
-foo` will first look for a foo package. If foo is not found, packages which
+Packages that provide other packages are also handled. For example, `pacman -S
+foo` will first look for a foo package. If foo is not found, packages that
provide the same functionality as foo will be searched for. If any package is
found, it will be installed.
+
@@ -94,7 +94,7 @@ greater than `1:3.6-1`.
*-T, \--deptest*::
Check dependencies; this is useful in scripts such as makepkg to check
installed packages. This operation will check each dependency specified and
- return a list of those which are not currently satisfied on the system.
+ return a list of dependencies that are not currently satisfied on the system.
This operation accepts no other options. Example usage: `pacman -T qt
"bash>=3.2"`.
@@ -125,7 +125,7 @@ Options
Specify an alternative installation root (default is `/`). This should
not be used as a way to install software into `/usr/local` instead of
`/usr`. This option is used if you want to install a package on a
- temporary mounted partition which is "owned" by another system.
+ temporary mounted partition that is "owned" by another system.
*NOTE*: if database path or logfile are not specified on either the
command line or in linkman:pacman.conf[5], their default location will
be inside this root path.
@@ -237,7 +237,7 @@ Query Options[[QO]]
*-e, \--explicit*::
Restrict or filter output to explicitly installed packages. This option
- can be combined with '-t' to list explicitly installed packages which
+ can be combined with '-t' to list explicitly installed packages that
are not required by any other package.
*-g, \--groups*::