HexChat replaces XChat

doc/EN/usage.org

@@ -200,15 +200,15 @@ ssh myusername@mydomain -p 2222
 #+END_SRC
 
 Then select *IRC* from the menu. However, other than via this method using ssh, irssi isn't a very good IRC client because it doesn't have the capability to onion route messages, and therefore leaks metadata. For the best security when using your IRC server, use XChat or client which supports Tor.
-*** XChat
-XChat is compatible with proxying via Tor and so provides the best security when connecting to your IRC server. It will allow you to connect to your IRC server's onion address.
+*** HexChat
+HexChat (formerly XChat) is compatible with proxying via Tor and so provides the best security when connecting to your IRC server. It will allow you to connect to your IRC server's onion address.
 
-First install XChat and set up its configuration file.
+First install HexChat and set up its configuration file.
 
 #+BEGIN_SRC bash
-sudo apt-get install tor xchat
-mkdir ~/.xchat2
-echo "# By default, XChat based IRC software, when started-up, or run for first time,
+sudo apt-get install tor hexchat
+mkdir -p ~/.config/hexchat
+echo "# By default, HexChat based IRC software, when started-up, or run for first time,
 # it starts to use local network, to connect to the internet. To prevent that,
 # and to force it, to use Tor proxy (a Socks5 server):
 #
@@ -224,7 +224,7 @@ net_proxy_type = 3
 #                 Check yourself https://toxin.jottit.com/xchat_set_variables
 net_proxy_use = 0
 
-# XChat should not use the same circuit/exit server as other Tor applications.
+# HexChat should not use the same circuit/exit server as other Tor applications.
 # Otherwise activity in different applications could be correlated to the same
 # pseudonym. There is a way to prevent that.
 # It is called stream isolation. We use IsolateSOCKSAuth, 
@@ -234,12 +234,12 @@ net_proxy_use = 0
 # Works with Tor 0.2.3 and above.
 #
 # /set net_proxy_auth 1
-# /set net_proxy_pass = XChat
-# /set net_proxy_user = XChat
+# /set net_proxy_pass = HexChat
+# /set net_proxy_user = HexChat
 #
 net_proxy_auth = 1
-net_proxy_pass = XChat
-net_proxy_user = XChat
+net_proxy_pass = HexChat
+net_proxy_user = HexChat
 
 # Get rid of protocol leaks:
 # a DCC session can reveal IP address, etc. identd flag can reveal your
@@ -250,7 +250,7 @@ net_proxy_user = XChat
 # /set dcc_auto_resume OFF
 # /set dcc_auto_send 0
 # /set irc_hide_version ON
-# /set identd OFF <-- NOT working on all XChat-based IRC software.
+# /set identd OFF <-- NOT working on all HexChat-based IRC software.
 # But still highly suggested to include & use it.
 # Probable not needed on UNIX, source: http://xchat.org/faq/#q21 
 dcc_auto_chat = 0
@@ -261,7 +261,7 @@ identd = 0
 
 # If you use your own comment instead of default values, then these data are
 # posted on each channel when you do these events: JOIN, PART, QUIT, AWAY.
-# So they can reveal who you actually are, when you are using same XChat
+# So they can reveal who you actually are, when you are using same HexChat
 # software for multiple different nicknames.
 #
 # Delete everything under Settings -> Preferences -> Default Messages:
@@ -272,7 +272,7 @@ away_reason =
 irc_part_reason = 
 irc_quit_reason = 
 
-# By default, XChat based IRC software uses your platform OS(Operating System)s
+# By default, HexChat based IRC software uses your platform OS(Operating System)s
 # login user name as your nickname, user name, real name.  To prevent leaking
 # that, and, to use your own choice of nickname, realname, username:
 #
@@ -300,18 +300,18 @@ irc_nick3 = user__
 
 # Use a more common nick completion suffix:
 # When you write the first few characters of a nickname followed by tab,
-# it will, by XChat default, complete the nickname and ", " behind the
-# nickname. The behavior is XChat specific. The " :" is more more common
+# it will, by HexChat default, complete the nickname and ", " behind the
+# nickname. The behavior is HexChat specific. The " :" is more more common
 # for more common clients such as mIRC.
 #
-# XChat -> Settings -> Preferences -> input box -> completion_suffix set to :
+# HexChat -> Settings -> Preferences -> input box -> completion_suffix set to :
 #
 completion_suffix = :
 
 # Not starting the server windows at the beginning so you can check and set
 # settings before connecting to any IRC networks.
 gui_slist_skip = 1
-" > ~/.xchat2/xchat.conf
+" > ~/.config/hexchat/hexchat.conf
 #+END_SRC
 
 Now look up the onion address for your IRC server
@@ -324,7 +324,7 @@ Select Administrator options, then *About this system* and make a note of the on
 
 [[file:images/xchat_setup.jpg]]
 
-Run XChat.
+Run HexChat.
 
 Within the network list click, *Add* and enter your domain name then click *Edit*.
 

website/EN/usage.html

@@ -3,7 +3,7 @@
 "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
 <html xmlns="http://www.w3.org/1999/xhtml" lang="en" xml:lang="en">
 <head>
-<!-- 2016-05-02 Mon 11:42 -->
+<!-- 2016-05-03 Tue 09:50 -->
 <meta http-equiv="Content-Type" content="text/html;charset=utf-8" />
 <meta name="viewport" content="width=device-width, initial-scale=1" />
 <title></title>
@@ -170,15 +170,15 @@ for the JavaScript code in this tag.
 </colgroup>
 <tbody>
 <tr>
-<td class="org-left"><a href="#orgbe07d11">Readme</a></td>
+<td class="org-left"><a href="#org6612024">Readme</a></td>
 </tr>
 
 <tr>
-<td class="org-left"><a href="#orgef813e5">Improving ssh security</a></td>
+<td class="org-left"><a href="#org26be483">Improving ssh security</a></td>
 </tr>
 
 <tr>
-<td class="org-left"><a href="#org18b106d">Administrating the system via an onion address (Tor)</a></td>
+<td class="org-left"><a href="#org1c4ec39">Administrating the system via an onion address (Tor)</a></td>
 </tr>
 
 <tr>
@@ -190,38 +190,38 @@ for the JavaScript code in this tag.
 </tr>
 
 <tr>
-<td class="org-left"><a href="#org8a03ab5">Syncing to the Cloud</a></td>
+<td class="org-left"><a href="#org9ff08c0">Syncing to the Cloud</a></td>
 </tr>
 
 <tr>
-<td class="org-left"><a href="#org2c738ba">Play Music</a></td>
+<td class="org-left"><a href="#org3d15a36">Play Music</a></td>
 </tr>
 
 <tr>
-<td class="org-left"><a href="#orgf5b70cb">Microblogging (GNU Social)</a></td>
+<td class="org-left"><a href="#org8c8fc0d">Microblogging (GNU Social)</a></td>
 </tr>
 
 <tr>
-<td class="org-left"><a href="#orgdef70e5">Social Network</a></td>
+<td class="org-left"><a href="#orgff04fd5">Social Network</a></td>
 </tr>
 
 <tr>
-<td class="org-left"><a href="#orgde14250">Chat Services</a></td>
+<td class="org-left"><a href="#org1e24252">Chat Services</a></td>
 </tr>
 
 <tr>
-<td class="org-left"><a href="#org1a5bd9f">RSS Reader</a></td>
+<td class="org-left"><a href="#org685ac90">RSS Reader</a></td>
 </tr>
 
 <tr>
-<td class="org-left"><a href="#org3063ad5">Adding or removing users</a></td>
+<td class="org-left"><a href="#orgf21ff78">Adding or removing users</a></td>
 </tr>
 </tbody>
 </table>
 
-<div id="outline-container-orgbe07d11" class="outline-2">
-<h2 id="orgbe07d11">Readme</h2>
-<div class="outline-text-2" id="text-orgbe07d11">
+<div id="outline-container-org6612024" class="outline-2">
+<h2 id="org6612024">Readme</h2>
+<div class="outline-text-2" id="text-org6612024">
 <p>
 After the system has installed a README file will be generated which contains passwords and some brief advice on using the installed systems. You can read this with the following commands:
 </p>
@@ -242,9 +242,9 @@ To exit you can either just close the terminal or use <b>CTRL-x CTRL-c</b> follo
 </p>
 </div>
 </div>
-<div id="outline-container-orgef813e5" class="outline-2">
-<h2 id="orgef813e5">Improving ssh security</h2>
-<div class="outline-text-2" id="text-orgef813e5">
+<div id="outline-container-org26be483" class="outline-2">
+<h2 id="org26be483">Improving ssh security</h2>
+<div class="outline-text-2" id="text-org26be483">
 <p>
 To improve ssh security you can generate an ssh key pair on your system and then upload the public key to the Freedombone.
 </p>
@@ -297,9 +297,9 @@ If you wish to only use ssh keys then log in to the Freedombone, become the root
 </div>
 </div>
 
-<div id="outline-container-org18b106d" class="outline-2">
-<h2 id="org18b106d">Administrating the system via an onion address (Tor)</h2>
-<div class="outline-text-2" id="text-org18b106d">
+<div id="outline-container-org1c4ec39" class="outline-2">
+<h2 id="org1c4ec39">Administrating the system via an onion address (Tor)</h2>
+<div class="outline-text-2" id="text-org1c4ec39">
 <p>
 You can also access your system via the Tor system using an onion address. To find out what the onion address for ssh access is you can do the following:
 </p>
@@ -345,9 +345,9 @@ Subsequently even if dynamic DNS isn't working you may still be able to administ
 </p>
 </div>
 </div>
-<div id="outline-container-org8a03ab5" class="outline-2">
-<h2 id="org8a03ab5">Syncing to the Cloud</h2>
-<div class="outline-text-2" id="text-org8a03ab5">
+<div id="outline-container-org9ff08c0" class="outline-2">
+<h2 id="org9ff08c0">Syncing to the Cloud</h2>
+<div class="outline-text-2" id="text-org9ff08c0">
 <p>
 <a href="https://syncthing.net/">Syncthing</a> provides a similar capability to proprietary systems such as <a href="http://www.drop-dropbox.com/">Dropbox</a>, and also is well suited for use with low power single board computers. You can have one or more directories which are synchronized across your various laptops/desktops/devices, and this makes it hard for you to ever lose important files. The manner in which the synchronization is done is pretty secure, such that it would be difficult for passive adversaries (mass surveillance, "<i>men in the middle</i>", etc) to know what files you're sharing. Of course, you don't necessarily need to be running a server in order to use Syncthing, but if you do have a server which is always running then there's always at least one place to synchronize your files to or from.
 </p>
@@ -357,9 +357,9 @@ Freedombone provides Syncthing shared directories for each user on the system, p
 </p>
 </div>
 
-<div id="outline-container-orgd9c5cb7" class="outline-3">
-<h3 id="orgd9c5cb7">On a laptop</h3>
-<div class="outline-text-3" id="text-orgd9c5cb7">
+<div id="outline-container-org41367ab" class="outline-3">
+<h3 id="org41367ab">On a laptop</h3>
+<div class="outline-text-3" id="text-org41367ab">
 <p>
 Install syncthing:
 </p>
@@ -414,9 +414,9 @@ Now wait for a few minutes. Eventually you will see two messages appear within t
 </p>
 </div>
 </div>
-<div id="outline-container-org20b5472" class="outline-3">
-<h3 id="org20b5472">On Android</h3>
-<div class="outline-text-3" id="text-org20b5472">
+<div id="outline-container-org12a7cf9" class="outline-3">
+<h3 id="org12a7cf9">On Android</h3>
+<div class="outline-text-3" id="text-org12a7cf9">
 <p>
 Install Syncthing and Connectbot from F-droid.
 </p>
@@ -447,12 +447,12 @@ Now wait for a few minutes or more. Eventually you should receive two notificati
 </div>
 </div>
 </div>
-<div id="outline-container-org2c738ba" class="outline-2">
-<h2 id="org2c738ba">Play Music</h2>
-<div class="outline-text-2" id="text-org2c738ba">
-</div><div id="outline-container-orgea71315" class="outline-3">
-<h3 id="orgea71315">With the DLNA service</h3>
-<div class="outline-text-3" id="text-orgea71315">
+<div id="outline-container-org3d15a36" class="outline-2">
+<h2 id="org3d15a36">Play Music</h2>
+<div class="outline-text-2" id="text-org3d15a36">
+</div><div id="outline-container-org782b524" class="outline-3">
+<h3 id="org782b524">With the DLNA service</h3>
+<div class="outline-text-3" id="text-org782b524">
 <p>
 An easy way to play music on any mobile device in your home is to use the DLNA service. Copy your music into a directory called "<i>Music</i>" on a USB thumb drive and then insert it into from socket on the Beaglebone.
 </p>
@@ -493,9 +493,9 @@ The DLNA service will only work within your local home network, and isn't remote
 </div>
 </div>
 
-<div id="outline-container-orgf5b70cb" class="outline-2">
-<h2 id="orgf5b70cb">Microblogging (GNU Social)</h2>
-<div class="outline-text-2" id="text-orgf5b70cb">
+<div id="outline-container-org8c8fc0d" class="outline-2">
+<h2 id="org8c8fc0d">Microblogging (GNU Social)</h2>
+<div class="outline-text-2" id="text-org8c8fc0d">
 <p>
 To log into your GNU Social site first obtain your username and password from the "microblogging" section of the readme file.
 </p>
@@ -524,20 +524,20 @@ GNU Social has a clutter-free mobile user interface which can be accessed via a
 </div>
 </div>
 
-<div id="outline-container-orgdef70e5" class="outline-2">
-<h2 id="orgdef70e5">Social Network</h2>
-<div class="outline-text-2" id="text-orgdef70e5">
-</div><div id="outline-container-orga3d8326" class="outline-3">
-<h3 id="orga3d8326">Domains</h3>
-<div class="outline-text-3" id="text-orga3d8326">
+<div id="outline-container-orgff04fd5" class="outline-2">
+<h2 id="orgff04fd5">Social Network</h2>
+<div class="outline-text-2" id="text-orgff04fd5">
+</div><div id="outline-container-org58b8d5b" class="outline-3">
+<h3 id="org58b8d5b">Domains</h3>
+<div class="outline-text-3" id="text-org58b8d5b">
 <p>
 Both Hubzilla and GNU Social try to obtain certificates automatically at the time of installation via Let's Encrypt. This will likely mean that in order for this to work you'll need to have obtained at least one "official" domain via a domain selling service, since Let's Encrypt mostly doesn't seem to work with free subdomains from sites such as freeDNS.
 </p>
 </div>
 </div>
-<div id="outline-container-orge174e5" class="outline-3">
-<h3 id="orge174e5">Initial install</h3>
-<div class="outline-text-3" id="text-orge174e5">
+<div id="outline-container-org426b91b" class="outline-3">
+<h3 id="org426b91b">Initial install</h3>
+<div class="outline-text-3" id="text-org426b91b">
 <p>
 On first visiting your Hubzilla site you'll see the login screen. The first thing you need to do is <b>register</b> a new user. The first user on the system then becomes its administrator.
 </p>
@@ -551,19 +551,19 @@ On first visiting your Hubzilla site you'll see the login screen. The first thin
 </div>
 </div>
 
-<div id="outline-container-orgde14250" class="outline-2">
-<h2 id="orgde14250">Chat Services</h2>
-<div class="outline-text-2" id="text-orgde14250">
-</div><div id="outline-container-org285097c" class="outline-3">
-<h3 id="org285097c">IRC</h3>
-<div class="outline-text-3" id="text-org285097c">
+<div id="outline-container-org1e24252" class="outline-2">
+<h2 id="org1e24252">Chat Services</h2>
+<div class="outline-text-2" id="text-org1e24252">
+</div><div id="outline-container-orgc371afa" class="outline-3">
+<h3 id="orgc371afa">IRC</h3>
+<div class="outline-text-3" id="text-orgc371afa">
 <p>
 IRC is useful for multi-user chat. The classic use case is for software development where many engineers might need to coordinate their activities, but it's also useful for meetings, parties and general socialising.
 </p>
 </div>
-<div id="outline-container-orgb40fb67" class="outline-4">
-<h4 id="orgb40fb67">Irssi</h4>
-<div class="outline-text-4" id="text-orgb40fb67">
+<div id="outline-container-org23ad9da" class="outline-4">
+<h4 id="org23ad9da">Irssi</h4>
+<div class="outline-text-4" id="text-org23ad9da">
 <p>
 The easiest way to use irssi is to connect to your system, like this:
 </p>
@@ -579,22 +579,22 @@ Then select <b>IRC</b> from the menu. However, other than via this method using
 </p>
 </div>
 </div>
-<div id="outline-container-org4515af" class="outline-4">
-<h4 id="org4515af">XChat</h4>
-<div class="outline-text-4" id="text-org4515af">
+<div id="outline-container-orgc3a1e65" class="outline-4">
+<h4 id="orgc3a1e65">HexChat</h4>
+<div class="outline-text-4" id="text-orgc3a1e65">
 <p>
-XChat is compatible with proxying via Tor and so provides the best security when connecting to your IRC server. It will allow you to connect to your IRC server's onion address.
+HexChat (formerly XChat) is compatible with proxying via Tor and so provides the best security when connecting to your IRC server. It will allow you to connect to your IRC server's onion address.
 </p>
 
 <p>
-First install XChat and set up its configuration file.
+First install HexChat and set up its configuration file.
 </p>
 
 <div class="org-src-container">
 
-<pre class="src src-bash">sudo apt-get install tor xchat
-mkdir ~/.xchat2
-<span class="org-builtin">echo</span> <span class="org-string">"# By default, XChat based IRC software, when started-up, or run for first time,</span>
+<pre class="src src-bash">sudo apt-get install tor hexchat
+mkdir -p ~/.config/hexchat
+<span class="org-builtin">echo</span> <span class="org-string">"# By default, HexChat based IRC software, when started-up, or run for first time,</span>
 <span class="org-string"># it starts to use local network, to connect to the internet. To prevent that,</span>
 <span class="org-string"># and to force it, to use Tor proxy (a Socks5 server):</span>
 <span class="org-string">#</span>
@@ -610,7 +610,7 @@ mkdir ~/.xchat2
 <span class="org-string">#                 Check yourself https://toxin.jottit.com/xchat_set_variables</span>
 <span class="org-string">net_proxy_use = 0</span>
 
-<span class="org-string"># XChat should not use the same circuit/exit server as other Tor applications.</span>
+<span class="org-string"># HexChat should not use the same circuit/exit server as other Tor applications.</span>
 <span class="org-string"># Otherwise activity in different applications could be correlated to the same</span>
 <span class="org-string"># pseudonym. There is a way to prevent that.</span>
 <span class="org-string"># It is called stream isolation. We use IsolateSOCKSAuth, </span>
@@ -620,12 +620,12 @@ mkdir ~/.xchat2
 <span class="org-string"># Works with Tor 0.2.3 and above.</span>
 <span class="org-string">#</span>
 <span class="org-string"># /set net_proxy_auth 1</span>
-<span class="org-string"># /set net_proxy_pass = XChat</span>
-<span class="org-string"># /set net_proxy_user = XChat</span>
+<span class="org-string"># /set net_proxy_pass = HexChat</span>
+<span class="org-string"># /set net_proxy_user = HexChat</span>
 <span class="org-string">#</span>
 <span class="org-string">net_proxy_auth = 1</span>
-<span class="org-string">net_proxy_pass = XChat</span>
-<span class="org-string">net_proxy_user = XChat</span>
+<span class="org-string">net_proxy_pass = HexChat</span>
+<span class="org-string">net_proxy_user = HexChat</span>
 
 <span class="org-string"># Get rid of protocol leaks:</span>
 <span class="org-string"># a DCC session can reveal IP address, etc. identd flag can reveal your</span>
@@ -636,7 +636,7 @@ mkdir ~/.xchat2
 <span class="org-string"># /set dcc_auto_resume OFF</span>
 <span class="org-string"># /set dcc_auto_send 0</span>
 <span class="org-string"># /set irc_hide_version ON</span>
-<span class="org-string"># /set identd OFF &lt;-- NOT working on all XChat-based IRC software.</span>
+<span class="org-string"># /set identd OFF &lt;-- NOT working on all HexChat-based IRC software.</span>
 <span class="org-string"># But still highly suggested to include &amp; use it.</span>
 <span class="org-string"># Probable not needed on UNIX, source: http://xchat.org/faq/#q21 </span>
 <span class="org-string">dcc_auto_chat = 0</span>
@@ -647,7 +647,7 @@ mkdir ~/.xchat2
 
 <span class="org-string"># If you use your own comment instead of default values, then these data are</span>
 <span class="org-string"># posted on each channel when you do these events: JOIN, PART, QUIT, AWAY.</span>
-<span class="org-string"># So they can reveal who you actually are, when you are using same XChat</span>
+<span class="org-string"># So they can reveal who you actually are, when you are using same HexChat</span>
 <span class="org-string"># software for multiple different nicknames.</span>
 <span class="org-string">#</span>
 <span class="org-string"># Delete everything under Settings -&gt; Preferences -&gt; Default Messages:</span>
@@ -658,7 +658,7 @@ mkdir ~/.xchat2
 <span class="org-string">irc_part_reason = </span>
 <span class="org-string">irc_quit_reason = </span>
 
-<span class="org-string"># By default, XChat based IRC software uses your platform OS(Operating System)s</span>
+<span class="org-string"># By default, HexChat based IRC software uses your platform OS(Operating System)s</span>
 <span class="org-string"># login user name as your nickname, user name, real name.  To prevent leaking</span>
 <span class="org-string"># that, and, to use your own choice of nickname, realname, username:</span>
 <span class="org-string">#</span>
@@ -686,21 +686,22 @@ mkdir ~/.xchat2
 
 <span class="org-string"># Use a more common nick completion suffix:</span>
 <span class="org-string"># When you write the first few characters of a nickname followed by tab,</span>
-<span class="org-string"># it will, by XChat default, complete the nickname and "</span>, <span class="org-string">" behind the</span>
-<span class="org-string"># nickname. The behavior is XChat specific. The "</span> :<span class="org-string">" is more more common</span>
+<span class="org-string"># it will, by HexChat default, complete the nickname and "</span>, <span class="org-string">" behind the</span>
+<span class="org-string"># nickname. The behavior is HexChat specific. The "</span> :<span class="org-string">" is more more common</span>
 <span class="org-string"># for more common clients such as mIRC.</span>
 <span class="org-string">#</span>
-<span class="org-string"># XChat -&gt; Settings -&gt; Preferences -&gt; input box -&gt; completion_suffix set to :</span>
+<span class="org-string"># HexChat -&gt; Settings -&gt; Preferences -&gt; input box -&gt; completion_suffix set to :</span>
 <span class="org-string">#</span>
 <span class="org-string">completion_suffix = :</span>
 
 <span class="org-string"># Not starting the server windows at the beginning so you can check and set</span>
 <span class="org-string"># settings before connecting to any IRC networks.</span>
 <span class="org-string">gui_slist_skip = 1</span>
-<span class="org-string">"</span> &gt; ~/.xchat2/xchat.conf
+<span class="org-string">"</span> &gt; ~/.config/hexchat/hexchat.conf
 </pre>
 </div>
 
+
 <p>
 Now look up the onion address for your IRC server
 </p>
@@ -722,7 +723,7 @@ Select Administrator options, then <b>About this system</b> and make a note of t
 </div>
 
 <p>
-Run XChat.
+Run HexChat.
 </p>
 
 <p>
@@ -759,9 +760,9 @@ Click <b>close</b> and then <b>connect</b>.
 </div>
 </div>
 
-<div id="outline-container-orga607a2b" class="outline-4">
-<h4 id="orga607a2b">Changing or removing the IRC password</h4>
-<div class="outline-text-4" id="text-orga607a2b">
+<div id="outline-container-orgba98014" class="outline-4">
+<h4 id="orgba98014">Changing or removing the IRC password</h4>
+<div class="outline-text-4" id="text-orgba98014">
 <p>
 By default the IRC server is set up to require a password for users to log in. The password is the same for all users. If you want to change or remove the password:
 </p>
@@ -779,12 +780,12 @@ Select <i>Administrator controls</i> then <b>IRC Menu</b> and then change the pa
 </div>
 </div>
 
-<div id="outline-container-org2305168" class="outline-3">
-<h3 id="org2305168">XMPP/Jabber</h3>
-<div class="outline-text-3" id="text-org2305168">
-</div><div id="outline-container-orgb9b59ca" class="outline-4">
-<h4 id="orgb9b59ca">Using with Profanity</h4>
-<div class="outline-text-4" id="text-orgb9b59ca">
+<div id="outline-container-org99478e9" class="outline-3">
+<h3 id="org99478e9">XMPP/Jabber</h3>
+<div class="outline-text-3" id="text-org99478e9">
+</div><div id="outline-container-org1b87a41" class="outline-4">
+<h4 id="org1b87a41">Using with Profanity</h4>
+<div class="outline-text-4" id="text-org1b87a41">
 <p>
 The <a href="http://profanity.im/">Profanity</a> shell based user interface and is perhaps the simplest way to use XMPP from a laptop. It's also a good way to ensure that your OTR keys are the same even when logging in from different laptops or devices, and it also means that if those devices later become compomised then there are no locally stored OTR keys to be found.
 </p>
@@ -874,9 +875,9 @@ When accessed via the user control panel the client is automatically routed thro
 </p>
 </div>
 </div>
-<div id="outline-container-orgcc651b3" class="outline-4">
-<h4 id="orgcc651b3">Using with Jitsi</h4>
-<div class="outline-text-4" id="text-orgcc651b3">
+<div id="outline-container-orgf2ff3cc" class="outline-4">
+<h4 id="orgf2ff3cc">Using with Jitsi</h4>
+<div class="outline-text-4" id="text-orgf2ff3cc">
 <p>
 Jitsi is the recommended communications client for desktop or laptop systems, since it includes the <i>off the record</i> (OTR) feature which provides some additional security beyond the usual SSL certificates.
 </p>
@@ -906,9 +907,9 @@ You can also <a href="https://www.youtube.com/watch?v=vgx7VSrDGjk">see this vide
 </p>
 </div>
 </div>
-<div id="outline-container-org29a25b4" class="outline-4">
-<h4 id="org29a25b4">Using with Ubuntu</h4>
-<div class="outline-text-4" id="text-org29a25b4">
+<div id="outline-container-orgc1ad0fb" class="outline-4">
+<h4 id="orgc1ad0fb">Using with Ubuntu</h4>
+<div class="outline-text-4" id="text-orgc1ad0fb">
 <p>
 The default XMPP client in Ubuntu is Empathy.  Using Empathy isn't as secure as using Jitsi, since it doesn't include the <i>off the record</i> feature, but since it's the default it's what many users will have easy access to.
 </p>
@@ -926,17 +927,17 @@ Click on <b>Advanced</b> and make sure that <b>Encryption required</b> and <b>Ig
 </p>
 </div>
 </div>
-<div id="outline-container-orgd0bdeb4" class="outline-4">
-<h4 id="orgd0bdeb4">Using Tor Messenger</h4>
-<div class="outline-text-4" id="text-orgd0bdeb4">
+<div id="outline-container-org6a5f16e" class="outline-4">
+<h4 id="org6a5f16e">Using Tor Messenger</h4>
+<div class="outline-text-4" id="text-org6a5f16e">
 <p>
 Tor Messenger is a messaging client which supports XMPP, and its onion routing enables you to protect the metadata of chat interactions to some extent by making it difficult for an adversary to know which server is talking to which. You can download Tor Messenger from <a href="https://torproject.org/">torproject.org</a> and the setup is pretty simple.
 </p>
 </div>
 </div>
-<div id="outline-container-orgc82e9ae" class="outline-4">
-<h4 id="orgc82e9ae">Using with Android</h4>
-<div class="outline-text-4" id="text-orgc82e9ae">
+<div id="outline-container-orgfbae828" class="outline-4">
+<h4 id="orgfbae828">Using with Android</h4>
+<div class="outline-text-4" id="text-orgfbae828">
 <p>
 Install <a href="https://f-droid.org/">F-Droid</a>
 </p>
@@ -972,16 +973,16 @@ Then select <b>Next</b>. When chatting you can use the lock icon to encrypt your
 </div>
 </div>
 </div>
-<div id="outline-container-orgb1f37b0" class="outline-3">
-<h3 id="orgb1f37b0">Tox</h3>
-<div class="outline-text-3" id="text-orgb1f37b0">
+<div id="outline-container-orgd9baee4" class="outline-3">
+<h3 id="orgd9baee4">Tox</h3>
+<div class="outline-text-3" id="text-orgd9baee4">
 <p>
 Tox is an encrypted peer-to-peer messaging system and so should work without Freedombone. It uses a system of nodes which act as a sort of directory service allowing users to find and connect to each other. The Tox node ID on the Freedombone can be found within the README within your home directory. If you have other users connect to your node then you will be able to continue chatting even when no other nodes are available.
 </p>
 </div>
-<div id="outline-container-orgf4dc70d" class="outline-4">
-<h4 id="orgf4dc70d">Using the Toxic client</h4>
-<div class="outline-text-4" id="text-orgf4dc70d">
+<div id="outline-container-orgd598cc" class="outline-4">
+<h4 id="orgd598cc">Using the Toxic client</h4>
+<div class="outline-text-4" id="text-orgd598cc">
 <p>
 Log into your system with:
 </p>
@@ -1005,12 +1006,12 @@ Then from the menu select <b>Tox Chat</b>. Tox is encrypted by default and also
 </div>
 </div>
 
-<div id="outline-container-org44aad51" class="outline-3">
-<h3 id="org44aad51">VoIP (Voice chat)</h3>
-<div class="outline-text-3" id="text-org44aad51">
-</div><div id="outline-container-orgef0333f" class="outline-4">
-<h4 id="orgef0333f">Using with Ubuntu</h4>
-<div class="outline-text-4" id="text-orgef0333f">
+<div id="outline-container-org3e54e14" class="outline-3">
+<h3 id="org3e54e14">VoIP (Voice chat)</h3>
+<div class="outline-text-3" id="text-org3e54e14">
+</div><div id="outline-container-orgc073efb" class="outline-4">
+<h4 id="orgc073efb">Using with Ubuntu</h4>
+<div class="outline-text-4" id="text-orgc073efb">
 <p>
 Within the software center search for "mumble" and install the client then run it. Skip through the audio setup wizard.
 </p>
@@ -1024,9 +1025,9 @@ Click on "add new" to add a new server and enter the default domain name for the
 </p>
 </div>
 </div>
-<div id="outline-container-orgf94e21d" class="outline-4">
-<h4 id="orgf94e21d">Using with Android</h4>
-<div class="outline-text-4" id="text-orgf94e21d">
+<div id="outline-container-org95243ca" class="outline-4">
+<h4 id="org95243ca">Using with Android</h4>
+<div class="outline-text-4" id="text-org95243ca">
 <p>
 Install <a href="https://f-droid.org/">F-Droid</a>
 </p>
@@ -1053,24 +1054,24 @@ Selecting the server by pressing on it then connects you to the server so that y
 </div>
 </div>
 </div>
-<div id="outline-container-orgf4bbca7" class="outline-3">
-<h3 id="orgf4bbca7">SIP phones</h3>
-<div class="outline-text-3" id="text-orgf4bbca7">
+<div id="outline-container-org48387e1" class="outline-3">
+<h3 id="org48387e1">SIP phones</h3>
+<div class="outline-text-3" id="text-org48387e1">
 <p>
 Freedombone also supports SIP phones The username and domain is the same as for your email address, and the SIP password and extension number will appear within the README file in your home directory. Various SIP client options are available, such as CSipSimple on Android and Jitsi on desktop or laptop machines. Ideally use clients which support ZRTP, which will provide the best level of security.
 </p>
 </div>
-<div id="outline-container-orgff682b" class="outline-4">
-<h4 id="orgff682b">About ZRTP</h4>
-<div class="outline-text-4" id="text-orgff682b">
+<div id="outline-container-org34ab3dc" class="outline-4">
+<h4 id="org34ab3dc">About ZRTP</h4>
+<div class="outline-text-4" id="text-org34ab3dc">
 <p>
 <a href="https://jitsi.org/Documentation/ZrtpFAQ">ZRTP</a> appears to be the current best standard to end-to-end encrypted voice calls, combining good security with simplicity of use. When the initial cryptographic negotiation between phones is done at the start of a call a short authentication string (SAS) is calculated and displayed at both ends. To check that there isn't anyone intercepting the call and acting as a <i>man in the middle</i> - as <a href="https://en.wikipedia.org/wiki/Stingray_phone_tracker">stingray type devices</a> try to do - the short authentication string can be read out and verbally confirmed between the callers. If it's the same then you can be pretty confident that the call is secure.
 </p>
 </div>
 </div>
-<div id="outline-container-orga4661af" class="outline-4">
-<h4 id="orga4661af">Using with CSIPSimple</h4>
-<div class="outline-text-4" id="text-orga4661af">
+<div id="outline-container-orgc015dde" class="outline-4">
+<h4 id="orgc015dde">Using with CSIPSimple</h4>
+<div class="outline-text-4" id="text-orgc015dde">
 <p>
 Add an account. Under <b>General Wizards</b> choose <b>Expert</b> and enter the following details:
 </p>
@@ -1126,9 +1127,9 @@ If everything is working the account should appear in green with a status of <b>
 </p>
 </div>
 </div>
-<div id="outline-container-orga80ce5f" class="outline-4">
-<h4 id="orga80ce5f">Using with Ring</h4>
-<div class="outline-text-4" id="text-orga80ce5f">
+<div id="outline-container-org605e58f" class="outline-4">
+<h4 id="org605e58f">Using with Ring</h4>
+<div class="outline-text-4" id="text-org605e58f">
 <p>
 From the menu select <b>Manage accounts</b>.
 </p>
@@ -1181,9 +1182,9 @@ Select the <b>Security</b> tab. Under <b>SRTP Key Exchange</b> select <b>ZRTP</b
 </div>
 </div>
 
-<div id="outline-container-org1a5bd9f" class="outline-2">
-<h2 id="org1a5bd9f">RSS Reader</h2>
-<div class="outline-text-2" id="text-org1a5bd9f">
+<div id="outline-container-org685ac90" class="outline-2">
+<h2 id="org685ac90">RSS Reader</h2>
+<div class="outline-text-2" id="text-org685ac90">
 <p>
 The way that RSS reading is set up on Freedombone gives you strong reading privacy. Not only is there onion routing between you and the server but also between the server and the source of the RSS feed. The only down side is that many RSS feeds are still http only, and so could be vulnerable to injection attacks, but it's expected that more of this will go to https in the foreseeable future due to a combination of growing recognition of security issues and systems like Let's Encrypt which make obtaining certificates much easier.
 </p>
@@ -1227,9 +1228,9 @@ A note for the paranoid is that on mobile devices you get redirected to a differ
 </blockquote>
 </div>
 </div>
-<div id="outline-container-org3063ad5" class="outline-2">
-<h2 id="org3063ad5">Adding or removing users</h2>
-<div class="outline-text-2" id="text-org3063ad5">
+<div id="outline-container-orgf21ff78" class="outline-2">
+<h2 id="orgf21ff78">Adding or removing users</h2>
+<div class="outline-text-2" id="text-orgf21ff78">
 <p>
 Log into the system with:
 </p>