summaryrefslogtreecommitdiff
path: root/docs
diff options
context:
space:
mode:
authorMicah Lee <micah@micahflee.com>2020-11-15 14:00:36 -0800
committerMicah Lee <micah@micahflee.com>2020-11-15 14:00:36 -0800
commitf288089c86aa8b804d944d0750c82e93f95a2338 (patch)
tree898df1bb4771e04573ba4dd54ba239b281ea3692 /docs
parent0931f70a443f8c7f7c64cc8e41c3a11150870272 (diff)
parent72e115b15eb17c4a6c4f965e46c1f1e7b1f5f84f (diff)
downloadonionshare-f288089c86aa8b804d944d0750c82e93f95a2338.tar.gz
onionshare-f288089c86aa8b804d944d0750c82e93f95a2338.zip
More updates to install docs
Diffstat (limited to 'docs')
-rw-r--r--docs/source/install.rst25
1 files changed, 14 insertions, 11 deletions
diff --git a/docs/source/install.rst b/docs/source/install.rst
index 51e000de..adcc8efd 100644
--- a/docs/source/install.rst
+++ b/docs/source/install.rst
@@ -1,8 +1,8 @@
Installation
============
-Install on Windows or macOS
----------------------------
+Windows or macOS
+----------------
You can download OnionShare for Windows and macOS from the `OnionShare website <https://onionshare.org/>`_.
@@ -11,7 +11,8 @@ You can download OnionShare for Windows and macOS from the `OnionShare website <
Install in Linux
----------------
-There are various ways to install OnionShare for Linux, but the recommended way is to use either the `Flatpak <https://flatpak.org/>`_ or the `Snapcraft <https://snapcraft.io/>`_ package. Flatpak and Snapcraft ensure that you'll always use the most latest dependencies and run OnionShare inside of a sandbox.
+There are various ways to install OnionShare for Linux, but the recommended way is to use either the `Flatpak <https://flatpak.org/>`_ or the `Snapcraft <https://snapcraft.io/>`_ package.
+Flatpak and Snapcraft ensure that you'll always use the newest version and run OnionShare inside of a sandbox.
Snapcraft is built-in to Ubuntu and Flatpak is built-in to Fedora, but which you use is up to you. Both work in all Linux distributions.
@@ -26,32 +27,34 @@ You can also download and install a PGP-signed ``.flatpak`` or ``.snap`` package
Verifying PGP signatures
------------------------
-You can verify that the Windows, macOS, Flatpak, Snapcraft, or source package you download is legitimate and hasn't been tampered with by verifying its PGP signature. For Windows and macOS, this step is optional and provides defense in depth: the installers also include their operating system-specific signatures, and you can just rely on those alone if you'd like.
+You can verify that the package you download is legitimate and hasn't been tampered with by verifying its PGP signature.
+For Windows and macOS, this step is optional and provides defense in depth: the OnionShare binaries include operating system-specific signatures, and you can just rely on those alone if you'd like.
Signing key
^^^^^^^^^^^
Packages are signed by Micah Lee, the core developer, using his PGP public key with fingerprint ``927F419D7EC82C2F149C1BD1403C2657CD994F73``. You can download Micah's key `from the keys.openpgp.org keyserver <https://keys.openpgp.org/vks/v1/by-fingerprint/927F419D7EC82C2F149C1BD1403C2657CD994F73>`_.
-In order to verify signatures, you must have GnuPG installed. For macOS you probably want `GPGTools <https://gpgtools.org/>`_, and for Windows you probably want `Gpg4win <https://www.gpg4win.org/>`_.
+You must have GnuPG installed to verify signatures. For macOS you probably want `GPGTools <https://gpgtools.org/>`_, and for Windows you probably want `Gpg4win <https://www.gpg4win.org/>`_.
Signatures
^^^^^^^^^^
-You can find the signatures (``.asc`` files), as well as Windows, macOS, and source packages, at https://onionshare.org/dist/ in the folders named for each version of OnionShare. You can also find them on the `GitHub Releases page <https://github.com/micahflee/onionshare/releases>`_.
+You can find the signatures (``.asc`` files), as well as Windows, macOS, Flatpak, Snapcraft, and source packages, at https://onionshare.org/dist/ in the folders named for each version of OnionShare.
+You can also find them on the `GitHub Releases page <https://github.com/micahflee/onionshare/releases>`_.
Verifying
^^^^^^^^^
-Once you have imported Micah's public key into your GnuPG keychain, downloaded the binary, and downloaded the ``.asc`` signature, you can verify the binary for macOS in terminal like this::
+Once you have imported Micah's public key into your GnuPG keychain, downloaded the binary, and downloaded the ``.asc`` signature, you can verify the binary for macOS in a terminal like this::
gpg --verify OnionShare-2.2.pkg.asc OnionShare-2.2.pkg
-Or for Windows in a command prompt like this::
+Or for Windows, in a command-prompt like this::
gpg.exe --verify onionshare-2.2-setup.exe.asc onionshare-2.2-setup.exe
-An expected output might look like this::
+The expected output looks like this::
gpg: Signature made Tue 19 Feb 2019 09:25:28 AM AEDT using RSA key ID CD994F73
gpg: Good signature from "Micah Lee <micah@micahflee.com>"
@@ -63,6 +66,6 @@ An expected output might look like this::
gpg: There is no indication that the signature belongs to the owner.
Primary key fingerprint: 927F 419D 7EC8 2C2F 149C 1BD1 403C 2657 CD99 4F73
-If you don't see 'Good signature from', then there might be a problem with the integrity of the file (malicious or otherwise), and you perhaps should not install the package. (The WARNING shown above, is not a problem with the package: it only means you have not defined any level of 'trust' regarding Micah's PGP key itself.)
+If you don't see 'Good signature from', there might be a problem with the integrity of the file (malicious or otherwise), and you should not install the package. (The WARNING shown above, is not a problem with the package: it only means you haven't already defined any level of 'trust' of Micah's PGP key.)
-If you want to learn more about verifying PGP signatures, guides for `Qubes OS <https://www.qubes-os.org/security/verifying-signatures/>`_ and the `Tor Project <https://2019.www.torproject.org/docs/verifying-signatures.html.en>`_ may be helpful. \ No newline at end of file
+If you want to learn more about verifying PGP signatures, guides for `Qubes OS <https://www.qubes-os.org/security/verifying-signatures/>`_ and the `Tor Project <https://support.torproject.org/tbb/how-to-verify-signature/>`_ may be helpful.