diff --git a/docs/gettext/.doctrees/advanced.doctree b/docs/gettext/.doctrees/advanced.doctree
index 9e5863a7..e94ddf02 100644
Binary files a/docs/gettext/.doctrees/advanced.doctree and b/docs/gettext/.doctrees/advanced.doctree differ
diff --git a/docs/gettext/.doctrees/develop.doctree b/docs/gettext/.doctrees/develop.doctree
index 0a49a671..8f4cc75f 100644
Binary files a/docs/gettext/.doctrees/develop.doctree and b/docs/gettext/.doctrees/develop.doctree differ
diff --git a/docs/gettext/.doctrees/environment.pickle b/docs/gettext/.doctrees/environment.pickle
index b5edaa34..b6b0c452 100644
Binary files a/docs/gettext/.doctrees/environment.pickle and b/docs/gettext/.doctrees/environment.pickle differ
diff --git a/docs/gettext/.doctrees/features.doctree b/docs/gettext/.doctrees/features.doctree
index 5774b145..ce20dd9e 100644
Binary files a/docs/gettext/.doctrees/features.doctree and b/docs/gettext/.doctrees/features.doctree differ
diff --git a/docs/gettext/.doctrees/help.doctree b/docs/gettext/.doctrees/help.doctree
index be312841..7dc6ce92 100644
Binary files a/docs/gettext/.doctrees/help.doctree and b/docs/gettext/.doctrees/help.doctree differ
diff --git a/docs/gettext/.doctrees/index.doctree b/docs/gettext/.doctrees/index.doctree
index 4c9378d6..f43a2187 100644
Binary files a/docs/gettext/.doctrees/index.doctree and b/docs/gettext/.doctrees/index.doctree differ
diff --git a/docs/gettext/.doctrees/install.doctree b/docs/gettext/.doctrees/install.doctree
index 4228705c..4135becc 100644
Binary files a/docs/gettext/.doctrees/install.doctree and b/docs/gettext/.doctrees/install.doctree differ
diff --git a/docs/gettext/.doctrees/security.doctree b/docs/gettext/.doctrees/security.doctree
index 014530c4..b078860c 100644
Binary files a/docs/gettext/.doctrees/security.doctree and b/docs/gettext/.doctrees/security.doctree differ
diff --git a/docs/gettext/.doctrees/tor.doctree b/docs/gettext/.doctrees/tor.doctree
index 36b08327..9c6bf3d7 100644
Binary files a/docs/gettext/.doctrees/tor.doctree and b/docs/gettext/.doctrees/tor.doctree differ
diff --git a/docs/gettext/advanced.pot b/docs/gettext/advanced.pot
index e87cd680..8727f1e1 100644
--- a/docs/gettext/advanced.pot
+++ b/docs/gettext/advanced.pot
@@ -1,5 +1,5 @@
 # SOME DESCRIPTIVE TITLE.
-# Copyright (C) Micah Lee, et al. Like all software, OnionShare may contain bugs or vulnerabilities.
+# Copyright (C) Micah Lee, et al.
 # This file is distributed under the same license as the OnionShare package.
 # FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 #
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OnionShare 2.3\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-08-26 20:38-0700\n"
+"POT-Creation-Date: 2020-08-27 20:28-0400\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -77,25 +77,77 @@ msgid "**Scheduling an OnionShare service to automatically stop can be useful to
 msgstr ""
 
 #: ../../source/advanced.rst:46
-msgid "Legacy addresses"
+msgid "Command line interface"
 msgstr ""
 
 #: ../../source/advanced.rst:48
-msgid "OnionShare uses v3 Tor onion services by default. These are modern onion addresses that have 56 characters, for example::"
+msgid "In addition to its graphical interface, OnionShare has a command line interface."
 msgstr ""
 
-#: ../../source/advanced.rst:52
-msgid "But it still has support for v2 onion addresses, the old type of onion addresses that have 16 characters, for example::"
+#: ../../source/advanced.rst:51
+msgid "Linux"
 msgstr ""
 
-#: ../../source/advanced.rst:56
-msgid "OnionShare calls v2 onion addresses \"legacy addresses\". v3 onion addresses are more secure, and using legacy addresses is not recommended."
+#: ../../source/advanced.rst:53
+msgid "If you installed OnionShare using the Flatpak package, unfortunately the command line interface isn't supported."
+msgstr ""
+
+#: ../../source/advanced.rst:55
+msgid "If you installed OnionShare using an operating system package, you can just run ``onionshare`` from the terminal."
 msgstr ""
 
 #: ../../source/advanced.rst:58
-msgid "To use legacy addresses, before starting a server click \"Show advanced settings\" in its tab and check the \"Use a legacy address (v2 onion service, not recommended)\" box. In legacy mode you can optionally enable Tor client authentication. Once you start a server in legacy mode you cannot remove legacy mode in that tab. Instead you must start a separate service in a separate tab."
+msgid "macOS"
 msgstr ""
 
 #: ../../source/advanced.rst:60
+msgid "Make a symbolic link to the OnionShare command line binary line this::"
+msgstr ""
+
+#: ../../source/advanced.rst:64
+msgid "Now you can run ``onionshare`` from the terminal."
+msgstr ""
+
+#: ../../source/advanced.rst:67
+msgid "Windows"
+msgstr ""
+
+#: ../../source/advanced.rst:69
+msgid "The command line interface isn't supported in Windows."
+msgstr ""
+
+#: ../../source/advanced.rst:71
+msgid "If you really want to use it anyway, you can set up a Windows development environment (see :ref:`starting_development`) and then run this in a command prompt::"
+msgstr ""
+
+#: ../../source/advanced.rst:76
+msgid "Usage"
+msgstr ""
+
+#: ../../source/advanced.rst:78
+msgid "You can see command line documentation by running ``onionshare --help``::"
+msgstr ""
+
+#: ../../source/advanced.rst:134
+msgid "Legacy addresses"
+msgstr ""
+
+#: ../../source/advanced.rst:136
+msgid "OnionShare uses v3 Tor onion services by default. These are modern onion addresses that have 56 characters, for example::"
+msgstr ""
+
+#: ../../source/advanced.rst:140
+msgid "But it still has support for v2 onion addresses, the old type of onion addresses that have 16 characters, for example::"
+msgstr ""
+
+#: ../../source/advanced.rst:144
+msgid "OnionShare calls v2 onion addresses \"legacy addresses\". v3 onion addresses are more secure, and using legacy addresses is not recommended."
+msgstr ""
+
+#: ../../source/advanced.rst:146
+msgid "To use legacy addresses, before starting a server click \"Show advanced settings\" in its tab and check the \"Use a legacy address (v2 onion service, not recommended)\" box. In legacy mode you can optionally enable Tor client authentication. Once you start a server in legacy mode you cannot remove legacy mode in that tab. Instead you must start a separate service in a separate tab."
+msgstr ""
+
+#: ../../source/advanced.rst:148
 msgid "Tor Project plans to `completely deprecate v2 onion services <https://blog.torproject.org/v2-deprecation-timeline>`_ on October 15, 2021, and legacy onion services will soon be removed from OnionShare as well."
 msgstr ""
diff --git a/docs/gettext/develop.pot b/docs/gettext/develop.pot
index a927cf15..f46c81b2 100644
--- a/docs/gettext/develop.pot
+++ b/docs/gettext/develop.pot
@@ -1,5 +1,5 @@
 # SOME DESCRIPTIVE TITLE.
-# Copyright (C) Micah Lee, et al. Like all software, OnionShare may contain bugs or vulnerabilities.
+# Copyright (C) Micah Lee, et al.
 # This file is distributed under the same license as the OnionShare package.
 # FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 #
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OnionShare 2.3\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-08-26 20:38-0700\n"
+"POT-Creation-Date: 2020-08-27 20:28-0400\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -48,130 +48,130 @@ msgstr ""
 msgid "When you're ready to contribute code, open a pull request in the GitHub repository and one of the project maintainers will review it and possible ask questions, request changes, reject it, or merge it into the project."
 msgstr ""
 
-#: ../../source/develop.rst:23
+#: ../../source/develop.rst:25
 msgid "Starting development"
 msgstr ""
 
-#: ../../source/develop.rst:25
+#: ../../source/develop.rst:27
 msgid "OnionShare is developed in Python. To get started, you should close the git repository at https://github.com/micahflee/onionshare/ and then consult the ``BUILD.md`` file."
 msgstr ""
 
-#: ../../source/develop.rst:27
+#: ../../source/develop.rst:29
 msgid "That file contains the technical instructions and commands necessary:"
 msgstr ""
 
-#: ../../source/develop.rst:29
+#: ../../source/develop.rst:31
 msgid "Install dependencies for your platform"
 msgstr ""
 
-#: ../../source/develop.rst:30
+#: ../../source/develop.rst:32
 msgid "Run OnionShare from the source tree, without building a package"
 msgstr ""
 
-#: ../../source/develop.rst:31
+#: ../../source/develop.rst:33
 msgid "Building packages"
 msgstr ""
 
-#: ../../source/develop.rst:32
+#: ../../source/develop.rst:34
 msgid "Making a release of OnionShare"
 msgstr ""
 
-#: ../../source/develop.rst:35
+#: ../../source/develop.rst:37
 msgid "Debugging tips"
 msgstr ""
 
-#: ../../source/develop.rst:38
+#: ../../source/develop.rst:40
 msgid "Verbose mode"
 msgstr ""
 
-#: ../../source/develop.rst:40
+#: ../../source/develop.rst:42
 msgid "When developing, it's convenient to run OnionShare from a terminal and add the ``--verbose`` (or ``-v``) flag to the command. This will print a lot of helpful messages to the terminal such as when certain objects are initialized, when events occur (like buttons clicked, settings saved or reloaded), and other debug information. For example::"
 msgstr ""
 
-#: ../../source/develop.rst:120
+#: ../../source/develop.rst:111
 msgid "You can add your own debug messages by running the ``Common.log`` method from ``onionshare/common.py``. For example::"
 msgstr ""
 
-#: ../../source/develop.rst:124
+#: ../../source/develop.rst:115
 msgid "This can be useful when learning the chain of events that occur when using the application or the value of certain variables before and after they are manipulated."
 msgstr ""
 
-#: ../../source/develop.rst:127
+#: ../../source/develop.rst:118
 msgid "Local only"
 msgstr ""
 
-#: ../../source/develop.rst:129
+#: ../../source/develop.rst:120
 msgid "Tor is slow, and it's often convenient to skip starting onion services altogether during development. You can do this with the ``--local-only`` flag. For example::"
 msgstr ""
 
-#: ../../source/develop.rst:166
+#: ../../source/develop.rst:157
 msgid "In this case, you load the URL ``http://onionshare:eject-snack@127.0.0.1:17614`` in a normal web browser like Firefox, instead of using Tor Browser."
 msgstr ""
 
-#: ../../source/develop.rst:169
+#: ../../source/develop.rst:160
 msgid "Debugging in Windows"
 msgstr ""
 
-#: ../../source/develop.rst:171
+#: ../../source/develop.rst:162
 msgid "If you want to obtain debug output from the ``onionshare-gui.exe`` in Windows, you will need to edit ``install\\pyinstaller.spec`` and change ``console=False`` to ``console=True``."
 msgstr ""
 
-#: ../../source/develop.rst:173
+#: ../../source/develop.rst:164
 msgid "Then rebuild the EXE with ``install\\build_exe.bat`` (you may need to comment out the ``signtool`` commands in the ``build_exe.bat`` and the ``onionshare.nsi`` files, as per the ``BUILD.md`` instructions)."
 msgstr ""
 
-#: ../../source/develop.rst:175
+#: ../../source/develop.rst:166
 msgid "After this, you can run ``onionshare-gui.exe -v`` from a command prompt to see the debug output."
 msgstr ""
 
-#: ../../source/develop.rst:178
+#: ../../source/develop.rst:169
 msgid "Contributing translations"
 msgstr ""
 
-#: ../../source/develop.rst:180
+#: ../../source/develop.rst:171
 msgid "Most of the OnionShare is translatable. You can help make it easier to use and more familiar and welcoming for people around the globe. The Localization Lab has some `documentation about translating OnionShare <https://wiki.localizationlab.org/index.php/OnionShare>`_."
 msgstr ""
 
-#: ../../source/develop.rst:182
+#: ../../source/develop.rst:173
 msgid "OnionShare uses Weblate to keep track of translations. You can view the OnionShare project here: https://hosted.weblate.org/projects/onionshare/"
 msgstr ""
 
-#: ../../source/develop.rst:184
+#: ../../source/develop.rst:175
 msgid "To help translate, make a Hosted Weblate account and start contributing to that project."
 msgstr ""
 
-#: ../../source/develop.rst:187
+#: ../../source/develop.rst:178
 msgid "Suggestions for original English strings"
 msgstr ""
 
-#: ../../source/develop.rst:189
+#: ../../source/develop.rst:180
 msgid "Sometimes the original English strings could be improved, making them easier to translate into other languages."
 msgstr ""
 
-#: ../../source/develop.rst:191
+#: ../../source/develop.rst:182
 msgid "If you have suggestions for a better English string, please open a GitHub issue rather than commenting in Weblate. This ensures the upstream developers will definitely see the suggestion, and can potentially modify the string via the usual code review processes."
 msgstr ""
 
-#: ../../source/develop.rst:194
+#: ../../source/develop.rst:185
 msgid "Status of translations"
 msgstr ""
 
-#: ../../source/develop.rst:195
+#: ../../source/develop.rst:186
 msgid "Here is the current translation status. If you want start a translation in a language not to be found here, please write us to the mailing list: onionshare-dev@lists.riseup.net"
 msgstr ""
 
-#: ../../source/develop.rst:200
+#: ../../source/develop.rst:191
 msgid "Translate the .desktop file"
 msgstr ""
 
-#: ../../source/develop.rst:202
+#: ../../source/develop.rst:193
 msgid "You can also translate the ``install/onionshare.desktop`` file."
 msgstr ""
 
-#: ../../source/develop.rst:204
+#: ../../source/develop.rst:195
 msgid "Duplicate the line that begins with ``Comment=``. Add the language code to the new line so it becomes ``Comment[lang]=`` (lang should be your language). You can see what language codes are used for translation by looking at the ``share/locale/*.json`` filenames::"
 msgstr ""
 
-#: ../../source/develop.rst:209
+#: ../../source/develop.rst:200
 msgid "Do the same for other untranslated lines."
 msgstr ""
diff --git a/docs/gettext/features.pot b/docs/gettext/features.pot
index f8c5e6d3..5b9bedad 100644
--- a/docs/gettext/features.pot
+++ b/docs/gettext/features.pot
@@ -1,5 +1,5 @@
 # SOME DESCRIPTIVE TITLE.
-# Copyright (C) Micah Lee, et al. Like all software, OnionShare may contain bugs or vulnerabilities.
+# Copyright (C) Micah Lee, et al.
 # This file is distributed under the same license as the OnionShare package.
 # FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 #
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OnionShare 2.3\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-08-26 20:38-0700\n"
+"POT-Creation-Date: 2020-08-27 20:28-0400\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/docs/gettext/help.pot b/docs/gettext/help.pot
index ba441c75..fef6e1a3 100644
--- a/docs/gettext/help.pot
+++ b/docs/gettext/help.pot
@@ -1,5 +1,5 @@
 # SOME DESCRIPTIVE TITLE.
-# Copyright (C) Micah Lee, et al. Like all software, OnionShare may contain bugs or vulnerabilities.
+# Copyright (C) Micah Lee, et al.
 # This file is distributed under the same license as the OnionShare package.
 # FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 #
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OnionShare 2.3\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-08-26 20:38-0700\n"
+"POT-Creation-Date: 2020-08-27 20:28-0400\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/docs/gettext/index.pot b/docs/gettext/index.pot
index 5dffd322..6e1dadaf 100644
--- a/docs/gettext/index.pot
+++ b/docs/gettext/index.pot
@@ -1,5 +1,5 @@
 # SOME DESCRIPTIVE TITLE.
-# Copyright (C) Micah Lee, et al. Like all software, OnionShare may contain bugs or vulnerabilities.
+# Copyright (C) Micah Lee, et al.
 # This file is distributed under the same license as the OnionShare package.
 # FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 #
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OnionShare 2.3\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-08-26 21:55-0700\n"
+"POT-Creation-Date: 2020-08-27 20:28-0400\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/docs/gettext/install.pot b/docs/gettext/install.pot
index fbf3fb79..9fa69485 100644
--- a/docs/gettext/install.pot
+++ b/docs/gettext/install.pot
@@ -1,5 +1,5 @@
 # SOME DESCRIPTIVE TITLE.
-# Copyright (C) Micah Lee, et al. Like all software, OnionShare may contain bugs or vulnerabilities.
+# Copyright (C) Micah Lee, et al.
 # This file is distributed under the same license as the OnionShare package.
 # FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 #
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OnionShare 2.3\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-08-26 20:38-0700\n"
+"POT-Creation-Date: 2020-08-27 20:28-0400\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/docs/gettext/security.pot b/docs/gettext/security.pot
index 25579768..4b274c9d 100644
--- a/docs/gettext/security.pot
+++ b/docs/gettext/security.pot
@@ -1,5 +1,5 @@
 # SOME DESCRIPTIVE TITLE.
-# Copyright (C) Micah Lee, et al. Like all software, OnionShare may contain bugs or vulnerabilities.
+# Copyright (C) Micah Lee, et al.
 # This file is distributed under the same license as the OnionShare package.
 # FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 #
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OnionShare 2.3\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-08-26 20:38-0700\n"
+"POT-Creation-Date: 2020-08-27 20:28-0400\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -24,34 +24,38 @@ msgstr ""
 msgid "First read :ref:`how_it_works` to understand the basics of how OnionShare works."
 msgstr ""
 
-#: ../../source/security.rst:7
-msgid "What OnionShare protects against"
+#: ../../source/security.rst:6
+msgid "Like all software, OnionShare may contain bugs or vulnerabilities."
 msgstr ""
 
 #: ../../source/security.rst:9
-msgid "**Third parties don't have access to anything that happens in OnionShare.** When you use OnionShare, you host services directly on your computer. For example, when you share files with OnionShare, you don't upload these files to any server, and when you start an OnionShare chat room, your computer is the chat room server itself. Traditional ways of sharing files or setting up websites and chat rooms require trusting a service with access to your data."
+msgid "What OnionShare protects against"
 msgstr ""
 
 #: ../../source/security.rst:11
-msgid "**Network eavesdroppers can't spy on anything that happens in OnionShare in transit.** Because connections between Tor onion services and Tor Browser are end-to-end encrypted, no network attackers can eavesdrop on what happens in an OnionShare service. If the eavesdropper is positioned on the OnionShare user's end, the Tor Browser user's end, or is a malicious Tor node, they will only see Tor traffic. If the eavesdropper is a malicious rendezvous node used to connect Tor Browser with OnionShare's onion service, the traffic will be encrypted using the onion service key."
+msgid "**Third parties don't have access to anything that happens in OnionShare.** When you use OnionShare, you host services directly on your computer. For example, when you share files with OnionShare, you don't upload these files to any server, and when you start an OnionShare chat room, your computer is the chat room server itself. Traditional ways of sharing files or setting up websites and chat rooms require trusting a service with access to your data."
 msgstr ""
 
 #: ../../source/security.rst:13
-msgid "**Anonymity of OnionShare users are protected by Tor.** OnionShare and Tor Browser protect the anonymity of the users. As long as the OnionShare user anonymously communicates the OnionShare address with the Tor Browser users, the Tor Browser users and eavesdroppers can't learn the identity of the OnionShare user."
+msgid "**Network eavesdroppers can't spy on anything that happens in OnionShare in transit.** Because connections between Tor onion services and Tor Browser are end-to-end encrypted, no network attackers can eavesdrop on what happens in an OnionShare service. If the eavesdropper is positioned on the OnionShare user's end, the Tor Browser user's end, or is a malicious Tor node, they will only see Tor traffic. If the eavesdropper is a malicious rendezvous node used to connect Tor Browser with OnionShare's onion service, the traffic will be encrypted using the onion service key."
 msgstr ""
 
 #: ../../source/security.rst:15
+msgid "**Anonymity of OnionShare users are protected by Tor.** OnionShare and Tor Browser protect the anonymity of the users. As long as the OnionShare user anonymously communicates the OnionShare address with the Tor Browser users, the Tor Browser users and eavesdroppers can't learn the identity of the OnionShare user."
+msgstr ""
+
+#: ../../source/security.rst:17
 msgid "**If an attacker learns about the onion service, they still can't access anything.** There have been attacks against the Tor network that can enumerate onion services. Even if someone discovers the .onion address of an OnionShare onion service, they can't access it without also knowing the service's random password (unless, of course, the OnionShare users chooses to disable the password and make it public). The password is generated by choosing two random words from a list of 6800 words, meaning there are 6800^2, or about 46 million possible password. But they can only make 20 wrong guesses before OnionShare stops the server, preventing brute force attacks against the password."
 msgstr ""
 
-#: ../../source/security.rst:18
+#: ../../source/security.rst:20
 msgid "What OnionShare doesn't protect against"
 msgstr ""
 
-#: ../../source/security.rst:20
+#: ../../source/security.rst:22
 msgid "**Communicating the OnionShare address might not be secure.** The OnionShare user is responsible for securely communicating the OnionShare address with people. If they send it insecurely (such as through an email message, and their email is being monitored by an attacker), the eavesdropper will learn that they're using OnionShare. If the attacker loads the address in Tor Browser before the legitimate recipient gets to it, they can access the service. If this risk fits the user's threat model, they must find a more secure way to communicate the address, such as in an encrypted email, chat, or voice call. This isn't necessary in cases where OnionShare is being used for something that isn't secret."
 msgstr ""
 
-#: ../../source/security.rst:22
+#: ../../source/security.rst:24
 msgid "**Communicating the OnionShare address might not be anonymous.** While OnionShare and Tor Browser allow for anonymity, if the user wishes to remain anonymous they must take extra steps to ensure this while communicating the OnionShare address. For example, they might need to use Tor to create a new anonymous email or chat account, and only access it over Tor, to use for sharing the address. This isn't necessary in cases where there's no need to protect anonymity, such as co-workers who know each other sharing work documents."
 msgstr ""
diff --git a/docs/gettext/tor.pot b/docs/gettext/tor.pot
index 27834b02..6141d352 100644
--- a/docs/gettext/tor.pot
+++ b/docs/gettext/tor.pot
@@ -1,5 +1,5 @@
 # SOME DESCRIPTIVE TITLE.
-# Copyright (C) Micah Lee, et al. Like all software, OnionShare may contain bugs or vulnerabilities.
+# Copyright (C) Micah Lee, et al.
 # This file is distributed under the same license as the OnionShare package.
 # FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 #
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OnionShare 2.3\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-08-26 20:38-0700\n"
+"POT-Creation-Date: 2020-08-27 20:28-0400\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/docs/source/advanced.rst b/docs/source/advanced.rst
index eb6afd1e..961cdd9e 100644
--- a/docs/source/advanced.rst
+++ b/docs/source/advanced.rst
@@ -42,6 +42,94 @@ If you scheduled a service to start in the future, when you click the start butt
 
 .. image:: _static/screenshots/advanced-schedule-stop-timer.png
 
+Command line interface
+----------------------
+
+In addition to its graphical interface, OnionShare has a command line interface.
+
+Linux
+^^^^^
+
+If you installed OnionShare using the Flatpak package, unfortunately the command line interface isn't supported.
+
+If you installed OnionShare using an operating system package, you can just run ``onionshare`` from the terminal.
+
+macOS
+^^^^^
+
+Make a symbolic link to the OnionShare command line binary line this::
+
+    ln -s /Applications/OnionShare.app/Contents/MacOS/onionshare /usr/local/bin
+
+Now you can run ``onionshare`` from the terminal.
+
+Windows
+^^^^^^^
+
+The command line interface isn't supported in Windows.
+
+If you really want to use it anyway, you can set up a Windows development environment (see :ref:`starting_development`) and then run this in a command prompt::
+
+    poetry run python dev_scripts\onionshare
+
+Usage
+^^^^^
+
+You can see command line documentation by running ``onionshare --help``::
+
+    $ onionshare --help
+    OnionShare 2.3 | https://onionshare.org/
+    
+                         @@@@@@@@@                      
+                    @@@@@@@@@@@@@@@@@@@                 
+                 @@@@@@@@@@@@@@@@@@@@@@@@@              
+               @@@@@@@@@@@@@@@@@@@@@@@@@@@@@            
+                 @@@@@@@@@@@@@@@@@@@@@@@@@@@@@           ___        _               
+                   @@@@@@         @@@@@@@@@@@@@         / _ \      (_)              
+             @@@@    @               @@@@@@@@@@@       | | | |_ __  _  ___  _ __    
+           @@@@@@@@                   @@@@@@@@@@       | | | | '_ \| |/ _ \| '_ \   
+         @@@@@@@@@@@@                  @@@@@@@@@@      \ \_/ / | | | | (_) | | | |  
+       @@@@@@@@@@@@@@@@                 @@@@@@@@@       \___/|_| |_|_|\___/|_| |_|  
+          @@@@@@@@@                 @@@@@@@@@@@@@@@@    _____ _                     
+          @@@@@@@@@@                  @@@@@@@@@@@@     /  ___| |                    
+           @@@@@@@@@@                   @@@@@@@@       \ `--.| |__   __ _ _ __ ___ 
+           @@@@@@@@@@@               @    @@@@          `--. \ '_ \ / _` | '__/ _ \
+            @@@@@@@@@@@@@         @@@@@@               /\__/ / | | | (_| | | |  __/
+             @@@@@@@@@@@@@@@@@@@@@@@@@@@@@             \____/|_| |_|\__,_|_|  \___|
+               @@@@@@@@@@@@@@@@@@@@@@@@@@@@@            
+                 @@@@@@@@@@@@@@@@@@@@@@@@@              
+                    @@@@@@@@@@@@@@@@@@@                 
+                         @@@@@@@@@                      
+
+    usage: onionshare [-h] [--receive] [--website] [--chat] [--local-only] [--connect-timeout SECONDS] [--config FILENAME] [--persistent FILENAME] [--public]
+                    [--auto-start-timer SECONDS] [--auto-stop-timer SECONDS] [--legacy] [--client-auth] [--autostop-sharing] [--data-dir data_dir] [--disable_csp] [-v]
+                    [filename [filename ...]]
+
+    positional arguments:
+    filename                  List of files or folders to share
+
+    optional arguments:
+    -h, --help                show this help message and exit
+    --receive                 Receive files
+    --website                 Publish website
+    --chat                    Start chat server
+    --local-only              Don't use Tor (only for development)
+    --connect-timeout SECONDS
+                                Give up connecting to Tor after a given amount of seconds (default: 120)
+    --config FILENAME         Filename of custom global settings
+    --persistent FILENAME     Filename of persistent session
+    --public                  Don't use a password
+    --auto-start-timer SECONDS
+                                Start onion service at scheduled time (N seconds from now)
+    --auto-stop-timer SECONDS
+                                Stop onion service at schedule time (N seconds from now)
+    --legacy                  Use legacy address (v2 onion service, not recommended)
+    --client-auth             Use client authorization (requires --legacy)
+    --autostop-sharing        Share files: Stop sharing after files have been sent
+    --data-dir data_dir       Receive files: Save files received to this directory
+    --disable_csp             Publish website: Disable Content Security Policy header (allows your website to use third-party resources)
+    -v, --verbose             Log OnionShare errors to stdout, and web errors to disk
+
 Legacy addresses
 ----------------
 
diff --git a/docs/source/conf.py b/docs/source/conf.py
index 4c3ae6b5..2b067f9a 100644
--- a/docs/source/conf.py
+++ b/docs/source/conf.py
@@ -3,9 +3,7 @@ import sphinx_intl
 
 
 project = "OnionShare"
-author = (
-    copyright
-) = "Micah Lee, et al. Like all software, OnionShare may contain bugs or vulnerabilities."
+author = copyright = "Micah Lee, et al."
 version = release = "2.3"
 
 extensions = ["sphinx_rtd_theme"]
diff --git a/docs/source/develop.rst b/docs/source/develop.rst
index 25aa6996..6783d781 100644
--- a/docs/source/develop.rst
+++ b/docs/source/develop.rst
@@ -19,6 +19,8 @@ If you'd like to contribute code to OnionShare, it helps to join the Keybase tea
 
 When you're ready to contribute code, open a pull request in the GitHub repository and one of the project maintainers will review it and possible ask questions, request changes, reject it, or merge it into the project.
 
+.. _starting_development:
+
 Starting development
 --------------------
 
@@ -42,26 +44,26 @@ When developing, it's convenient to run OnionShare from a terminal and add the `
     $ poetry run ./dev_scripts/onionshare -v test.txt 
     OnionShare 2.3 | https://onionshare.org/
 
-                        @@@@@@@@@                      
+                         @@@@@@@@@                      
                     @@@@@@@@@@@@@@@@@@@                 
-                @@@@@@@@@@@@@@@@@@@@@@@@@              
-            @@@@@@@@@@@@@@@@@@@@@@@@@@@@@            
-                @@@@@@@@@@@@@@@@@@@@@@@@@@@@@           ___        _               
-                @@@@@@         @@@@@@@@@@@@@         / _ \      (_)              
-            @@@@    @               @@@@@@@@@@@       | | | |_ __  _  ___  _ __    
-        @@@@@@@@                   @@@@@@@@@@       | | | | '_ \| |/ _ \| '_ \   
-        @@@@@@@@@@@@                  @@@@@@@@@@      \ \_/ / | | | | (_) | | | |  
-    @@@@@@@@@@@@@@@@                 @@@@@@@@@       \___/|_| |_|_|\___/|_| |_|  
-        @@@@@@@@@                 @@@@@@@@@@@@@@@@    _____ _                     
-        @@@@@@@@@@                  @@@@@@@@@@@@     /  ___| |                    
-        @@@@@@@@@@                   @@@@@@@@       \ `--.| |__   __ _ _ __ ___ 
-        @@@@@@@@@@@               @    @@@@          `--. \ '_ \ / _` | '__/ _ \
+                 @@@@@@@@@@@@@@@@@@@@@@@@@              
+               @@@@@@@@@@@@@@@@@@@@@@@@@@@@@            
+                 @@@@@@@@@@@@@@@@@@@@@@@@@@@@@           ___        _               
+                   @@@@@@         @@@@@@@@@@@@@         / _ \      (_)              
+             @@@@    @               @@@@@@@@@@@       | | | |_ __  _  ___  _ __    
+           @@@@@@@@                   @@@@@@@@@@       | | | | '_ \| |/ _ \| '_ \   
+         @@@@@@@@@@@@                  @@@@@@@@@@      \ \_/ / | | | | (_) | | | |  
+       @@@@@@@@@@@@@@@@                 @@@@@@@@@       \___/|_| |_|_|\___/|_| |_|  
+          @@@@@@@@@                 @@@@@@@@@@@@@@@@    _____ _                     
+          @@@@@@@@@@                  @@@@@@@@@@@@     /  ___| |                    
+           @@@@@@@@@@                   @@@@@@@@       \ `--.| |__   __ _ _ __ ___ 
+           @@@@@@@@@@@               @    @@@@          `--. \ '_ \ / _` | '__/ _ \
             @@@@@@@@@@@@@         @@@@@@               /\__/ / | | | (_| | | |  __/
-            @@@@@@@@@@@@@@@@@@@@@@@@@@@@@             \____/|_| |_|\__,_|_|  \___|
-            @@@@@@@@@@@@@@@@@@@@@@@@@@@@@            
-                @@@@@@@@@@@@@@@@@@@@@@@@@              
+             @@@@@@@@@@@@@@@@@@@@@@@@@@@@@             \____/|_| |_|\__,_|_|  \___|
+               @@@@@@@@@@@@@@@@@@@@@@@@@@@@@            
+                 @@@@@@@@@@@@@@@@@@@@@@@@@              
                     @@@@@@@@@@@@@@@@@@@                 
-                        @@@@@@@@@                      
+                         @@@@@@@@@                      
 
     [Aug 23 2020 22:37:06] Settings.__init__
     [Aug 23 2020 22:37:06] Settings.load
@@ -82,18 +84,7 @@ When developing, it's convenient to run OnionShare from a terminal and add the `
     [Aug 23 2020 22:37:06] Settings.load
     [Aug 23 2020 22:37:06] Settings.load: Trying to load /home/user/.config/onionshare/onionshare.json
     [Aug 23 2020 22:37:06] Onion.connect: tor_data_directory_name=/home/user/.config/onionshare/tmp/tmpig895mfl
-    Connecting to the Tor network: 14% - Handshaking with a relay
-    Connecting to the Tor network: 25% - Asking for networkstatus consensus
-    Connecting to the Tor network: 30% - Loading networkstatus consensus
-    Connecting to the Tor network: 40% - Loading authority key certs
-    Connecting to the Tor network: 45% - Asking for relay descriptors
-    Connecting to the Tor network: 50% - Loading relay descriptors
-    Connecting to the Tor network: 59% - Loading relay descriptors
-    Connecting to the Tor network: 68% - Loading relay descriptors
-    Connecting to the Tor network: 89% - Finishing handshake with a relay to build circuits
-    Connecting to the Tor network: 95% - Establishing a Tor circuit
     Connecting to the Tor network: 100% - Done
-
     [Aug 23 2020 22:37:14] Onion.connect: Connected to tor 0.4.3.6
     [Aug 23 2020 22:37:14] Settings.load
     [Aug 23 2020 22:37:14] Settings.load: Trying to load /home/user/.config/onionshare/onionshare.json
@@ -131,26 +122,26 @@ Tor is slow, and it's often convenient to skip starting onion services altogethe
     $ poetry run ./dev_scripts/onionshare --local-only --receive
     OnionShare 2.3 | https://onionshare.org/
 
-                        @@@@@@@@@                      
+                         @@@@@@@@@                      
                     @@@@@@@@@@@@@@@@@@@                 
-                @@@@@@@@@@@@@@@@@@@@@@@@@              
-            @@@@@@@@@@@@@@@@@@@@@@@@@@@@@            
-                @@@@@@@@@@@@@@@@@@@@@@@@@@@@@           ___        _               
-                @@@@@@         @@@@@@@@@@@@@         / _ \      (_)              
-            @@@@    @               @@@@@@@@@@@       | | | |_ __  _  ___  _ __    
-        @@@@@@@@                   @@@@@@@@@@       | | | | '_ \| |/ _ \| '_ \   
-        @@@@@@@@@@@@                  @@@@@@@@@@      \ \_/ / | | | | (_) | | | |  
-    @@@@@@@@@@@@@@@@                 @@@@@@@@@       \___/|_| |_|_|\___/|_| |_|  
-        @@@@@@@@@                 @@@@@@@@@@@@@@@@    _____ _                     
-        @@@@@@@@@@                  @@@@@@@@@@@@     /  ___| |                    
-        @@@@@@@@@@                   @@@@@@@@       \ `--.| |__   __ _ _ __ ___ 
-        @@@@@@@@@@@               @    @@@@          `--. \ '_ \ / _` | '__/ _ \
+                 @@@@@@@@@@@@@@@@@@@@@@@@@              
+               @@@@@@@@@@@@@@@@@@@@@@@@@@@@@            
+                 @@@@@@@@@@@@@@@@@@@@@@@@@@@@@           ___        _               
+                   @@@@@@         @@@@@@@@@@@@@         / _ \      (_)              
+             @@@@    @               @@@@@@@@@@@       | | | |_ __  _  ___  _ __    
+           @@@@@@@@                   @@@@@@@@@@       | | | | '_ \| |/ _ \| '_ \   
+         @@@@@@@@@@@@                  @@@@@@@@@@      \ \_/ / | | | | (_) | | | |  
+       @@@@@@@@@@@@@@@@                 @@@@@@@@@       \___/|_| |_|_|\___/|_| |_|  
+          @@@@@@@@@                 @@@@@@@@@@@@@@@@    _____ _                     
+          @@@@@@@@@@                  @@@@@@@@@@@@     /  ___| |                    
+           @@@@@@@@@@                   @@@@@@@@       \ `--.| |__   __ _ _ __ ___ 
+           @@@@@@@@@@@               @    @@@@          `--. \ '_ \ / _` | '__/ _ \
             @@@@@@@@@@@@@         @@@@@@               /\__/ / | | | (_| | | |  __/
-            @@@@@@@@@@@@@@@@@@@@@@@@@@@@@             \____/|_| |_|\__,_|_|  \___|
-            @@@@@@@@@@@@@@@@@@@@@@@@@@@@@            
-                @@@@@@@@@@@@@@@@@@@@@@@@@              
+             @@@@@@@@@@@@@@@@@@@@@@@@@@@@@             \____/|_| |_|\__,_|_|  \___|
+               @@@@@@@@@@@@@@@@@@@@@@@@@@@@@            
+                 @@@@@@@@@@@@@@@@@@@@@@@@@              
                     @@@@@@@@@@@@@@@@@@@                 
-                        @@@@@@@@@                      
+                         @@@@@@@@@                      
 
     * Running on http://127.0.0.1:17614/ (Press CTRL+C to quit)
 
diff --git a/docs/source/locale/ar/LC_MESSAGES/advanced.po b/docs/source/locale/ar/LC_MESSAGES/advanced.po
index ba0a2218..0b6a4166 100644
--- a/docs/source/locale/ar/LC_MESSAGES/advanced.po
+++ b/docs/source/locale/ar/LC_MESSAGES/advanced.po
@@ -9,7 +9,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OnionShare 2.3\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-08-26 20:38-0700\n"
+"POT-Creation-Date: 2020-08-27 20:28-0400\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -123,28 +123,89 @@ msgid ""
 msgstr ""
 
 #: ../../source/advanced.rst:46
-msgid "Legacy addresses"
+msgid "Command line interface"
 msgstr ""
 
 #: ../../source/advanced.rst:48
 msgid ""
+"In addition to its graphical interface, OnionShare has a command line "
+"interface."
+msgstr ""
+
+#: ../../source/advanced.rst:51
+msgid "Linux"
+msgstr ""
+
+#: ../../source/advanced.rst:53
+msgid ""
+"If you installed OnionShare using the Flatpak package, unfortunately the "
+"command line interface isn't supported."
+msgstr ""
+
+#: ../../source/advanced.rst:55
+msgid ""
+"If you installed OnionShare using an operating system package, you can "
+"just run ``onionshare`` from the terminal."
+msgstr ""
+
+#: ../../source/advanced.rst:58
+msgid "macOS"
+msgstr ""
+
+#: ../../source/advanced.rst:60
+msgid "Make a symbolic link to the OnionShare command line binary line this::"
+msgstr ""
+
+#: ../../source/advanced.rst:64
+msgid "Now you can run ``onionshare`` from the terminal."
+msgstr ""
+
+#: ../../source/advanced.rst:67
+msgid "Windows"
+msgstr ""
+
+#: ../../source/advanced.rst:69
+msgid "The command line interface isn't supported in Windows."
+msgstr ""
+
+#: ../../source/advanced.rst:71
+msgid ""
+"If you really want to use it anyway, you can set up a Windows development"
+" environment (see :ref:`starting_development`) and then run this in a "
+"command prompt::"
+msgstr ""
+
+#: ../../source/advanced.rst:76
+msgid "Usage"
+msgstr ""
+
+#: ../../source/advanced.rst:78
+msgid "You can see command line documentation by running ``onionshare --help``::"
+msgstr ""
+
+#: ../../source/advanced.rst:134
+msgid "Legacy addresses"
+msgstr ""
+
+#: ../../source/advanced.rst:136
+msgid ""
 "OnionShare uses v3 Tor onion services by default. These are modern onion "
 "addresses that have 56 characters, for example::"
 msgstr ""
 
-#: ../../source/advanced.rst:52
+#: ../../source/advanced.rst:140
 msgid ""
 "But it still has support for v2 onion addresses, the old type of onion "
 "addresses that have 16 characters, for example::"
 msgstr ""
 
-#: ../../source/advanced.rst:56
+#: ../../source/advanced.rst:144
 msgid ""
 "OnionShare calls v2 onion addresses \"legacy addresses\". v3 onion "
 "addresses are more secure, and using legacy addresses is not recommended."
 msgstr ""
 
-#: ../../source/advanced.rst:58
+#: ../../source/advanced.rst:146
 msgid ""
 "To use legacy addresses, before starting a server click \"Show advanced "
 "settings\" in its tab and check the \"Use a legacy address (v2 onion "
@@ -154,7 +215,7 @@ msgid ""
 "service in a separate tab."
 msgstr ""
 
-#: ../../source/advanced.rst:60
+#: ../../source/advanced.rst:148
 msgid ""
 "Tor Project plans to `completely deprecate v2 onion services "
 "<https://blog.torproject.org/v2-deprecation-timeline>`_ on October 15, "
diff --git a/docs/source/locale/ar/LC_MESSAGES/security.po b/docs/source/locale/ar/LC_MESSAGES/security.po
index d7540eaa..627b0d48 100644
--- a/docs/source/locale/ar/LC_MESSAGES/security.po
+++ b/docs/source/locale/ar/LC_MESSAGES/security.po
@@ -9,7 +9,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OnionShare 2.3\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-08-26 20:38-0700\n"
+"POT-Creation-Date: 2020-08-27 20:28-0400\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -28,11 +28,15 @@ msgid ""
 " works."
 msgstr ""
 
-#: ../../source/security.rst:7
-msgid "What OnionShare protects against"
+#: ../../source/security.rst:6
+msgid "Like all software, OnionShare may contain bugs or vulnerabilities."
 msgstr ""
 
 #: ../../source/security.rst:9
+msgid "What OnionShare protects against"
+msgstr ""
+
+#: ../../source/security.rst:11
 msgid ""
 "**Third parties don't have access to anything that happens in "
 "OnionShare.** When you use OnionShare, you host services directly on your"
@@ -43,7 +47,7 @@ msgid ""
 "service with access to your data."
 msgstr ""
 
-#: ../../source/security.rst:11
+#: ../../source/security.rst:13
 msgid ""
 "**Network eavesdroppers can't spy on anything that happens in OnionShare "
 "in transit.** Because connections between Tor onion services and Tor "
@@ -56,7 +60,7 @@ msgid ""
 " service key."
 msgstr ""
 
-#: ../../source/security.rst:13
+#: ../../source/security.rst:15
 msgid ""
 "**Anonymity of OnionShare users are protected by Tor.** OnionShare and "
 "Tor Browser protect the anonymity of the users. As long as the OnionShare"
@@ -65,7 +69,7 @@ msgid ""
 "identity of the OnionShare user."
 msgstr ""
 
-#: ../../source/security.rst:15
+#: ../../source/security.rst:17
 msgid ""
 "**If an attacker learns about the onion service, they still can't access "
 "anything.** There have been attacks against the Tor network that can "
@@ -79,11 +83,11 @@ msgid ""
 " brute force attacks against the password."
 msgstr ""
 
-#: ../../source/security.rst:18
+#: ../../source/security.rst:20
 msgid "What OnionShare doesn't protect against"
 msgstr ""
 
-#: ../../source/security.rst:20
+#: ../../source/security.rst:22
 msgid ""
 "**Communicating the OnionShare address might not be secure.** The "
 "OnionShare user is responsible for securely communicating the OnionShare "
@@ -97,7 +101,7 @@ msgid ""
 "cases where OnionShare is being used for something that isn't secret."
 msgstr ""
 
-#: ../../source/security.rst:22
+#: ../../source/security.rst:24
 msgid ""
 "**Communicating the OnionShare address might not be anonymous.** While "
 "OnionShare and Tor Browser allow for anonymity, if the user wishes to "
diff --git a/docs/source/locale/ca/LC_MESSAGES/advanced.po b/docs/source/locale/ca/LC_MESSAGES/advanced.po
index ba0a2218..0b6a4166 100644
--- a/docs/source/locale/ca/LC_MESSAGES/advanced.po
+++ b/docs/source/locale/ca/LC_MESSAGES/advanced.po
@@ -9,7 +9,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OnionShare 2.3\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-08-26 20:38-0700\n"
+"POT-Creation-Date: 2020-08-27 20:28-0400\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -123,28 +123,89 @@ msgid ""
 msgstr ""
 
 #: ../../source/advanced.rst:46
-msgid "Legacy addresses"
+msgid "Command line interface"
 msgstr ""
 
 #: ../../source/advanced.rst:48
 msgid ""
+"In addition to its graphical interface, OnionShare has a command line "
+"interface."
+msgstr ""
+
+#: ../../source/advanced.rst:51
+msgid "Linux"
+msgstr ""
+
+#: ../../source/advanced.rst:53
+msgid ""
+"If you installed OnionShare using the Flatpak package, unfortunately the "
+"command line interface isn't supported."
+msgstr ""
+
+#: ../../source/advanced.rst:55
+msgid ""
+"If you installed OnionShare using an operating system package, you can "
+"just run ``onionshare`` from the terminal."
+msgstr ""
+
+#: ../../source/advanced.rst:58
+msgid "macOS"
+msgstr ""
+
+#: ../../source/advanced.rst:60
+msgid "Make a symbolic link to the OnionShare command line binary line this::"
+msgstr ""
+
+#: ../../source/advanced.rst:64
+msgid "Now you can run ``onionshare`` from the terminal."
+msgstr ""
+
+#: ../../source/advanced.rst:67
+msgid "Windows"
+msgstr ""
+
+#: ../../source/advanced.rst:69
+msgid "The command line interface isn't supported in Windows."
+msgstr ""
+
+#: ../../source/advanced.rst:71
+msgid ""
+"If you really want to use it anyway, you can set up a Windows development"
+" environment (see :ref:`starting_development`) and then run this in a "
+"command prompt::"
+msgstr ""
+
+#: ../../source/advanced.rst:76
+msgid "Usage"
+msgstr ""
+
+#: ../../source/advanced.rst:78
+msgid "You can see command line documentation by running ``onionshare --help``::"
+msgstr ""
+
+#: ../../source/advanced.rst:134
+msgid "Legacy addresses"
+msgstr ""
+
+#: ../../source/advanced.rst:136
+msgid ""
 "OnionShare uses v3 Tor onion services by default. These are modern onion "
 "addresses that have 56 characters, for example::"
 msgstr ""
 
-#: ../../source/advanced.rst:52
+#: ../../source/advanced.rst:140
 msgid ""
 "But it still has support for v2 onion addresses, the old type of onion "
 "addresses that have 16 characters, for example::"
 msgstr ""
 
-#: ../../source/advanced.rst:56
+#: ../../source/advanced.rst:144
 msgid ""
 "OnionShare calls v2 onion addresses \"legacy addresses\". v3 onion "
 "addresses are more secure, and using legacy addresses is not recommended."
 msgstr ""
 
-#: ../../source/advanced.rst:58
+#: ../../source/advanced.rst:146
 msgid ""
 "To use legacy addresses, before starting a server click \"Show advanced "
 "settings\" in its tab and check the \"Use a legacy address (v2 onion "
@@ -154,7 +215,7 @@ msgid ""
 "service in a separate tab."
 msgstr ""
 
-#: ../../source/advanced.rst:60
+#: ../../source/advanced.rst:148
 msgid ""
 "Tor Project plans to `completely deprecate v2 onion services "
 "<https://blog.torproject.org/v2-deprecation-timeline>`_ on October 15, "
diff --git a/docs/source/locale/ca/LC_MESSAGES/security.po b/docs/source/locale/ca/LC_MESSAGES/security.po
index d7540eaa..627b0d48 100644
--- a/docs/source/locale/ca/LC_MESSAGES/security.po
+++ b/docs/source/locale/ca/LC_MESSAGES/security.po
@@ -9,7 +9,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OnionShare 2.3\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-08-26 20:38-0700\n"
+"POT-Creation-Date: 2020-08-27 20:28-0400\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -28,11 +28,15 @@ msgid ""
 " works."
 msgstr ""
 
-#: ../../source/security.rst:7
-msgid "What OnionShare protects against"
+#: ../../source/security.rst:6
+msgid "Like all software, OnionShare may contain bugs or vulnerabilities."
 msgstr ""
 
 #: ../../source/security.rst:9
+msgid "What OnionShare protects against"
+msgstr ""
+
+#: ../../source/security.rst:11
 msgid ""
 "**Third parties don't have access to anything that happens in "
 "OnionShare.** When you use OnionShare, you host services directly on your"
@@ -43,7 +47,7 @@ msgid ""
 "service with access to your data."
 msgstr ""
 
-#: ../../source/security.rst:11
+#: ../../source/security.rst:13
 msgid ""
 "**Network eavesdroppers can't spy on anything that happens in OnionShare "
 "in transit.** Because connections between Tor onion services and Tor "
@@ -56,7 +60,7 @@ msgid ""
 " service key."
 msgstr ""
 
-#: ../../source/security.rst:13
+#: ../../source/security.rst:15
 msgid ""
 "**Anonymity of OnionShare users are protected by Tor.** OnionShare and "
 "Tor Browser protect the anonymity of the users. As long as the OnionShare"
@@ -65,7 +69,7 @@ msgid ""
 "identity of the OnionShare user."
 msgstr ""
 
-#: ../../source/security.rst:15
+#: ../../source/security.rst:17
 msgid ""
 "**If an attacker learns about the onion service, they still can't access "
 "anything.** There have been attacks against the Tor network that can "
@@ -79,11 +83,11 @@ msgid ""
 " brute force attacks against the password."
 msgstr ""
 
-#: ../../source/security.rst:18
+#: ../../source/security.rst:20
 msgid "What OnionShare doesn't protect against"
 msgstr ""
 
-#: ../../source/security.rst:20
+#: ../../source/security.rst:22
 msgid ""
 "**Communicating the OnionShare address might not be secure.** The "
 "OnionShare user is responsible for securely communicating the OnionShare "
@@ -97,7 +101,7 @@ msgid ""
 "cases where OnionShare is being used for something that isn't secret."
 msgstr ""
 
-#: ../../source/security.rst:22
+#: ../../source/security.rst:24
 msgid ""
 "**Communicating the OnionShare address might not be anonymous.** While "
 "OnionShare and Tor Browser allow for anonymity, if the user wishes to "
diff --git a/docs/source/locale/da/LC_MESSAGES/advanced.po b/docs/source/locale/da/LC_MESSAGES/advanced.po
index ba0a2218..0b6a4166 100644
--- a/docs/source/locale/da/LC_MESSAGES/advanced.po
+++ b/docs/source/locale/da/LC_MESSAGES/advanced.po
@@ -9,7 +9,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OnionShare 2.3\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-08-26 20:38-0700\n"
+"POT-Creation-Date: 2020-08-27 20:28-0400\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -123,28 +123,89 @@ msgid ""
 msgstr ""
 
 #: ../../source/advanced.rst:46
-msgid "Legacy addresses"
+msgid "Command line interface"
 msgstr ""
 
 #: ../../source/advanced.rst:48
 msgid ""
+"In addition to its graphical interface, OnionShare has a command line "
+"interface."
+msgstr ""
+
+#: ../../source/advanced.rst:51
+msgid "Linux"
+msgstr ""
+
+#: ../../source/advanced.rst:53
+msgid ""
+"If you installed OnionShare using the Flatpak package, unfortunately the "
+"command line interface isn't supported."
+msgstr ""
+
+#: ../../source/advanced.rst:55
+msgid ""
+"If you installed OnionShare using an operating system package, you can "
+"just run ``onionshare`` from the terminal."
+msgstr ""
+
+#: ../../source/advanced.rst:58
+msgid "macOS"
+msgstr ""
+
+#: ../../source/advanced.rst:60
+msgid "Make a symbolic link to the OnionShare command line binary line this::"
+msgstr ""
+
+#: ../../source/advanced.rst:64
+msgid "Now you can run ``onionshare`` from the terminal."
+msgstr ""
+
+#: ../../source/advanced.rst:67
+msgid "Windows"
+msgstr ""
+
+#: ../../source/advanced.rst:69
+msgid "The command line interface isn't supported in Windows."
+msgstr ""
+
+#: ../../source/advanced.rst:71
+msgid ""
+"If you really want to use it anyway, you can set up a Windows development"
+" environment (see :ref:`starting_development`) and then run this in a "
+"command prompt::"
+msgstr ""
+
+#: ../../source/advanced.rst:76
+msgid "Usage"
+msgstr ""
+
+#: ../../source/advanced.rst:78
+msgid "You can see command line documentation by running ``onionshare --help``::"
+msgstr ""
+
+#: ../../source/advanced.rst:134
+msgid "Legacy addresses"
+msgstr ""
+
+#: ../../source/advanced.rst:136
+msgid ""
 "OnionShare uses v3 Tor onion services by default. These are modern onion "
 "addresses that have 56 characters, for example::"
 msgstr ""
 
-#: ../../source/advanced.rst:52
+#: ../../source/advanced.rst:140
 msgid ""
 "But it still has support for v2 onion addresses, the old type of onion "
 "addresses that have 16 characters, for example::"
 msgstr ""
 
-#: ../../source/advanced.rst:56
+#: ../../source/advanced.rst:144
 msgid ""
 "OnionShare calls v2 onion addresses \"legacy addresses\". v3 onion "
 "addresses are more secure, and using legacy addresses is not recommended."
 msgstr ""
 
-#: ../../source/advanced.rst:58
+#: ../../source/advanced.rst:146
 msgid ""
 "To use legacy addresses, before starting a server click \"Show advanced "
 "settings\" in its tab and check the \"Use a legacy address (v2 onion "
@@ -154,7 +215,7 @@ msgid ""
 "service in a separate tab."
 msgstr ""
 
-#: ../../source/advanced.rst:60
+#: ../../source/advanced.rst:148
 msgid ""
 "Tor Project plans to `completely deprecate v2 onion services "
 "<https://blog.torproject.org/v2-deprecation-timeline>`_ on October 15, "
diff --git a/docs/source/locale/da/LC_MESSAGES/security.po b/docs/source/locale/da/LC_MESSAGES/security.po
index d7540eaa..627b0d48 100644
--- a/docs/source/locale/da/LC_MESSAGES/security.po
+++ b/docs/source/locale/da/LC_MESSAGES/security.po
@@ -9,7 +9,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OnionShare 2.3\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-08-26 20:38-0700\n"
+"POT-Creation-Date: 2020-08-27 20:28-0400\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -28,11 +28,15 @@ msgid ""
 " works."
 msgstr ""
 
-#: ../../source/security.rst:7
-msgid "What OnionShare protects against"
+#: ../../source/security.rst:6
+msgid "Like all software, OnionShare may contain bugs or vulnerabilities."
 msgstr ""
 
 #: ../../source/security.rst:9
+msgid "What OnionShare protects against"
+msgstr ""
+
+#: ../../source/security.rst:11
 msgid ""
 "**Third parties don't have access to anything that happens in "
 "OnionShare.** When you use OnionShare, you host services directly on your"
@@ -43,7 +47,7 @@ msgid ""
 "service with access to your data."
 msgstr ""
 
-#: ../../source/security.rst:11
+#: ../../source/security.rst:13
 msgid ""
 "**Network eavesdroppers can't spy on anything that happens in OnionShare "
 "in transit.** Because connections between Tor onion services and Tor "
@@ -56,7 +60,7 @@ msgid ""
 " service key."
 msgstr ""
 
-#: ../../source/security.rst:13
+#: ../../source/security.rst:15
 msgid ""
 "**Anonymity of OnionShare users are protected by Tor.** OnionShare and "
 "Tor Browser protect the anonymity of the users. As long as the OnionShare"
@@ -65,7 +69,7 @@ msgid ""
 "identity of the OnionShare user."
 msgstr ""
 
-#: ../../source/security.rst:15
+#: ../../source/security.rst:17
 msgid ""
 "**If an attacker learns about the onion service, they still can't access "
 "anything.** There have been attacks against the Tor network that can "
@@ -79,11 +83,11 @@ msgid ""
 " brute force attacks against the password."
 msgstr ""
 
-#: ../../source/security.rst:18
+#: ../../source/security.rst:20
 msgid "What OnionShare doesn't protect against"
 msgstr ""
 
-#: ../../source/security.rst:20
+#: ../../source/security.rst:22
 msgid ""
 "**Communicating the OnionShare address might not be secure.** The "
 "OnionShare user is responsible for securely communicating the OnionShare "
@@ -97,7 +101,7 @@ msgid ""
 "cases where OnionShare is being used for something that isn't secret."
 msgstr ""
 
-#: ../../source/security.rst:22
+#: ../../source/security.rst:24
 msgid ""
 "**Communicating the OnionShare address might not be anonymous.** While "
 "OnionShare and Tor Browser allow for anonymity, if the user wishes to "
diff --git a/docs/source/locale/de/LC_MESSAGES/advanced.po b/docs/source/locale/de/LC_MESSAGES/advanced.po
index ba0a2218..0b6a4166 100644
--- a/docs/source/locale/de/LC_MESSAGES/advanced.po
+++ b/docs/source/locale/de/LC_MESSAGES/advanced.po
@@ -9,7 +9,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OnionShare 2.3\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-08-26 20:38-0700\n"
+"POT-Creation-Date: 2020-08-27 20:28-0400\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -123,28 +123,89 @@ msgid ""
 msgstr ""
 
 #: ../../source/advanced.rst:46
-msgid "Legacy addresses"
+msgid "Command line interface"
 msgstr ""
 
 #: ../../source/advanced.rst:48
 msgid ""
+"In addition to its graphical interface, OnionShare has a command line "
+"interface."
+msgstr ""
+
+#: ../../source/advanced.rst:51
+msgid "Linux"
+msgstr ""
+
+#: ../../source/advanced.rst:53
+msgid ""
+"If you installed OnionShare using the Flatpak package, unfortunately the "
+"command line interface isn't supported."
+msgstr ""
+
+#: ../../source/advanced.rst:55
+msgid ""
+"If you installed OnionShare using an operating system package, you can "
+"just run ``onionshare`` from the terminal."
+msgstr ""
+
+#: ../../source/advanced.rst:58
+msgid "macOS"
+msgstr ""
+
+#: ../../source/advanced.rst:60
+msgid "Make a symbolic link to the OnionShare command line binary line this::"
+msgstr ""
+
+#: ../../source/advanced.rst:64
+msgid "Now you can run ``onionshare`` from the terminal."
+msgstr ""
+
+#: ../../source/advanced.rst:67
+msgid "Windows"
+msgstr ""
+
+#: ../../source/advanced.rst:69
+msgid "The command line interface isn't supported in Windows."
+msgstr ""
+
+#: ../../source/advanced.rst:71
+msgid ""
+"If you really want to use it anyway, you can set up a Windows development"
+" environment (see :ref:`starting_development`) and then run this in a "
+"command prompt::"
+msgstr ""
+
+#: ../../source/advanced.rst:76
+msgid "Usage"
+msgstr ""
+
+#: ../../source/advanced.rst:78
+msgid "You can see command line documentation by running ``onionshare --help``::"
+msgstr ""
+
+#: ../../source/advanced.rst:134
+msgid "Legacy addresses"
+msgstr ""
+
+#: ../../source/advanced.rst:136
+msgid ""
 "OnionShare uses v3 Tor onion services by default. These are modern onion "
 "addresses that have 56 characters, for example::"
 msgstr ""
 
-#: ../../source/advanced.rst:52
+#: ../../source/advanced.rst:140
 msgid ""
 "But it still has support for v2 onion addresses, the old type of onion "
 "addresses that have 16 characters, for example::"
 msgstr ""
 
-#: ../../source/advanced.rst:56
+#: ../../source/advanced.rst:144
 msgid ""
 "OnionShare calls v2 onion addresses \"legacy addresses\". v3 onion "
 "addresses are more secure, and using legacy addresses is not recommended."
 msgstr ""
 
-#: ../../source/advanced.rst:58
+#: ../../source/advanced.rst:146
 msgid ""
 "To use legacy addresses, before starting a server click \"Show advanced "
 "settings\" in its tab and check the \"Use a legacy address (v2 onion "
@@ -154,7 +215,7 @@ msgid ""
 "service in a separate tab."
 msgstr ""
 
-#: ../../source/advanced.rst:60
+#: ../../source/advanced.rst:148
 msgid ""
 "Tor Project plans to `completely deprecate v2 onion services "
 "<https://blog.torproject.org/v2-deprecation-timeline>`_ on October 15, "
diff --git a/docs/source/locale/de/LC_MESSAGES/security.po b/docs/source/locale/de/LC_MESSAGES/security.po
index d7540eaa..627b0d48 100644
--- a/docs/source/locale/de/LC_MESSAGES/security.po
+++ b/docs/source/locale/de/LC_MESSAGES/security.po
@@ -9,7 +9,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OnionShare 2.3\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-08-26 20:38-0700\n"
+"POT-Creation-Date: 2020-08-27 20:28-0400\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -28,11 +28,15 @@ msgid ""
 " works."
 msgstr ""
 
-#: ../../source/security.rst:7
-msgid "What OnionShare protects against"
+#: ../../source/security.rst:6
+msgid "Like all software, OnionShare may contain bugs or vulnerabilities."
 msgstr ""
 
 #: ../../source/security.rst:9
+msgid "What OnionShare protects against"
+msgstr ""
+
+#: ../../source/security.rst:11
 msgid ""
 "**Third parties don't have access to anything that happens in "
 "OnionShare.** When you use OnionShare, you host services directly on your"
@@ -43,7 +47,7 @@ msgid ""
 "service with access to your data."
 msgstr ""
 
-#: ../../source/security.rst:11
+#: ../../source/security.rst:13
 msgid ""
 "**Network eavesdroppers can't spy on anything that happens in OnionShare "
 "in transit.** Because connections between Tor onion services and Tor "
@@ -56,7 +60,7 @@ msgid ""
 " service key."
 msgstr ""
 
-#: ../../source/security.rst:13
+#: ../../source/security.rst:15
 msgid ""
 "**Anonymity of OnionShare users are protected by Tor.** OnionShare and "
 "Tor Browser protect the anonymity of the users. As long as the OnionShare"
@@ -65,7 +69,7 @@ msgid ""
 "identity of the OnionShare user."
 msgstr ""
 
-#: ../../source/security.rst:15
+#: ../../source/security.rst:17
 msgid ""
 "**If an attacker learns about the onion service, they still can't access "
 "anything.** There have been attacks against the Tor network that can "
@@ -79,11 +83,11 @@ msgid ""
 " brute force attacks against the password."
 msgstr ""
 
-#: ../../source/security.rst:18
+#: ../../source/security.rst:20
 msgid "What OnionShare doesn't protect against"
 msgstr ""
 
-#: ../../source/security.rst:20
+#: ../../source/security.rst:22
 msgid ""
 "**Communicating the OnionShare address might not be secure.** The "
 "OnionShare user is responsible for securely communicating the OnionShare "
@@ -97,7 +101,7 @@ msgid ""
 "cases where OnionShare is being used for something that isn't secret."
 msgstr ""
 
-#: ../../source/security.rst:22
+#: ../../source/security.rst:24
 msgid ""
 "**Communicating the OnionShare address might not be anonymous.** While "
 "OnionShare and Tor Browser allow for anonymity, if the user wishes to "
diff --git a/docs/source/locale/el/LC_MESSAGES/advanced.po b/docs/source/locale/el/LC_MESSAGES/advanced.po
index ba0a2218..0b6a4166 100644
--- a/docs/source/locale/el/LC_MESSAGES/advanced.po
+++ b/docs/source/locale/el/LC_MESSAGES/advanced.po
@@ -9,7 +9,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OnionShare 2.3\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-08-26 20:38-0700\n"
+"POT-Creation-Date: 2020-08-27 20:28-0400\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -123,28 +123,89 @@ msgid ""
 msgstr ""
 
 #: ../../source/advanced.rst:46
-msgid "Legacy addresses"
+msgid "Command line interface"
 msgstr ""
 
 #: ../../source/advanced.rst:48
 msgid ""
+"In addition to its graphical interface, OnionShare has a command line "
+"interface."
+msgstr ""
+
+#: ../../source/advanced.rst:51
+msgid "Linux"
+msgstr ""
+
+#: ../../source/advanced.rst:53
+msgid ""
+"If you installed OnionShare using the Flatpak package, unfortunately the "
+"command line interface isn't supported."
+msgstr ""
+
+#: ../../source/advanced.rst:55
+msgid ""
+"If you installed OnionShare using an operating system package, you can "
+"just run ``onionshare`` from the terminal."
+msgstr ""
+
+#: ../../source/advanced.rst:58
+msgid "macOS"
+msgstr ""
+
+#: ../../source/advanced.rst:60
+msgid "Make a symbolic link to the OnionShare command line binary line this::"
+msgstr ""
+
+#: ../../source/advanced.rst:64
+msgid "Now you can run ``onionshare`` from the terminal."
+msgstr ""
+
+#: ../../source/advanced.rst:67
+msgid "Windows"
+msgstr ""
+
+#: ../../source/advanced.rst:69
+msgid "The command line interface isn't supported in Windows."
+msgstr ""
+
+#: ../../source/advanced.rst:71
+msgid ""
+"If you really want to use it anyway, you can set up a Windows development"
+" environment (see :ref:`starting_development`) and then run this in a "
+"command prompt::"
+msgstr ""
+
+#: ../../source/advanced.rst:76
+msgid "Usage"
+msgstr ""
+
+#: ../../source/advanced.rst:78
+msgid "You can see command line documentation by running ``onionshare --help``::"
+msgstr ""
+
+#: ../../source/advanced.rst:134
+msgid "Legacy addresses"
+msgstr ""
+
+#: ../../source/advanced.rst:136
+msgid ""
 "OnionShare uses v3 Tor onion services by default. These are modern onion "
 "addresses that have 56 characters, for example::"
 msgstr ""
 
-#: ../../source/advanced.rst:52
+#: ../../source/advanced.rst:140
 msgid ""
 "But it still has support for v2 onion addresses, the old type of onion "
 "addresses that have 16 characters, for example::"
 msgstr ""
 
-#: ../../source/advanced.rst:56
+#: ../../source/advanced.rst:144
 msgid ""
 "OnionShare calls v2 onion addresses \"legacy addresses\". v3 onion "
 "addresses are more secure, and using legacy addresses is not recommended."
 msgstr ""
 
-#: ../../source/advanced.rst:58
+#: ../../source/advanced.rst:146
 msgid ""
 "To use legacy addresses, before starting a server click \"Show advanced "
 "settings\" in its tab and check the \"Use a legacy address (v2 onion "
@@ -154,7 +215,7 @@ msgid ""
 "service in a separate tab."
 msgstr ""
 
-#: ../../source/advanced.rst:60
+#: ../../source/advanced.rst:148
 msgid ""
 "Tor Project plans to `completely deprecate v2 onion services "
 "<https://blog.torproject.org/v2-deprecation-timeline>`_ on October 15, "
diff --git a/docs/source/locale/el/LC_MESSAGES/security.po b/docs/source/locale/el/LC_MESSAGES/security.po
index d7540eaa..627b0d48 100644
--- a/docs/source/locale/el/LC_MESSAGES/security.po
+++ b/docs/source/locale/el/LC_MESSAGES/security.po
@@ -9,7 +9,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OnionShare 2.3\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-08-26 20:38-0700\n"
+"POT-Creation-Date: 2020-08-27 20:28-0400\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -28,11 +28,15 @@ msgid ""
 " works."
 msgstr ""
 
-#: ../../source/security.rst:7
-msgid "What OnionShare protects against"
+#: ../../source/security.rst:6
+msgid "Like all software, OnionShare may contain bugs or vulnerabilities."
 msgstr ""
 
 #: ../../source/security.rst:9
+msgid "What OnionShare protects against"
+msgstr ""
+
+#: ../../source/security.rst:11
 msgid ""
 "**Third parties don't have access to anything that happens in "
 "OnionShare.** When you use OnionShare, you host services directly on your"
@@ -43,7 +47,7 @@ msgid ""
 "service with access to your data."
 msgstr ""
 
-#: ../../source/security.rst:11
+#: ../../source/security.rst:13
 msgid ""
 "**Network eavesdroppers can't spy on anything that happens in OnionShare "
 "in transit.** Because connections between Tor onion services and Tor "
@@ -56,7 +60,7 @@ msgid ""
 " service key."
 msgstr ""
 
-#: ../../source/security.rst:13
+#: ../../source/security.rst:15
 msgid ""
 "**Anonymity of OnionShare users are protected by Tor.** OnionShare and "
 "Tor Browser protect the anonymity of the users. As long as the OnionShare"
@@ -65,7 +69,7 @@ msgid ""
 "identity of the OnionShare user."
 msgstr ""
 
-#: ../../source/security.rst:15
+#: ../../source/security.rst:17
 msgid ""
 "**If an attacker learns about the onion service, they still can't access "
 "anything.** There have been attacks against the Tor network that can "
@@ -79,11 +83,11 @@ msgid ""
 " brute force attacks against the password."
 msgstr ""
 
-#: ../../source/security.rst:18
+#: ../../source/security.rst:20
 msgid "What OnionShare doesn't protect against"
 msgstr ""
 
-#: ../../source/security.rst:20
+#: ../../source/security.rst:22
 msgid ""
 "**Communicating the OnionShare address might not be secure.** The "
 "OnionShare user is responsible for securely communicating the OnionShare "
@@ -97,7 +101,7 @@ msgid ""
 "cases where OnionShare is being used for something that isn't secret."
 msgstr ""
 
-#: ../../source/security.rst:22
+#: ../../source/security.rst:24
 msgid ""
 "**Communicating the OnionShare address might not be anonymous.** While "
 "OnionShare and Tor Browser allow for anonymity, if the user wishes to "
diff --git a/docs/source/locale/en/LC_MESSAGES/advanced.po b/docs/source/locale/en/LC_MESSAGES/advanced.po
index ba0a2218..0b6a4166 100644
--- a/docs/source/locale/en/LC_MESSAGES/advanced.po
+++ b/docs/source/locale/en/LC_MESSAGES/advanced.po
@@ -9,7 +9,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OnionShare 2.3\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-08-26 20:38-0700\n"
+"POT-Creation-Date: 2020-08-27 20:28-0400\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -123,28 +123,89 @@ msgid ""
 msgstr ""
 
 #: ../../source/advanced.rst:46
-msgid "Legacy addresses"
+msgid "Command line interface"
 msgstr ""
 
 #: ../../source/advanced.rst:48
 msgid ""
+"In addition to its graphical interface, OnionShare has a command line "
+"interface."
+msgstr ""
+
+#: ../../source/advanced.rst:51
+msgid "Linux"
+msgstr ""
+
+#: ../../source/advanced.rst:53
+msgid ""
+"If you installed OnionShare using the Flatpak package, unfortunately the "
+"command line interface isn't supported."
+msgstr ""
+
+#: ../../source/advanced.rst:55
+msgid ""
+"If you installed OnionShare using an operating system package, you can "
+"just run ``onionshare`` from the terminal."
+msgstr ""
+
+#: ../../source/advanced.rst:58
+msgid "macOS"
+msgstr ""
+
+#: ../../source/advanced.rst:60
+msgid "Make a symbolic link to the OnionShare command line binary line this::"
+msgstr ""
+
+#: ../../source/advanced.rst:64
+msgid "Now you can run ``onionshare`` from the terminal."
+msgstr ""
+
+#: ../../source/advanced.rst:67
+msgid "Windows"
+msgstr ""
+
+#: ../../source/advanced.rst:69
+msgid "The command line interface isn't supported in Windows."
+msgstr ""
+
+#: ../../source/advanced.rst:71
+msgid ""
+"If you really want to use it anyway, you can set up a Windows development"
+" environment (see :ref:`starting_development`) and then run this in a "
+"command prompt::"
+msgstr ""
+
+#: ../../source/advanced.rst:76
+msgid "Usage"
+msgstr ""
+
+#: ../../source/advanced.rst:78
+msgid "You can see command line documentation by running ``onionshare --help``::"
+msgstr ""
+
+#: ../../source/advanced.rst:134
+msgid "Legacy addresses"
+msgstr ""
+
+#: ../../source/advanced.rst:136
+msgid ""
 "OnionShare uses v3 Tor onion services by default. These are modern onion "
 "addresses that have 56 characters, for example::"
 msgstr ""
 
-#: ../../source/advanced.rst:52
+#: ../../source/advanced.rst:140
 msgid ""
 "But it still has support for v2 onion addresses, the old type of onion "
 "addresses that have 16 characters, for example::"
 msgstr ""
 
-#: ../../source/advanced.rst:56
+#: ../../source/advanced.rst:144
 msgid ""
 "OnionShare calls v2 onion addresses \"legacy addresses\". v3 onion "
 "addresses are more secure, and using legacy addresses is not recommended."
 msgstr ""
 
-#: ../../source/advanced.rst:58
+#: ../../source/advanced.rst:146
 msgid ""
 "To use legacy addresses, before starting a server click \"Show advanced "
 "settings\" in its tab and check the \"Use a legacy address (v2 onion "
@@ -154,7 +215,7 @@ msgid ""
 "service in a separate tab."
 msgstr ""
 
-#: ../../source/advanced.rst:60
+#: ../../source/advanced.rst:148
 msgid ""
 "Tor Project plans to `completely deprecate v2 onion services "
 "<https://blog.torproject.org/v2-deprecation-timeline>`_ on October 15, "
diff --git a/docs/source/locale/en/LC_MESSAGES/security.po b/docs/source/locale/en/LC_MESSAGES/security.po
index d7540eaa..627b0d48 100644
--- a/docs/source/locale/en/LC_MESSAGES/security.po
+++ b/docs/source/locale/en/LC_MESSAGES/security.po
@@ -9,7 +9,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OnionShare 2.3\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-08-26 20:38-0700\n"
+"POT-Creation-Date: 2020-08-27 20:28-0400\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -28,11 +28,15 @@ msgid ""
 " works."
 msgstr ""
 
-#: ../../source/security.rst:7
-msgid "What OnionShare protects against"
+#: ../../source/security.rst:6
+msgid "Like all software, OnionShare may contain bugs or vulnerabilities."
 msgstr ""
 
 #: ../../source/security.rst:9
+msgid "What OnionShare protects against"
+msgstr ""
+
+#: ../../source/security.rst:11
 msgid ""
 "**Third parties don't have access to anything that happens in "
 "OnionShare.** When you use OnionShare, you host services directly on your"
@@ -43,7 +47,7 @@ msgid ""
 "service with access to your data."
 msgstr ""
 
-#: ../../source/security.rst:11
+#: ../../source/security.rst:13
 msgid ""
 "**Network eavesdroppers can't spy on anything that happens in OnionShare "
 "in transit.** Because connections between Tor onion services and Tor "
@@ -56,7 +60,7 @@ msgid ""
 " service key."
 msgstr ""
 
-#: ../../source/security.rst:13
+#: ../../source/security.rst:15
 msgid ""
 "**Anonymity of OnionShare users are protected by Tor.** OnionShare and "
 "Tor Browser protect the anonymity of the users. As long as the OnionShare"
@@ -65,7 +69,7 @@ msgid ""
 "identity of the OnionShare user."
 msgstr ""
 
-#: ../../source/security.rst:15
+#: ../../source/security.rst:17
 msgid ""
 "**If an attacker learns about the onion service, they still can't access "
 "anything.** There have been attacks against the Tor network that can "
@@ -79,11 +83,11 @@ msgid ""
 " brute force attacks against the password."
 msgstr ""
 
-#: ../../source/security.rst:18
+#: ../../source/security.rst:20
 msgid "What OnionShare doesn't protect against"
 msgstr ""
 
-#: ../../source/security.rst:20
+#: ../../source/security.rst:22
 msgid ""
 "**Communicating the OnionShare address might not be secure.** The "
 "OnionShare user is responsible for securely communicating the OnionShare "
@@ -97,7 +101,7 @@ msgid ""
 "cases where OnionShare is being used for something that isn't secret."
 msgstr ""
 
-#: ../../source/security.rst:22
+#: ../../source/security.rst:24
 msgid ""
 "**Communicating the OnionShare address might not be anonymous.** While "
 "OnionShare and Tor Browser allow for anonymity, if the user wishes to "
diff --git a/docs/source/locale/es/LC_MESSAGES/advanced.po b/docs/source/locale/es/LC_MESSAGES/advanced.po
index ba0a2218..0b6a4166 100644
--- a/docs/source/locale/es/LC_MESSAGES/advanced.po
+++ b/docs/source/locale/es/LC_MESSAGES/advanced.po
@@ -9,7 +9,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OnionShare 2.3\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-08-26 20:38-0700\n"
+"POT-Creation-Date: 2020-08-27 20:28-0400\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -123,28 +123,89 @@ msgid ""
 msgstr ""
 
 #: ../../source/advanced.rst:46
-msgid "Legacy addresses"
+msgid "Command line interface"
 msgstr ""
 
 #: ../../source/advanced.rst:48
 msgid ""
+"In addition to its graphical interface, OnionShare has a command line "
+"interface."
+msgstr ""
+
+#: ../../source/advanced.rst:51
+msgid "Linux"
+msgstr ""
+
+#: ../../source/advanced.rst:53
+msgid ""
+"If you installed OnionShare using the Flatpak package, unfortunately the "
+"command line interface isn't supported."
+msgstr ""
+
+#: ../../source/advanced.rst:55
+msgid ""
+"If you installed OnionShare using an operating system package, you can "
+"just run ``onionshare`` from the terminal."
+msgstr ""
+
+#: ../../source/advanced.rst:58
+msgid "macOS"
+msgstr ""
+
+#: ../../source/advanced.rst:60
+msgid "Make a symbolic link to the OnionShare command line binary line this::"
+msgstr ""
+
+#: ../../source/advanced.rst:64
+msgid "Now you can run ``onionshare`` from the terminal."
+msgstr ""
+
+#: ../../source/advanced.rst:67
+msgid "Windows"
+msgstr ""
+
+#: ../../source/advanced.rst:69
+msgid "The command line interface isn't supported in Windows."
+msgstr ""
+
+#: ../../source/advanced.rst:71
+msgid ""
+"If you really want to use it anyway, you can set up a Windows development"
+" environment (see :ref:`starting_development`) and then run this in a "
+"command prompt::"
+msgstr ""
+
+#: ../../source/advanced.rst:76
+msgid "Usage"
+msgstr ""
+
+#: ../../source/advanced.rst:78
+msgid "You can see command line documentation by running ``onionshare --help``::"
+msgstr ""
+
+#: ../../source/advanced.rst:134
+msgid "Legacy addresses"
+msgstr ""
+
+#: ../../source/advanced.rst:136
+msgid ""
 "OnionShare uses v3 Tor onion services by default. These are modern onion "
 "addresses that have 56 characters, for example::"
 msgstr ""
 
-#: ../../source/advanced.rst:52
+#: ../../source/advanced.rst:140
 msgid ""
 "But it still has support for v2 onion addresses, the old type of onion "
 "addresses that have 16 characters, for example::"
 msgstr ""
 
-#: ../../source/advanced.rst:56
+#: ../../source/advanced.rst:144
 msgid ""
 "OnionShare calls v2 onion addresses \"legacy addresses\". v3 onion "
 "addresses are more secure, and using legacy addresses is not recommended."
 msgstr ""
 
-#: ../../source/advanced.rst:58
+#: ../../source/advanced.rst:146
 msgid ""
 "To use legacy addresses, before starting a server click \"Show advanced "
 "settings\" in its tab and check the \"Use a legacy address (v2 onion "
@@ -154,7 +215,7 @@ msgid ""
 "service in a separate tab."
 msgstr ""
 
-#: ../../source/advanced.rst:60
+#: ../../source/advanced.rst:148
 msgid ""
 "Tor Project plans to `completely deprecate v2 onion services "
 "<https://blog.torproject.org/v2-deprecation-timeline>`_ on October 15, "
diff --git a/docs/source/locale/es/LC_MESSAGES/security.po b/docs/source/locale/es/LC_MESSAGES/security.po
index d7540eaa..627b0d48 100644
--- a/docs/source/locale/es/LC_MESSAGES/security.po
+++ b/docs/source/locale/es/LC_MESSAGES/security.po
@@ -9,7 +9,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OnionShare 2.3\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-08-26 20:38-0700\n"
+"POT-Creation-Date: 2020-08-27 20:28-0400\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -28,11 +28,15 @@ msgid ""
 " works."
 msgstr ""
 
-#: ../../source/security.rst:7
-msgid "What OnionShare protects against"
+#: ../../source/security.rst:6
+msgid "Like all software, OnionShare may contain bugs or vulnerabilities."
 msgstr ""
 
 #: ../../source/security.rst:9
+msgid "What OnionShare protects against"
+msgstr ""
+
+#: ../../source/security.rst:11
 msgid ""
 "**Third parties don't have access to anything that happens in "
 "OnionShare.** When you use OnionShare, you host services directly on your"
@@ -43,7 +47,7 @@ msgid ""
 "service with access to your data."
 msgstr ""
 
-#: ../../source/security.rst:11
+#: ../../source/security.rst:13
 msgid ""
 "**Network eavesdroppers can't spy on anything that happens in OnionShare "
 "in transit.** Because connections between Tor onion services and Tor "
@@ -56,7 +60,7 @@ msgid ""
 " service key."
 msgstr ""
 
-#: ../../source/security.rst:13
+#: ../../source/security.rst:15
 msgid ""
 "**Anonymity of OnionShare users are protected by Tor.** OnionShare and "
 "Tor Browser protect the anonymity of the users. As long as the OnionShare"
@@ -65,7 +69,7 @@ msgid ""
 "identity of the OnionShare user."
 msgstr ""
 
-#: ../../source/security.rst:15
+#: ../../source/security.rst:17
 msgid ""
 "**If an attacker learns about the onion service, they still can't access "
 "anything.** There have been attacks against the Tor network that can "
@@ -79,11 +83,11 @@ msgid ""
 " brute force attacks against the password."
 msgstr ""
 
-#: ../../source/security.rst:18
+#: ../../source/security.rst:20
 msgid "What OnionShare doesn't protect against"
 msgstr ""
 
-#: ../../source/security.rst:20
+#: ../../source/security.rst:22
 msgid ""
 "**Communicating the OnionShare address might not be secure.** The "
 "OnionShare user is responsible for securely communicating the OnionShare "
@@ -97,7 +101,7 @@ msgid ""
 "cases where OnionShare is being used for something that isn't secret."
 msgstr ""
 
-#: ../../source/security.rst:22
+#: ../../source/security.rst:24
 msgid ""
 "**Communicating the OnionShare address might not be anonymous.** While "
 "OnionShare and Tor Browser allow for anonymity, if the user wishes to "
diff --git a/docs/source/locale/fa/LC_MESSAGES/advanced.po b/docs/source/locale/fa/LC_MESSAGES/advanced.po
index ba0a2218..0b6a4166 100644
--- a/docs/source/locale/fa/LC_MESSAGES/advanced.po
+++ b/docs/source/locale/fa/LC_MESSAGES/advanced.po
@@ -9,7 +9,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OnionShare 2.3\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-08-26 20:38-0700\n"
+"POT-Creation-Date: 2020-08-27 20:28-0400\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -123,28 +123,89 @@ msgid ""
 msgstr ""
 
 #: ../../source/advanced.rst:46
-msgid "Legacy addresses"
+msgid "Command line interface"
 msgstr ""
 
 #: ../../source/advanced.rst:48
 msgid ""
+"In addition to its graphical interface, OnionShare has a command line "
+"interface."
+msgstr ""
+
+#: ../../source/advanced.rst:51
+msgid "Linux"
+msgstr ""
+
+#: ../../source/advanced.rst:53
+msgid ""
+"If you installed OnionShare using the Flatpak package, unfortunately the "
+"command line interface isn't supported."
+msgstr ""
+
+#: ../../source/advanced.rst:55
+msgid ""
+"If you installed OnionShare using an operating system package, you can "
+"just run ``onionshare`` from the terminal."
+msgstr ""
+
+#: ../../source/advanced.rst:58
+msgid "macOS"
+msgstr ""
+
+#: ../../source/advanced.rst:60
+msgid "Make a symbolic link to the OnionShare command line binary line this::"
+msgstr ""
+
+#: ../../source/advanced.rst:64
+msgid "Now you can run ``onionshare`` from the terminal."
+msgstr ""
+
+#: ../../source/advanced.rst:67
+msgid "Windows"
+msgstr ""
+
+#: ../../source/advanced.rst:69
+msgid "The command line interface isn't supported in Windows."
+msgstr ""
+
+#: ../../source/advanced.rst:71
+msgid ""
+"If you really want to use it anyway, you can set up a Windows development"
+" environment (see :ref:`starting_development`) and then run this in a "
+"command prompt::"
+msgstr ""
+
+#: ../../source/advanced.rst:76
+msgid "Usage"
+msgstr ""
+
+#: ../../source/advanced.rst:78
+msgid "You can see command line documentation by running ``onionshare --help``::"
+msgstr ""
+
+#: ../../source/advanced.rst:134
+msgid "Legacy addresses"
+msgstr ""
+
+#: ../../source/advanced.rst:136
+msgid ""
 "OnionShare uses v3 Tor onion services by default. These are modern onion "
 "addresses that have 56 characters, for example::"
 msgstr ""
 
-#: ../../source/advanced.rst:52
+#: ../../source/advanced.rst:140
 msgid ""
 "But it still has support for v2 onion addresses, the old type of onion "
 "addresses that have 16 characters, for example::"
 msgstr ""
 
-#: ../../source/advanced.rst:56
+#: ../../source/advanced.rst:144
 msgid ""
 "OnionShare calls v2 onion addresses \"legacy addresses\". v3 onion "
 "addresses are more secure, and using legacy addresses is not recommended."
 msgstr ""
 
-#: ../../source/advanced.rst:58
+#: ../../source/advanced.rst:146
 msgid ""
 "To use legacy addresses, before starting a server click \"Show advanced "
 "settings\" in its tab and check the \"Use a legacy address (v2 onion "
@@ -154,7 +215,7 @@ msgid ""
 "service in a separate tab."
 msgstr ""
 
-#: ../../source/advanced.rst:60
+#: ../../source/advanced.rst:148
 msgid ""
 "Tor Project plans to `completely deprecate v2 onion services "
 "<https://blog.torproject.org/v2-deprecation-timeline>`_ on October 15, "
diff --git a/docs/source/locale/fa/LC_MESSAGES/security.po b/docs/source/locale/fa/LC_MESSAGES/security.po
index d7540eaa..627b0d48 100644
--- a/docs/source/locale/fa/LC_MESSAGES/security.po
+++ b/docs/source/locale/fa/LC_MESSAGES/security.po
@@ -9,7 +9,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OnionShare 2.3\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-08-26 20:38-0700\n"
+"POT-Creation-Date: 2020-08-27 20:28-0400\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -28,11 +28,15 @@ msgid ""
 " works."
 msgstr ""
 
-#: ../../source/security.rst:7
-msgid "What OnionShare protects against"
+#: ../../source/security.rst:6
+msgid "Like all software, OnionShare may contain bugs or vulnerabilities."
 msgstr ""
 
 #: ../../source/security.rst:9
+msgid "What OnionShare protects against"
+msgstr ""
+
+#: ../../source/security.rst:11
 msgid ""
 "**Third parties don't have access to anything that happens in "
 "OnionShare.** When you use OnionShare, you host services directly on your"
@@ -43,7 +47,7 @@ msgid ""
 "service with access to your data."
 msgstr ""
 
-#: ../../source/security.rst:11
+#: ../../source/security.rst:13
 msgid ""
 "**Network eavesdroppers can't spy on anything that happens in OnionShare "
 "in transit.** Because connections between Tor onion services and Tor "
@@ -56,7 +60,7 @@ msgid ""
 " service key."
 msgstr ""
 
-#: ../../source/security.rst:13
+#: ../../source/security.rst:15
 msgid ""
 "**Anonymity of OnionShare users are protected by Tor.** OnionShare and "
 "Tor Browser protect the anonymity of the users. As long as the OnionShare"
@@ -65,7 +69,7 @@ msgid ""
 "identity of the OnionShare user."
 msgstr ""
 
-#: ../../source/security.rst:15
+#: ../../source/security.rst:17
 msgid ""
 "**If an attacker learns about the onion service, they still can't access "
 "anything.** There have been attacks against the Tor network that can "
@@ -79,11 +83,11 @@ msgid ""
 " brute force attacks against the password."
 msgstr ""
 
-#: ../../source/security.rst:18
+#: ../../source/security.rst:20
 msgid "What OnionShare doesn't protect against"
 msgstr ""
 
-#: ../../source/security.rst:20
+#: ../../source/security.rst:22
 msgid ""
 "**Communicating the OnionShare address might not be secure.** The "
 "OnionShare user is responsible for securely communicating the OnionShare "
@@ -97,7 +101,7 @@ msgid ""
 "cases where OnionShare is being used for something that isn't secret."
 msgstr ""
 
-#: ../../source/security.rst:22
+#: ../../source/security.rst:24
 msgid ""
 "**Communicating the OnionShare address might not be anonymous.** While "
 "OnionShare and Tor Browser allow for anonymity, if the user wishes to "
diff --git a/docs/source/locale/fr/LC_MESSAGES/advanced.po b/docs/source/locale/fr/LC_MESSAGES/advanced.po
index ba0a2218..0b6a4166 100644
--- a/docs/source/locale/fr/LC_MESSAGES/advanced.po
+++ b/docs/source/locale/fr/LC_MESSAGES/advanced.po
@@ -9,7 +9,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OnionShare 2.3\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-08-26 20:38-0700\n"
+"POT-Creation-Date: 2020-08-27 20:28-0400\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -123,28 +123,89 @@ msgid ""
 msgstr ""
 
 #: ../../source/advanced.rst:46
-msgid "Legacy addresses"
+msgid "Command line interface"
 msgstr ""
 
 #: ../../source/advanced.rst:48
 msgid ""
+"In addition to its graphical interface, OnionShare has a command line "
+"interface."
+msgstr ""
+
+#: ../../source/advanced.rst:51
+msgid "Linux"
+msgstr ""
+
+#: ../../source/advanced.rst:53
+msgid ""
+"If you installed OnionShare using the Flatpak package, unfortunately the "
+"command line interface isn't supported."
+msgstr ""
+
+#: ../../source/advanced.rst:55
+msgid ""
+"If you installed OnionShare using an operating system package, you can "
+"just run ``onionshare`` from the terminal."
+msgstr ""
+
+#: ../../source/advanced.rst:58
+msgid "macOS"
+msgstr ""
+
+#: ../../source/advanced.rst:60
+msgid "Make a symbolic link to the OnionShare command line binary line this::"
+msgstr ""
+
+#: ../../source/advanced.rst:64
+msgid "Now you can run ``onionshare`` from the terminal."
+msgstr ""
+
+#: ../../source/advanced.rst:67
+msgid "Windows"
+msgstr ""
+
+#: ../../source/advanced.rst:69
+msgid "The command line interface isn't supported in Windows."
+msgstr ""
+
+#: ../../source/advanced.rst:71
+msgid ""
+"If you really want to use it anyway, you can set up a Windows development"
+" environment (see :ref:`starting_development`) and then run this in a "
+"command prompt::"
+msgstr ""
+
+#: ../../source/advanced.rst:76
+msgid "Usage"
+msgstr ""
+
+#: ../../source/advanced.rst:78
+msgid "You can see command line documentation by running ``onionshare --help``::"
+msgstr ""
+
+#: ../../source/advanced.rst:134
+msgid "Legacy addresses"
+msgstr ""
+
+#: ../../source/advanced.rst:136
+msgid ""
 "OnionShare uses v3 Tor onion services by default. These are modern onion "
 "addresses that have 56 characters, for example::"
 msgstr ""
 
-#: ../../source/advanced.rst:52
+#: ../../source/advanced.rst:140
 msgid ""
 "But it still has support for v2 onion addresses, the old type of onion "
 "addresses that have 16 characters, for example::"
 msgstr ""
 
-#: ../../source/advanced.rst:56
+#: ../../source/advanced.rst:144
 msgid ""
 "OnionShare calls v2 onion addresses \"legacy addresses\". v3 onion "
 "addresses are more secure, and using legacy addresses is not recommended."
 msgstr ""
 
-#: ../../source/advanced.rst:58
+#: ../../source/advanced.rst:146
 msgid ""
 "To use legacy addresses, before starting a server click \"Show advanced "
 "settings\" in its tab and check the \"Use a legacy address (v2 onion "
@@ -154,7 +215,7 @@ msgid ""
 "service in a separate tab."
 msgstr ""
 
-#: ../../source/advanced.rst:60
+#: ../../source/advanced.rst:148
 msgid ""
 "Tor Project plans to `completely deprecate v2 onion services "
 "<https://blog.torproject.org/v2-deprecation-timeline>`_ on October 15, "
diff --git a/docs/source/locale/fr/LC_MESSAGES/security.po b/docs/source/locale/fr/LC_MESSAGES/security.po
index d7540eaa..627b0d48 100644
--- a/docs/source/locale/fr/LC_MESSAGES/security.po
+++ b/docs/source/locale/fr/LC_MESSAGES/security.po
@@ -9,7 +9,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OnionShare 2.3\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-08-26 20:38-0700\n"
+"POT-Creation-Date: 2020-08-27 20:28-0400\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -28,11 +28,15 @@ msgid ""
 " works."
 msgstr ""
 
-#: ../../source/security.rst:7
-msgid "What OnionShare protects against"
+#: ../../source/security.rst:6
+msgid "Like all software, OnionShare may contain bugs or vulnerabilities."
 msgstr ""
 
 #: ../../source/security.rst:9
+msgid "What OnionShare protects against"
+msgstr ""
+
+#: ../../source/security.rst:11
 msgid ""
 "**Third parties don't have access to anything that happens in "
 "OnionShare.** When you use OnionShare, you host services directly on your"
@@ -43,7 +47,7 @@ msgid ""
 "service with access to your data."
 msgstr ""
 
-#: ../../source/security.rst:11
+#: ../../source/security.rst:13
 msgid ""
 "**Network eavesdroppers can't spy on anything that happens in OnionShare "
 "in transit.** Because connections between Tor onion services and Tor "
@@ -56,7 +60,7 @@ msgid ""
 " service key."
 msgstr ""
 
-#: ../../source/security.rst:13
+#: ../../source/security.rst:15
 msgid ""
 "**Anonymity of OnionShare users are protected by Tor.** OnionShare and "
 "Tor Browser protect the anonymity of the users. As long as the OnionShare"
@@ -65,7 +69,7 @@ msgid ""
 "identity of the OnionShare user."
 msgstr ""
 
-#: ../../source/security.rst:15
+#: ../../source/security.rst:17
 msgid ""
 "**If an attacker learns about the onion service, they still can't access "
 "anything.** There have been attacks against the Tor network that can "
@@ -79,11 +83,11 @@ msgid ""
 " brute force attacks against the password."
 msgstr ""
 
-#: ../../source/security.rst:18
+#: ../../source/security.rst:20
 msgid "What OnionShare doesn't protect against"
 msgstr ""
 
-#: ../../source/security.rst:20
+#: ../../source/security.rst:22
 msgid ""
 "**Communicating the OnionShare address might not be secure.** The "
 "OnionShare user is responsible for securely communicating the OnionShare "
@@ -97,7 +101,7 @@ msgid ""
 "cases where OnionShare is being used for something that isn't secret."
 msgstr ""
 
-#: ../../source/security.rst:22
+#: ../../source/security.rst:24
 msgid ""
 "**Communicating the OnionShare address might not be anonymous.** While "
 "OnionShare and Tor Browser allow for anonymity, if the user wishes to "
diff --git a/docs/source/locale/ga/LC_MESSAGES/advanced.po b/docs/source/locale/ga/LC_MESSAGES/advanced.po
index ba0a2218..0b6a4166 100644
--- a/docs/source/locale/ga/LC_MESSAGES/advanced.po
+++ b/docs/source/locale/ga/LC_MESSAGES/advanced.po
@@ -9,7 +9,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OnionShare 2.3\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-08-26 20:38-0700\n"
+"POT-Creation-Date: 2020-08-27 20:28-0400\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -123,28 +123,89 @@ msgid ""
 msgstr ""
 
 #: ../../source/advanced.rst:46
-msgid "Legacy addresses"
+msgid "Command line interface"
 msgstr ""
 
 #: ../../source/advanced.rst:48
 msgid ""
+"In addition to its graphical interface, OnionShare has a command line "
+"interface."
+msgstr ""
+
+#: ../../source/advanced.rst:51
+msgid "Linux"
+msgstr ""
+
+#: ../../source/advanced.rst:53
+msgid ""
+"If you installed OnionShare using the Flatpak package, unfortunately the "
+"command line interface isn't supported."
+msgstr ""
+
+#: ../../source/advanced.rst:55
+msgid ""
+"If you installed OnionShare using an operating system package, you can "
+"just run ``onionshare`` from the terminal."
+msgstr ""
+
+#: ../../source/advanced.rst:58
+msgid "macOS"
+msgstr ""
+
+#: ../../source/advanced.rst:60
+msgid "Make a symbolic link to the OnionShare command line binary line this::"
+msgstr ""
+
+#: ../../source/advanced.rst:64
+msgid "Now you can run ``onionshare`` from the terminal."
+msgstr ""
+
+#: ../../source/advanced.rst:67
+msgid "Windows"
+msgstr ""
+
+#: ../../source/advanced.rst:69
+msgid "The command line interface isn't supported in Windows."
+msgstr ""
+
+#: ../../source/advanced.rst:71
+msgid ""
+"If you really want to use it anyway, you can set up a Windows development"
+" environment (see :ref:`starting_development`) and then run this in a "
+"command prompt::"
+msgstr ""
+
+#: ../../source/advanced.rst:76
+msgid "Usage"
+msgstr ""
+
+#: ../../source/advanced.rst:78
+msgid "You can see command line documentation by running ``onionshare --help``::"
+msgstr ""
+
+#: ../../source/advanced.rst:134
+msgid "Legacy addresses"
+msgstr ""
+
+#: ../../source/advanced.rst:136
+msgid ""
 "OnionShare uses v3 Tor onion services by default. These are modern onion "
 "addresses that have 56 characters, for example::"
 msgstr ""
 
-#: ../../source/advanced.rst:52
+#: ../../source/advanced.rst:140
 msgid ""
 "But it still has support for v2 onion addresses, the old type of onion "
 "addresses that have 16 characters, for example::"
 msgstr ""
 
-#: ../../source/advanced.rst:56
+#: ../../source/advanced.rst:144
 msgid ""
 "OnionShare calls v2 onion addresses \"legacy addresses\". v3 onion "
 "addresses are more secure, and using legacy addresses is not recommended."
 msgstr ""
 
-#: ../../source/advanced.rst:58
+#: ../../source/advanced.rst:146
 msgid ""
 "To use legacy addresses, before starting a server click \"Show advanced "
 "settings\" in its tab and check the \"Use a legacy address (v2 onion "
@@ -154,7 +215,7 @@ msgid ""
 "service in a separate tab."
 msgstr ""
 
-#: ../../source/advanced.rst:60
+#: ../../source/advanced.rst:148
 msgid ""
 "Tor Project plans to `completely deprecate v2 onion services "
 "<https://blog.torproject.org/v2-deprecation-timeline>`_ on October 15, "
diff --git a/docs/source/locale/ga/LC_MESSAGES/security.po b/docs/source/locale/ga/LC_MESSAGES/security.po
index d7540eaa..627b0d48 100644
--- a/docs/source/locale/ga/LC_MESSAGES/security.po
+++ b/docs/source/locale/ga/LC_MESSAGES/security.po
@@ -9,7 +9,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OnionShare 2.3\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-08-26 20:38-0700\n"
+"POT-Creation-Date: 2020-08-27 20:28-0400\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -28,11 +28,15 @@ msgid ""
 " works."
 msgstr ""
 
-#: ../../source/security.rst:7
-msgid "What OnionShare protects against"
+#: ../../source/security.rst:6
+msgid "Like all software, OnionShare may contain bugs or vulnerabilities."
 msgstr ""
 
 #: ../../source/security.rst:9
+msgid "What OnionShare protects against"
+msgstr ""
+
+#: ../../source/security.rst:11
 msgid ""
 "**Third parties don't have access to anything that happens in "
 "OnionShare.** When you use OnionShare, you host services directly on your"
@@ -43,7 +47,7 @@ msgid ""
 "service with access to your data."
 msgstr ""
 
-#: ../../source/security.rst:11
+#: ../../source/security.rst:13
 msgid ""
 "**Network eavesdroppers can't spy on anything that happens in OnionShare "
 "in transit.** Because connections between Tor onion services and Tor "
@@ -56,7 +60,7 @@ msgid ""
 " service key."
 msgstr ""
 
-#: ../../source/security.rst:13
+#: ../../source/security.rst:15
 msgid ""
 "**Anonymity of OnionShare users are protected by Tor.** OnionShare and "
 "Tor Browser protect the anonymity of the users. As long as the OnionShare"
@@ -65,7 +69,7 @@ msgid ""
 "identity of the OnionShare user."
 msgstr ""
 
-#: ../../source/security.rst:15
+#: ../../source/security.rst:17
 msgid ""
 "**If an attacker learns about the onion service, they still can't access "
 "anything.** There have been attacks against the Tor network that can "
@@ -79,11 +83,11 @@ msgid ""
 " brute force attacks against the password."
 msgstr ""
 
-#: ../../source/security.rst:18
+#: ../../source/security.rst:20
 msgid "What OnionShare doesn't protect against"
 msgstr ""
 
-#: ../../source/security.rst:20
+#: ../../source/security.rst:22
 msgid ""
 "**Communicating the OnionShare address might not be secure.** The "
 "OnionShare user is responsible for securely communicating the OnionShare "
@@ -97,7 +101,7 @@ msgid ""
 "cases where OnionShare is being used for something that isn't secret."
 msgstr ""
 
-#: ../../source/security.rst:22
+#: ../../source/security.rst:24
 msgid ""
 "**Communicating the OnionShare address might not be anonymous.** While "
 "OnionShare and Tor Browser allow for anonymity, if the user wishes to "
diff --git a/docs/source/locale/is/LC_MESSAGES/advanced.po b/docs/source/locale/is/LC_MESSAGES/advanced.po
index ba0a2218..0b6a4166 100644
--- a/docs/source/locale/is/LC_MESSAGES/advanced.po
+++ b/docs/source/locale/is/LC_MESSAGES/advanced.po
@@ -9,7 +9,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OnionShare 2.3\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-08-26 20:38-0700\n"
+"POT-Creation-Date: 2020-08-27 20:28-0400\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -123,28 +123,89 @@ msgid ""
 msgstr ""
 
 #: ../../source/advanced.rst:46
-msgid "Legacy addresses"
+msgid "Command line interface"
 msgstr ""
 
 #: ../../source/advanced.rst:48
 msgid ""
+"In addition to its graphical interface, OnionShare has a command line "
+"interface."
+msgstr ""
+
+#: ../../source/advanced.rst:51
+msgid "Linux"
+msgstr ""
+
+#: ../../source/advanced.rst:53
+msgid ""
+"If you installed OnionShare using the Flatpak package, unfortunately the "
+"command line interface isn't supported."
+msgstr ""
+
+#: ../../source/advanced.rst:55
+msgid ""
+"If you installed OnionShare using an operating system package, you can "
+"just run ``onionshare`` from the terminal."
+msgstr ""
+
+#: ../../source/advanced.rst:58
+msgid "macOS"
+msgstr ""
+
+#: ../../source/advanced.rst:60
+msgid "Make a symbolic link to the OnionShare command line binary line this::"
+msgstr ""
+
+#: ../../source/advanced.rst:64
+msgid "Now you can run ``onionshare`` from the terminal."
+msgstr ""
+
+#: ../../source/advanced.rst:67
+msgid "Windows"
+msgstr ""
+
+#: ../../source/advanced.rst:69
+msgid "The command line interface isn't supported in Windows."
+msgstr ""
+
+#: ../../source/advanced.rst:71
+msgid ""
+"If you really want to use it anyway, you can set up a Windows development"
+" environment (see :ref:`starting_development`) and then run this in a "
+"command prompt::"
+msgstr ""
+
+#: ../../source/advanced.rst:76
+msgid "Usage"
+msgstr ""
+
+#: ../../source/advanced.rst:78
+msgid "You can see command line documentation by running ``onionshare --help``::"
+msgstr ""
+
+#: ../../source/advanced.rst:134
+msgid "Legacy addresses"
+msgstr ""
+
+#: ../../source/advanced.rst:136
+msgid ""
 "OnionShare uses v3 Tor onion services by default. These are modern onion "
 "addresses that have 56 characters, for example::"
 msgstr ""
 
-#: ../../source/advanced.rst:52
+#: ../../source/advanced.rst:140
 msgid ""
 "But it still has support for v2 onion addresses, the old type of onion "
 "addresses that have 16 characters, for example::"
 msgstr ""
 
-#: ../../source/advanced.rst:56
+#: ../../source/advanced.rst:144
 msgid ""
 "OnionShare calls v2 onion addresses \"legacy addresses\". v3 onion "
 "addresses are more secure, and using legacy addresses is not recommended."
 msgstr ""
 
-#: ../../source/advanced.rst:58
+#: ../../source/advanced.rst:146
 msgid ""
 "To use legacy addresses, before starting a server click \"Show advanced "
 "settings\" in its tab and check the \"Use a legacy address (v2 onion "
@@ -154,7 +215,7 @@ msgid ""
 "service in a separate tab."
 msgstr ""
 
-#: ../../source/advanced.rst:60
+#: ../../source/advanced.rst:148
 msgid ""
 "Tor Project plans to `completely deprecate v2 onion services "
 "<https://blog.torproject.org/v2-deprecation-timeline>`_ on October 15, "
diff --git a/docs/source/locale/is/LC_MESSAGES/security.po b/docs/source/locale/is/LC_MESSAGES/security.po
index d7540eaa..627b0d48 100644
--- a/docs/source/locale/is/LC_MESSAGES/security.po
+++ b/docs/source/locale/is/LC_MESSAGES/security.po
@@ -9,7 +9,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OnionShare 2.3\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-08-26 20:38-0700\n"
+"POT-Creation-Date: 2020-08-27 20:28-0400\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -28,11 +28,15 @@ msgid ""
 " works."
 msgstr ""
 
-#: ../../source/security.rst:7
-msgid "What OnionShare protects against"
+#: ../../source/security.rst:6
+msgid "Like all software, OnionShare may contain bugs or vulnerabilities."
 msgstr ""
 
 #: ../../source/security.rst:9
+msgid "What OnionShare protects against"
+msgstr ""
+
+#: ../../source/security.rst:11
 msgid ""
 "**Third parties don't have access to anything that happens in "
 "OnionShare.** When you use OnionShare, you host services directly on your"
@@ -43,7 +47,7 @@ msgid ""
 "service with access to your data."
 msgstr ""
 
-#: ../../source/security.rst:11
+#: ../../source/security.rst:13
 msgid ""
 "**Network eavesdroppers can't spy on anything that happens in OnionShare "
 "in transit.** Because connections between Tor onion services and Tor "
@@ -56,7 +60,7 @@ msgid ""
 " service key."
 msgstr ""
 
-#: ../../source/security.rst:13
+#: ../../source/security.rst:15
 msgid ""
 "**Anonymity of OnionShare users are protected by Tor.** OnionShare and "
 "Tor Browser protect the anonymity of the users. As long as the OnionShare"
@@ -65,7 +69,7 @@ msgid ""
 "identity of the OnionShare user."
 msgstr ""
 
-#: ../../source/security.rst:15
+#: ../../source/security.rst:17
 msgid ""
 "**If an attacker learns about the onion service, they still can't access "
 "anything.** There have been attacks against the Tor network that can "
@@ -79,11 +83,11 @@ msgid ""
 " brute force attacks against the password."
 msgstr ""
 
-#: ../../source/security.rst:18
+#: ../../source/security.rst:20
 msgid "What OnionShare doesn't protect against"
 msgstr ""
 
-#: ../../source/security.rst:20
+#: ../../source/security.rst:22
 msgid ""
 "**Communicating the OnionShare address might not be secure.** The "
 "OnionShare user is responsible for securely communicating the OnionShare "
@@ -97,7 +101,7 @@ msgid ""
 "cases where OnionShare is being used for something that isn't secret."
 msgstr ""
 
-#: ../../source/security.rst:22
+#: ../../source/security.rst:24
 msgid ""
 "**Communicating the OnionShare address might not be anonymous.** While "
 "OnionShare and Tor Browser allow for anonymity, if the user wishes to "
diff --git a/docs/source/locale/it/LC_MESSAGES/advanced.po b/docs/source/locale/it/LC_MESSAGES/advanced.po
index ba0a2218..0b6a4166 100644
--- a/docs/source/locale/it/LC_MESSAGES/advanced.po
+++ b/docs/source/locale/it/LC_MESSAGES/advanced.po
@@ -9,7 +9,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OnionShare 2.3\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-08-26 20:38-0700\n"
+"POT-Creation-Date: 2020-08-27 20:28-0400\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -123,28 +123,89 @@ msgid ""
 msgstr ""
 
 #: ../../source/advanced.rst:46
-msgid "Legacy addresses"
+msgid "Command line interface"
 msgstr ""
 
 #: ../../source/advanced.rst:48
 msgid ""
+"In addition to its graphical interface, OnionShare has a command line "
+"interface."
+msgstr ""
+
+#: ../../source/advanced.rst:51
+msgid "Linux"
+msgstr ""
+
+#: ../../source/advanced.rst:53
+msgid ""
+"If you installed OnionShare using the Flatpak package, unfortunately the "
+"command line interface isn't supported."
+msgstr ""
+
+#: ../../source/advanced.rst:55
+msgid ""
+"If you installed OnionShare using an operating system package, you can "
+"just run ``onionshare`` from the terminal."
+msgstr ""
+
+#: ../../source/advanced.rst:58
+msgid "macOS"
+msgstr ""
+
+#: ../../source/advanced.rst:60
+msgid "Make a symbolic link to the OnionShare command line binary line this::"
+msgstr ""
+
+#: ../../source/advanced.rst:64
+msgid "Now you can run ``onionshare`` from the terminal."
+msgstr ""
+
+#: ../../source/advanced.rst:67
+msgid "Windows"
+msgstr ""
+
+#: ../../source/advanced.rst:69
+msgid "The command line interface isn't supported in Windows."
+msgstr ""
+
+#: ../../source/advanced.rst:71
+msgid ""
+"If you really want to use it anyway, you can set up a Windows development"
+" environment (see :ref:`starting_development`) and then run this in a "
+"command prompt::"
+msgstr ""
+
+#: ../../source/advanced.rst:76
+msgid "Usage"
+msgstr ""
+
+#: ../../source/advanced.rst:78
+msgid "You can see command line documentation by running ``onionshare --help``::"
+msgstr ""
+
+#: ../../source/advanced.rst:134
+msgid "Legacy addresses"
+msgstr ""
+
+#: ../../source/advanced.rst:136
+msgid ""
 "OnionShare uses v3 Tor onion services by default. These are modern onion "
 "addresses that have 56 characters, for example::"
 msgstr ""
 
-#: ../../source/advanced.rst:52
+#: ../../source/advanced.rst:140
 msgid ""
 "But it still has support for v2 onion addresses, the old type of onion "
 "addresses that have 16 characters, for example::"
 msgstr ""
 
-#: ../../source/advanced.rst:56
+#: ../../source/advanced.rst:144
 msgid ""
 "OnionShare calls v2 onion addresses \"legacy addresses\". v3 onion "
 "addresses are more secure, and using legacy addresses is not recommended."
 msgstr ""
 
-#: ../../source/advanced.rst:58
+#: ../../source/advanced.rst:146
 msgid ""
 "To use legacy addresses, before starting a server click \"Show advanced "
 "settings\" in its tab and check the \"Use a legacy address (v2 onion "
@@ -154,7 +215,7 @@ msgid ""
 "service in a separate tab."
 msgstr ""
 
-#: ../../source/advanced.rst:60
+#: ../../source/advanced.rst:148
 msgid ""
 "Tor Project plans to `completely deprecate v2 onion services "
 "<https://blog.torproject.org/v2-deprecation-timeline>`_ on October 15, "
diff --git a/docs/source/locale/it/LC_MESSAGES/security.po b/docs/source/locale/it/LC_MESSAGES/security.po
index d7540eaa..627b0d48 100644
--- a/docs/source/locale/it/LC_MESSAGES/security.po
+++ b/docs/source/locale/it/LC_MESSAGES/security.po
@@ -9,7 +9,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OnionShare 2.3\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-08-26 20:38-0700\n"
+"POT-Creation-Date: 2020-08-27 20:28-0400\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -28,11 +28,15 @@ msgid ""
 " works."
 msgstr ""
 
-#: ../../source/security.rst:7
-msgid "What OnionShare protects against"
+#: ../../source/security.rst:6
+msgid "Like all software, OnionShare may contain bugs or vulnerabilities."
 msgstr ""
 
 #: ../../source/security.rst:9
+msgid "What OnionShare protects against"
+msgstr ""
+
+#: ../../source/security.rst:11
 msgid ""
 "**Third parties don't have access to anything that happens in "
 "OnionShare.** When you use OnionShare, you host services directly on your"
@@ -43,7 +47,7 @@ msgid ""
 "service with access to your data."
 msgstr ""
 
-#: ../../source/security.rst:11
+#: ../../source/security.rst:13
 msgid ""
 "**Network eavesdroppers can't spy on anything that happens in OnionShare "
 "in transit.** Because connections between Tor onion services and Tor "
@@ -56,7 +60,7 @@ msgid ""
 " service key."
 msgstr ""
 
-#: ../../source/security.rst:13
+#: ../../source/security.rst:15
 msgid ""
 "**Anonymity of OnionShare users are protected by Tor.** OnionShare and "
 "Tor Browser protect the anonymity of the users. As long as the OnionShare"
@@ -65,7 +69,7 @@ msgid ""
 "identity of the OnionShare user."
 msgstr ""
 
-#: ../../source/security.rst:15
+#: ../../source/security.rst:17
 msgid ""
 "**If an attacker learns about the onion service, they still can't access "
 "anything.** There have been attacks against the Tor network that can "
@@ -79,11 +83,11 @@ msgid ""
 " brute force attacks against the password."
 msgstr ""
 
-#: ../../source/security.rst:18
+#: ../../source/security.rst:20
 msgid "What OnionShare doesn't protect against"
 msgstr ""
 
-#: ../../source/security.rst:20
+#: ../../source/security.rst:22
 msgid ""
 "**Communicating the OnionShare address might not be secure.** The "
 "OnionShare user is responsible for securely communicating the OnionShare "
@@ -97,7 +101,7 @@ msgid ""
 "cases where OnionShare is being used for something that isn't secret."
 msgstr ""
 
-#: ../../source/security.rst:22
+#: ../../source/security.rst:24
 msgid ""
 "**Communicating the OnionShare address might not be anonymous.** While "
 "OnionShare and Tor Browser allow for anonymity, if the user wishes to "
diff --git a/docs/source/locale/ja/LC_MESSAGES/advanced.po b/docs/source/locale/ja/LC_MESSAGES/advanced.po
index ba0a2218..0b6a4166 100644
--- a/docs/source/locale/ja/LC_MESSAGES/advanced.po
+++ b/docs/source/locale/ja/LC_MESSAGES/advanced.po
@@ -9,7 +9,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OnionShare 2.3\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-08-26 20:38-0700\n"
+"POT-Creation-Date: 2020-08-27 20:28-0400\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -123,28 +123,89 @@ msgid ""
 msgstr ""
 
 #: ../../source/advanced.rst:46
-msgid "Legacy addresses"
+msgid "Command line interface"
 msgstr ""
 
 #: ../../source/advanced.rst:48
 msgid ""
+"In addition to its graphical interface, OnionShare has a command line "
+"interface."
+msgstr ""
+
+#: ../../source/advanced.rst:51
+msgid "Linux"
+msgstr ""
+
+#: ../../source/advanced.rst:53
+msgid ""
+"If you installed OnionShare using the Flatpak package, unfortunately the "
+"command line interface isn't supported."
+msgstr ""
+
+#: ../../source/advanced.rst:55
+msgid ""
+"If you installed OnionShare using an operating system package, you can "
+"just run ``onionshare`` from the terminal."
+msgstr ""
+
+#: ../../source/advanced.rst:58
+msgid "macOS"
+msgstr ""
+
+#: ../../source/advanced.rst:60
+msgid "Make a symbolic link to the OnionShare command line binary line this::"
+msgstr ""
+
+#: ../../source/advanced.rst:64
+msgid "Now you can run ``onionshare`` from the terminal."
+msgstr ""
+
+#: ../../source/advanced.rst:67
+msgid "Windows"
+msgstr ""
+
+#: ../../source/advanced.rst:69
+msgid "The command line interface isn't supported in Windows."
+msgstr ""
+
+#: ../../source/advanced.rst:71
+msgid ""
+"If you really want to use it anyway, you can set up a Windows development"
+" environment (see :ref:`starting_development`) and then run this in a "
+"command prompt::"
+msgstr ""
+
+#: ../../source/advanced.rst:76
+msgid "Usage"
+msgstr ""
+
+#: ../../source/advanced.rst:78
+msgid "You can see command line documentation by running ``onionshare --help``::"
+msgstr ""
+
+#: ../../source/advanced.rst:134
+msgid "Legacy addresses"
+msgstr ""
+
+#: ../../source/advanced.rst:136
+msgid ""
 "OnionShare uses v3 Tor onion services by default. These are modern onion "
 "addresses that have 56 characters, for example::"
 msgstr ""
 
-#: ../../source/advanced.rst:52
+#: ../../source/advanced.rst:140
 msgid ""
 "But it still has support for v2 onion addresses, the old type of onion "
 "addresses that have 16 characters, for example::"
 msgstr ""
 
-#: ../../source/advanced.rst:56
+#: ../../source/advanced.rst:144
 msgid ""
 "OnionShare calls v2 onion addresses \"legacy addresses\". v3 onion "
 "addresses are more secure, and using legacy addresses is not recommended."
 msgstr ""
 
-#: ../../source/advanced.rst:58
+#: ../../source/advanced.rst:146
 msgid ""
 "To use legacy addresses, before starting a server click \"Show advanced "
 "settings\" in its tab and check the \"Use a legacy address (v2 onion "
@@ -154,7 +215,7 @@ msgid ""
 "service in a separate tab."
 msgstr ""
 
-#: ../../source/advanced.rst:60
+#: ../../source/advanced.rst:148
 msgid ""
 "Tor Project plans to `completely deprecate v2 onion services "
 "<https://blog.torproject.org/v2-deprecation-timeline>`_ on October 15, "
diff --git a/docs/source/locale/ja/LC_MESSAGES/security.po b/docs/source/locale/ja/LC_MESSAGES/security.po
index d7540eaa..627b0d48 100644
--- a/docs/source/locale/ja/LC_MESSAGES/security.po
+++ b/docs/source/locale/ja/LC_MESSAGES/security.po
@@ -9,7 +9,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OnionShare 2.3\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-08-26 20:38-0700\n"
+"POT-Creation-Date: 2020-08-27 20:28-0400\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -28,11 +28,15 @@ msgid ""
 " works."
 msgstr ""
 
-#: ../../source/security.rst:7
-msgid "What OnionShare protects against"
+#: ../../source/security.rst:6
+msgid "Like all software, OnionShare may contain bugs or vulnerabilities."
 msgstr ""
 
 #: ../../source/security.rst:9
+msgid "What OnionShare protects against"
+msgstr ""
+
+#: ../../source/security.rst:11
 msgid ""
 "**Third parties don't have access to anything that happens in "
 "OnionShare.** When you use OnionShare, you host services directly on your"
@@ -43,7 +47,7 @@ msgid ""
 "service with access to your data."
 msgstr ""
 
-#: ../../source/security.rst:11
+#: ../../source/security.rst:13
 msgid ""
 "**Network eavesdroppers can't spy on anything that happens in OnionShare "
 "in transit.** Because connections between Tor onion services and Tor "
@@ -56,7 +60,7 @@ msgid ""
 " service key."
 msgstr ""
 
-#: ../../source/security.rst:13
+#: ../../source/security.rst:15
 msgid ""
 "**Anonymity of OnionShare users are protected by Tor.** OnionShare and "
 "Tor Browser protect the anonymity of the users. As long as the OnionShare"
@@ -65,7 +69,7 @@ msgid ""
 "identity of the OnionShare user."
 msgstr ""
 
-#: ../../source/security.rst:15
+#: ../../source/security.rst:17
 msgid ""
 "**If an attacker learns about the onion service, they still can't access "
 "anything.** There have been attacks against the Tor network that can "
@@ -79,11 +83,11 @@ msgid ""
 " brute force attacks against the password."
 msgstr ""
 
-#: ../../source/security.rst:18
+#: ../../source/security.rst:20
 msgid "What OnionShare doesn't protect against"
 msgstr ""
 
-#: ../../source/security.rst:20
+#: ../../source/security.rst:22
 msgid ""
 "**Communicating the OnionShare address might not be secure.** The "
 "OnionShare user is responsible for securely communicating the OnionShare "
@@ -97,7 +101,7 @@ msgid ""
 "cases where OnionShare is being used for something that isn't secret."
 msgstr ""
 
-#: ../../source/security.rst:22
+#: ../../source/security.rst:24
 msgid ""
 "**Communicating the OnionShare address might not be anonymous.** While "
 "OnionShare and Tor Browser allow for anonymity, if the user wishes to "
diff --git a/docs/source/locale/nb/LC_MESSAGES/advanced.po b/docs/source/locale/nb/LC_MESSAGES/advanced.po
index ba0a2218..0b6a4166 100644
--- a/docs/source/locale/nb/LC_MESSAGES/advanced.po
+++ b/docs/source/locale/nb/LC_MESSAGES/advanced.po
@@ -9,7 +9,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OnionShare 2.3\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-08-26 20:38-0700\n"
+"POT-Creation-Date: 2020-08-27 20:28-0400\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -123,28 +123,89 @@ msgid ""
 msgstr ""
 
 #: ../../source/advanced.rst:46
-msgid "Legacy addresses"
+msgid "Command line interface"
 msgstr ""
 
 #: ../../source/advanced.rst:48
 msgid ""
+"In addition to its graphical interface, OnionShare has a command line "
+"interface."
+msgstr ""
+
+#: ../../source/advanced.rst:51
+msgid "Linux"
+msgstr ""
+
+#: ../../source/advanced.rst:53
+msgid ""
+"If you installed OnionShare using the Flatpak package, unfortunately the "
+"command line interface isn't supported."
+msgstr ""
+
+#: ../../source/advanced.rst:55
+msgid ""
+"If you installed OnionShare using an operating system package, you can "
+"just run ``onionshare`` from the terminal."
+msgstr ""
+
+#: ../../source/advanced.rst:58
+msgid "macOS"
+msgstr ""
+
+#: ../../source/advanced.rst:60
+msgid "Make a symbolic link to the OnionShare command line binary line this::"
+msgstr ""
+
+#: ../../source/advanced.rst:64
+msgid "Now you can run ``onionshare`` from the terminal."
+msgstr ""
+
+#: ../../source/advanced.rst:67
+msgid "Windows"
+msgstr ""
+
+#: ../../source/advanced.rst:69
+msgid "The command line interface isn't supported in Windows."
+msgstr ""
+
+#: ../../source/advanced.rst:71
+msgid ""
+"If you really want to use it anyway, you can set up a Windows development"
+" environment (see :ref:`starting_development`) and then run this in a "
+"command prompt::"
+msgstr ""
+
+#: ../../source/advanced.rst:76
+msgid "Usage"
+msgstr ""
+
+#: ../../source/advanced.rst:78
+msgid "You can see command line documentation by running ``onionshare --help``::"
+msgstr ""
+
+#: ../../source/advanced.rst:134
+msgid "Legacy addresses"
+msgstr ""
+
+#: ../../source/advanced.rst:136
+msgid ""
 "OnionShare uses v3 Tor onion services by default. These are modern onion "
 "addresses that have 56 characters, for example::"
 msgstr ""
 
-#: ../../source/advanced.rst:52
+#: ../../source/advanced.rst:140
 msgid ""
 "But it still has support for v2 onion addresses, the old type of onion "
 "addresses that have 16 characters, for example::"
 msgstr ""
 
-#: ../../source/advanced.rst:56
+#: ../../source/advanced.rst:144
 msgid ""
 "OnionShare calls v2 onion addresses \"legacy addresses\". v3 onion "
 "addresses are more secure, and using legacy addresses is not recommended."
 msgstr ""
 
-#: ../../source/advanced.rst:58
+#: ../../source/advanced.rst:146
 msgid ""
 "To use legacy addresses, before starting a server click \"Show advanced "
 "settings\" in its tab and check the \"Use a legacy address (v2 onion "
@@ -154,7 +215,7 @@ msgid ""
 "service in a separate tab."
 msgstr ""
 
-#: ../../source/advanced.rst:60
+#: ../../source/advanced.rst:148
 msgid ""
 "Tor Project plans to `completely deprecate v2 onion services "
 "<https://blog.torproject.org/v2-deprecation-timeline>`_ on October 15, "
diff --git a/docs/source/locale/nb/LC_MESSAGES/security.po b/docs/source/locale/nb/LC_MESSAGES/security.po
index d7540eaa..627b0d48 100644
--- a/docs/source/locale/nb/LC_MESSAGES/security.po
+++ b/docs/source/locale/nb/LC_MESSAGES/security.po
@@ -9,7 +9,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OnionShare 2.3\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-08-26 20:38-0700\n"
+"POT-Creation-Date: 2020-08-27 20:28-0400\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -28,11 +28,15 @@ msgid ""
 " works."
 msgstr ""
 
-#: ../../source/security.rst:7
-msgid "What OnionShare protects against"
+#: ../../source/security.rst:6
+msgid "Like all software, OnionShare may contain bugs or vulnerabilities."
 msgstr ""
 
 #: ../../source/security.rst:9
+msgid "What OnionShare protects against"
+msgstr ""
+
+#: ../../source/security.rst:11
 msgid ""
 "**Third parties don't have access to anything that happens in "
 "OnionShare.** When you use OnionShare, you host services directly on your"
@@ -43,7 +47,7 @@ msgid ""
 "service with access to your data."
 msgstr ""
 
-#: ../../source/security.rst:11
+#: ../../source/security.rst:13
 msgid ""
 "**Network eavesdroppers can't spy on anything that happens in OnionShare "
 "in transit.** Because connections between Tor onion services and Tor "
@@ -56,7 +60,7 @@ msgid ""
 " service key."
 msgstr ""
 
-#: ../../source/security.rst:13
+#: ../../source/security.rst:15
 msgid ""
 "**Anonymity of OnionShare users are protected by Tor.** OnionShare and "
 "Tor Browser protect the anonymity of the users. As long as the OnionShare"
@@ -65,7 +69,7 @@ msgid ""
 "identity of the OnionShare user."
 msgstr ""
 
-#: ../../source/security.rst:15
+#: ../../source/security.rst:17
 msgid ""
 "**If an attacker learns about the onion service, they still can't access "
 "anything.** There have been attacks against the Tor network that can "
@@ -79,11 +83,11 @@ msgid ""
 " brute force attacks against the password."
 msgstr ""
 
-#: ../../source/security.rst:18
+#: ../../source/security.rst:20
 msgid "What OnionShare doesn't protect against"
 msgstr ""
 
-#: ../../source/security.rst:20
+#: ../../source/security.rst:22
 msgid ""
 "**Communicating the OnionShare address might not be secure.** The "
 "OnionShare user is responsible for securely communicating the OnionShare "
@@ -97,7 +101,7 @@ msgid ""
 "cases where OnionShare is being used for something that isn't secret."
 msgstr ""
 
-#: ../../source/security.rst:22
+#: ../../source/security.rst:24
 msgid ""
 "**Communicating the OnionShare address might not be anonymous.** While "
 "OnionShare and Tor Browser allow for anonymity, if the user wishes to "
diff --git a/docs/source/locale/nl/LC_MESSAGES/advanced.po b/docs/source/locale/nl/LC_MESSAGES/advanced.po
index ba0a2218..0b6a4166 100644
--- a/docs/source/locale/nl/LC_MESSAGES/advanced.po
+++ b/docs/source/locale/nl/LC_MESSAGES/advanced.po
@@ -9,7 +9,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OnionShare 2.3\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-08-26 20:38-0700\n"
+"POT-Creation-Date: 2020-08-27 20:28-0400\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -123,28 +123,89 @@ msgid ""
 msgstr ""
 
 #: ../../source/advanced.rst:46
-msgid "Legacy addresses"
+msgid "Command line interface"
 msgstr ""
 
 #: ../../source/advanced.rst:48
 msgid ""
+"In addition to its graphical interface, OnionShare has a command line "
+"interface."
+msgstr ""
+
+#: ../../source/advanced.rst:51
+msgid "Linux"
+msgstr ""
+
+#: ../../source/advanced.rst:53
+msgid ""
+"If you installed OnionShare using the Flatpak package, unfortunately the "
+"command line interface isn't supported."
+msgstr ""
+
+#: ../../source/advanced.rst:55
+msgid ""
+"If you installed OnionShare using an operating system package, you can "
+"just run ``onionshare`` from the terminal."
+msgstr ""
+
+#: ../../source/advanced.rst:58
+msgid "macOS"
+msgstr ""
+
+#: ../../source/advanced.rst:60
+msgid "Make a symbolic link to the OnionShare command line binary line this::"
+msgstr ""
+
+#: ../../source/advanced.rst:64
+msgid "Now you can run ``onionshare`` from the terminal."
+msgstr ""
+
+#: ../../source/advanced.rst:67
+msgid "Windows"
+msgstr ""
+
+#: ../../source/advanced.rst:69
+msgid "The command line interface isn't supported in Windows."
+msgstr ""
+
+#: ../../source/advanced.rst:71
+msgid ""
+"If you really want to use it anyway, you can set up a Windows development"
+" environment (see :ref:`starting_development`) and then run this in a "
+"command prompt::"
+msgstr ""
+
+#: ../../source/advanced.rst:76
+msgid "Usage"
+msgstr ""
+
+#: ../../source/advanced.rst:78
+msgid "You can see command line documentation by running ``onionshare --help``::"
+msgstr ""
+
+#: ../../source/advanced.rst:134
+msgid "Legacy addresses"
+msgstr ""
+
+#: ../../source/advanced.rst:136
+msgid ""
 "OnionShare uses v3 Tor onion services by default. These are modern onion "
 "addresses that have 56 characters, for example::"
 msgstr ""
 
-#: ../../source/advanced.rst:52
+#: ../../source/advanced.rst:140
 msgid ""
 "But it still has support for v2 onion addresses, the old type of onion "
 "addresses that have 16 characters, for example::"
 msgstr ""
 
-#: ../../source/advanced.rst:56
+#: ../../source/advanced.rst:144
 msgid ""
 "OnionShare calls v2 onion addresses \"legacy addresses\". v3 onion "
 "addresses are more secure, and using legacy addresses is not recommended."
 msgstr ""
 
-#: ../../source/advanced.rst:58
+#: ../../source/advanced.rst:146
 msgid ""
 "To use legacy addresses, before starting a server click \"Show advanced "
 "settings\" in its tab and check the \"Use a legacy address (v2 onion "
@@ -154,7 +215,7 @@ msgid ""
 "service in a separate tab."
 msgstr ""
 
-#: ../../source/advanced.rst:60
+#: ../../source/advanced.rst:148
 msgid ""
 "Tor Project plans to `completely deprecate v2 onion services "
 "<https://blog.torproject.org/v2-deprecation-timeline>`_ on October 15, "
diff --git a/docs/source/locale/nl/LC_MESSAGES/security.po b/docs/source/locale/nl/LC_MESSAGES/security.po
index d7540eaa..627b0d48 100644
--- a/docs/source/locale/nl/LC_MESSAGES/security.po
+++ b/docs/source/locale/nl/LC_MESSAGES/security.po
@@ -9,7 +9,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OnionShare 2.3\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-08-26 20:38-0700\n"
+"POT-Creation-Date: 2020-08-27 20:28-0400\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -28,11 +28,15 @@ msgid ""
 " works."
 msgstr ""
 
-#: ../../source/security.rst:7
-msgid "What OnionShare protects against"
+#: ../../source/security.rst:6
+msgid "Like all software, OnionShare may contain bugs or vulnerabilities."
 msgstr ""
 
 #: ../../source/security.rst:9
+msgid "What OnionShare protects against"
+msgstr ""
+
+#: ../../source/security.rst:11
 msgid ""
 "**Third parties don't have access to anything that happens in "
 "OnionShare.** When you use OnionShare, you host services directly on your"
@@ -43,7 +47,7 @@ msgid ""
 "service with access to your data."
 msgstr ""
 
-#: ../../source/security.rst:11
+#: ../../source/security.rst:13
 msgid ""
 "**Network eavesdroppers can't spy on anything that happens in OnionShare "
 "in transit.** Because connections between Tor onion services and Tor "
@@ -56,7 +60,7 @@ msgid ""
 " service key."
 msgstr ""
 
-#: ../../source/security.rst:13
+#: ../../source/security.rst:15
 msgid ""
 "**Anonymity of OnionShare users are protected by Tor.** OnionShare and "
 "Tor Browser protect the anonymity of the users. As long as the OnionShare"
@@ -65,7 +69,7 @@ msgid ""
 "identity of the OnionShare user."
 msgstr ""
 
-#: ../../source/security.rst:15
+#: ../../source/security.rst:17
 msgid ""
 "**If an attacker learns about the onion service, they still can't access "
 "anything.** There have been attacks against the Tor network that can "
@@ -79,11 +83,11 @@ msgid ""
 " brute force attacks against the password."
 msgstr ""
 
-#: ../../source/security.rst:18
+#: ../../source/security.rst:20
 msgid "What OnionShare doesn't protect against"
 msgstr ""
 
-#: ../../source/security.rst:20
+#: ../../source/security.rst:22
 msgid ""
 "**Communicating the OnionShare address might not be secure.** The "
 "OnionShare user is responsible for securely communicating the OnionShare "
@@ -97,7 +101,7 @@ msgid ""
 "cases where OnionShare is being used for something that isn't secret."
 msgstr ""
 
-#: ../../source/security.rst:22
+#: ../../source/security.rst:24
 msgid ""
 "**Communicating the OnionShare address might not be anonymous.** While "
 "OnionShare and Tor Browser allow for anonymity, if the user wishes to "
diff --git a/docs/source/locale/pl/LC_MESSAGES/advanced.po b/docs/source/locale/pl/LC_MESSAGES/advanced.po
index ba0a2218..0b6a4166 100644
--- a/docs/source/locale/pl/LC_MESSAGES/advanced.po
+++ b/docs/source/locale/pl/LC_MESSAGES/advanced.po
@@ -9,7 +9,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OnionShare 2.3\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-08-26 20:38-0700\n"
+"POT-Creation-Date: 2020-08-27 20:28-0400\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -123,28 +123,89 @@ msgid ""
 msgstr ""
 
 #: ../../source/advanced.rst:46
-msgid "Legacy addresses"
+msgid "Command line interface"
 msgstr ""
 
 #: ../../source/advanced.rst:48
 msgid ""
+"In addition to its graphical interface, OnionShare has a command line "
+"interface."
+msgstr ""
+
+#: ../../source/advanced.rst:51
+msgid "Linux"
+msgstr ""
+
+#: ../../source/advanced.rst:53
+msgid ""
+"If you installed OnionShare using the Flatpak package, unfortunately the "
+"command line interface isn't supported."
+msgstr ""
+
+#: ../../source/advanced.rst:55
+msgid ""
+"If you installed OnionShare using an operating system package, you can "
+"just run ``onionshare`` from the terminal."
+msgstr ""
+
+#: ../../source/advanced.rst:58
+msgid "macOS"
+msgstr ""
+
+#: ../../source/advanced.rst:60
+msgid "Make a symbolic link to the OnionShare command line binary line this::"
+msgstr ""
+
+#: ../../source/advanced.rst:64
+msgid "Now you can run ``onionshare`` from the terminal."
+msgstr ""
+
+#: ../../source/advanced.rst:67
+msgid "Windows"
+msgstr ""
+
+#: ../../source/advanced.rst:69
+msgid "The command line interface isn't supported in Windows."
+msgstr ""
+
+#: ../../source/advanced.rst:71
+msgid ""
+"If you really want to use it anyway, you can set up a Windows development"
+" environment (see :ref:`starting_development`) and then run this in a "
+"command prompt::"
+msgstr ""
+
+#: ../../source/advanced.rst:76
+msgid "Usage"
+msgstr ""
+
+#: ../../source/advanced.rst:78
+msgid "You can see command line documentation by running ``onionshare --help``::"
+msgstr ""
+
+#: ../../source/advanced.rst:134
+msgid "Legacy addresses"
+msgstr ""
+
+#: ../../source/advanced.rst:136
+msgid ""
 "OnionShare uses v3 Tor onion services by default. These are modern onion "
 "addresses that have 56 characters, for example::"
 msgstr ""
 
-#: ../../source/advanced.rst:52
+#: ../../source/advanced.rst:140
 msgid ""
 "But it still has support for v2 onion addresses, the old type of onion "
 "addresses that have 16 characters, for example::"
 msgstr ""
 
-#: ../../source/advanced.rst:56
+#: ../../source/advanced.rst:144
 msgid ""
 "OnionShare calls v2 onion addresses \"legacy addresses\". v3 onion "
 "addresses are more secure, and using legacy addresses is not recommended."
 msgstr ""
 
-#: ../../source/advanced.rst:58
+#: ../../source/advanced.rst:146
 msgid ""
 "To use legacy addresses, before starting a server click \"Show advanced "
 "settings\" in its tab and check the \"Use a legacy address (v2 onion "
@@ -154,7 +215,7 @@ msgid ""
 "service in a separate tab."
 msgstr ""
 
-#: ../../source/advanced.rst:60
+#: ../../source/advanced.rst:148
 msgid ""
 "Tor Project plans to `completely deprecate v2 onion services "
 "<https://blog.torproject.org/v2-deprecation-timeline>`_ on October 15, "
diff --git a/docs/source/locale/pl/LC_MESSAGES/security.po b/docs/source/locale/pl/LC_MESSAGES/security.po
index d7540eaa..627b0d48 100644
--- a/docs/source/locale/pl/LC_MESSAGES/security.po
+++ b/docs/source/locale/pl/LC_MESSAGES/security.po
@@ -9,7 +9,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OnionShare 2.3\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-08-26 20:38-0700\n"
+"POT-Creation-Date: 2020-08-27 20:28-0400\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -28,11 +28,15 @@ msgid ""
 " works."
 msgstr ""
 
-#: ../../source/security.rst:7
-msgid "What OnionShare protects against"
+#: ../../source/security.rst:6
+msgid "Like all software, OnionShare may contain bugs or vulnerabilities."
 msgstr ""
 
 #: ../../source/security.rst:9
+msgid "What OnionShare protects against"
+msgstr ""
+
+#: ../../source/security.rst:11
 msgid ""
 "**Third parties don't have access to anything that happens in "
 "OnionShare.** When you use OnionShare, you host services directly on your"
@@ -43,7 +47,7 @@ msgid ""
 "service with access to your data."
 msgstr ""
 
-#: ../../source/security.rst:11
+#: ../../source/security.rst:13
 msgid ""
 "**Network eavesdroppers can't spy on anything that happens in OnionShare "
 "in transit.** Because connections between Tor onion services and Tor "
@@ -56,7 +60,7 @@ msgid ""
 " service key."
 msgstr ""
 
-#: ../../source/security.rst:13
+#: ../../source/security.rst:15
 msgid ""
 "**Anonymity of OnionShare users are protected by Tor.** OnionShare and "
 "Tor Browser protect the anonymity of the users. As long as the OnionShare"
@@ -65,7 +69,7 @@ msgid ""
 "identity of the OnionShare user."
 msgstr ""
 
-#: ../../source/security.rst:15
+#: ../../source/security.rst:17
 msgid ""
 "**If an attacker learns about the onion service, they still can't access "
 "anything.** There have been attacks against the Tor network that can "
@@ -79,11 +83,11 @@ msgid ""
 " brute force attacks against the password."
 msgstr ""
 
-#: ../../source/security.rst:18
+#: ../../source/security.rst:20
 msgid "What OnionShare doesn't protect against"
 msgstr ""
 
-#: ../../source/security.rst:20
+#: ../../source/security.rst:22
 msgid ""
 "**Communicating the OnionShare address might not be secure.** The "
 "OnionShare user is responsible for securely communicating the OnionShare "
@@ -97,7 +101,7 @@ msgid ""
 "cases where OnionShare is being used for something that isn't secret."
 msgstr ""
 
-#: ../../source/security.rst:22
+#: ../../source/security.rst:24
 msgid ""
 "**Communicating the OnionShare address might not be anonymous.** While "
 "OnionShare and Tor Browser allow for anonymity, if the user wishes to "
diff --git a/docs/source/locale/pt_BR/LC_MESSAGES/advanced.po b/docs/source/locale/pt_BR/LC_MESSAGES/advanced.po
index ba0a2218..0b6a4166 100644
--- a/docs/source/locale/pt_BR/LC_MESSAGES/advanced.po
+++ b/docs/source/locale/pt_BR/LC_MESSAGES/advanced.po
@@ -9,7 +9,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OnionShare 2.3\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-08-26 20:38-0700\n"
+"POT-Creation-Date: 2020-08-27 20:28-0400\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -123,28 +123,89 @@ msgid ""
 msgstr ""
 
 #: ../../source/advanced.rst:46
-msgid "Legacy addresses"
+msgid "Command line interface"
 msgstr ""
 
 #: ../../source/advanced.rst:48
 msgid ""
+"In addition to its graphical interface, OnionShare has a command line "
+"interface."
+msgstr ""
+
+#: ../../source/advanced.rst:51
+msgid "Linux"
+msgstr ""
+
+#: ../../source/advanced.rst:53
+msgid ""
+"If you installed OnionShare using the Flatpak package, unfortunately the "
+"command line interface isn't supported."
+msgstr ""
+
+#: ../../source/advanced.rst:55
+msgid ""
+"If you installed OnionShare using an operating system package, you can "
+"just run ``onionshare`` from the terminal."
+msgstr ""
+
+#: ../../source/advanced.rst:58
+msgid "macOS"
+msgstr ""
+
+#: ../../source/advanced.rst:60
+msgid "Make a symbolic link to the OnionShare command line binary line this::"
+msgstr ""
+
+#: ../../source/advanced.rst:64
+msgid "Now you can run ``onionshare`` from the terminal."
+msgstr ""
+
+#: ../../source/advanced.rst:67
+msgid "Windows"
+msgstr ""
+
+#: ../../source/advanced.rst:69
+msgid "The command line interface isn't supported in Windows."
+msgstr ""
+
+#: ../../source/advanced.rst:71
+msgid ""
+"If you really want to use it anyway, you can set up a Windows development"
+" environment (see :ref:`starting_development`) and then run this in a "
+"command prompt::"
+msgstr ""
+
+#: ../../source/advanced.rst:76
+msgid "Usage"
+msgstr ""
+
+#: ../../source/advanced.rst:78
+msgid "You can see command line documentation by running ``onionshare --help``::"
+msgstr ""
+
+#: ../../source/advanced.rst:134
+msgid "Legacy addresses"
+msgstr ""
+
+#: ../../source/advanced.rst:136
+msgid ""
 "OnionShare uses v3 Tor onion services by default. These are modern onion "
 "addresses that have 56 characters, for example::"
 msgstr ""
 
-#: ../../source/advanced.rst:52
+#: ../../source/advanced.rst:140
 msgid ""
 "But it still has support for v2 onion addresses, the old type of onion "
 "addresses that have 16 characters, for example::"
 msgstr ""
 
-#: ../../source/advanced.rst:56
+#: ../../source/advanced.rst:144
 msgid ""
 "OnionShare calls v2 onion addresses \"legacy addresses\". v3 onion "
 "addresses are more secure, and using legacy addresses is not recommended."
 msgstr ""
 
-#: ../../source/advanced.rst:58
+#: ../../source/advanced.rst:146
 msgid ""
 "To use legacy addresses, before starting a server click \"Show advanced "
 "settings\" in its tab and check the \"Use a legacy address (v2 onion "
@@ -154,7 +215,7 @@ msgid ""
 "service in a separate tab."
 msgstr ""
 
-#: ../../source/advanced.rst:60
+#: ../../source/advanced.rst:148
 msgid ""
 "Tor Project plans to `completely deprecate v2 onion services "
 "<https://blog.torproject.org/v2-deprecation-timeline>`_ on October 15, "
diff --git a/docs/source/locale/pt_BR/LC_MESSAGES/security.po b/docs/source/locale/pt_BR/LC_MESSAGES/security.po
index d7540eaa..627b0d48 100644
--- a/docs/source/locale/pt_BR/LC_MESSAGES/security.po
+++ b/docs/source/locale/pt_BR/LC_MESSAGES/security.po
@@ -9,7 +9,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OnionShare 2.3\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-08-26 20:38-0700\n"
+"POT-Creation-Date: 2020-08-27 20:28-0400\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -28,11 +28,15 @@ msgid ""
 " works."
 msgstr ""
 
-#: ../../source/security.rst:7
-msgid "What OnionShare protects against"
+#: ../../source/security.rst:6
+msgid "Like all software, OnionShare may contain bugs or vulnerabilities."
 msgstr ""
 
 #: ../../source/security.rst:9
+msgid "What OnionShare protects against"
+msgstr ""
+
+#: ../../source/security.rst:11
 msgid ""
 "**Third parties don't have access to anything that happens in "
 "OnionShare.** When you use OnionShare, you host services directly on your"
@@ -43,7 +47,7 @@ msgid ""
 "service with access to your data."
 msgstr ""
 
-#: ../../source/security.rst:11
+#: ../../source/security.rst:13
 msgid ""
 "**Network eavesdroppers can't spy on anything that happens in OnionShare "
 "in transit.** Because connections between Tor onion services and Tor "
@@ -56,7 +60,7 @@ msgid ""
 " service key."
 msgstr ""
 
-#: ../../source/security.rst:13
+#: ../../source/security.rst:15
 msgid ""
 "**Anonymity of OnionShare users are protected by Tor.** OnionShare and "
 "Tor Browser protect the anonymity of the users. As long as the OnionShare"
@@ -65,7 +69,7 @@ msgid ""
 "identity of the OnionShare user."
 msgstr ""
 
-#: ../../source/security.rst:15
+#: ../../source/security.rst:17
 msgid ""
 "**If an attacker learns about the onion service, they still can't access "
 "anything.** There have been attacks against the Tor network that can "
@@ -79,11 +83,11 @@ msgid ""
 " brute force attacks against the password."
 msgstr ""
 
-#: ../../source/security.rst:18
+#: ../../source/security.rst:20
 msgid "What OnionShare doesn't protect against"
 msgstr ""
 
-#: ../../source/security.rst:20
+#: ../../source/security.rst:22
 msgid ""
 "**Communicating the OnionShare address might not be secure.** The "
 "OnionShare user is responsible for securely communicating the OnionShare "
@@ -97,7 +101,7 @@ msgid ""
 "cases where OnionShare is being used for something that isn't secret."
 msgstr ""
 
-#: ../../source/security.rst:22
+#: ../../source/security.rst:24
 msgid ""
 "**Communicating the OnionShare address might not be anonymous.** While "
 "OnionShare and Tor Browser allow for anonymity, if the user wishes to "
diff --git a/docs/source/locale/pt_PT/LC_MESSAGES/advanced.po b/docs/source/locale/pt_PT/LC_MESSAGES/advanced.po
index ba0a2218..0b6a4166 100644
--- a/docs/source/locale/pt_PT/LC_MESSAGES/advanced.po
+++ b/docs/source/locale/pt_PT/LC_MESSAGES/advanced.po
@@ -9,7 +9,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OnionShare 2.3\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-08-26 20:38-0700\n"
+"POT-Creation-Date: 2020-08-27 20:28-0400\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -123,28 +123,89 @@ msgid ""
 msgstr ""
 
 #: ../../source/advanced.rst:46
-msgid "Legacy addresses"
+msgid "Command line interface"
 msgstr ""
 
 #: ../../source/advanced.rst:48
 msgid ""
+"In addition to its graphical interface, OnionShare has a command line "
+"interface."
+msgstr ""
+
+#: ../../source/advanced.rst:51
+msgid "Linux"
+msgstr ""
+
+#: ../../source/advanced.rst:53
+msgid ""
+"If you installed OnionShare using the Flatpak package, unfortunately the "
+"command line interface isn't supported."
+msgstr ""
+
+#: ../../source/advanced.rst:55
+msgid ""
+"If you installed OnionShare using an operating system package, you can "
+"just run ``onionshare`` from the terminal."
+msgstr ""
+
+#: ../../source/advanced.rst:58
+msgid "macOS"
+msgstr ""
+
+#: ../../source/advanced.rst:60
+msgid "Make a symbolic link to the OnionShare command line binary line this::"
+msgstr ""
+
+#: ../../source/advanced.rst:64
+msgid "Now you can run ``onionshare`` from the terminal."
+msgstr ""
+
+#: ../../source/advanced.rst:67
+msgid "Windows"
+msgstr ""
+
+#: ../../source/advanced.rst:69
+msgid "The command line interface isn't supported in Windows."
+msgstr ""
+
+#: ../../source/advanced.rst:71
+msgid ""
+"If you really want to use it anyway, you can set up a Windows development"
+" environment (see :ref:`starting_development`) and then run this in a "
+"command prompt::"
+msgstr ""
+
+#: ../../source/advanced.rst:76
+msgid "Usage"
+msgstr ""
+
+#: ../../source/advanced.rst:78
+msgid "You can see command line documentation by running ``onionshare --help``::"
+msgstr ""
+
+#: ../../source/advanced.rst:134
+msgid "Legacy addresses"
+msgstr ""
+
+#: ../../source/advanced.rst:136
+msgid ""
 "OnionShare uses v3 Tor onion services by default. These are modern onion "
 "addresses that have 56 characters, for example::"
 msgstr ""
 
-#: ../../source/advanced.rst:52
+#: ../../source/advanced.rst:140
 msgid ""
 "But it still has support for v2 onion addresses, the old type of onion "
 "addresses that have 16 characters, for example::"
 msgstr ""
 
-#: ../../source/advanced.rst:56
+#: ../../source/advanced.rst:144
 msgid ""
 "OnionShare calls v2 onion addresses \"legacy addresses\". v3 onion "
 "addresses are more secure, and using legacy addresses is not recommended."
 msgstr ""
 
-#: ../../source/advanced.rst:58
+#: ../../source/advanced.rst:146
 msgid ""
 "To use legacy addresses, before starting a server click \"Show advanced "
 "settings\" in its tab and check the \"Use a legacy address (v2 onion "
@@ -154,7 +215,7 @@ msgid ""
 "service in a separate tab."
 msgstr ""
 
-#: ../../source/advanced.rst:60
+#: ../../source/advanced.rst:148
 msgid ""
 "Tor Project plans to `completely deprecate v2 onion services "
 "<https://blog.torproject.org/v2-deprecation-timeline>`_ on October 15, "
diff --git a/docs/source/locale/pt_PT/LC_MESSAGES/security.po b/docs/source/locale/pt_PT/LC_MESSAGES/security.po
index d7540eaa..627b0d48 100644
--- a/docs/source/locale/pt_PT/LC_MESSAGES/security.po
+++ b/docs/source/locale/pt_PT/LC_MESSAGES/security.po
@@ -9,7 +9,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OnionShare 2.3\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-08-26 20:38-0700\n"
+"POT-Creation-Date: 2020-08-27 20:28-0400\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -28,11 +28,15 @@ msgid ""
 " works."
 msgstr ""
 
-#: ../../source/security.rst:7
-msgid "What OnionShare protects against"
+#: ../../source/security.rst:6
+msgid "Like all software, OnionShare may contain bugs or vulnerabilities."
 msgstr ""
 
 #: ../../source/security.rst:9
+msgid "What OnionShare protects against"
+msgstr ""
+
+#: ../../source/security.rst:11
 msgid ""
 "**Third parties don't have access to anything that happens in "
 "OnionShare.** When you use OnionShare, you host services directly on your"
@@ -43,7 +47,7 @@ msgid ""
 "service with access to your data."
 msgstr ""
 
-#: ../../source/security.rst:11
+#: ../../source/security.rst:13
 msgid ""
 "**Network eavesdroppers can't spy on anything that happens in OnionShare "
 "in transit.** Because connections between Tor onion services and Tor "
@@ -56,7 +60,7 @@ msgid ""
 " service key."
 msgstr ""
 
-#: ../../source/security.rst:13
+#: ../../source/security.rst:15
 msgid ""
 "**Anonymity of OnionShare users are protected by Tor.** OnionShare and "
 "Tor Browser protect the anonymity of the users. As long as the OnionShare"
@@ -65,7 +69,7 @@ msgid ""
 "identity of the OnionShare user."
 msgstr ""
 
-#: ../../source/security.rst:15
+#: ../../source/security.rst:17
 msgid ""
 "**If an attacker learns about the onion service, they still can't access "
 "anything.** There have been attacks against the Tor network that can "
@@ -79,11 +83,11 @@ msgid ""
 " brute force attacks against the password."
 msgstr ""
 
-#: ../../source/security.rst:18
+#: ../../source/security.rst:20
 msgid "What OnionShare doesn't protect against"
 msgstr ""
 
-#: ../../source/security.rst:20
+#: ../../source/security.rst:22
 msgid ""
 "**Communicating the OnionShare address might not be secure.** The "
 "OnionShare user is responsible for securely communicating the OnionShare "
@@ -97,7 +101,7 @@ msgid ""
 "cases where OnionShare is being used for something that isn't secret."
 msgstr ""
 
-#: ../../source/security.rst:22
+#: ../../source/security.rst:24
 msgid ""
 "**Communicating the OnionShare address might not be anonymous.** While "
 "OnionShare and Tor Browser allow for anonymity, if the user wishes to "
diff --git a/docs/source/locale/ro/LC_MESSAGES/advanced.po b/docs/source/locale/ro/LC_MESSAGES/advanced.po
index ba0a2218..0b6a4166 100644
--- a/docs/source/locale/ro/LC_MESSAGES/advanced.po
+++ b/docs/source/locale/ro/LC_MESSAGES/advanced.po
@@ -9,7 +9,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OnionShare 2.3\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-08-26 20:38-0700\n"
+"POT-Creation-Date: 2020-08-27 20:28-0400\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -123,28 +123,89 @@ msgid ""
 msgstr ""
 
 #: ../../source/advanced.rst:46
-msgid "Legacy addresses"
+msgid "Command line interface"
 msgstr ""
 
 #: ../../source/advanced.rst:48
 msgid ""
+"In addition to its graphical interface, OnionShare has a command line "
+"interface."
+msgstr ""
+
+#: ../../source/advanced.rst:51
+msgid "Linux"
+msgstr ""
+
+#: ../../source/advanced.rst:53
+msgid ""
+"If you installed OnionShare using the Flatpak package, unfortunately the "
+"command line interface isn't supported."
+msgstr ""
+
+#: ../../source/advanced.rst:55
+msgid ""
+"If you installed OnionShare using an operating system package, you can "
+"just run ``onionshare`` from the terminal."
+msgstr ""
+
+#: ../../source/advanced.rst:58
+msgid "macOS"
+msgstr ""
+
+#: ../../source/advanced.rst:60
+msgid "Make a symbolic link to the OnionShare command line binary line this::"
+msgstr ""
+
+#: ../../source/advanced.rst:64
+msgid "Now you can run ``onionshare`` from the terminal."
+msgstr ""
+
+#: ../../source/advanced.rst:67
+msgid "Windows"
+msgstr ""
+
+#: ../../source/advanced.rst:69
+msgid "The command line interface isn't supported in Windows."
+msgstr ""
+
+#: ../../source/advanced.rst:71
+msgid ""
+"If you really want to use it anyway, you can set up a Windows development"
+" environment (see :ref:`starting_development`) and then run this in a "
+"command prompt::"
+msgstr ""
+
+#: ../../source/advanced.rst:76
+msgid "Usage"
+msgstr ""
+
+#: ../../source/advanced.rst:78
+msgid "You can see command line documentation by running ``onionshare --help``::"
+msgstr ""
+
+#: ../../source/advanced.rst:134
+msgid "Legacy addresses"
+msgstr ""
+
+#: ../../source/advanced.rst:136
+msgid ""
 "OnionShare uses v3 Tor onion services by default. These are modern onion "
 "addresses that have 56 characters, for example::"
 msgstr ""
 
-#: ../../source/advanced.rst:52
+#: ../../source/advanced.rst:140
 msgid ""
 "But it still has support for v2 onion addresses, the old type of onion "
 "addresses that have 16 characters, for example::"
 msgstr ""
 
-#: ../../source/advanced.rst:56
+#: ../../source/advanced.rst:144
 msgid ""
 "OnionShare calls v2 onion addresses \"legacy addresses\". v3 onion "
 "addresses are more secure, and using legacy addresses is not recommended."
 msgstr ""
 
-#: ../../source/advanced.rst:58
+#: ../../source/advanced.rst:146
 msgid ""
 "To use legacy addresses, before starting a server click \"Show advanced "
 "settings\" in its tab and check the \"Use a legacy address (v2 onion "
@@ -154,7 +215,7 @@ msgid ""
 "service in a separate tab."
 msgstr ""
 
-#: ../../source/advanced.rst:60
+#: ../../source/advanced.rst:148
 msgid ""
 "Tor Project plans to `completely deprecate v2 onion services "
 "<https://blog.torproject.org/v2-deprecation-timeline>`_ on October 15, "
diff --git a/docs/source/locale/ro/LC_MESSAGES/security.po b/docs/source/locale/ro/LC_MESSAGES/security.po
index d7540eaa..627b0d48 100644
--- a/docs/source/locale/ro/LC_MESSAGES/security.po
+++ b/docs/source/locale/ro/LC_MESSAGES/security.po
@@ -9,7 +9,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OnionShare 2.3\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-08-26 20:38-0700\n"
+"POT-Creation-Date: 2020-08-27 20:28-0400\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -28,11 +28,15 @@ msgid ""
 " works."
 msgstr ""
 
-#: ../../source/security.rst:7
-msgid "What OnionShare protects against"
+#: ../../source/security.rst:6
+msgid "Like all software, OnionShare may contain bugs or vulnerabilities."
 msgstr ""
 
 #: ../../source/security.rst:9
+msgid "What OnionShare protects against"
+msgstr ""
+
+#: ../../source/security.rst:11
 msgid ""
 "**Third parties don't have access to anything that happens in "
 "OnionShare.** When you use OnionShare, you host services directly on your"
@@ -43,7 +47,7 @@ msgid ""
 "service with access to your data."
 msgstr ""
 
-#: ../../source/security.rst:11
+#: ../../source/security.rst:13
 msgid ""
 "**Network eavesdroppers can't spy on anything that happens in OnionShare "
 "in transit.** Because connections between Tor onion services and Tor "
@@ -56,7 +60,7 @@ msgid ""
 " service key."
 msgstr ""
 
-#: ../../source/security.rst:13
+#: ../../source/security.rst:15
 msgid ""
 "**Anonymity of OnionShare users are protected by Tor.** OnionShare and "
 "Tor Browser protect the anonymity of the users. As long as the OnionShare"
@@ -65,7 +69,7 @@ msgid ""
 "identity of the OnionShare user."
 msgstr ""
 
-#: ../../source/security.rst:15
+#: ../../source/security.rst:17
 msgid ""
 "**If an attacker learns about the onion service, they still can't access "
 "anything.** There have been attacks against the Tor network that can "
@@ -79,11 +83,11 @@ msgid ""
 " brute force attacks against the password."
 msgstr ""
 
-#: ../../source/security.rst:18
+#: ../../source/security.rst:20
 msgid "What OnionShare doesn't protect against"
 msgstr ""
 
-#: ../../source/security.rst:20
+#: ../../source/security.rst:22
 msgid ""
 "**Communicating the OnionShare address might not be secure.** The "
 "OnionShare user is responsible for securely communicating the OnionShare "
@@ -97,7 +101,7 @@ msgid ""
 "cases where OnionShare is being used for something that isn't secret."
 msgstr ""
 
-#: ../../source/security.rst:22
+#: ../../source/security.rst:24
 msgid ""
 "**Communicating the OnionShare address might not be anonymous.** While "
 "OnionShare and Tor Browser allow for anonymity, if the user wishes to "
diff --git a/docs/source/locale/ru/LC_MESSAGES/advanced.po b/docs/source/locale/ru/LC_MESSAGES/advanced.po
index ba0a2218..0b6a4166 100644
--- a/docs/source/locale/ru/LC_MESSAGES/advanced.po
+++ b/docs/source/locale/ru/LC_MESSAGES/advanced.po
@@ -9,7 +9,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OnionShare 2.3\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-08-26 20:38-0700\n"
+"POT-Creation-Date: 2020-08-27 20:28-0400\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -123,28 +123,89 @@ msgid ""
 msgstr ""
 
 #: ../../source/advanced.rst:46
-msgid "Legacy addresses"
+msgid "Command line interface"
 msgstr ""
 
 #: ../../source/advanced.rst:48
 msgid ""
+"In addition to its graphical interface, OnionShare has a command line "
+"interface."
+msgstr ""
+
+#: ../../source/advanced.rst:51
+msgid "Linux"
+msgstr ""
+
+#: ../../source/advanced.rst:53
+msgid ""
+"If you installed OnionShare using the Flatpak package, unfortunately the "
+"command line interface isn't supported."
+msgstr ""
+
+#: ../../source/advanced.rst:55
+msgid ""
+"If you installed OnionShare using an operating system package, you can "
+"just run ``onionshare`` from the terminal."
+msgstr ""
+
+#: ../../source/advanced.rst:58
+msgid "macOS"
+msgstr ""
+
+#: ../../source/advanced.rst:60
+msgid "Make a symbolic link to the OnionShare command line binary line this::"
+msgstr ""
+
+#: ../../source/advanced.rst:64
+msgid "Now you can run ``onionshare`` from the terminal."
+msgstr ""
+
+#: ../../source/advanced.rst:67
+msgid "Windows"
+msgstr ""
+
+#: ../../source/advanced.rst:69
+msgid "The command line interface isn't supported in Windows."
+msgstr ""
+
+#: ../../source/advanced.rst:71
+msgid ""
+"If you really want to use it anyway, you can set up a Windows development"
+" environment (see :ref:`starting_development`) and then run this in a "
+"command prompt::"
+msgstr ""
+
+#: ../../source/advanced.rst:76
+msgid "Usage"
+msgstr ""
+
+#: ../../source/advanced.rst:78
+msgid "You can see command line documentation by running ``onionshare --help``::"
+msgstr ""
+
+#: ../../source/advanced.rst:134
+msgid "Legacy addresses"
+msgstr ""
+
+#: ../../source/advanced.rst:136
+msgid ""
 "OnionShare uses v3 Tor onion services by default. These are modern onion "
 "addresses that have 56 characters, for example::"
 msgstr ""
 
-#: ../../source/advanced.rst:52
+#: ../../source/advanced.rst:140
 msgid ""
 "But it still has support for v2 onion addresses, the old type of onion "
 "addresses that have 16 characters, for example::"
 msgstr ""
 
-#: ../../source/advanced.rst:56
+#: ../../source/advanced.rst:144
 msgid ""
 "OnionShare calls v2 onion addresses \"legacy addresses\". v3 onion "
 "addresses are more secure, and using legacy addresses is not recommended."
 msgstr ""
 
-#: ../../source/advanced.rst:58
+#: ../../source/advanced.rst:146
 msgid ""
 "To use legacy addresses, before starting a server click \"Show advanced "
 "settings\" in its tab and check the \"Use a legacy address (v2 onion "
@@ -154,7 +215,7 @@ msgid ""
 "service in a separate tab."
 msgstr ""
 
-#: ../../source/advanced.rst:60
+#: ../../source/advanced.rst:148
 msgid ""
 "Tor Project plans to `completely deprecate v2 onion services "
 "<https://blog.torproject.org/v2-deprecation-timeline>`_ on October 15, "
diff --git a/docs/source/locale/ru/LC_MESSAGES/security.po b/docs/source/locale/ru/LC_MESSAGES/security.po
index d7540eaa..627b0d48 100644
--- a/docs/source/locale/ru/LC_MESSAGES/security.po
+++ b/docs/source/locale/ru/LC_MESSAGES/security.po
@@ -9,7 +9,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OnionShare 2.3\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-08-26 20:38-0700\n"
+"POT-Creation-Date: 2020-08-27 20:28-0400\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -28,11 +28,15 @@ msgid ""
 " works."
 msgstr ""
 
-#: ../../source/security.rst:7
-msgid "What OnionShare protects against"
+#: ../../source/security.rst:6
+msgid "Like all software, OnionShare may contain bugs or vulnerabilities."
 msgstr ""
 
 #: ../../source/security.rst:9
+msgid "What OnionShare protects against"
+msgstr ""
+
+#: ../../source/security.rst:11
 msgid ""
 "**Third parties don't have access to anything that happens in "
 "OnionShare.** When you use OnionShare, you host services directly on your"
@@ -43,7 +47,7 @@ msgid ""
 "service with access to your data."
 msgstr ""
 
-#: ../../source/security.rst:11
+#: ../../source/security.rst:13
 msgid ""
 "**Network eavesdroppers can't spy on anything that happens in OnionShare "
 "in transit.** Because connections between Tor onion services and Tor "
@@ -56,7 +60,7 @@ msgid ""
 " service key."
 msgstr ""
 
-#: ../../source/security.rst:13
+#: ../../source/security.rst:15
 msgid ""
 "**Anonymity of OnionShare users are protected by Tor.** OnionShare and "
 "Tor Browser protect the anonymity of the users. As long as the OnionShare"
@@ -65,7 +69,7 @@ msgid ""
 "identity of the OnionShare user."
 msgstr ""
 
-#: ../../source/security.rst:15
+#: ../../source/security.rst:17
 msgid ""
 "**If an attacker learns about the onion service, they still can't access "
 "anything.** There have been attacks against the Tor network that can "
@@ -79,11 +83,11 @@ msgid ""
 " brute force attacks against the password."
 msgstr ""
 
-#: ../../source/security.rst:18
+#: ../../source/security.rst:20
 msgid "What OnionShare doesn't protect against"
 msgstr ""
 
-#: ../../source/security.rst:20
+#: ../../source/security.rst:22
 msgid ""
 "**Communicating the OnionShare address might not be secure.** The "
 "OnionShare user is responsible for securely communicating the OnionShare "
@@ -97,7 +101,7 @@ msgid ""
 "cases where OnionShare is being used for something that isn't secret."
 msgstr ""
 
-#: ../../source/security.rst:22
+#: ../../source/security.rst:24
 msgid ""
 "**Communicating the OnionShare address might not be anonymous.** While "
 "OnionShare and Tor Browser allow for anonymity, if the user wishes to "
diff --git a/docs/source/locale/sr@latin/LC_MESSAGES/advanced.po b/docs/source/locale/sr@latin/LC_MESSAGES/advanced.po
index ba0a2218..0b6a4166 100644
--- a/docs/source/locale/sr@latin/LC_MESSAGES/advanced.po
+++ b/docs/source/locale/sr@latin/LC_MESSAGES/advanced.po
@@ -9,7 +9,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OnionShare 2.3\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-08-26 20:38-0700\n"
+"POT-Creation-Date: 2020-08-27 20:28-0400\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -123,28 +123,89 @@ msgid ""
 msgstr ""
 
 #: ../../source/advanced.rst:46
-msgid "Legacy addresses"
+msgid "Command line interface"
 msgstr ""
 
 #: ../../source/advanced.rst:48
 msgid ""
+"In addition to its graphical interface, OnionShare has a command line "
+"interface."
+msgstr ""
+
+#: ../../source/advanced.rst:51
+msgid "Linux"
+msgstr ""
+
+#: ../../source/advanced.rst:53
+msgid ""
+"If you installed OnionShare using the Flatpak package, unfortunately the "
+"command line interface isn't supported."
+msgstr ""
+
+#: ../../source/advanced.rst:55
+msgid ""
+"If you installed OnionShare using an operating system package, you can "
+"just run ``onionshare`` from the terminal."
+msgstr ""
+
+#: ../../source/advanced.rst:58
+msgid "macOS"
+msgstr ""
+
+#: ../../source/advanced.rst:60
+msgid "Make a symbolic link to the OnionShare command line binary line this::"
+msgstr ""
+
+#: ../../source/advanced.rst:64
+msgid "Now you can run ``onionshare`` from the terminal."
+msgstr ""
+
+#: ../../source/advanced.rst:67
+msgid "Windows"
+msgstr ""
+
+#: ../../source/advanced.rst:69
+msgid "The command line interface isn't supported in Windows."
+msgstr ""
+
+#: ../../source/advanced.rst:71
+msgid ""
+"If you really want to use it anyway, you can set up a Windows development"
+" environment (see :ref:`starting_development`) and then run this in a "
+"command prompt::"
+msgstr ""
+
+#: ../../source/advanced.rst:76
+msgid "Usage"
+msgstr ""
+
+#: ../../source/advanced.rst:78
+msgid "You can see command line documentation by running ``onionshare --help``::"
+msgstr ""
+
+#: ../../source/advanced.rst:134
+msgid "Legacy addresses"
+msgstr ""
+
+#: ../../source/advanced.rst:136
+msgid ""
 "OnionShare uses v3 Tor onion services by default. These are modern onion "
 "addresses that have 56 characters, for example::"
 msgstr ""
 
-#: ../../source/advanced.rst:52
+#: ../../source/advanced.rst:140
 msgid ""
 "But it still has support for v2 onion addresses, the old type of onion "
 "addresses that have 16 characters, for example::"
 msgstr ""
 
-#: ../../source/advanced.rst:56
+#: ../../source/advanced.rst:144
 msgid ""
 "OnionShare calls v2 onion addresses \"legacy addresses\". v3 onion "
 "addresses are more secure, and using legacy addresses is not recommended."
 msgstr ""
 
-#: ../../source/advanced.rst:58
+#: ../../source/advanced.rst:146
 msgid ""
 "To use legacy addresses, before starting a server click \"Show advanced "
 "settings\" in its tab and check the \"Use a legacy address (v2 onion "
@@ -154,7 +215,7 @@ msgid ""
 "service in a separate tab."
 msgstr ""
 
-#: ../../source/advanced.rst:60
+#: ../../source/advanced.rst:148
 msgid ""
 "Tor Project plans to `completely deprecate v2 onion services "
 "<https://blog.torproject.org/v2-deprecation-timeline>`_ on October 15, "
diff --git a/docs/source/locale/sr@latin/LC_MESSAGES/security.po b/docs/source/locale/sr@latin/LC_MESSAGES/security.po
index d7540eaa..627b0d48 100644
--- a/docs/source/locale/sr@latin/LC_MESSAGES/security.po
+++ b/docs/source/locale/sr@latin/LC_MESSAGES/security.po
@@ -9,7 +9,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OnionShare 2.3\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-08-26 20:38-0700\n"
+"POT-Creation-Date: 2020-08-27 20:28-0400\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -28,11 +28,15 @@ msgid ""
 " works."
 msgstr ""
 
-#: ../../source/security.rst:7
-msgid "What OnionShare protects against"
+#: ../../source/security.rst:6
+msgid "Like all software, OnionShare may contain bugs or vulnerabilities."
 msgstr ""
 
 #: ../../source/security.rst:9
+msgid "What OnionShare protects against"
+msgstr ""
+
+#: ../../source/security.rst:11
 msgid ""
 "**Third parties don't have access to anything that happens in "
 "OnionShare.** When you use OnionShare, you host services directly on your"
@@ -43,7 +47,7 @@ msgid ""
 "service with access to your data."
 msgstr ""
 
-#: ../../source/security.rst:11
+#: ../../source/security.rst:13
 msgid ""
 "**Network eavesdroppers can't spy on anything that happens in OnionShare "
 "in transit.** Because connections between Tor onion services and Tor "
@@ -56,7 +60,7 @@ msgid ""
 " service key."
 msgstr ""
 
-#: ../../source/security.rst:13
+#: ../../source/security.rst:15
 msgid ""
 "**Anonymity of OnionShare users are protected by Tor.** OnionShare and "
 "Tor Browser protect the anonymity of the users. As long as the OnionShare"
@@ -65,7 +69,7 @@ msgid ""
 "identity of the OnionShare user."
 msgstr ""
 
-#: ../../source/security.rst:15
+#: ../../source/security.rst:17
 msgid ""
 "**If an attacker learns about the onion service, they still can't access "
 "anything.** There have been attacks against the Tor network that can "
@@ -79,11 +83,11 @@ msgid ""
 " brute force attacks against the password."
 msgstr ""
 
-#: ../../source/security.rst:18
+#: ../../source/security.rst:20
 msgid "What OnionShare doesn't protect against"
 msgstr ""
 
-#: ../../source/security.rst:20
+#: ../../source/security.rst:22
 msgid ""
 "**Communicating the OnionShare address might not be secure.** The "
 "OnionShare user is responsible for securely communicating the OnionShare "
@@ -97,7 +101,7 @@ msgid ""
 "cases where OnionShare is being used for something that isn't secret."
 msgstr ""
 
-#: ../../source/security.rst:22
+#: ../../source/security.rst:24
 msgid ""
 "**Communicating the OnionShare address might not be anonymous.** While "
 "OnionShare and Tor Browser allow for anonymity, if the user wishes to "
diff --git a/docs/source/locale/sv/LC_MESSAGES/advanced.po b/docs/source/locale/sv/LC_MESSAGES/advanced.po
index ba0a2218..0b6a4166 100644
--- a/docs/source/locale/sv/LC_MESSAGES/advanced.po
+++ b/docs/source/locale/sv/LC_MESSAGES/advanced.po
@@ -9,7 +9,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OnionShare 2.3\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-08-26 20:38-0700\n"
+"POT-Creation-Date: 2020-08-27 20:28-0400\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -123,28 +123,89 @@ msgid ""
 msgstr ""
 
 #: ../../source/advanced.rst:46
-msgid "Legacy addresses"
+msgid "Command line interface"
 msgstr ""
 
 #: ../../source/advanced.rst:48
 msgid ""
+"In addition to its graphical interface, OnionShare has a command line "
+"interface."
+msgstr ""
+
+#: ../../source/advanced.rst:51
+msgid "Linux"
+msgstr ""
+
+#: ../../source/advanced.rst:53
+msgid ""
+"If you installed OnionShare using the Flatpak package, unfortunately the "
+"command line interface isn't supported."
+msgstr ""
+
+#: ../../source/advanced.rst:55
+msgid ""
+"If you installed OnionShare using an operating system package, you can "
+"just run ``onionshare`` from the terminal."
+msgstr ""
+
+#: ../../source/advanced.rst:58
+msgid "macOS"
+msgstr ""
+
+#: ../../source/advanced.rst:60
+msgid "Make a symbolic link to the OnionShare command line binary line this::"
+msgstr ""
+
+#: ../../source/advanced.rst:64
+msgid "Now you can run ``onionshare`` from the terminal."
+msgstr ""
+
+#: ../../source/advanced.rst:67
+msgid "Windows"
+msgstr ""
+
+#: ../../source/advanced.rst:69
+msgid "The command line interface isn't supported in Windows."
+msgstr ""
+
+#: ../../source/advanced.rst:71
+msgid ""
+"If you really want to use it anyway, you can set up a Windows development"
+" environment (see :ref:`starting_development`) and then run this in a "
+"command prompt::"
+msgstr ""
+
+#: ../../source/advanced.rst:76
+msgid "Usage"
+msgstr ""
+
+#: ../../source/advanced.rst:78
+msgid "You can see command line documentation by running ``onionshare --help``::"
+msgstr ""
+
+#: ../../source/advanced.rst:134
+msgid "Legacy addresses"
+msgstr ""
+
+#: ../../source/advanced.rst:136
+msgid ""
 "OnionShare uses v3 Tor onion services by default. These are modern onion "
 "addresses that have 56 characters, for example::"
 msgstr ""
 
-#: ../../source/advanced.rst:52
+#: ../../source/advanced.rst:140
 msgid ""
 "But it still has support for v2 onion addresses, the old type of onion "
 "addresses that have 16 characters, for example::"
 msgstr ""
 
-#: ../../source/advanced.rst:56
+#: ../../source/advanced.rst:144
 msgid ""
 "OnionShare calls v2 onion addresses \"legacy addresses\". v3 onion "
 "addresses are more secure, and using legacy addresses is not recommended."
 msgstr ""
 
-#: ../../source/advanced.rst:58
+#: ../../source/advanced.rst:146
 msgid ""
 "To use legacy addresses, before starting a server click \"Show advanced "
 "settings\" in its tab and check the \"Use a legacy address (v2 onion "
@@ -154,7 +215,7 @@ msgid ""
 "service in a separate tab."
 msgstr ""
 
-#: ../../source/advanced.rst:60
+#: ../../source/advanced.rst:148
 msgid ""
 "Tor Project plans to `completely deprecate v2 onion services "
 "<https://blog.torproject.org/v2-deprecation-timeline>`_ on October 15, "
diff --git a/docs/source/locale/sv/LC_MESSAGES/security.po b/docs/source/locale/sv/LC_MESSAGES/security.po
index d7540eaa..627b0d48 100644
--- a/docs/source/locale/sv/LC_MESSAGES/security.po
+++ b/docs/source/locale/sv/LC_MESSAGES/security.po
@@ -9,7 +9,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OnionShare 2.3\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-08-26 20:38-0700\n"
+"POT-Creation-Date: 2020-08-27 20:28-0400\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -28,11 +28,15 @@ msgid ""
 " works."
 msgstr ""
 
-#: ../../source/security.rst:7
-msgid "What OnionShare protects against"
+#: ../../source/security.rst:6
+msgid "Like all software, OnionShare may contain bugs or vulnerabilities."
 msgstr ""
 
 #: ../../source/security.rst:9
+msgid "What OnionShare protects against"
+msgstr ""
+
+#: ../../source/security.rst:11
 msgid ""
 "**Third parties don't have access to anything that happens in "
 "OnionShare.** When you use OnionShare, you host services directly on your"
@@ -43,7 +47,7 @@ msgid ""
 "service with access to your data."
 msgstr ""
 
-#: ../../source/security.rst:11
+#: ../../source/security.rst:13
 msgid ""
 "**Network eavesdroppers can't spy on anything that happens in OnionShare "
 "in transit.** Because connections between Tor onion services and Tor "
@@ -56,7 +60,7 @@ msgid ""
 " service key."
 msgstr ""
 
-#: ../../source/security.rst:13
+#: ../../source/security.rst:15
 msgid ""
 "**Anonymity of OnionShare users are protected by Tor.** OnionShare and "
 "Tor Browser protect the anonymity of the users. As long as the OnionShare"
@@ -65,7 +69,7 @@ msgid ""
 "identity of the OnionShare user."
 msgstr ""
 
-#: ../../source/security.rst:15
+#: ../../source/security.rst:17
 msgid ""
 "**If an attacker learns about the onion service, they still can't access "
 "anything.** There have been attacks against the Tor network that can "
@@ -79,11 +83,11 @@ msgid ""
 " brute force attacks against the password."
 msgstr ""
 
-#: ../../source/security.rst:18
+#: ../../source/security.rst:20
 msgid "What OnionShare doesn't protect against"
 msgstr ""
 
-#: ../../source/security.rst:20
+#: ../../source/security.rst:22
 msgid ""
 "**Communicating the OnionShare address might not be secure.** The "
 "OnionShare user is responsible for securely communicating the OnionShare "
@@ -97,7 +101,7 @@ msgid ""
 "cases where OnionShare is being used for something that isn't secret."
 msgstr ""
 
-#: ../../source/security.rst:22
+#: ../../source/security.rst:24
 msgid ""
 "**Communicating the OnionShare address might not be anonymous.** While "
 "OnionShare and Tor Browser allow for anonymity, if the user wishes to "
diff --git a/docs/source/locale/te/LC_MESSAGES/advanced.po b/docs/source/locale/te/LC_MESSAGES/advanced.po
index ba0a2218..0b6a4166 100644
--- a/docs/source/locale/te/LC_MESSAGES/advanced.po
+++ b/docs/source/locale/te/LC_MESSAGES/advanced.po
@@ -9,7 +9,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OnionShare 2.3\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-08-26 20:38-0700\n"
+"POT-Creation-Date: 2020-08-27 20:28-0400\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -123,28 +123,89 @@ msgid ""
 msgstr ""
 
 #: ../../source/advanced.rst:46
-msgid "Legacy addresses"
+msgid "Command line interface"
 msgstr ""
 
 #: ../../source/advanced.rst:48
 msgid ""
+"In addition to its graphical interface, OnionShare has a command line "
+"interface."
+msgstr ""
+
+#: ../../source/advanced.rst:51
+msgid "Linux"
+msgstr ""
+
+#: ../../source/advanced.rst:53
+msgid ""
+"If you installed OnionShare using the Flatpak package, unfortunately the "
+"command line interface isn't supported."
+msgstr ""
+
+#: ../../source/advanced.rst:55
+msgid ""
+"If you installed OnionShare using an operating system package, you can "
+"just run ``onionshare`` from the terminal."
+msgstr ""
+
+#: ../../source/advanced.rst:58
+msgid "macOS"
+msgstr ""
+
+#: ../../source/advanced.rst:60
+msgid "Make a symbolic link to the OnionShare command line binary line this::"
+msgstr ""
+
+#: ../../source/advanced.rst:64
+msgid "Now you can run ``onionshare`` from the terminal."
+msgstr ""
+
+#: ../../source/advanced.rst:67
+msgid "Windows"
+msgstr ""
+
+#: ../../source/advanced.rst:69
+msgid "The command line interface isn't supported in Windows."
+msgstr ""
+
+#: ../../source/advanced.rst:71
+msgid ""
+"If you really want to use it anyway, you can set up a Windows development"
+" environment (see :ref:`starting_development`) and then run this in a "
+"command prompt::"
+msgstr ""
+
+#: ../../source/advanced.rst:76
+msgid "Usage"
+msgstr ""
+
+#: ../../source/advanced.rst:78
+msgid "You can see command line documentation by running ``onionshare --help``::"
+msgstr ""
+
+#: ../../source/advanced.rst:134
+msgid "Legacy addresses"
+msgstr ""
+
+#: ../../source/advanced.rst:136
+msgid ""
 "OnionShare uses v3 Tor onion services by default. These are modern onion "
 "addresses that have 56 characters, for example::"
 msgstr ""
 
-#: ../../source/advanced.rst:52
+#: ../../source/advanced.rst:140
 msgid ""
 "But it still has support for v2 onion addresses, the old type of onion "
 "addresses that have 16 characters, for example::"
 msgstr ""
 
-#: ../../source/advanced.rst:56
+#: ../../source/advanced.rst:144
 msgid ""
 "OnionShare calls v2 onion addresses \"legacy addresses\". v3 onion "
 "addresses are more secure, and using legacy addresses is not recommended."
 msgstr ""
 
-#: ../../source/advanced.rst:58
+#: ../../source/advanced.rst:146
 msgid ""
 "To use legacy addresses, before starting a server click \"Show advanced "
 "settings\" in its tab and check the \"Use a legacy address (v2 onion "
@@ -154,7 +215,7 @@ msgid ""
 "service in a separate tab."
 msgstr ""
 
-#: ../../source/advanced.rst:60
+#: ../../source/advanced.rst:148
 msgid ""
 "Tor Project plans to `completely deprecate v2 onion services "
 "<https://blog.torproject.org/v2-deprecation-timeline>`_ on October 15, "
diff --git a/docs/source/locale/te/LC_MESSAGES/security.po b/docs/source/locale/te/LC_MESSAGES/security.po
index d7540eaa..627b0d48 100644
--- a/docs/source/locale/te/LC_MESSAGES/security.po
+++ b/docs/source/locale/te/LC_MESSAGES/security.po
@@ -9,7 +9,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OnionShare 2.3\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-08-26 20:38-0700\n"
+"POT-Creation-Date: 2020-08-27 20:28-0400\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -28,11 +28,15 @@ msgid ""
 " works."
 msgstr ""
 
-#: ../../source/security.rst:7
-msgid "What OnionShare protects against"
+#: ../../source/security.rst:6
+msgid "Like all software, OnionShare may contain bugs or vulnerabilities."
 msgstr ""
 
 #: ../../source/security.rst:9
+msgid "What OnionShare protects against"
+msgstr ""
+
+#: ../../source/security.rst:11
 msgid ""
 "**Third parties don't have access to anything that happens in "
 "OnionShare.** When you use OnionShare, you host services directly on your"
@@ -43,7 +47,7 @@ msgid ""
 "service with access to your data."
 msgstr ""
 
-#: ../../source/security.rst:11
+#: ../../source/security.rst:13
 msgid ""
 "**Network eavesdroppers can't spy on anything that happens in OnionShare "
 "in transit.** Because connections between Tor onion services and Tor "
@@ -56,7 +60,7 @@ msgid ""
 " service key."
 msgstr ""
 
-#: ../../source/security.rst:13
+#: ../../source/security.rst:15
 msgid ""
 "**Anonymity of OnionShare users are protected by Tor.** OnionShare and "
 "Tor Browser protect the anonymity of the users. As long as the OnionShare"
@@ -65,7 +69,7 @@ msgid ""
 "identity of the OnionShare user."
 msgstr ""
 
-#: ../../source/security.rst:15
+#: ../../source/security.rst:17
 msgid ""
 "**If an attacker learns about the onion service, they still can't access "
 "anything.** There have been attacks against the Tor network that can "
@@ -79,11 +83,11 @@ msgid ""
 " brute force attacks against the password."
 msgstr ""
 
-#: ../../source/security.rst:18
+#: ../../source/security.rst:20
 msgid "What OnionShare doesn't protect against"
 msgstr ""
 
-#: ../../source/security.rst:20
+#: ../../source/security.rst:22
 msgid ""
 "**Communicating the OnionShare address might not be secure.** The "
 "OnionShare user is responsible for securely communicating the OnionShare "
@@ -97,7 +101,7 @@ msgid ""
 "cases where OnionShare is being used for something that isn't secret."
 msgstr ""
 
-#: ../../source/security.rst:22
+#: ../../source/security.rst:24
 msgid ""
 "**Communicating the OnionShare address might not be anonymous.** While "
 "OnionShare and Tor Browser allow for anonymity, if the user wishes to "
diff --git a/docs/source/locale/tr/LC_MESSAGES/advanced.po b/docs/source/locale/tr/LC_MESSAGES/advanced.po
index ba0a2218..0b6a4166 100644
--- a/docs/source/locale/tr/LC_MESSAGES/advanced.po
+++ b/docs/source/locale/tr/LC_MESSAGES/advanced.po
@@ -9,7 +9,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OnionShare 2.3\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-08-26 20:38-0700\n"
+"POT-Creation-Date: 2020-08-27 20:28-0400\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -123,28 +123,89 @@ msgid ""
 msgstr ""
 
 #: ../../source/advanced.rst:46
-msgid "Legacy addresses"
+msgid "Command line interface"
 msgstr ""
 
 #: ../../source/advanced.rst:48
 msgid ""
+"In addition to its graphical interface, OnionShare has a command line "
+"interface."
+msgstr ""
+
+#: ../../source/advanced.rst:51
+msgid "Linux"
+msgstr ""
+
+#: ../../source/advanced.rst:53
+msgid ""
+"If you installed OnionShare using the Flatpak package, unfortunately the "
+"command line interface isn't supported."
+msgstr ""
+
+#: ../../source/advanced.rst:55
+msgid ""
+"If you installed OnionShare using an operating system package, you can "
+"just run ``onionshare`` from the terminal."
+msgstr ""
+
+#: ../../source/advanced.rst:58
+msgid "macOS"
+msgstr ""
+
+#: ../../source/advanced.rst:60
+msgid "Make a symbolic link to the OnionShare command line binary line this::"
+msgstr ""
+
+#: ../../source/advanced.rst:64
+msgid "Now you can run ``onionshare`` from the terminal."
+msgstr ""
+
+#: ../../source/advanced.rst:67
+msgid "Windows"
+msgstr ""
+
+#: ../../source/advanced.rst:69
+msgid "The command line interface isn't supported in Windows."
+msgstr ""
+
+#: ../../source/advanced.rst:71
+msgid ""
+"If you really want to use it anyway, you can set up a Windows development"
+" environment (see :ref:`starting_development`) and then run this in a "
+"command prompt::"
+msgstr ""
+
+#: ../../source/advanced.rst:76
+msgid "Usage"
+msgstr ""
+
+#: ../../source/advanced.rst:78
+msgid "You can see command line documentation by running ``onionshare --help``::"
+msgstr ""
+
+#: ../../source/advanced.rst:134
+msgid "Legacy addresses"
+msgstr ""
+
+#: ../../source/advanced.rst:136
+msgid ""
 "OnionShare uses v3 Tor onion services by default. These are modern onion "
 "addresses that have 56 characters, for example::"
 msgstr ""
 
-#: ../../source/advanced.rst:52
+#: ../../source/advanced.rst:140
 msgid ""
 "But it still has support for v2 onion addresses, the old type of onion "
 "addresses that have 16 characters, for example::"
 msgstr ""
 
-#: ../../source/advanced.rst:56
+#: ../../source/advanced.rst:144
 msgid ""
 "OnionShare calls v2 onion addresses \"legacy addresses\". v3 onion "
 "addresses are more secure, and using legacy addresses is not recommended."
 msgstr ""
 
-#: ../../source/advanced.rst:58
+#: ../../source/advanced.rst:146
 msgid ""
 "To use legacy addresses, before starting a server click \"Show advanced "
 "settings\" in its tab and check the \"Use a legacy address (v2 onion "
@@ -154,7 +215,7 @@ msgid ""
 "service in a separate tab."
 msgstr ""
 
-#: ../../source/advanced.rst:60
+#: ../../source/advanced.rst:148
 msgid ""
 "Tor Project plans to `completely deprecate v2 onion services "
 "<https://blog.torproject.org/v2-deprecation-timeline>`_ on October 15, "
diff --git a/docs/source/locale/tr/LC_MESSAGES/security.po b/docs/source/locale/tr/LC_MESSAGES/security.po
index d7540eaa..627b0d48 100644
--- a/docs/source/locale/tr/LC_MESSAGES/security.po
+++ b/docs/source/locale/tr/LC_MESSAGES/security.po
@@ -9,7 +9,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OnionShare 2.3\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-08-26 20:38-0700\n"
+"POT-Creation-Date: 2020-08-27 20:28-0400\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -28,11 +28,15 @@ msgid ""
 " works."
 msgstr ""
 
-#: ../../source/security.rst:7
-msgid "What OnionShare protects against"
+#: ../../source/security.rst:6
+msgid "Like all software, OnionShare may contain bugs or vulnerabilities."
 msgstr ""
 
 #: ../../source/security.rst:9
+msgid "What OnionShare protects against"
+msgstr ""
+
+#: ../../source/security.rst:11
 msgid ""
 "**Third parties don't have access to anything that happens in "
 "OnionShare.** When you use OnionShare, you host services directly on your"
@@ -43,7 +47,7 @@ msgid ""
 "service with access to your data."
 msgstr ""
 
-#: ../../source/security.rst:11
+#: ../../source/security.rst:13
 msgid ""
 "**Network eavesdroppers can't spy on anything that happens in OnionShare "
 "in transit.** Because connections between Tor onion services and Tor "
@@ -56,7 +60,7 @@ msgid ""
 " service key."
 msgstr ""
 
-#: ../../source/security.rst:13
+#: ../../source/security.rst:15
 msgid ""
 "**Anonymity of OnionShare users are protected by Tor.** OnionShare and "
 "Tor Browser protect the anonymity of the users. As long as the OnionShare"
@@ -65,7 +69,7 @@ msgid ""
 "identity of the OnionShare user."
 msgstr ""
 
-#: ../../source/security.rst:15
+#: ../../source/security.rst:17
 msgid ""
 "**If an attacker learns about the onion service, they still can't access "
 "anything.** There have been attacks against the Tor network that can "
@@ -79,11 +83,11 @@ msgid ""
 " brute force attacks against the password."
 msgstr ""
 
-#: ../../source/security.rst:18
+#: ../../source/security.rst:20
 msgid "What OnionShare doesn't protect against"
 msgstr ""
 
-#: ../../source/security.rst:20
+#: ../../source/security.rst:22
 msgid ""
 "**Communicating the OnionShare address might not be secure.** The "
 "OnionShare user is responsible for securely communicating the OnionShare "
@@ -97,7 +101,7 @@ msgid ""
 "cases where OnionShare is being used for something that isn't secret."
 msgstr ""
 
-#: ../../source/security.rst:22
+#: ../../source/security.rst:24
 msgid ""
 "**Communicating the OnionShare address might not be anonymous.** While "
 "OnionShare and Tor Browser allow for anonymity, if the user wishes to "
diff --git a/docs/source/locale/uk/LC_MESSAGES/advanced.po b/docs/source/locale/uk/LC_MESSAGES/advanced.po
index ba0a2218..0b6a4166 100644
--- a/docs/source/locale/uk/LC_MESSAGES/advanced.po
+++ b/docs/source/locale/uk/LC_MESSAGES/advanced.po
@@ -9,7 +9,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OnionShare 2.3\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-08-26 20:38-0700\n"
+"POT-Creation-Date: 2020-08-27 20:28-0400\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -123,28 +123,89 @@ msgid ""
 msgstr ""
 
 #: ../../source/advanced.rst:46
-msgid "Legacy addresses"
+msgid "Command line interface"
 msgstr ""
 
 #: ../../source/advanced.rst:48
 msgid ""
+"In addition to its graphical interface, OnionShare has a command line "
+"interface."
+msgstr ""
+
+#: ../../source/advanced.rst:51
+msgid "Linux"
+msgstr ""
+
+#: ../../source/advanced.rst:53
+msgid ""
+"If you installed OnionShare using the Flatpak package, unfortunately the "
+"command line interface isn't supported."
+msgstr ""
+
+#: ../../source/advanced.rst:55
+msgid ""
+"If you installed OnionShare using an operating system package, you can "
+"just run ``onionshare`` from the terminal."
+msgstr ""
+
+#: ../../source/advanced.rst:58
+msgid "macOS"
+msgstr ""
+
+#: ../../source/advanced.rst:60
+msgid "Make a symbolic link to the OnionShare command line binary line this::"
+msgstr ""
+
+#: ../../source/advanced.rst:64
+msgid "Now you can run ``onionshare`` from the terminal."
+msgstr ""
+
+#: ../../source/advanced.rst:67
+msgid "Windows"
+msgstr ""
+
+#: ../../source/advanced.rst:69
+msgid "The command line interface isn't supported in Windows."
+msgstr ""
+
+#: ../../source/advanced.rst:71
+msgid ""
+"If you really want to use it anyway, you can set up a Windows development"
+" environment (see :ref:`starting_development`) and then run this in a "
+"command prompt::"
+msgstr ""
+
+#: ../../source/advanced.rst:76
+msgid "Usage"
+msgstr ""
+
+#: ../../source/advanced.rst:78
+msgid "You can see command line documentation by running ``onionshare --help``::"
+msgstr ""
+
+#: ../../source/advanced.rst:134
+msgid "Legacy addresses"
+msgstr ""
+
+#: ../../source/advanced.rst:136
+msgid ""
 "OnionShare uses v3 Tor onion services by default. These are modern onion "
 "addresses that have 56 characters, for example::"
 msgstr ""
 
-#: ../../source/advanced.rst:52
+#: ../../source/advanced.rst:140
 msgid ""
 "But it still has support for v2 onion addresses, the old type of onion "
 "addresses that have 16 characters, for example::"
 msgstr ""
 
-#: ../../source/advanced.rst:56
+#: ../../source/advanced.rst:144
 msgid ""
 "OnionShare calls v2 onion addresses \"legacy addresses\". v3 onion "
 "addresses are more secure, and using legacy addresses is not recommended."
 msgstr ""
 
-#: ../../source/advanced.rst:58
+#: ../../source/advanced.rst:146
 msgid ""
 "To use legacy addresses, before starting a server click \"Show advanced "
 "settings\" in its tab and check the \"Use a legacy address (v2 onion "
@@ -154,7 +215,7 @@ msgid ""
 "service in a separate tab."
 msgstr ""
 
-#: ../../source/advanced.rst:60
+#: ../../source/advanced.rst:148
 msgid ""
 "Tor Project plans to `completely deprecate v2 onion services "
 "<https://blog.torproject.org/v2-deprecation-timeline>`_ on October 15, "
diff --git a/docs/source/locale/uk/LC_MESSAGES/security.po b/docs/source/locale/uk/LC_MESSAGES/security.po
index d7540eaa..627b0d48 100644
--- a/docs/source/locale/uk/LC_MESSAGES/security.po
+++ b/docs/source/locale/uk/LC_MESSAGES/security.po
@@ -9,7 +9,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OnionShare 2.3\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-08-26 20:38-0700\n"
+"POT-Creation-Date: 2020-08-27 20:28-0400\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -28,11 +28,15 @@ msgid ""
 " works."
 msgstr ""
 
-#: ../../source/security.rst:7
-msgid "What OnionShare protects against"
+#: ../../source/security.rst:6
+msgid "Like all software, OnionShare may contain bugs or vulnerabilities."
 msgstr ""
 
 #: ../../source/security.rst:9
+msgid "What OnionShare protects against"
+msgstr ""
+
+#: ../../source/security.rst:11
 msgid ""
 "**Third parties don't have access to anything that happens in "
 "OnionShare.** When you use OnionShare, you host services directly on your"
@@ -43,7 +47,7 @@ msgid ""
 "service with access to your data."
 msgstr ""
 
-#: ../../source/security.rst:11
+#: ../../source/security.rst:13
 msgid ""
 "**Network eavesdroppers can't spy on anything that happens in OnionShare "
 "in transit.** Because connections between Tor onion services and Tor "
@@ -56,7 +60,7 @@ msgid ""
 " service key."
 msgstr ""
 
-#: ../../source/security.rst:13
+#: ../../source/security.rst:15
 msgid ""
 "**Anonymity of OnionShare users are protected by Tor.** OnionShare and "
 "Tor Browser protect the anonymity of the users. As long as the OnionShare"
@@ -65,7 +69,7 @@ msgid ""
 "identity of the OnionShare user."
 msgstr ""
 
-#: ../../source/security.rst:15
+#: ../../source/security.rst:17
 msgid ""
 "**If an attacker learns about the onion service, they still can't access "
 "anything.** There have been attacks against the Tor network that can "
@@ -79,11 +83,11 @@ msgid ""
 " brute force attacks against the password."
 msgstr ""
 
-#: ../../source/security.rst:18
+#: ../../source/security.rst:20
 msgid "What OnionShare doesn't protect against"
 msgstr ""
 
-#: ../../source/security.rst:20
+#: ../../source/security.rst:22
 msgid ""
 "**Communicating the OnionShare address might not be secure.** The "
 "OnionShare user is responsible for securely communicating the OnionShare "
@@ -97,7 +101,7 @@ msgid ""
 "cases where OnionShare is being used for something that isn't secret."
 msgstr ""
 
-#: ../../source/security.rst:22
+#: ../../source/security.rst:24
 msgid ""
 "**Communicating the OnionShare address might not be anonymous.** While "
 "OnionShare and Tor Browser allow for anonymity, if the user wishes to "
diff --git a/docs/source/locale/zh_CN/LC_MESSAGES/advanced.po b/docs/source/locale/zh_CN/LC_MESSAGES/advanced.po
index ba0a2218..0b6a4166 100644
--- a/docs/source/locale/zh_CN/LC_MESSAGES/advanced.po
+++ b/docs/source/locale/zh_CN/LC_MESSAGES/advanced.po
@@ -9,7 +9,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OnionShare 2.3\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-08-26 20:38-0700\n"
+"POT-Creation-Date: 2020-08-27 20:28-0400\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -123,28 +123,89 @@ msgid ""
 msgstr ""
 
 #: ../../source/advanced.rst:46
-msgid "Legacy addresses"
+msgid "Command line interface"
 msgstr ""
 
 #: ../../source/advanced.rst:48
 msgid ""
+"In addition to its graphical interface, OnionShare has a command line "
+"interface."
+msgstr ""
+
+#: ../../source/advanced.rst:51
+msgid "Linux"
+msgstr ""
+
+#: ../../source/advanced.rst:53
+msgid ""
+"If you installed OnionShare using the Flatpak package, unfortunately the "
+"command line interface isn't supported."
+msgstr ""
+
+#: ../../source/advanced.rst:55
+msgid ""
+"If you installed OnionShare using an operating system package, you can "
+"just run ``onionshare`` from the terminal."
+msgstr ""
+
+#: ../../source/advanced.rst:58
+msgid "macOS"
+msgstr ""
+
+#: ../../source/advanced.rst:60
+msgid "Make a symbolic link to the OnionShare command line binary line this::"
+msgstr ""
+
+#: ../../source/advanced.rst:64
+msgid "Now you can run ``onionshare`` from the terminal."
+msgstr ""
+
+#: ../../source/advanced.rst:67
+msgid "Windows"
+msgstr ""
+
+#: ../../source/advanced.rst:69
+msgid "The command line interface isn't supported in Windows."
+msgstr ""
+
+#: ../../source/advanced.rst:71
+msgid ""
+"If you really want to use it anyway, you can set up a Windows development"
+" environment (see :ref:`starting_development`) and then run this in a "
+"command prompt::"
+msgstr ""
+
+#: ../../source/advanced.rst:76
+msgid "Usage"
+msgstr ""
+
+#: ../../source/advanced.rst:78
+msgid "You can see command line documentation by running ``onionshare --help``::"
+msgstr ""
+
+#: ../../source/advanced.rst:134
+msgid "Legacy addresses"
+msgstr ""
+
+#: ../../source/advanced.rst:136
+msgid ""
 "OnionShare uses v3 Tor onion services by default. These are modern onion "
 "addresses that have 56 characters, for example::"
 msgstr ""
 
-#: ../../source/advanced.rst:52
+#: ../../source/advanced.rst:140
 msgid ""
 "But it still has support for v2 onion addresses, the old type of onion "
 "addresses that have 16 characters, for example::"
 msgstr ""
 
-#: ../../source/advanced.rst:56
+#: ../../source/advanced.rst:144
 msgid ""
 "OnionShare calls v2 onion addresses \"legacy addresses\". v3 onion "
 "addresses are more secure, and using legacy addresses is not recommended."
 msgstr ""
 
-#: ../../source/advanced.rst:58
+#: ../../source/advanced.rst:146
 msgid ""
 "To use legacy addresses, before starting a server click \"Show advanced "
 "settings\" in its tab and check the \"Use a legacy address (v2 onion "
@@ -154,7 +215,7 @@ msgid ""
 "service in a separate tab."
 msgstr ""
 
-#: ../../source/advanced.rst:60
+#: ../../source/advanced.rst:148
 msgid ""
 "Tor Project plans to `completely deprecate v2 onion services "
 "<https://blog.torproject.org/v2-deprecation-timeline>`_ on October 15, "
diff --git a/docs/source/locale/zh_CN/LC_MESSAGES/security.po b/docs/source/locale/zh_CN/LC_MESSAGES/security.po
index d7540eaa..627b0d48 100644
--- a/docs/source/locale/zh_CN/LC_MESSAGES/security.po
+++ b/docs/source/locale/zh_CN/LC_MESSAGES/security.po
@@ -9,7 +9,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OnionShare 2.3\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-08-26 20:38-0700\n"
+"POT-Creation-Date: 2020-08-27 20:28-0400\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -28,11 +28,15 @@ msgid ""
 " works."
 msgstr ""
 
-#: ../../source/security.rst:7
-msgid "What OnionShare protects against"
+#: ../../source/security.rst:6
+msgid "Like all software, OnionShare may contain bugs or vulnerabilities."
 msgstr ""
 
 #: ../../source/security.rst:9
+msgid "What OnionShare protects against"
+msgstr ""
+
+#: ../../source/security.rst:11
 msgid ""
 "**Third parties don't have access to anything that happens in "
 "OnionShare.** When you use OnionShare, you host services directly on your"
@@ -43,7 +47,7 @@ msgid ""
 "service with access to your data."
 msgstr ""
 
-#: ../../source/security.rst:11
+#: ../../source/security.rst:13
 msgid ""
 "**Network eavesdroppers can't spy on anything that happens in OnionShare "
 "in transit.** Because connections between Tor onion services and Tor "
@@ -56,7 +60,7 @@ msgid ""
 " service key."
 msgstr ""
 
-#: ../../source/security.rst:13
+#: ../../source/security.rst:15
 msgid ""
 "**Anonymity of OnionShare users are protected by Tor.** OnionShare and "
 "Tor Browser protect the anonymity of the users. As long as the OnionShare"
@@ -65,7 +69,7 @@ msgid ""
 "identity of the OnionShare user."
 msgstr ""
 
-#: ../../source/security.rst:15
+#: ../../source/security.rst:17
 msgid ""
 "**If an attacker learns about the onion service, they still can't access "
 "anything.** There have been attacks against the Tor network that can "
@@ -79,11 +83,11 @@ msgid ""
 " brute force attacks against the password."
 msgstr ""
 
-#: ../../source/security.rst:18
+#: ../../source/security.rst:20
 msgid "What OnionShare doesn't protect against"
 msgstr ""
 
-#: ../../source/security.rst:20
+#: ../../source/security.rst:22
 msgid ""
 "**Communicating the OnionShare address might not be secure.** The "
 "OnionShare user is responsible for securely communicating the OnionShare "
@@ -97,7 +101,7 @@ msgid ""
 "cases where OnionShare is being used for something that isn't secret."
 msgstr ""
 
-#: ../../source/security.rst:22
+#: ../../source/security.rst:24
 msgid ""
 "**Communicating the OnionShare address might not be anonymous.** While "
 "OnionShare and Tor Browser allow for anonymity, if the user wishes to "
diff --git a/docs/source/locale/zh_TW/LC_MESSAGES/advanced.po b/docs/source/locale/zh_TW/LC_MESSAGES/advanced.po
index ba0a2218..0b6a4166 100644
--- a/docs/source/locale/zh_TW/LC_MESSAGES/advanced.po
+++ b/docs/source/locale/zh_TW/LC_MESSAGES/advanced.po
@@ -9,7 +9,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OnionShare 2.3\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-08-26 20:38-0700\n"
+"POT-Creation-Date: 2020-08-27 20:28-0400\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -123,28 +123,89 @@ msgid ""
 msgstr ""
 
 #: ../../source/advanced.rst:46
-msgid "Legacy addresses"
+msgid "Command line interface"
 msgstr ""
 
 #: ../../source/advanced.rst:48
 msgid ""
+"In addition to its graphical interface, OnionShare has a command line "
+"interface."
+msgstr ""
+
+#: ../../source/advanced.rst:51
+msgid "Linux"
+msgstr ""
+
+#: ../../source/advanced.rst:53
+msgid ""
+"If you installed OnionShare using the Flatpak package, unfortunately the "
+"command line interface isn't supported."
+msgstr ""
+
+#: ../../source/advanced.rst:55
+msgid ""
+"If you installed OnionShare using an operating system package, you can "
+"just run ``onionshare`` from the terminal."
+msgstr ""
+
+#: ../../source/advanced.rst:58
+msgid "macOS"
+msgstr ""
+
+#: ../../source/advanced.rst:60
+msgid "Make a symbolic link to the OnionShare command line binary line this::"
+msgstr ""
+
+#: ../../source/advanced.rst:64
+msgid "Now you can run ``onionshare`` from the terminal."
+msgstr ""
+
+#: ../../source/advanced.rst:67
+msgid "Windows"
+msgstr ""
+
+#: ../../source/advanced.rst:69
+msgid "The command line interface isn't supported in Windows."
+msgstr ""
+
+#: ../../source/advanced.rst:71
+msgid ""
+"If you really want to use it anyway, you can set up a Windows development"
+" environment (see :ref:`starting_development`) and then run this in a "
+"command prompt::"
+msgstr ""
+
+#: ../../source/advanced.rst:76
+msgid "Usage"
+msgstr ""
+
+#: ../../source/advanced.rst:78
+msgid "You can see command line documentation by running ``onionshare --help``::"
+msgstr ""
+
+#: ../../source/advanced.rst:134
+msgid "Legacy addresses"
+msgstr ""
+
+#: ../../source/advanced.rst:136
+msgid ""
 "OnionShare uses v3 Tor onion services by default. These are modern onion "
 "addresses that have 56 characters, for example::"
 msgstr ""
 
-#: ../../source/advanced.rst:52
+#: ../../source/advanced.rst:140
 msgid ""
 "But it still has support for v2 onion addresses, the old type of onion "
 "addresses that have 16 characters, for example::"
 msgstr ""
 
-#: ../../source/advanced.rst:56
+#: ../../source/advanced.rst:144
 msgid ""
 "OnionShare calls v2 onion addresses \"legacy addresses\". v3 onion "
 "addresses are more secure, and using legacy addresses is not recommended."
 msgstr ""
 
-#: ../../source/advanced.rst:58
+#: ../../source/advanced.rst:146
 msgid ""
 "To use legacy addresses, before starting a server click \"Show advanced "
 "settings\" in its tab and check the \"Use a legacy address (v2 onion "
@@ -154,7 +215,7 @@ msgid ""
 "service in a separate tab."
 msgstr ""
 
-#: ../../source/advanced.rst:60
+#: ../../source/advanced.rst:148
 msgid ""
 "Tor Project plans to `completely deprecate v2 onion services "
 "<https://blog.torproject.org/v2-deprecation-timeline>`_ on October 15, "
diff --git a/docs/source/locale/zh_TW/LC_MESSAGES/security.po b/docs/source/locale/zh_TW/LC_MESSAGES/security.po
index d7540eaa..627b0d48 100644
--- a/docs/source/locale/zh_TW/LC_MESSAGES/security.po
+++ b/docs/source/locale/zh_TW/LC_MESSAGES/security.po
@@ -9,7 +9,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OnionShare 2.3\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-08-26 20:38-0700\n"
+"POT-Creation-Date: 2020-08-27 20:28-0400\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -28,11 +28,15 @@ msgid ""
 " works."
 msgstr ""
 
-#: ../../source/security.rst:7
-msgid "What OnionShare protects against"
+#: ../../source/security.rst:6
+msgid "Like all software, OnionShare may contain bugs or vulnerabilities."
 msgstr ""
 
 #: ../../source/security.rst:9
+msgid "What OnionShare protects against"
+msgstr ""
+
+#: ../../source/security.rst:11
 msgid ""
 "**Third parties don't have access to anything that happens in "
 "OnionShare.** When you use OnionShare, you host services directly on your"
@@ -43,7 +47,7 @@ msgid ""
 "service with access to your data."
 msgstr ""
 
-#: ../../source/security.rst:11
+#: ../../source/security.rst:13
 msgid ""
 "**Network eavesdroppers can't spy on anything that happens in OnionShare "
 "in transit.** Because connections between Tor onion services and Tor "
@@ -56,7 +60,7 @@ msgid ""
 " service key."
 msgstr ""
 
-#: ../../source/security.rst:13
+#: ../../source/security.rst:15
 msgid ""
 "**Anonymity of OnionShare users are protected by Tor.** OnionShare and "
 "Tor Browser protect the anonymity of the users. As long as the OnionShare"
@@ -65,7 +69,7 @@ msgid ""
 "identity of the OnionShare user."
 msgstr ""
 
-#: ../../source/security.rst:15
+#: ../../source/security.rst:17
 msgid ""
 "**If an attacker learns about the onion service, they still can't access "
 "anything.** There have been attacks against the Tor network that can "
@@ -79,11 +83,11 @@ msgid ""
 " brute force attacks against the password."
 msgstr ""
 
-#: ../../source/security.rst:18
+#: ../../source/security.rst:20
 msgid "What OnionShare doesn't protect against"
 msgstr ""
 
-#: ../../source/security.rst:20
+#: ../../source/security.rst:22
 msgid ""
 "**Communicating the OnionShare address might not be secure.** The "
 "OnionShare user is responsible for securely communicating the OnionShare "
@@ -97,7 +101,7 @@ msgid ""
 "cases where OnionShare is being used for something that isn't secret."
 msgstr ""
 
-#: ../../source/security.rst:22
+#: ../../source/security.rst:24
 msgid ""
 "**Communicating the OnionShare address might not be anonymous.** While "
 "OnionShare and Tor Browser allow for anonymity, if the user wishes to "
diff --git a/docs/source/security.rst b/docs/source/security.rst
index 901dff03..e7f4529b 100644
--- a/docs/source/security.rst
+++ b/docs/source/security.rst
@@ -3,6 +3,8 @@ Security design
 
 First read :ref:`how_it_works` to understand the basics of how OnionShare works.
 
+Like all software, OnionShare may contain bugs or vulnerabilities.
+
 What OnionShare protects against
 --------------------------------