summaryrefslogtreecommitdiffstats
path: root/doc
diff options
context:
space:
mode:
Diffstat (limited to 'doc')
-rw-r--r--doc/.gitignore1
-rw-r--r--doc/Makefile.am4
-rw-r--r--doc/PKGBUILD.5.txt17
-rw-r--r--doc/index.txt2
-rw-r--r--doc/pacman.8.txt48
-rw-r--r--doc/pacman.conf.5.txt4
-rw-r--r--doc/pactree.8.txt69
7 files changed, 49 insertions, 96 deletions
diff --git a/doc/.gitignore b/doc/.gitignore
index 2eae9e4b..186f45e4 100644
--- a/doc/.gitignore
+++ b/doc/.gitignore
@@ -7,7 +7,6 @@ makepkg.conf.5
pacman.8
pacman-key.8
pacman.conf.5
-pactree.8
pkgdelta.8
repo-add.8
repo-remove.8
diff --git a/doc/Makefile.am b/doc/Makefile.am
index 5d7c9754..44e32996 100644
--- a/doc/Makefile.am
+++ b/doc/Makefile.am
@@ -12,7 +12,6 @@ ASCIIDOC_MANS = \
vercmp.8 \
pkgdelta.8 \
pacman-key.8 \
- pactree.8 \
PKGBUILD.5 \
makepkg.conf.5 \
pacman.conf.5 \
@@ -29,7 +28,6 @@ HTML_MANPAGES = \
vercmp.8.html \
pkgdelta.8.html \
pacman-key.8.html \
- pactree.8.html \
PKGBUILD.5.html \
makepkg.conf.5.html \
pacman.conf.5.html \
@@ -56,7 +54,6 @@ EXTRA_DIST = \
vercmp.8.txt \
pkgdelta.8.txt \
pacman-key.8.txt \
- pactree.8.txt \
PKGBUILD.5.txt \
PKGBUILD-example.txt \
makepkg.conf.5.txt \
@@ -159,7 +156,6 @@ repo-add.8 repo-add.8.html: repo-add.8.txt
vercmp.8 vercmp.8.html: vercmp.8.txt
pkgdelta.8 pkgdelta.8.html: pkgdelta.8.txt
pacman-key.8 pacman-key.8.html: pacman-key.8.txt
-pactree.8 pactree.8.html: pactree.8.txt
PKGBUILD.5 PKGBUILD.5.html: PKGBUILD.5.txt PKGBUILD-example.txt
makepkg.conf.5 makepkg.conf.5.html: makepkg.conf.5.txt
pacman.conf.5 pacman.conf.5.html: pacman.conf.5.txt
diff --git a/doc/PKGBUILD.5.txt b/doc/PKGBUILD.5.txt
index 08ef3e4d..18bc2a19 100644
--- a/doc/PKGBUILD.5.txt
+++ b/doc/PKGBUILD.5.txt
@@ -48,7 +48,7 @@ similar to `$_basekernver`.
*pkgver*::
The version of the software as released from the author (e.g., '2.7.1').
- The variable is not allowed to contain colons or hyphens.
+ The variable is not allowed to contain colons, forward slashes or hyphens.
+
The `pkgver` variable can be automatically updated by providing a `pkgver()`
function in the PKGBUILD that outputs the new package version.
@@ -464,12 +464,12 @@ Using VCS Sources[[VCS]]
------------------------
Building a developmental version of a package using sources from a version
control system (VCS) is enabled by specifying the source in the form
-`source=('directory::url#fragment')`. Currently makepkg supports the Bazaar, Git,
-Subversion, and Mercurial version control systems. For other version control
-systems, manual cloning of upstream repositories must be done in the `prepare()`
-function.
+`source=('directory::url#fragment?query')`. Currently makepkg supports the
+Bazaar, Git, Subversion, and Mercurial version control systems. For other
+version control systems, manual cloning of upstream repositories must be done
+in the `prepare()` function.
-The source URL is divided into three components:
+The source URL is divided into four components:
*directory*::
(optional) Specifies an alternate directory name for makepkg to download
@@ -501,6 +501,11 @@ The source URL is divided into three components:
*svn*;;
revision
+*query*::
+ (optional) Allows specifying whether a VCS checkout should be checked for
+ PGP-signed revisions. The source line should have the format
+ `source=(url#fragment?signed)` or `source=(url?signed#fragment)`. Currently
+ only supported by Git.
Example
-------
diff --git a/doc/index.txt b/doc/index.txt
index a969618f..7939923e 100644
--- a/doc/index.txt
+++ b/doc/index.txt
@@ -255,7 +255,7 @@ bugs under the Pacman project.
Copyright
---------
-pacman is Copyright (C) 2006-2016 Pacman Development Team
+pacman is Copyright (C) 2006-2017 Pacman Development Team
<pacman-dev@archlinux.org> and Copyright (C) 2002-2006 Judd Vinet
<jvinet@zeroflux.org> and is licensed through the GNU General Public License,
version 2 or later.
diff --git a/doc/pacman.8.txt b/doc/pacman.8.txt
index 2bafa414..d670e82a 100644
--- a/doc/pacman.8.txt
+++ b/doc/pacman.8.txt
@@ -136,11 +136,12 @@ Options
*-r, \--root* <path>::
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
- temporarily mounted partition that is "owned" by another system.
+ `/usr`.
*NOTE*: If database path or log file are not specified on either the
command line or in linkman:pacman.conf[5], their default location will
be inside this root path.
+ *NOTE*: This option is not suitable for performing operations on a mounted
+ guest system. See '\--sysroot' instead.
*-v, \--verbose*::
Output paths such as as the Root, Conf File, DB Path, Cache Dirs, etc.
@@ -193,6 +194,16 @@ Options
*\--confirm*::
Cancels the effects of a previous '\--noconfirm'.
+*\--disable-download-timeout*::
+ Disable defaults for low speed limit and timeout on downloads. Use this
+ if you have issues downloading files with proxy and/or security gateway.
+
+*\--sysroot* <dir>::
+ Specify an alternative system root. Pacman will chroot and chdir into the
+ system root prior to running. This allows mounted guest systems to be
+ properly operated on. Any other paths given will be interpreted as relative
+ to the system root. Requires root privileges.
+
Transaction Options (apply to '-S', '-R' and '-U')
--------------------------------------------------
@@ -233,14 +244,6 @@ Transaction Options (apply to '-S', '-R' and '-U')
Upgrade Options (apply to '-S' and '-U')[[UO]]
----------------------------------------------
-*\--force*::
- Bypass file conflict checks and overwrite conflicting files. If the
- package that is about to be installed contains files that are already
- installed, this option will cause all those files to be overwritten.
- Using '\--force' will not allow overwriting a directory with a file or
- installing packages with conflicting files and directories.
- This option should be used with care, ideally not at all.
-
*\--asdeps*::
Install packages non-explicitly; in other words, fake their install reason
to be installed as a dependency. This is useful for makepkg and other
@@ -266,6 +269,18 @@ Upgrade Options (apply to '-S' and '-U')[[UO]]
*\--needed*::
Do not reinstall the targets that are already up-to-date.
+*\--overwrite* <glob>::
+ Bypass file conflict checks and overwrite conflicting files. If the
+ package that is about to be installed contains files that are already
+ installed and match 'glob', this option will cause all those files to be
+ overwritten. Using '\--overwrite' will not allow overwriting a directory
+ with a file or installing packages with conflicting files and directories.
+ Multiple patterns can be specified by separating them with a comma. May be
+ specified multiple times. Patterns can be negated, such that files
+ matching them will not be overwritten, by prefixing them with an
+ exclamation mark. Subsequent matches will override previous ones. A leading
+ literal exclamation mark or backslash needs to be escaped.
+
Query Options (apply to '-Q')[[QO]]
-----------------------------------
@@ -338,10 +353,10 @@ Query Options (apply to '-Q')[[QO]]
with descriptions matching ALL of those terms are returned.
*-t, \--unrequired*::
- Restrict or filter output to packages not required or optionally required by
- any currently installed package. Specify this option twice to only filter
- packages that are direct dependencies (i.e. do not filter optional
- dependencies).
+ Restrict or filter output to print only packages neither required nor
+ optionally required by any currently installed package. Specify this
+ option twice to include packages which are optionally, but not directly,
+ required by another package.
*-u, \--upgrades*::
Restrict or filter output to packages that are out-of-date on the local
@@ -456,7 +471,7 @@ Database Options (apply to '-D')[[QO]]
package installed even when it was initially installed as a dependency
of another package.
-*-k \--check*::
+*-k, \--check*::
Check the local package database is internally consistent. This will
check all required files are present and that installed packages have
the required dependencies, do not conflict and that multiple packages
@@ -464,6 +479,9 @@ Database Options (apply to '-D')[[QO]]
a check on the sync databases to ensure all specified dependencies
are available.
+*-q, \--quiet*::
+ Suppress messages on successful completion of database operations.
+
File Options (apply to '-F')[[FO]]
----------------------------------
*-y, --refresh*::
diff --git a/doc/pacman.conf.5.txt b/doc/pacman.conf.5.txt
index c6658706..f92ee207 100644
--- a/doc/pacman.conf.5.txt
+++ b/doc/pacman.conf.5.txt
@@ -209,6 +209,10 @@ Options
Displays name, version and size of target packages formatted
as a table for upgrade, sync and remove operations.
+*DisableDownloadTimeout*::
+ Disable defaults for low speed limit and timeout on downloads. Use this
+ if you have issues downloading files with proxy and/or security gateway.
+
Repository Sections
-------------------
diff --git a/doc/pactree.8.txt b/doc/pactree.8.txt
deleted file mode 100644
index b177788a..00000000
--- a/doc/pactree.8.txt
+++ /dev/null
@@ -1,69 +0,0 @@
-/////
-vim:set ts=4 sw=4 syntax=asciidoc noet spell spelllang=en_us:
-/////
-pactree(8)
-=========
-
-Name
-----
-pactree - package dependency tree viewer
-
-
-Synopsis
---------
-'pactree' [options] package
-
-
-Description
------------
-Pactree produces a dependency tree for a package.
-
-By default, a tree-like output is generated, but with the '\--graph' option, a Graphviz
-description is generated.
-
-
-Options
--------
-*-a, \--ascii*::
- Use ASCII characters for tree formatting. By default, pactree will use Unicode
- line drawing characters if it is able to detect that the locale supports them.
-
-*-b, \--dbpath*::
- Specify an alternative database location.
-
-*-c, \--color*::
- Colorize output.
-
-*-d, \--depth <num>*::
- Limits the number of levels of dependency to show. A zero means
- show the named package only, one shows the packages that are directly
- required.
-
-*-g, \--graph*::
- Generate a Graphviz description. If this option is given, the '\--color' and
- '\--linear' options are ignored.
-
-*-h, \--help*::
- Output syntax and command-line options.
-
-*-l, \--linear*::
- Prints package names at the start of each line, one per line.
-
-*-r, \--reverse*::
- Show packages that depend on the named package.
-
-*-s, \--sync*::
- Read package data from sync databases instead of local database.
-
-*-u, \--unique*::
- List dependent packages once. Implies '\--linear'.
-
-*\--config <file>*::
- Specify an alternate pacman configuration file.
-
-
-See Also
---------
-linkman:pacman[8], linkman:pacman.conf[5], linkman:makepkg[8]
-
-include::footer.txt[]