summaryrefslogtreecommitdiffstats
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
parent8365f3723e3b009dc872b0633e2bf4b218d532cc (diff)
parentc0700691af0554eceefd219c42868634d840ea5d (diff)
Merge remote-tracking branch 'origin/devel' into devel0.14-rc1
-rw-r--r--wiki/src/.htaccess3
-rw-r--r--wiki/src/doc/encryption_and_privacy.index.mdwn2
-rw-r--r--wiki/src/doc/encryption_and_privacy/FireGPG_susceptible_to_devastating_attacks.mdwn2
-rw-r--r--wiki/src/doc/encryption_and_privacy/gpgapplet.mdwn2
-rw-r--r--wiki/src/doc/encryption_and_privacy/gpgapplet/decrypt_verify.mdwn2
-rw-r--r--wiki/src/doc/encryption_and_privacy/gpgapplet/passphrase_encryption.mdwn4
-rw-r--r--wiki/src/doc/encryption_and_privacy/gpgapplet/public-key_cryptography.de.po (renamed from wiki/src/doc/encryption_and_privacy/gpgapplet/public-key_encryption.de.po)0
-rw-r--r--wiki/src/doc/encryption_and_privacy/gpgapplet/public-key_cryptography.es.po (renamed from wiki/src/doc/encryption_and_privacy/gpgapplet/public-key_encryption.es.po)0
-rw-r--r--wiki/src/doc/encryption_and_privacy/gpgapplet/public-key_cryptography.fr.po (renamed from wiki/src/doc/encryption_and_privacy/gpgapplet/public-key_encryption.fr.po)0
-rw-r--r--wiki/src/doc/encryption_and_privacy/gpgapplet/public-key_cryptography.mdwn (renamed from wiki/src/doc/encryption_and_privacy/gpgapplet/public-key_encryption.mdwn)6
-rw-r--r--wiki/src/doc/encryption_and_privacy/gpgapplet/public-key_cryptography.pt.po (renamed from wiki/src/doc/encryption_and_privacy/gpgapplet/public-key_encryption.pt.po)0
11 files changed, 11 insertions, 10 deletions
diff --git a/wiki/src/.htaccess b/wiki/src/.htaccess
index 8af7fc2..52fe341 100644
--- a/wiki/src/.htaccess
+++ b/wiki/src/.htaccess
@@ -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]
diff --git a/wiki/src/doc/encryption_and_privacy.index.mdwn b/wiki/src/doc/encryption_and_privacy.index.mdwn
index 33c36fd..9c7632b 100644
--- a/wiki/src/doc/encryption_and_privacy.index.mdwn
+++ b/wiki/src/doc/encryption_and_privacy.index.mdwn
@@ -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]]
diff --git a/wiki/src/doc/encryption_and_privacy/FireGPG_susceptible_to_devastating_attacks.mdwn b/wiki/src/doc/encryption_and_privacy/FireGPG_susceptible_to_devastating_attacks.mdwn
index 7453578..22078d2 100644
--- a/wiki/src/doc/encryption_and_privacy/FireGPG_susceptible_to_devastating_attacks.mdwn
+++ b/wiki/src/doc/encryption_and_privacy/FireGPG_susceptible_to_devastating_attacks.mdwn
@@ -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]]
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]]
diff --git a/wiki/src/doc/encryption_and_privacy/gpgapplet/decrypt_verify.mdwn b/wiki/src/doc/encryption_and_privacy/gpgapplet/decrypt_verify.mdwn
index 2e66450..43ef1e3 100644
--- a/wiki/src/doc/encryption_and_privacy/gpgapplet/decrypt_verify.mdwn
+++ b/wiki/src/doc/encryption_and_privacy/gpgapplet/decrypt_verify.mdwn
@@ -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
diff --git a/wiki/src/doc/encryption_and_privacy/gpgapplet/passphrase_encryption.mdwn b/wiki/src/doc/encryption_and_privacy/gpgapplet/passphrase_encryption.mdwn
index f03689c..0690e04 100644
--- a/wiki/src/doc/encryption_and_privacy/gpgapplet/passphrase_encryption.mdwn
+++ b/wiki/src/doc/encryption_and_privacy/gpgapplet/passphrase_encryption.mdwn
@@ -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>
diff --git a/wiki/src/doc/encryption_and_privacy/gpgapplet/public-key_encryption.de.po b/wiki/src/doc/encryption_and_privacy/gpgapplet/public-key_cryptography.de.po
index fbe2bde..fbe2bde 100644
--- a/wiki/src/doc/encryption_and_privacy/gpgapplet/public-key_encryption.de.po
+++ b/wiki/src/doc/encryption_and_privacy/gpgapplet/public-key_cryptography.de.po
diff --git a/wiki/src/doc/encryption_and_privacy/gpgapplet/public-key_encryption.es.po b/wiki/src/doc/encryption_and_privacy/gpgapplet/public-key_cryptography.es.po
index 305c8c9..305c8c9 100644
--- a/wiki/src/doc/encryption_and_privacy/gpgapplet/public-key_encryption.es.po
+++ b/wiki/src/doc/encryption_and_privacy/gpgapplet/public-key_cryptography.es.po
diff --git a/wiki/src/doc/encryption_and_privacy/gpgapplet/public-key_encryption.fr.po b/wiki/src/doc/encryption_and_privacy/gpgapplet/public-key_cryptography.fr.po
index 3205403..3205403 100644
--- a/wiki/src/doc/encryption_and_privacy/gpgapplet/public-key_encryption.fr.po
+++ b/wiki/src/doc/encryption_and_privacy/gpgapplet/public-key_cryptography.fr.po
diff --git a/wiki/src/doc/encryption_and_privacy/gpgapplet/public-key_encryption.mdwn b/wiki/src/doc/encryption_and_privacy/gpgapplet/public-key_cryptography.mdwn
index 1e79d4d..7c14ee9 100644
--- a/wiki/src/doc/encryption_and_privacy/gpgapplet/public-key_encryption.mdwn
+++ b/wiki/src/doc/encryption_and_privacy/gpgapplet/public-key_cryptography.mdwn
@@ -1,4 +1,4 @@
-[[!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>
diff --git a/wiki/src/doc/encryption_and_privacy/gpgapplet/public-key_encryption.pt.po b/wiki/src/doc/encryption_and_privacy/gpgapplet/public-key_cryptography.pt.po
index 0e6eb89..0e6eb89 100644
--- a/wiki/src/doc/encryption_and_privacy/gpgapplet/public-key_encryption.pt.po
+++ b/wiki/src/doc/encryption_and_privacy/gpgapplet/public-key_cryptography.pt.po