</div>
-<p><a
-href="https://crm.fsf.org/civicrm/contribute/transact?reset=1&id=14&mtm_campaign=email_self_defense&mtm_kwd=guide_donate"><img
-alt="Donate"
-src="../static/img/en/donate.png" /></a></p>
+<center><p><a href="https://crm.fsf.org/civicrm/contribute/transact?reset=1&id=14&mtm_campaign=email_self_defense&mtm_kwd=guide_donate"><img alt="Donate" src="../static/img/en/donate.png" style="img align: center;"/></a></p></center>
+
+<div style="text-align: center;">
+<h5>Sign up</h5>
+<form action="https://my.fsf.org/civicrm/profile/create?reset=1&gid=31" method="post">
+<p>Enter your email address to receive our monthly newsletter, the<br><a href="https://www.fsf.org/free-software-supporter/">Free Software Supporter</a></p>
+
+<p><input id="frmEmail" type="text" name="email-Primary" size="18" maxlength="80" /></p>
+<p><input type="submit" name="_qf_Edit_next" value="Subscribe me" /></p>
+<div><input name="postURL" type="hidden" value="" />
+<input type="hidden" name="group[25]" value="1" />
+<input name="cancelURL" type="hidden" value="https://my.fsf.org/civicrm/profile?reset=1&gid=31" />
+<input name="_qf_default" type="hidden" value="Edit:cancel" />
+</div>
+</form></div>
</div><!-- End #fsf-intro -->
<p># Enter the following keysize: <code>4096</code> for a strong key.</p>
<p># Choose the expiration date; we suggest <code>2y</code> (2 years).</p>
<p>Follow the prompts to continue setting up with your personal details.</p>
+<p class="notes"> Depending on your version of GPG, you may need to use
+<code>--gen-key</code> instead of <code>--full-generate-key</code>.</p>
<h4>Set your passphrase</h4>
<p>On the screen titled "Passphrase," pick a strong password! You can
<samp>Command 'gpg' not found, but can be installed with:
sudo apt install gnupg</samp>. Follow that command and install the program.</dd>
-<dt><code>gpg --full-generate-key</code> command not working</dt>
-<dd>Some distributions use a different version of GPG. When you receive an error code that is something along the lines of:<code>gpg: Invalid option "--full-generate-key"</code> , you can try the following commands: <br />
-<code>sudo apt update</code><br />
-<code>sudo apt install gnupg2</code><br />
-<code>gpg2 --full-generate-key</code><br />
-If this resolved the issue, you need to continue to use this the gpg2 identifier instead of gpg throughout the following steps of the guide.</dd>
+<dt><i>gpg --full-generate-key</i> command not working</dt>
+<dd>Some distributions use a different version of GPG. When you receive an error code that is something along the lines of: <samp>gpg: Invalid option "--full-generate-key"</samp>, you can try the following commands: <br />
+<code>sudo apt update</code><br />
+<code>sudo apt install gnupg2</code><br />
+<code>gpg2 --full-generate-key</code><br />
+If this resolved the issue, you need to continue to use the gpg2 identifier instead of gpg throughout the following steps of the guide.
+<p class="notes"> Depending on your version of GPG, you may need to use
+<code>--gen-key</code> instead of <code>--full-generate-key</code>.</p>
+</dd>
<dt>I took too long to create my passphrase</dt>
<dd>That's okay. It's important to think about your passphrase. When you're ready, just follow the steps from the beginning again to create your key.</dd>
<h4>Upload your key to a keyserver</h4>
<p>We will upload your key to a keyserver, so if someone wants to send you an encrypted message, they can download your public key from the Internet. There are multiple keyservers
-that you can select from the menu when you upload, but they are all copies
-of each other, so it doesn't matter which one you use. However, it sometimes
-takes a few hours for them to match each other when a new key is uploaded.</p>
+that you can select from the menu when you upload, but they are mostly all copies
+of each other. Any server will work, but it's good to remember which one you uploaded your key to originally. Also keep in mind, sometimes takes a few hours for them to match each other when a new key is uploaded.</p>
<p># Copy your keyID: <code>gpg --list-key [your@email]</code> will list your public ("pub") key information, including your keyID, which is a unique list of numbers and letters. Copy this keyID, so you can use it in the following command.</p>
<p># Upload your key to a server:
<code>gpg --send-key [keyID]</code></p>
<h4>Troubleshooting</h4>
<dl>
+<dt>Sending my key to the keyserver is not working</dt>
+<dd>Instead of using the general command to upload your key to the keyserver, you can use a more specific command and add the keyserver to your command <code>gpg --keyserver keys.openpgp.org --send-key [keyID]</code>.</dd>
+
<dt>My key doesn't seem to be working or I get a "permission denied."</dt>
<dd><p>Like every other file or folder, gpg keys are subject to permissions. If these are not set correctly, your system may not be accepting your keys. You can follow the next steps to check, and update to the right permissions.</p>
<p class="notes">If you have (for any reason) created your own folders inside ~/.gnupg, you must also additionally apply execute permissions to that folder. Folders require execution privileges to be opened. For more information on permissions, you can check out <a href="https://helpdeskgeek.com/linux-tips/understanding-linux-permissions-chmod-usage/">this detailed information guide</a>.</p>
</dd>
+
<dt class="feedback">Don't see a solution to your problem?</dt>
<dd class="feedback">Please let us know on the <a
href="https://libreplanet.org/wiki/GPG_guide/Public_Review">feedback
<dl>
<dt>"Recipients not valid, not trusted or not found"</dt>
-<dd>You could get the above error message, or something along these lines: "Unable to send this message with end-to-end encryption, because there are problems with the keys of the following recipients: ..." In these cases, you may be trying to send an encrypted email to someone when you do not have their public key yet. Make sure you follow the steps above to import the key to your key manager. Open OpenPGP Key Manager to make sure the recipient is listed there.</dd>
+<dd>You could get the above error message, or something along these lines: "Unable to send this message with end-to-end encryption, because there are problems with the keys of the following recipients: ..." In these cases, you may be trying to send an encrypted email to someone when you do not have their public key yet. Make sure you follow the steps above to import the key to your key manager. Open the OpenPGP Key Manager to make sure the recipient is listed there.</dd>
<dt>Unable to send message</dt>
<dd>You could get the following message when trying to send your encrypted email: "Unable to send this message with end-to-end encryption, because there are problems with the keys of the following recipients: edward-en@fsf.org." This usually means you imported the key with the "unaccepted (unverified) option." Go to the "key properties" of this key by right clicking on the key in the OpenPGP Key Manager, and select the option <i>Yes, but I have not verified that this is the correct key</i> in the "Acceptance" option at the bottom of this window. Resend the email.</dd>
<dt>I can't find Edward's key</dt>
<dd>Close the pop-ups that have appeared since you clicked Send. Make sure
-you are connected to the Internet and try again. If that doesn't work, you can download the key manually from <a href="https://keys.openpgp.org/search?q=edward-en%40fsf.org">the keyserver</a>, and import it by using the <i>Import Public Key(s) from File</i> option in the <i>OpenPGP Key Manager</i>.</dd>
+you are connected to the Internet and try again. If that doesn't work, you can download the key manually from <a href="https://keys.openpgp.org/search?q=edward-en%40fsf.org">the keyserver</a>, and import it by using the <i>Import Public Key(s) from File</i> option in the OpenPGP Key Manager.</dd>
<dt>Unscrambled messages in the Sent folder</dt>
<dd>Even though you can't decrypt messages encrypted to someone else's key,
projects / enc.git / blobdiff