Commit c0700691 authored by Tails developers's avatar Tails developers

doc: Change public-key encryption → public-key cryptography

parent bf19324c
......@@ -25,4 +25,5 @@ RewriteRule ^doc/first_steps/windows_theme doc/first_steps/startup_options/windo
RewriteRule ^doc/trusting_tails_signing_key doc/get/trusting_tails_signing_key [R]
RewriteRule ^doc/first_steps/report_a_bug doc/first_steps/bug_reporting [R]
RewriteRule ^doc/encryption_and_privacy/your_data_wont_be_saved_unless_explicitely_asked doc/encryption_and_privacy/your_data_wont_be_saved_unless_explicitly_asked [R]
RewriteRule ^doc/encryption_and_privacy/openpgp_with_gedit doc/encryption_and_privacy/openpgp_public-key_encryption [R]
RewriteRule ^doc/encryption_and_privacy/openpgp_passphrase_encryption doc/encryption_and_privacy/gpgapplet/passphrase_encryption [R]
RewriteRule ^doc/encryption_and_privacy/openpgp_with_gedit doc/encryption_and_privacy/gpgapplet/public-key_cryptography [R]
......@@ -4,6 +4,6 @@
- [[!traillink TrueCrypt|encryption_and_privacy/truecrypt]]
- [[!traillink Encrypt,_decrypt,_sign,_and_verify_text_using_OpenPGP_and_<span_class="application">Tails_gpgApplet</span>|encryption_and_privacy/gpgapplet]]
- [[!traillink Encrypt_text_with_a_passphrase|encryption_and_privacy/gpgapplet/passphrase_encryption]]
- [[!traillink Encrypt_and_sign_text_using_public-key_encryption|encryption_and_privacy/gpgapplet/public-key_encryption]]
- [[!traillink Encrypt_and_sign_text_using_public-key_cryptography|encryption_and_privacy/gpgapplet/public-key_cryptography]]
- [[!traillink Decrypt_and_verify_text|encryption_and_privacy/gpgapplet/decrypt_verify]]
- [[!traillink Securely_delete_files_and_clean_diskspace_using_Nautilus_Wipe|encryption_and_privacy/secure_deletion]]
......@@ -5,7 +5,7 @@
You should instead use our custom GPG applet to:
- [[Encrypt text with a passphrase|encryption_and_privacy/gpgapplet/passphrase_encryption]]
- [[Encrypt and sign text using public-key encryption|encryption_and_privacy/gpgapplet/public-key_encryption]]
- [[Encrypt and sign text using public-key cryptography|encryption_and_privacy/gpgapplet/public-key_cryptography]]
- [[Decrypt and verify text|encryption_and_privacy/gpgapplet/decrypt_verify]]
[[!toc levels=2]]
......
......@@ -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]]
......@@ -41,7 +41,7 @@ in step 6 appears directly.
the passphrase that has been used to encrypt the text and click <span
class="guilabel">OK</span>.
If the text is encrypted using public-key encryption, three different
If the text is encrypted using public-key cryptography, three different
dialog boxes can appear.
a. If the passphrase for the corresponding private key is not already cached
......
......@@ -9,8 +9,8 @@ with a passphrase** using the passphrase encryption of OpenPGP.
<strong>This technique requires you to share a secret passphrase with the people
who will decrypt the text.</strong> OpenPGP also allows you to use public-key
encryption to send confidential messages without having a shared passphrase.
[[See the corresponding documentation.|gpgapplet/public-key_encryption]]
cryptography to send confidential messages without having a shared passphrase.
[[See the corresponding documentation.|gpgapplet/public-key_cryptography]]
</div>
......
[[!meta title="OpenPGP public-key encryption"]]
[[!meta title="OpenPGP public-key cryptography"]]
With <span class="application">Tails gpgApplet</span> you can **encrypt or sign
text using the public key encryption of OpenPGP**.
......@@ -8,7 +8,7 @@ text using the public key encryption of OpenPGP**.
<div class="note">
<strong>This technique requires you to use public-key
encryption.</strong> If you never used OpenPGP keys before, you might
cryptography.</strong> If you never used OpenPGP keys before, you might
rather want to encrypt your text using a passphrase with OpenPGP
passphrase encryption. [[See the corresponding
documentation.|gpgapplet/passphrase_encryption]]
......@@ -86,7 +86,7 @@ class="guimenuitem">Paste</span> from the menu.
<div class="next">
You can also [[decrypt or verify a text that is encrypted or signed using
public-key encryption|decrypt_verify]] using <span class="application">Tails
public-key cryptography|decrypt_verify]] using <span class="application">Tails
gpgApplet</span>.
</div>
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment