diff options
| author | Dan McGee <dan@archlinux.org> | 2012-03-08 18:08:15 -0600 |
|---|---|---|
| committer | Dan McGee <dan@archlinux.org> | 2012-03-08 18:08:15 -0600 |
| commit | 8de0631edbd1fd7681f6a924f5e166621328c13f (patch) | |
| tree | 228db78143b109eeafdcd386354a2e09f561c854 /doc | |
| parent | f34864cc9e4e755f2add7581419f4ec1c2525fe0 (diff) | |
| parent | 1a8c3e52d70bfa21ba108aa77179adf90401949d (diff) | |
Merge branch 'maint'
Conflicts:
lib/libalpm/be_package.c
Diffstat (limited to 'doc')
| -rw-r--r-- | doc/pacman-key.8.txt | 5 |
1 files changed, 0 insertions, 5 deletions
diff --git a/doc/pacman-key.8.txt b/doc/pacman-key.8.txt index 1582a3ca..3631ec8c 100644 --- a/doc/pacman-key.8.txt +++ b/doc/pacman-key.8.txt @@ -129,11 +129,6 @@ any signing", so should be used with prudence. A key being marked as revoked will be disabled in the keyring and no longer treated as valid, so this always takes priority over it's trusted state in any other keyring. -All files are required to be signed (detached) by a trusted PGP key that the -user must manually import to the pacman keyring. This prevents a potentially -malicious repository adding keys to the pacman keyring without the users -knowledge. - See Also -------- |