Rebuild docs

18 files changed, 91 insertions, 75 deletions

diff --git a/docs/gettext/.doctrees/advanced.doctree b/docs/gettext/.doctrees/advanced.doctree
index 8b98b176..e36dddee 100644
--- a/docs/gettext/.doctrees/advanced.doctree
+++ b/docs/gettext/.doctrees/advanced.doctree
diff --git a/docs/gettext/.doctrees/develop.doctree b/docs/gettext/.doctrees/develop.doctree
index 857fea03..e3a6bd6a 100644
--- a/docs/gettext/.doctrees/develop.doctree
+++ b/docs/gettext/.doctrees/develop.doctree
diff --git a/docs/gettext/.doctrees/environment.pickle b/docs/gettext/.doctrees/environment.pickle
index c7599d67..9619e47c 100644
--- a/docs/gettext/.doctrees/environment.pickle
+++ b/docs/gettext/.doctrees/environment.pickle
diff --git a/docs/gettext/.doctrees/features.doctree b/docs/gettext/.doctrees/features.doctree
index 21d030ce..3c7f575c 100644
--- a/docs/gettext/.doctrees/features.doctree
+++ b/docs/gettext/.doctrees/features.doctree
diff --git a/docs/gettext/.doctrees/help.doctree b/docs/gettext/.doctrees/help.doctree
index f38d5320..c733889f 100644
--- a/docs/gettext/.doctrees/help.doctree
+++ b/docs/gettext/.doctrees/help.doctree
diff --git a/docs/gettext/.doctrees/index.doctree b/docs/gettext/.doctrees/index.doctree
index 36e30fb1..e79b6478 100644
--- a/docs/gettext/.doctrees/index.doctree
+++ b/docs/gettext/.doctrees/index.doctree
diff --git a/docs/gettext/.doctrees/install.doctree b/docs/gettext/.doctrees/install.doctree
index 212698e0..22d1cf79 100644
--- a/docs/gettext/.doctrees/install.doctree
+++ b/docs/gettext/.doctrees/install.doctree
diff --git a/docs/gettext/.doctrees/security.doctree b/docs/gettext/.doctrees/security.doctree
index 30c53f5e..9c8ff96e 100644
--- a/docs/gettext/.doctrees/security.doctree
+++ b/docs/gettext/.doctrees/security.doctree
diff --git a/docs/gettext/.doctrees/tor.doctree b/docs/gettext/.doctrees/tor.doctree
index 74773ead..d1b40318 100644
--- a/docs/gettext/.doctrees/tor.doctree
+++ b/docs/gettext/.doctrees/tor.doctree
diff --git a/docs/gettext/advanced.pot b/docs/gettext/advanced.pot
index c2310c47..cbb1a2e6 100644
--- a/docs/gettext/advanced.pot
+++ b/docs/gettext/advanced.pot
@@ -6,9 +6,9 @@
 #, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: OnionShare 2.4\n"
+"Project-Id-Version: OnionShare 2.4.1\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-09-09 19:49-0700\n"
+"POT-Creation-Date: 2021-11-23 19:33-0800\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/develop.pot b/docs/gettext/develop.pot
index facf22b4..0e69a5c4 100644
--- a/docs/gettext/develop.pot
+++ b/docs/gettext/develop.pot
@@ -6,9 +6,9 @@
 #, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: OnionShare 2.4\n"
+"Project-Id-Version: OnionShare 2.4.1\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-09-09 19:16-0700\n"
+"POT-Creation-Date: 2021-11-23 19:33-0800\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/features.pot b/docs/gettext/features.pot
index 8e5caac3..ed794467 100644
--- a/docs/gettext/features.pot
+++ b/docs/gettext/features.pot
@@ -6,9 +6,9 @@
 #, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: OnionShare 2.4\n"
+"Project-Id-Version: OnionShare 2.4.1\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-09-09 19:16-0700\n"
+"POT-Creation-Date: 2021-11-23 19:33-0800\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"
@@ -178,73 +178,81 @@ msgid "By default OnionShare helps secure your website by setting a strict `Cont
 msgstr ""
 
 #: ../../source/features.rst:121
-msgid "If you want to load content from third-party websites, like assets or JavaScript libraries from CDNs, check the \"Don't send Content Security Policy header (allows your website to use third-party resources)\" box before starting the service."
+msgid "If you want to load content from third-party websites, like assets or JavaScript libraries from CDNs, you have two options:"
+msgstr ""
+
+#: ../../source/features.rst:123
+msgid "You can disable sending a Content Security Policy header by checking the \"Don't send Content Security Policy header (allows your website to use third-party resources)\" box before starting the service."
 msgstr ""
 
 #: ../../source/features.rst:124
+msgid "You can send a custom Content Security Policy header."
+msgstr ""
+
+#: ../../source/features.rst:127
 msgid "Tips for running a website service"
 msgstr ""
 
-#: ../../source/features.rst:126
+#: ../../source/features.rst:129
 msgid "If you want to host a long-term website using OnionShare (meaning not just to quickly show someone something), it's recommended you do it on a separate, dedicated computer that is always powered on and connected to the internet, and not on the one you use on a regular basis. Save the tab (see :ref:`save_tabs`) so you can resume the website with the same address if you close OnionShare and re-open it later."
 msgstr ""
 
-#: ../../source/features.rst:129
+#: ../../source/features.rst:132
 msgid "If your website is intended for the public, you should run it as a public service (see :ref:`turn_off_private_key`)."
 msgstr ""
 
-#: ../../source/features.rst:132
+#: ../../source/features.rst:135
 msgid "Chat Anonymously"
 msgstr ""
 
-#: ../../source/features.rst:134
+#: ../../source/features.rst:137
 msgid "You can use OnionShare to set up a private, secure chat room that doesn't log anything. Just open a chat tab and click \"Start chat server\"."
 msgstr ""
 
-#: ../../source/features.rst:138
+#: ../../source/features.rst:141
 msgid "After you start the server, copy the OnionShare address and private key and send them to the people you want in the anonymous chat room. If it's important to limit exactly who can join, use an encrypted messaging app to send out the OnionShare address and private key."
 msgstr ""
 
-#: ../../source/features.rst:143
+#: ../../source/features.rst:146
 msgid "People can join the chat room by loading its OnionShare address in Tor Browser. The chat room requires JavasScript, so everyone who wants to participate must have their Tor Browser security level set to \"Standard\" or \"Safer\", instead of \"Safest\"."
 msgstr ""
 
-#: ../../source/features.rst:146
+#: ../../source/features.rst:149
 msgid "When someone joins the chat room they get assigned a random name. They can change their name by typing a new name in the box in the left panel and pressing ↵. Since the chat history isn't saved anywhere, it doesn't get displayed at all, even if others were already chatting in the room."
 msgstr ""
 
-#: ../../source/features.rst:152
+#: ../../source/features.rst:155
 msgid "In an OnionShare chat room, everyone is anonymous. Anyone can change their name to anything, and there is no way to confirm anyone's identity."
 msgstr ""
 
-#: ../../source/features.rst:155
+#: ../../source/features.rst:158
 msgid "However, if you create an OnionShare chat room and securely send the address only to a small group of trusted friends using encrypted messages, you can be reasonably confident the people joining the chat room are your friends."
 msgstr ""
 
-#: ../../source/features.rst:158
+#: ../../source/features.rst:161
 msgid "How is this useful?"
 msgstr ""
 
-#: ../../source/features.rst:160
+#: ../../source/features.rst:163
 msgid "If you need to already be using an encrypted messaging app, what's the point of an OnionShare chat room to begin with? It leaves less traces."
 msgstr ""
 
-#: ../../source/features.rst:162
+#: ../../source/features.rst:165
 msgid "If you for example send a message to a Signal group, a copy of your message ends up on each device (the smartphones, and computers if they set up Signal Desktop) of each member of the group. Even if disappearing messages is turned on, it's hard to confirm all copies of the messages are actually deleted from all devices, and from any other places (like notifications databases) they may have been saved to. OnionShare chat rooms don't store any messages anywhere, so the problem is reduced to a minimum."
 msgstr ""
 
-#: ../../source/features.rst:165
+#: ../../source/features.rst:168
 msgid "OnionShare chat rooms can also be useful for people wanting to chat anonymously and securely with someone without needing to create any accounts. For example, a source can send an OnionShare address to a journalist using a disposable email address, and then wait for the journalist to join the chat room, all without compromosing their anonymity."
 msgstr ""
 
-#: ../../source/features.rst:169
+#: ../../source/features.rst:172
 msgid "How does the encryption work?"
 msgstr ""
 
-#: ../../source/features.rst:171
+#: ../../source/features.rst:174
 msgid "Because OnionShare relies on Tor onion services, connections between the Tor Browser and OnionShare are all end-to-end encrypted (E2EE). When someone posts a message to an OnionShare chat room, they send it to the server through the E2EE onion connection, which then sends it to all other members of the chat room using WebSockets, through their E2EE onion connections."
 msgstr ""
 
-#: ../../source/features.rst:173
+#: ../../source/features.rst:176
 msgid "OnionShare doesn't implement any chat encryption on its own. It relies on the Tor onion service's encryption instead."
 msgstr ""
diff --git a/docs/gettext/help.pot b/docs/gettext/help.pot
index e7cabc61..38237877 100644
--- a/docs/gettext/help.pot
+++ b/docs/gettext/help.pot
@@ -6,9 +6,9 @@
 #, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: OnionShare 2.4\n"
+"Project-Id-Version: OnionShare 2.4.1\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-09-09 19:16-0700\n"
+"POT-Creation-Date: 2021-11-23 19:33-0800\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 20bac98d..431f6d84 100644
--- a/docs/gettext/index.pot
+++ b/docs/gettext/index.pot
@@ -6,9 +6,9 @@
 #, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: OnionShare 2.4\n"
+"Project-Id-Version: OnionShare 2.4.1\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-09-09 19:16-0700\n"
+"POT-Creation-Date: 2021-11-23 19:33-0800\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 a0f4c385..b0cb6c4d 100644
--- a/docs/gettext/install.pot
+++ b/docs/gettext/install.pot
@@ -6,9 +6,9 @@
 #, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: OnionShare 2.4\n"
+"Project-Id-Version: OnionShare 2.4.1\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-09-09 19:16-0700\n"
+"POT-Creation-Date: 2021-11-23 19:33-0800\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 fa5f0f3a..c68c04e2 100644
--- a/docs/gettext/security.pot
+++ b/docs/gettext/security.pot
@@ -6,9 +6,9 @@
 #, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: OnionShare 2.4\n"
+"Project-Id-Version: OnionShare 2.4.1\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-09-17 14:39-0700\n"
+"POT-Creation-Date: 2021-11-23 19:33-0800\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/sphinx.pot b/docs/gettext/sphinx.pot
index c877cc7b..454a1718 100644
--- a/docs/gettext/sphinx.pot
+++ b/docs/gettext/sphinx.pot
@@ -6,9 +6,9 @@
 #, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: OnionShare 2.4\n"
+"Project-Id-Version: OnionShare 2.4.1\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-09-09 19:16-0700\n"
+"POT-Creation-Date: 2021-11-23 19:33-0800\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/tor.pot b/docs/gettext/tor.pot
index da3333e9..7fd4bc5b 100644
--- a/docs/gettext/tor.pot
+++ b/docs/gettext/tor.pot
@@ -6,9 +6,9 @@
 #, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: OnionShare 2.4\n"
+"Project-Id-Version: OnionShare 2.4.1\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-09-09 19:16-0700\n"
+"POT-Creation-Date: 2021-11-23 19:33-0800\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"
@@ -21,11 +21,11 @@ msgid "Connecting to Tor"
 msgstr ""
 
 #: ../../source/tor.rst:4
-msgid "Pick a way to connect OnionShare to Tor by clicking the \"⚙\" icon in the bottom right of the OnionShare window to get to its settings."
+msgid "Pick a way to connect OnionShare to Tor by clicking the Tor onion icon in the bottom right of the OnionShare window to open the Tor Settings tab."
 msgstr ""
 
 #: ../../source/tor.rst:9
-msgid "Use the ``tor`` bundled with OnionShare"
+msgid "Use the Tor version built into OnionShare"
 msgstr ""
 
 #: ../../source/tor.rst:11
@@ -37,106 +37,114 @@ msgid "When you open OnionShare, it launches an already configured ``tor`` proce
 msgstr ""
 
 #: ../../source/tor.rst:18
-msgid "Attempt auto-configuration with Tor Browser"
+msgid "Getting Around Censorship"
 msgstr ""
 
 #: ../../source/tor.rst:20
+msgid "If your access to the internet is censored, you can configure OnionShare to connect to the Tor network using `Tor bridges <https://tb-manual.torproject.org/bridges/>`_. If OnionShare connects to Tor without one, you don't need to use a bridge."
+msgstr ""
+
+#: ../../source/tor.rst:22
+msgid "To use a bridge, open the Tor Settings tab. You must select \"Use the Tor version built into OnionShare\" and check the \"Use a bridge\" checkbox."
+msgstr ""
+
+#: ../../source/tor.rst:25
+msgid "Try using a built-in bridge first. Using `obfs4` or `snowflake` bridges is recommended over using `meek-azure`."
+msgstr ""
+
+#: ../../source/tor.rst:29
+msgid "If using a built-in bridge doesn't work, you can request a bridge from torproject.org. You will have to solve a CAPTCHA in order to request a bridge. (This makes it more difficult for governments or ISPs to block access to Tor bridges.)"
+msgstr ""
+
+#: ../../source/tor.rst:33
+msgid "You also have the option of using a bridge that you learned about from a trusted source."
+msgstr ""
+
+#: ../../source/tor.rst:36
+msgid "Attempt auto-configuration with Tor Browser"
+msgstr ""
+
+#: ../../source/tor.rst:38
 msgid "If you have `downloaded the Tor Browser <https://www.torproject.org>`_ and don't want two ``tor`` processes running, you can use the ``tor`` process from the Tor Browser. Keep in mind you need to keep Tor Browser open in the background while you're using OnionShare for this to work."
 msgstr ""
 
-#: ../../source/tor.rst:24
+#: ../../source/tor.rst:42
 msgid "Using a system ``tor`` in Windows"
 msgstr ""
 
-#: ../../source/tor.rst:26
+#: ../../source/tor.rst:44
 msgid "This is fairly advanced. You'll need to know how edit plaintext files and do stuff as an administrator."
 msgstr ""
 
-#: ../../source/tor.rst:28
+#: ../../source/tor.rst:46
 msgid "Download the Tor Windows Expert Bundle `from <https://www.torproject.org/download/tor/>`_. Extract the compressed file and copy the extracted folder to ``C:\\Program Files (x86)\\`` Rename the extracted folder with ``Data`` and ``Tor`` in it to ``tor-win32``."
 msgstr ""
 
-#: ../../source/tor.rst:32
+#: ../../source/tor.rst:50
 msgid "Make up a control port password. (Using 7 words in a sequence like ``comprised stumble rummage work avenging construct volatile`` is a good idea for a password.) Now open a command prompt (``cmd``) as an administrator, and use ``tor.exe --hash-password`` to generate a hash of your password. For example::"
 msgstr ""
 
-#: ../../source/tor.rst:39
+#: ../../source/tor.rst:57
 msgid "The hashed password output is displayed after some warnings (which you can ignore). In the case of the above example, it is ``16:00322E903D96DE986058BB9ABDA91E010D7A863768635AC38E213FDBEF``."
 msgstr ""
 
-#: ../../source/tor.rst:41
+#: ../../source/tor.rst:59
 msgid "Now create a new text file at ``C:\\Program Files (x86)\\tor-win32\\torrc`` and put your hashed password output in it, replacing the ``HashedControlPassword`` with the one you just generated::"
 msgstr ""
 
-#: ../../source/tor.rst:46
+#: ../../source/tor.rst:64
 msgid "In your administrator command prompt, install ``tor`` as a service using the appropriate ``torrc`` file you just created (as described in `<https://2019.www.torproject.org/docs/faq.html.en#NTService>`_). Like this::"
 msgstr ""
 
-#: ../../source/tor.rst:50
+#: ../../source/tor.rst:68
 msgid "You are now running a system ``tor`` process in Windows!"
 msgstr ""
 
-#: ../../source/tor.rst:52
+#: ../../source/tor.rst:70
 msgid "Open OnionShare and click the \"⚙\" icon in it. Under \"How should OnionShare connect to Tor?\" choose \"Connect using control port\", and set \"Control port\" to ``127.0.0.1`` and \"Port\" to ``9051``. Under \"Tor authentication settings\" choose \"Password\" and set the password to the control port password you picked above. Click the \"Test Connection to Tor\" button. If all goes well, you should see \"Connected to the Tor controller\"."
 msgstr ""
 
-#: ../../source/tor.rst:61
+#: ../../source/tor.rst:79
 msgid "Using a system ``tor`` in macOS"
 msgstr ""
 
-#: ../../source/tor.rst:63
+#: ../../source/tor.rst:81
 msgid "First, install `Homebrew <https://brew.sh/>`_ if you don't already have it, and then install Tor::"
 msgstr ""
 
-#: ../../source/tor.rst:67
+#: ../../source/tor.rst:85
 msgid "Now configure Tor to allow connections from OnionShare::"
 msgstr ""
 
-#: ../../source/tor.rst:74
+#: ../../source/tor.rst:92
 msgid "And start the system Tor service::"
 msgstr ""
 
-#: ../../source/tor.rst:78
+#: ../../source/tor.rst:96
 msgid "Open OnionShare and click the \"⚙\" icon in it. Under \"How should OnionShare connect to Tor?\" choose \"Connect using socket file\", and set the socket file to be ``/usr/local/var/run/tor/control.socket``. Under \"Tor authentication settings\" choose \"No authentication, or cookie authentication\". Click the \"Test Connection to Tor\" button."
 msgstr ""
 
-#: ../../source/tor.rst:84
-#: ../../source/tor.rst:104
+#: ../../source/tor.rst:102
+#: ../../source/tor.rst:122
 msgid "If all goes well, you should see \"Connected to the Tor controller\"."
 msgstr ""
 
-#: ../../source/tor.rst:87
+#: ../../source/tor.rst:105
 msgid "Using a system ``tor`` in Linux"
 msgstr ""
 
-#: ../../source/tor.rst:89
+#: ../../source/tor.rst:107
 msgid "First, install the ``tor`` package. If you're using Debian, Ubuntu, or a similar Linux distro, It is recommended to use the Tor Project's `official repository <https://support.torproject.org/apt/tor-deb-repo/>`_."
 msgstr ""
 
-#: ../../source/tor.rst:91
+#: ../../source/tor.rst:109
 msgid "Next, add your user to the group that runs the ``tor`` process (in the case of Debian and Ubuntu, ``debian-tor``) and configure OnionShare to connect to your system ``tor``'s control socket file."
 msgstr ""
 
-#: ../../source/tor.rst:93
+#: ../../source/tor.rst:111
 msgid "Add your user to the ``debian-tor`` group by running this command (replace ``username`` with your actual username)::"
 msgstr ""
 
-#: ../../source/tor.rst:97
+#: ../../source/tor.rst:115
 msgid "Reboot your computer. After it boots up again, open OnionShare and click the \"⚙\" icon in it. Under \"How should OnionShare connect to Tor?\" choose \"Connect using socket file\". Set the socket file to be ``/var/run/tor/control``. Under \"Tor authentication settings\" choose \"No authentication, or cookie authentication\". Click the \"Test Connection to Tor\" button."
 msgstr ""
-
-#: ../../source/tor.rst:107
-msgid "Using Tor bridges"
-msgstr ""
-
-#: ../../source/tor.rst:109
-msgid "If your access to the internet is censored, you can configure OnionShare to connect to the Tor network using `Tor bridges <https://2019.www.torproject.org/docs/bridges.html.en>`_. If OnionShare connects to Tor without one, you don't need to use a bridge."
-msgstr ""
-
-#: ../../source/tor.rst:111
-msgid "To configure bridges, click the \"⚙\" icon in OnionShare."
-msgstr ""
-
-#: ../../source/tor.rst:113
-msgid "You can use the built-in obfs4 pluggable transports, the built-in meek_lite (Azure) pluggable transports, or custom bridges, which you can obtain from Tor's `BridgeDB <https://bridges.torproject.org/>`_. If you need to use a bridge, try the built-in obfs4 ones first."
-msgstr ""