summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authoranonym <anonym@riseup.net>2015-05-11 20:36:05 +0200
committeranonym <anonym@riseup.net>2015-05-11 20:36:05 +0200
commitbe3d7d588fa4ddbac08531f7b0f5ec5af45a99c9 (patch)
tree3bdb66d395264800aed84f46c4b1e4ee6fa3db8b
parent3303dc76852f7fd26eb24052164878488c02d263 (diff)
parentd9e99322b9a7ccc5cac9dcdec0fd0fae9b11bcff (diff)
Merge remote-tracking branch 'origin/testing' into testing
-rw-r--r--wiki/src/doc/encryption_and_privacy/gpgapplet/passphrase_encryption.mdwn8
-rw-r--r--wiki/src/doc/encryption_and_privacy/gpgapplet/public-key_cryptography.mdwn8
2 files changed, 6 insertions, 10 deletions
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 23b028c..f266c26 100644
--- a/wiki/src/doc/encryption_and_privacy/gpgapplet/passphrase_encryption.mdwn
+++ b/wiki/src/doc/encryption_and_privacy/gpgapplet/passphrase_encryption.mdwn
@@ -16,11 +16,9 @@ cryptography to send confidential messages without having a shared passphrase.
1. Write your text in a text editor. **Do not write it in the web browser!**
- For example, open <span class="application">gedit</span> from the menu
- <span class="menuchoice">
- <span class="guimenu">Applications</span>&nbsp;▸
- <span class="guisubmenu">Accessories</span>&nbsp;▸
- <span class="guimenuitem">gedit Text Editor</span></span>.
+ Click on <span class="application">Tails OpenPGP Applet</span> and
+ choose <span class="guimenuitem">Open Text Editor</span> to open
+ <span class="application">gedit</span>.
2. Select with the mouse the text that you want to encrypt. To copy it
into the [[!wikipedia Clipboard_(computing) desc="clipboard"]],
diff --git a/wiki/src/doc/encryption_and_privacy/gpgapplet/public-key_cryptography.mdwn b/wiki/src/doc/encryption_and_privacy/gpgapplet/public-key_cryptography.mdwn
index 1ee310a..88fec19 100644
--- a/wiki/src/doc/encryption_and_privacy/gpgapplet/public-key_cryptography.mdwn
+++ b/wiki/src/doc/encryption_and_privacy/gpgapplet/public-key_cryptography.mdwn
@@ -17,11 +17,9 @@ documentation.|gpgapplet/passphrase_encryption]]
1. Write your text in a text editor. **Do not write it in the web browser!**
- For example, open <span class="application">gedit</span> from the menu
- <span class="menuchoice">
- <span class="guimenu">Applications</span>&nbsp;▸
- <span class="guisubmenu">Accessories</span>&nbsp;▸
- <span class="guimenuitem">gedit Text Editor</span></span>.
+ Click on <span class="application">Tails OpenPGP Applet</span> and
+ choose <span class="guimenuitem">Open Text Editor</span> to open
+ <span class="application">gedit</span>.
2. Select with the mouse the text that you want to encrypt or sign. To
copy it into the [[!wikipedia Clipboard_(computing) desc="clipboard"]],