summaryrefslogtreecommitdiff
path: root/docs
diff options
context:
space:
mode:
authorAllan Nordhøy <epost@anotheragency.no>2020-11-18 09:44:52 +0000
committerGitHub <noreply@github.com>2020-11-18 09:44:52 +0000
commitd4069c50486e67d39cd0fc06ada10d2ae610e6a1 (patch)
tree8a1772d5d254ec0af7563fb582f8dc6f3dfaf9d7 /docs
parentc26f3e68687b83c61f9cfda7755a052e39519565 (diff)
downloadonionshare-d4069c50486e67d39cd0fc06ada10d2ae610e6a1.tar.gz
onionshare-d4069c50486e67d39cd0fc06ada10d2ae610e6a1.zip
Changed "Snap", "as", "and", in source doc
Diffstat (limited to 'docs')
-rw-r--r--docs/source/install.rst16
1 files changed, 8 insertions, 8 deletions
diff --git a/docs/source/install.rst b/docs/source/install.rst
index adcc8efd..51f1e7fc 100644
--- a/docs/source/install.rst
+++ b/docs/source/install.rst
@@ -11,16 +11,16 @@ 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 newest version 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 `Snap <https://snapcraft.io/>`_ package.
+Flatpak and Snap 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.
+Snap support is built-in to Ubuntu and Fedora comes with Flatpak support, but which you use is up to you. Both work in all Linux distributions.
**Install OnionShare using Flatpak**: https://flathub.org/apps/details/org.onionshare.OnionShare
-**Install OnionShare using Snapcraft**: https://snapcraft.io/onionshare
+**Install OnionShare using Snap**: https://snapcraft.io/onionshare
-You can also download and install a PGP-signed ``.flatpak`` or ``.snap`` packages from https://onionshare.org/dist/ if you prefer.
+You can also download and install PGP-signed ``.flatpak`` or ``.snap`` packages from https://onionshare.org/dist/ if you prefer.
.. _verifying_sigs:
@@ -40,13 +40,13 @@ You must have GnuPG installed to verify signatures. For macOS you probably want
Signatures
^^^^^^^^^^
-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 find the signatures (as ``.asc`` files), as well as Windows, macOS, Flatpak, Snap, 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 a terminal like this::
+Once you have imported Micah's public key into your GnuPG keychain, downloaded the binary and and ``.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
@@ -66,6 +66,6 @@ The expected output looks 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', 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 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://support.torproject.org/tbb/how-to-verify-signature/>`_ may be helpful.