[pacman-dev] [PATCH 1/3] pacman-key: document --lsign-key
Signed-off-by: Dan McGee <dan@archlinux.org> --- doc/pacman-key.8.txt | 4 ++++ scripts/pacman-key.sh.in | 1 + 2 files changed, 5 insertions(+), 0 deletions(-) diff --git a/doc/pacman-key.8.txt b/doc/pacman-key.8.txt index 3582b99..4201107 100644 --- a/doc/pacman-key.8.txt +++ b/doc/pacman-key.8.txt @@ -77,6 +77,10 @@ Options *--list-sigs* [keyid(s)]:: Same as --list-keys, but the signatures are listed too. +*\--lsign-key* <keyid>:: + Locally sign the given key. This is primarily used to root the web of trust + in the local private key generated by \--init. + *-r, \--receive* <keyserver> <keyid(s)>:: Fetch the specified keyids from the specified key server URL. diff --git a/scripts/pacman-key.sh.in b/scripts/pacman-key.sh.in index 14ea07d..b469fd3 100644 --- a/scripts/pacman-key.sh.in +++ b/scripts/pacman-key.sh.in @@ -74,6 +74,7 @@ usage() { echo "$(gettext " --import-trustdb <dir(s)> Imports ownertrust values from trustdb.gpg in dir(s)")" echo "$(gettext " --init Ensure the keyring is properly initialized")" echo "$(gettext " --list-sigs [<keyid(s)>] List keys and their signatures")" + echo "$(gettext " --lsign-key <keyid> Locally sign the specified keyid")" printf "$(gettext " --populate [<keyring(s)] Reload the default keys from the (given) keyrings\n\ in '%s'")\n" "@pkgdatadir@/keyrings" } -- 1.7.6
Use '\--option' rather than `--option` everywhere. Signed-off-by: Dan McGee <dan@archlinux.org> --- doc/index.txt | 6 +++--- doc/makepkg.8.txt | 2 +- doc/makepkg.conf.5.txt | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/doc/index.txt b/doc/index.txt index 05c24b5..5e903e2 100644 --- a/doc/index.txt +++ b/doc/index.txt @@ -16,10 +16,10 @@ automatically and can download packages from a remote server. History ~~~~~~~ -Version 2.0 of pacman introduced the ability to sync packages (the `--sync` +Version 2.0 of pacman introduced the ability to sync packages (the '\--sync' option) with a master server through the use of package databases. Prior to -this, packages would have to be installed manually using the `--add` and -`--upgrade` operations. +this, packages would have to be installed manually using the '\--add' and +'\--upgrade' operations. Version 3.0 was the switch to a two-part pacman- a backend named libalpm (library for Arch Linux Package Management), and the familiar pacman frontend. diff --git a/doc/makepkg.8.txt b/doc/makepkg.8.txt index baff204..f693a5a 100644 --- a/doc/makepkg.8.txt +++ b/doc/makepkg.8.txt @@ -117,7 +117,7 @@ Options *-o, \--nobuild*:: Download and extract files only, but do not build them. Useful with the - `\--noextract` option if you wish to tweak the files in src/ before + '\--noextract' option if you wish to tweak the files in src/ before building. *-p* <buildscript>:: diff --git a/doc/makepkg.conf.5.txt b/doc/makepkg.conf.5.txt index a0ea2d7..2778361 100644 --- a/doc/makepkg.conf.5.txt +++ b/doc/makepkg.conf.5.txt @@ -96,7 +96,7 @@ Options *check*;; Run the check() function if present in the PKGBUILD. This can be enabled or disabled for individual packages through the use of - makepkg's `--check` and `--nocheck` options respectively. + makepkg's '\--check' and '\--nocheck' options respectively. *sign*;; Generate a PGP signature file using GnuPG. This will execute `gpg @@ -120,7 +120,7 @@ Options **GPGKEY=**"":: Specify a key to use for gpg signing instead of the default key in the - keyring. Can be overridden with makepkg's `--key` option. + keyring. Can be overridden with makepkg's '\--key' option. **OPTIONS=(**strip docs libtool emptydirs zipman purge !upx**)**:: This array contains options that affect the default packaging. They are -- 1.7.6
participants (1)
-
Dan McGee