10 files changed, 197 insertions, 20 deletions
diff --git a/doc/.gitignore b/doc/.gitignore
index a6f4df7f..a7f33e55 100644
--- a/doc/.gitignore
+++ b/doc/.gitignore
@@ -3,7 +3,9 @@ libalpm.3
 makepkg.8
 makepkg.conf.5
 pacman.8
+pacman-key.8
 pacman.conf.5
+pkgdelta.8
 repo-add.8
 repo-remove.8
 vercmp.8
diff --git a/doc/Makefile.am b/doc/Makefile.am
index 00a0e88d..def58c4e 100644
--- a/doc/Makefile.am
+++ b/doc/Makefile.am
@@ -8,6 +8,8 @@ ASCIIDOC_MANS = \
 	makepkg.8 \
 	repo-add.8 \
 	vercmp.8 \
+	pkgdelta.8 \
+	pacman-key.8 \
 	PKGBUILD.5 \
 	makepkg.conf.5 \
 	pacman.conf.5 \
@@ -20,6 +22,8 @@ HTML_MANPAGES = \
 	makepkg.8.html \
 	repo-add.8.html \
 	vercmp.8.html \
+	pkgdelta.8.html \
+	pacman-key.8.html \
 	PKGBUILD.5.html \
 	makepkg.conf.5.html \
 	pacman.conf.5.html \
@@ -41,6 +45,8 @@ EXTRA_DIST = \
 	makepkg.8.txt \
 	repo-add.8.txt \
 	vercmp.8.txt \
+	pkgdelta.8.txt \
+	pacman-key.8.txt \
 	PKGBUILD.5.txt \
 	PKGBUILD-example.txt \
 	makepkg.conf.5.txt \
@@ -133,6 +139,8 @@ pacman.8 pacman.8.html: pacman.8.txt
 makepkg.8 makepkg.8.html: makepkg.8.txt
 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
 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/index.txt b/doc/index.txt
index a21cba18..bd09cf55 100644
--- a/doc/index.txt
+++ b/doc/index.txt
@@ -41,7 +41,9 @@ configuration files dealing with pacman.
 * linkman:makepkg[8]
 * linkman:makepkg.conf[5]
 * linkman:pacman[8]
+* linkman:pacman-key[8]
 * linkman:pacman.conf[5]
+* linkman:pkgdelta[8]
 * linkman:repo-add[8]
 * linkman:vercmp[8]
 
diff --git a/doc/makepkg.8.txt b/doc/makepkg.8.txt
index c59800c6..f9e72392 100644
--- a/doc/makepkg.8.txt
+++ b/doc/makepkg.8.txt
@@ -11,24 +11,24 @@ makepkg - package build utility
 
 Synopsis
 --------
-makepkg [options]
+'makepkg' [options]
 
 
 Description
 -----------
-makepkg is a script to automate the building of packages. The requirements for
+'makepkg' is a script to automate the building of packages. The requirements for
 using the script are a build-capable \*nix platform and a custom build script
 for each package you wish to build (known as a PKGBUILD). See
 linkman:PKGBUILD[5] for details on creating your own build scripts.
 
 The advantage to a script-based build is that the work is only done once. Once
-you have the build script for a package, makepkg will do the rest: download and
+you have the build script for a package, 'makepkg' will do the rest: download and
 validate source files, check dependencies, configure the build-time settings,
 build the package, install the package into a temporary root, make
 customizations, generate meta-info, and package the whole thing up for pacman
 to use.
 
-NOTE: makepkg uses your current locale by default and does not unset it when
+NOTE: 'makepkg' uses your current locale by default and does not unset it when
 building packages. If you wish to share your build output with others when
 seeking help or for other purposes, you may wish to run "`LC_ALL=C makepkg`" so
 your logs and output are not localized.
diff --git a/doc/makepkg.conf.5.txt b/doc/makepkg.conf.5.txt
index 61302492..a9faa14d 100644
--- a/doc/makepkg.conf.5.txt
+++ b/doc/makepkg.conf.5.txt
@@ -70,7 +70,7 @@ Options
 	This is often used to set the number of jobs used, for example, `-j2`.
 	Other flags that make accepts can also be passed.
 
-**BUILDENV=(**fakeroot !distcc color !ccache**)**::
+**BUILDENV=(**fakeroot !distcc color !ccache !sign**)**::
 	This array contains options that affect the build environment, the defaults
 	are shown here. All options should always be left in the array; to enable
 	or disable an option simply remove or place an ``!'' at the front of the
@@ -98,6 +98,13 @@ Options
 		enabled or disabled for individual packages through the use of
 		makepkg's `--check` and `--nocheck` options respectively.
 
+	*sign*;;
+		Generate a PGP signature file using GnuPG. This will execute `gpg
+		--detach-sign --use-agent` on the built package to generate a detached
+		signature file, using the GPG agent if it is available. The signature
+		file will be the entire filename of the package with a ``.sig''
+		extension.
+
 **DISTCC_HOSTS=**"host1 ..."::
 	If using DistCC, this is used to specify a space-delimited list of hosts
 	running in the DistCC cluster. In addition, you will want to modify your
diff --git a/doc/pacman-key.8.txt b/doc/pacman-key.8.txt
new file mode 100644
index 00000000..8a08480f
--- /dev/null
+++ b/doc/pacman-key.8.txt
@@ -0,0 +1,85 @@
+/////
+vim:set ts=4 sw=4 syntax=asciidoc noet:
+/////
+pacman-key(8)
+=============
+
+
+Name
+----
+pacman-key - manage pacman's list of trusted keys
+
+
+Synopsis
+--------
+'pacman-key' [options] <command> [arguments]
+
+
+Description
+-----------
+'pacman-key' is a script used to manage pacman's keyring, which is the collection
+of GnuPG keys used to check signed packages. It provides the ability to import
+and export keys, fetch keys from keyservers and update the key trust database.
+
+
+Options
+-------
+*\--config* <file>::
+	Use an alternate config file instead of the `{sysconfdir}/pacman.conf`
+	default.
+
+*\--gpgdir* <dir>::
+	Set an alternate home directory for GnuPG. If unspecified, the value is
+	read from `{sysconfdir}/pacman.conf`.
+
+
+Commands
+-------
+*-a, \--add* file ...::
+	Add the key(s) contained in the specified file or files to pacman's
+	keyring. If a key already exists, update it.
+
+*\--adv* param ...::
+	Use this option to issue particular GnuPG actions to pacman's keyring. This
+	option should be used with care as it can modify pacman's trust in
+	packages' signatures.
+
+*-d, \--del* keyid ...::
+	Remove the key(s) identified by the specified keyid or keyids from pacman's
+	keyring.
+
+*-e, \--export* [keyid ...]::
+	Export key(s) identified by the specified keyid to 'stdout'. If no keyid is
+	specified, all keys will be exported.
+
+*-f, \--finger* [keyid ...]::
+	List a fingerprint for each specified keyid, or for all known keys if no
+	keyids are specified.
+
+*-h, \--help*::
+	Output syntax and command line options.
+
+*-l, \--list*::
+	Equivalent to --list-sigs from GnuPG.
+
+*-r, \--receive* keyserver keyid ...::
+	Fetch the specified keyids from the specified key server URL.
+
+*\--reload*::
+	Reloads the keys from the keyring package.
+
+*-t, \--trust* keyid::
+	Set the trust level of the given key.
+
+*-u, \--updatedb*::
+	Equivalent to \--check-trustdb in GnuPG.
+
+*-v, \--version*::
+	Displays the program version.
+
+
+See Also
+--------
+linkman:pacman[8], linkman:pacman.conf[5]
+
+include::footer.txt[]
diff --git a/doc/pacman.8.txt b/doc/pacman.8.txt
index b727269b..f638123d 100644
--- a/doc/pacman.8.txt
+++ b/doc/pacman.8.txt
@@ -149,6 +149,13 @@ Options
 	Display debug messages. When reporting bugs, this option is recommended
 	to be used.
 
+*\--gpgdir* <dir>::
+	Specify a directory of files used by GnuPG to verify package signatures.
+	This directory should contain two files: `pubring.gpg` and `trustdb.gpg`.
+	`pubring.gpg` holds the public keys of all packagers. `trustdb.gpg`
+	contains a so-called trust database, which specifies that the keys are
+	authentic and trusted.
+
 *\--logfile* <file>::
 	Specify an alternate log file. This is an absolute path, regardless of
 	the installation root setting.
diff --git a/doc/pacman.conf.5.txt b/doc/pacman.conf.5.txt
index bfa07458..ca1f8833 100644
--- a/doc/pacman.conf.5.txt
+++ b/doc/pacman.conf.5.txt
@@ -69,6 +69,15 @@ Options
 	to the first cache directory with write access. *NOTE*: this is an absolute
 	path, the root path is not automatically prepended.
 
+*GPGDir =* path/to/gpg/dir::
+	Overrides the default location of the directory containing configuration
+	files for GnuPG. A typical default is `{sysconfdir}/pacman.d/gnupg/`.
+	This directory should contain two files: `pubring.gpg` and `trustdb.gpg`.
+	`pubring.gpg` holds the public keys of all packagers. `trustdb.gpg`
+	contains a so-called trust database, which specifies that the keys are
+	authentic and trusted.
+	*NOTE*: this is an absolute path, the root path is not automatically
+	prepended.
 
 *LogFile =* '/path/to/file'::
 	Overrides the default location of the pacman log file. A typical default
diff --git a/doc/pkgdelta.8.txt b/doc/pkgdelta.8.txt
new file mode 100644
index 00000000..2d99a87f
--- /dev/null
+++ b/doc/pkgdelta.8.txt
@@ -0,0 +1,42 @@
+/////
+vim:set ts=4 sw=4 syntax=asciidoc noet:
+/////
+pkgdelta(8)
+=========
+
+Name
+----
+pkgdelta - package delta generation utility
+
+
+Synopsis
+--------
+'pkgdelta' [-q] <package1> <package2>
+
+
+Description
+-----------
+'pkgdelta' is used to create package delta files between two versions of the
+same package. These files are essentially binary patches. linkman:pacman[8] can
+download deltas instead of full package upgrades, and use them with the
+previous versions of packages (in the package cache) to synthesize the upgraded
+version of the packages. This likely reduces download sizes for upgrades
+significantly.
+
+'pkgdelta' requires linkman:xdelta3[1] to do its job.
+
+Options
+-------
+*-q, \--quiet*::
+	Be quiet. Do not output anything but warnings and errors.
+
+Examples
+--------
+
+  $ pkgdelta libreoffice-3.3.2-1-x86_64.pkg.tar.xz libreoffice-3.3.2-2-x86_64.pkg.tar.xz
+
+See Also
+--------
+linkman:pacman[8], linkman:xdelta3[1]
+
+include::footer.txt[]
diff --git a/doc/repo-add.8.txt b/doc/repo-add.8.txt
index 75f49ef5..24e2fe6c 100644
--- a/doc/repo-add.8.txt
+++ b/doc/repo-add.8.txt
@@ -10,26 +10,45 @@ repo-add - package database maintenance utility
 
 Synopsis
 --------
-repo-add [-d] [-f] [-q] <path-to-db> <package1> [<package2> ...]
+'repo-add' [-d] [-f] [-q] [-s] [-v] <path-to-db> <package|delta> [<package|delta> ...]
 
-repo-remove [-q] <path-to-db> <packagename> [<packagename2> ...]
+'repo-remove' [-q] [-s] [-v] <path-to-db> <packagename|delta> [<packagename|delta> ...]
 
 
 Description
 -----------
-repo-add and repo-remove are two scripts to help build a package database for
+'repo-add' and 'repo-remove' are two scripts to help build a package database for
 packages built with linkman:makepkg[8] and installed with linkman:pacman[8].
+They also handle package deltas produced by linkman:pkgdelta[8].
 
-repo-add will update a package database by reading a built package file.
-Multiple packages to add can be specified on the command line.
+'repo-add' will update a package database by reading a built package or package
+delta file. Multiple packages and/or deltas to add can be specified on the
+command line.
 
-repo-remove will update a package database by removing the package name
-specified on the command line. Multiple packages to remove can be specified
-on the command line.
+'repo-remove' will update a package database by removing the package name or
+delta specified on the command line. Multiple packages and/or delta to remove
+can be specified on the command line.
 
 
-Options
--------
+Common Options
+--------------
+*-q, \--quiet*::
+	Force this program to keep quiet and run silent except for warning and
+	error messages.
+
+*-s, \--sign*::
+	Generate a PGP signature file using GnuPG. This will execute `gpg
+	--detach-sign --use-agent` on the generated database to generate a detached
+	signature file, using the GPG agent if it is available. The signature file
+	will be the entire filename of the database with a ``.sig'' extension.
+
+*-v, \--verify*::
+	Verify the PGP signature of the database before updating the database.
+	If the signature is invalid, an error is produced and the update does not
+	proceed.
+
+repo-add Options
+----------------
 *-d, \--delta*::
 	Automatically generate and add a delta file between the old entry and the
 	new one, if the old package file is found next to the new one.
@@ -39,12 +58,8 @@ Options
 	specified packages. This is useful for creating databases listing all files
 	in a given sync repository for tools that may use this information.
 
-*-q, \--quiet*::
-	Force this program to keep quiet and run silent except for warning and
-	error messages.
-
 See Also
 --------
-linkman:makepkg[8], linkman:pacman[8]
+linkman:makepkg[8], linkman:pacman[8], linkman:pkgdelta[8]
 
 include::footer.txt[]