summaryrefslogtreecommitdiffstats
path: root/wiki/src/doc/encryption_and_privacy/gpgapplet.mdwn
diff options
context:
space:
mode:
authorTails developers <amnesia@boum.org>2012-10-09 23:35:06 +0200
committerTails developers <amnesia@boum.org>2012-10-09 23:35:06 +0200
commit39d1966e61a9a6805238eec4f3364712647b6c1a (patch)
tree221dcbf525c3aeaf6648db422d3c8912e3f4365b /wiki/src/doc/encryption_and_privacy/gpgapplet.mdwn
parent8365f3723e3b009dc872b0633e2bf4b218d532cc (diff)
parentc0700691af0554eceefd219c42868634d840ea5d (diff)
Merge remote-tracking branch 'origin/devel' into devel0.14-rc1
Diffstat (limited to 'wiki/src/doc/encryption_and_privacy/gpgapplet.mdwn')
-rw-r--r--wiki/src/doc/encryption_and_privacy/gpgapplet.mdwn2
1 files changed, 1 insertions, 1 deletions
diff --git a/wiki/src/doc/encryption_and_privacy/gpgapplet.mdwn b/wiki/src/doc/encryption_and_privacy/gpgapplet.mdwn
index ab17723..5d49ebe 100644
--- a/wiki/src/doc/encryption_and_privacy/gpgapplet.mdwn
+++ b/wiki/src/doc/encryption_and_privacy/gpgapplet.mdwn
@@ -13,5 +13,5 @@ text"]]
With <span class="application">Tails gpgApplet</span> you can:
- [[Encrypt text with a passphrase|encryption_and_privacy/gpgapplet/passphrase_encryption]]
- - [[Encrypt and sign text with a public key|encryption_and_privacy/gpgapplet/public-key_encryption]]
+ - [[Encrypt and sign text with a public key|encryption_and_privacy/gpgapplet/public-key_cryptography]]
- [[Decrypt and verify text|encryption_and_privacy/gpgapplet/decrypt_verify]]