Version bump to 2.3.dev2, and update Linux installation in docs

12 files changed, 31 insertions, 28 deletions

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 272f8efc..c64fee9e 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -7,7 +7,7 @@
 * New feature: All new design
 * New feature: Ability to display QR codes of OnionShare addresses
 * New feature: Web apps have responsive design and look better on mobile
-* New feature: Flatpak packaging for Linux
+* New feature: Flatpak and Snapcraft packaging for Linux
 * Several bug fixes
 
 ## 2.2
diff --git a/RELEASE.md b/RELEASE.md
index 3bf24a6b..d0c31770 100644
--- a/RELEASE.md
+++ b/RELEASE.md
@@ -12,6 +12,16 @@ Before making a release, you must update the version in these places:
 - [ ] `desktop/pyproject.toml` (under `version` and the `./onionshare_cli-$VERSION-py3-none-any.whl` dependency)
 - [ ] `desktop/src/setup.py`
 - [ ] `docs/source/conf.py`
+- [ ] `snap/snapcraft.yaml`
+
+Update the documentation:
+
+- [ ] Update all of the documentation in `docs` to cover new features, including taking new screenshots if necessary
+
+You also must edit these files:
+
+- [ ] `desktop/src/org.onionshare.OnionShare.appdata.xml` should have the correct version, release date, and links to correct screenshots
+- [ ] `CHANGELOG.md` should be updated to include a list of all major changes since the last release
 
 Make sure snapcraft packaging works. In `snap/snapcraft.yaml`:
 
@@ -47,15 +57,6 @@ mv python3-modules.json onionshare.json
 # - onionshare.json
 ```
 
-Update the documentation:
-
-- [ ] Update all of the documentation in `docs` to cover new features, including taking new screenshots if necessary
-
-You also must edit these files:
-
-- [ ] `desktop/install/org.onionshare.OnionShare.appdata.xml` should have the correct release date, and links to correct screenshots
-- [ ] `CHANGELOG.md` should be updated to include a list of all major changes since the last release
-
 Finally:
 
 - [ ] There must be a PGP-signed git tag for the version, e.g. for OnionShare 2.1, the tag must be `v2.1`
diff --git a/cli/onionshare_cli/resources/version.txt b/cli/onionshare_cli/resources/version.txt
index 4804c3be..355ca743 100644
--- a/cli/onionshare_cli/resources/version.txt
+++ b/cli/onionshare_cli/resources/version.txt
@@ -1 +1 @@
-2.3.dev1
\ No newline at end of file
+2.3.dev2
\ No newline at end of file
diff --git a/cli/pyproject.toml b/cli/pyproject.toml
index fc748a7c..9946ab62 100644
--- a/cli/pyproject.toml
+++ b/cli/pyproject.toml
@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "onionshare_cli"
-version = "2.3.dev1"
+version = "2.3.dev2"
 description = "OnionShare lets you securely and anonymously send and receive files. It works by starting a web server, making it accessible as a Tor onion service, and generating an unguessable web address so others can download files from you, or upload files to you. It does _not_ require setting up a separate server or using a third party file-sharing service."
 authors = ["Micah Lee <micah@micahflee.com>"]
 license = "GPLv3+"
diff --git a/cli/setup.py b/cli/setup.py
index 0ee54c6a..1ebe028c 100644
--- a/cli/setup.py
+++ b/cli/setup.py
@@ -25,7 +25,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 import os
 import setuptools
 
-version = "2.3.dev1"
+version = "2.3.dev2"
 
 setuptools.setup(
     name="onionshare-cli",
diff --git a/desktop/pyproject.toml b/desktop/pyproject.toml
index 494873fb..d5de5461 100644
--- a/desktop/pyproject.toml
+++ b/desktop/pyproject.toml
@@ -1,7 +1,7 @@
 [tool.briefcase]
 project_name = "OnionShare"
 bundle = "org.onionshare"
-version = "2.3.dev1"
+version = "2.3.dev2"
 url = "https://onionshare.org"
 license = "GPLv3"
 author = 'Micah Lee'
diff --git a/desktop/src/org.onionshare.OnionShare.appdata.xml b/desktop/src/org.onionshare.OnionShare.appdata.xml
index 3630b89c..835b4877 100644
--- a/desktop/src/org.onionshare.OnionShare.appdata.xml
+++ b/desktop/src/org.onionshare.OnionShare.appdata.xml
@@ -24,6 +24,6 @@
     <update_contact>micah@micahflee.com</update_contact>
     <content_rating type="oars-1.1" />
     <releases>
-        <release type="development" date="2020-09-20" version="2.3.dev1" />
+        <release type="development" date="2020-11-08" version="2.3.dev2" />
     </releases>
 </component>
diff --git a/desktop/src/setup.py b/desktop/src/setup.py
index d4ff13af..eb09c101 100644
--- a/desktop/src/setup.py
+++ b/desktop/src/setup.py
@@ -25,7 +25,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 import os
 import setuptools
 
-version = "2.3.dev1"
+version = "2.3.dev2"
 
 setuptools.setup(
     name="onionshare",
diff --git a/docs/pyproject.toml b/docs/pyproject.toml
index 9cc7bcc2..1b1cb289 100644
--- a/docs/pyproject.toml
+++ b/docs/pyproject.toml
@@ -5,7 +5,7 @@ description = ""
 authors = ["Micah Lee <micah@micahflee.com>"]
 
 [tool.poetry.dependencies]
-python = "~3.6"
+python = "^3.6"
 sphinx = "^3.2.1"
 sphinx-rtd-theme = "^0.5.0"
 sphinx-intl = "^2.0.1"
diff --git a/docs/source/conf.py b/docs/source/conf.py
index a8d0393e..ac8bd793 100644
--- a/docs/source/conf.py
+++ b/docs/source/conf.py
@@ -16,7 +16,7 @@ languages = [
     ("Українська", "uk"),
 ]
 
-versions = ["2.3"]
+versions = ["2.3.dev2"]
 
 html_theme = "sphinx_rtd_theme"
 html_logo = "_static/logo.png"
diff --git a/docs/source/install.rst b/docs/source/install.rst
index a8383e35..51e000de 100644
--- a/docs/source/install.rst
+++ b/docs/source/install.rst
@@ -6,30 +6,32 @@ Install on Windows or macOS
 
 You can download OnionShare for Windows and macOS from the `OnionShare website <https://onionshare.org/>`_.
 
-For added security, see :ref:`verifying_sigs`.
-
 .. _linux:
 
-Install in Linux with Flatpak
------------------------------
+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.
+
+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.
 
-There are various ways to install OnionShare for Linux, but the recommended way is to use the Flatpak package. Flatpak ensures that you'll always use the most latest dependencies and run OnionShare inside of a sandbox.
+**Install OnionShare using Flatpak**: https://flathub.org/apps/details/org.onionshare.OnionShare
 
-Make sure you have ``flatpak`` installed and the Flathub repository added by following `these instructions <https://flatpak.org/setup/>`_ for your Linux distribution.
+**Install OnionShare using Snapcraft**: https://snapcraft.io/onionshare
 
-Then install OnionShare from Flathub by following `the instructions here <https://flathub.org/apps/details/org.onionshare.OnionShare>`_.
+You can also download and install a PGP-signed ``.flatpak`` or ``.snap`` packages from https://onionshare.org/dist/ if you prefer.
 
 .. _verifying_sigs:
 
 Verifying PGP signatures
 ------------------------
 
-You can verify that the Windows, macOS, 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 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.
 
 Signing key
 ^^^^^^^^^^^
 
-Windows, macOS, and source packaged 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>`_.
+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/>`_.
 
diff --git a/snap/snapcraft.yaml b/snap/snapcraft.yaml
index 5464b1a9..e53cd449 100644
--- a/snap/snapcraft.yaml
+++ b/snap/snapcraft.yaml
@@ -1,6 +1,6 @@
 name: onionshare
 base: core18
-version: '2.3.dev1'
+version: '2.3.dev2'
 summary: Securely and anonymously share files, host websites, and chat using Tor
 description: |
   OnionShare lets you securely and anonymously send and receive files. It works by starting