Selaa lähdekoodia

Documentation

Bob Mottram 9 vuotta sitten
vanhempi
commit
f20c24f330
5 muutettua tiedostoa jossa 292 lisäystä ja 251 poistoa
  1. 1
    1
      README.md
  2. 1
    0
      doc/EN/installation.org
  3. 10
    2
      doc/EN/usage.org
  4. 6
    1
      website/EN/installation.html
  5. 274
    247
      website/EN/usage.html

+ 1
- 1
README.md Näytä tiedosto

@@ -8,7 +8,7 @@ The Freedombone system can be installed onto a Beaglebone Black, or any system c
8 8
  - **Social**: Social networking with Red Matrix and GNU Social
9 9
  - **Media**: Runs media services such as DLNA to play music or videos on your devices
10 10
  - **Writer**: Host your blog and wiki
11
- - **Chat**: Encrypted IRC, XMPP and VoIP services for one-to-one and many-to-many chat
11
+ - **Chat**: Encrypted IRC, XMPP, Tox and VoIP services for one-to-one and many-to-many chat
12 12
  - **Developer**: Host your own git projects with a Github-like user interface
13 13
  - **Nonmailbox**: Installs eveything except for the email server
14 14
 

+ 1
- 0
doc/EN/installation.org Näytä tiedosto

@@ -177,6 +177,7 @@ On your internet router, typically under firewall settings, open the following p
177 177
 | Email   |        465 |
178 178
 | Email   |        993 |
179 179
 | VoIP    |      64738 |
180
+| Tox     |      33445 |
180 181
 
181 182
 * Keydrives
182 183
 After installing for the first time it's a good idea to create some keydrives. These will store your gpg key so that if all else fails you will still be able to restore from backup. There are two ways to do this:

+ 10
- 2
doc/EN/usage.org Näytä tiedosto

@@ -130,11 +130,11 @@ Open Thinderbird
130 130
 
131 131
 Select "*Skip this and use existing email*"
132 132
 
133
-Enter your name, email address (myusername@mydomainname.com) and the password for your user (the one from [[Add a user]]).
133
+Enter your name, email address (myusername@mydomainname.com) and the password for your user.
134 134
 
135 135
 You'll get a message saying "/Thunderbird failed to find the settings/"
136 136
 
137
-The settings should be as follows, substituting /mydomainname.com/ for your domain name and /myusername/ for the username given previously in [[Add a user]].
137
+The settings should be as follows, substituting /mydomainname.com/ for your domain name and /myusername/ for the username.
138 138
 
139 139
   * Incoming: IMAP, mydomainname.com, 993, SSL/TLS, Normal Password
140 140
   * Outgoing: SMTP, mydomainname.com, 465, SSL/TLS, Normal Password
@@ -481,6 +481,14 @@ From the menu select *Settings* then *Security* then *OTR mode*.  Set the mode t
481 481
 Make sure that *Check server certificate* is not checked.
482 482
 
483 483
 Go back to the initial screen and then using the menu you can add contacts and begin chatting.  Both parties will need to go through the off-the-record question and answer verification before the chat can begin, but that only needs to be done once for each person you're chatting with.
484
+** Tox
485
+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.
486
+*** Using the Toxic client
487
+To connect to your node use the command:
488
+
489
+#+BEGIN_SRC bash
490
+/connect [yourdomainname] 33445 [your tox node ID]
491
+#+END_SRC
484 492
 ** VoIP (Voice chat)
485 493
 *** Using with Ubuntu
486 494
 Within the software center search for "mumble" and install the client then run it. Skip through the audio setup wizard.

+ 6
- 1
website/EN/installation.html Näytä tiedosto

@@ -4,7 +4,7 @@
4 4
 <html xmlns="http://www.w3.org/1999/xhtml" lang="en" xml:lang="en">
5 5
 <head>
6 6
 <title></title>
7
-<!-- 2015-07-05 Sun 20:31 -->
7
+<!-- 2015-07-11 Sat 12:37 -->
8 8
 <meta  http-equiv="Content-Type" content="text/html;charset=utf-8" />
9 9
 <meta  name="generator" content="Org-mode" />
10 10
 <meta  name="author" content="Bob Mottram" />
@@ -547,6 +547,11 @@ On your internet router, typically under firewall settings, open the following p
547 547
 <td class="org-left">VoIP</td>
548 548
 <td class="org-right">64738</td>
549 549
 </tr>
550
+
551
+<tr>
552
+<td class="org-left">Tox</td>
553
+<td class="org-right">33445</td>
554
+</tr>
550 555
 </tbody>
551 556
 </table>
552 557
 </div>

+ 274
- 247
website/EN/usage.html Näytä tiedosto

@@ -4,16 +4,22 @@
4 4
 <html xmlns="http://www.w3.org/1999/xhtml" lang="en" xml:lang="en">
5 5
 <head>
6 6
 <title></title>
7
-<!-- 2015-04-08 Wed 23:37 -->
7
+<!-- 2015-07-11 Sat 12:51 -->
8 8
 <meta  http-equiv="Content-Type" content="text/html;charset=utf-8" />
9 9
 <meta  name="generator" content="Org-mode" />
10 10
 <meta  name="author" content="Bob Mottram" />
11 11
 <meta  name="description" content="Turn the Beaglebone Black into a personal communications server"
12 12
  />
13 13
 <meta  name="keywords" content="freedombox, debian, beaglebone, red matrix, email, web server, home server, internet, censorship, surveillance, social network, irc, jabber" />
14
+<meta  name="viewport" content="width=device-width, initial-scale=1" />
14 15
 <style type="text/css">
15 16
  <!--/*--><![CDATA[/*><!--*/
16
-  .title  { text-align: center; }
17
+  .title  { text-align: center;
18
+             margin-bottom: .2em; }
19
+  .subtitle { text-align: center;
20
+              font-size: medium;
21
+              font-weight: bold;
22
+              margin-top:0; }
17 23
   .todo   { font-family: monospace; color: red; }
18 24
   .done   { font-family: monospace; color: green; }
19 25
   .priority { font-family: monospace; color: orange; }
@@ -21,9 +27,9 @@
21 27
             padding: 2px; font-size: 80%; font-weight: normal; }
22 28
   .timestamp { color: #bebebe; }
23 29
   .timestamp-kwd { color: #5f9ea0; }
24
-  .right  { margin-left: auto; margin-right: 0px;  text-align: right; }
25
-  .left   { margin-left: 0px;  margin-right: auto; text-align: left; }
26
-  .center { margin-left: auto; margin-right: auto; text-align: center; }
30
+  .org-right  { margin-left: auto; margin-right: 0px;  text-align: right; }
31
+  .org-left   { margin-left: 0px;  margin-right: auto; text-align: left; }
32
+  .org-center { margin-left: auto; margin-right: auto; text-align: center; }
27 33
   .underline { text-decoration: underline; }
28 34
   #postamble p, #preamble p { font-size: 90%; margin: .2em; }
29 35
   p.verse { margin-left: 3%; }
@@ -62,12 +68,12 @@
62 68
   caption.t-above { caption-side: top; }
63 69
   caption.t-bottom { caption-side: bottom; }
64 70
   td, th { vertical-align:top;  }
65
-  th.right  { text-align: center;  }
66
-  th.left   { text-align: center;   }
67
-  th.center { text-align: center; }
68
-  td.right  { text-align: right;  }
69
-  td.left   { text-align: left;   }
70
-  td.center { text-align: center; }
71
+  th.org-right  { text-align: center;  }
72
+  th.org-left   { text-align: center;   }
73
+  th.org-center { text-align: center; }
74
+  td.org-right  { text-align: right;  }
75
+  td.org-left   { text-align: left;   }
76
+  td.org-center { text-align: center; }
71 77
   dt { font-weight: bold; }
72 78
   .footpara:nth-child(2) { display: inline; }
73 79
   .footpara { display: block; }
@@ -148,7 +154,6 @@ for the JavaScript code in this tag.
148 154
 <a name="top" id="top"></a>
149 155
 </div>
150 156
 <div id="content">
151
-<h1 class="title"></h1>
152 157
 <div class="center">
153 158
 
154 159
 <div class="figure">
@@ -161,42 +166,42 @@ for the JavaScript code in this tag.
161 166
 
162 167
 
163 168
 <colgroup>
164
-<col  class="left" />
169
+<col  class="org-left" />
165 170
 
166
-<col  class="left" />
171
+<col  class="org-left" />
167 172
 
168
-<col  class="left" />
173
+<col  class="org-left" />
169 174
 
170
-<col  class="left" />
175
+<col  class="org-left" />
171 176
 
172
-<col  class="left" />
177
+<col  class="org-left" />
173 178
 
174
-<col  class="left" />
179
+<col  class="org-left" />
175 180
 
176
-<col  class="left" />
181
+<col  class="org-left" />
177 182
 
178
-<col  class="left" />
183
+<col  class="org-left" />
179 184
 
180
-<col  class="left" />
185
+<col  class="org-left" />
181 186
 </colgroup>
182 187
 <tbody>
183 188
 <tr>
184
-<td class="left"><a href="index.html">Home</a></td>
185
-<td class="left"><a href="#unnumbered-1">Readme</a></td>
186
-<td class="left"><a href="#unnumbered-3">Using Email</a></td>
187
-<td class="left"><a href="#unnumbered-20">Mailing List</a></td>
188
-<td class="left"><a href="#unnumbered-21">Syncing to the Cloud</a></td>
189
-<td class="left"><a href="#unnumbered-25">Play Music</a></td>
190
-<td class="left"><a href="#unnumbered-28">Microblogging</a></td>
191
-<td class="left"><a href="#unnumbered-30">Social Network</a></td>
192
-<td class="left"><a href="#unnumbered-33">Chat Services</a></td>
189
+<td class="org-left"><a href="index.html">Home</a></td>
190
+<td class="org-left"><a href="#orgheadline1">Readme</a></td>
191
+<td class="org-left"><a href="#orgheadline2">Using Email</a></td>
192
+<td class="org-left"><a href="#orgheadline3">Mailing List</a></td>
193
+<td class="org-left"><a href="#orgheadline4">Syncing to the Cloud</a></td>
194
+<td class="org-left"><a href="#orgheadline5">Play Music</a></td>
195
+<td class="org-left"><a href="#orgheadline6">Microblogging</a></td>
196
+<td class="org-left"><a href="#orgheadline7">Social Network</a></td>
197
+<td class="org-left"><a href="#orgheadline8">Chat Services</a></td>
193 198
 </tr>
194 199
 </tbody>
195 200
 </table>
196 201
 
197
-<div id="outline-container-unnumbered-1" class="outline-2">
198
-<h2 id="unnumbered-1">Readme</h2>
199
-<div class="outline-text-2" id="text-unnumbered-1">
202
+<div id="outline-container-orgheadline1" class="outline-2">
203
+<h2 id="orgheadline1">Readme</h2>
204
+<div class="outline-text-2" id="text-orgheadline1">
200 205
 <p>
201 206
 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:
202 207
 </p>
@@ -217,9 +222,9 @@ To exit you can either just close the terminal or use <b>CTRL-x CTRL-c</b> follo
217 222
 </p>
218 223
 </div>
219 224
 </div>
220
-<div id="outline-container-unnumbered-2" class="outline-2">
221
-<h2 id="unnumbered-2">Improving ssh security</h2>
222
-<div class="outline-text-2" id="text-unnumbered-2">
225
+<div id="outline-container-orgheadline9" class="outline-2">
226
+<h2 id="orgheadline9">Improving ssh security</h2>
227
+<div class="outline-text-2" id="text-orgheadline9">
223 228
 <p>
224 229
 To improve ssh security you can generate an ssh key pair on your system and then upload the public key to the Freedombone.
225 230
 </p>
@@ -273,20 +278,20 @@ If you wish to only use ssh keys then log in to the Freedombone and edit <b>/etc
273 278
 </div>
274 279
 </div>
275 280
 
276
-<div id="outline-container-unnumbered-3" class="outline-2">
277
-<h2 id="unnumbered-3">Using Email</h2>
278
-<div class="outline-text-2" id="text-unnumbered-3">
279
-</div><div id="outline-container-unnumbered-4" class="outline-3">
280
-<h3 id="unnumbered-4">A technical note about email transport security</h3>
281
-<div class="outline-text-3" id="text-unnumbered-4">
281
+<div id="outline-container-orgheadline2" class="outline-2">
282
+<h2 id="orgheadline2">Using Email</h2>
283
+<div class="outline-text-2" id="text-orgheadline2">
284
+</div><div id="outline-container-orgheadline10" class="outline-3">
285
+<h3 id="orgheadline10">A technical note about email transport security</h3>
286
+<div class="outline-text-3" id="text-orgheadline10">
282 287
 <p>
283 288
 Port 465 is used for SMTP and this is supposedly deprecated for secure email. However, using TLS from the start of the communications seems far more secure than starting off with insecure communications and then trying to upgrade it with a command to begin TLS, as happens with STARTTLS. There are <a href="https://www.eff.org/deeplinks/2014/11/starttls-downgrade-attacks">possible attacks against STARTTLS</a> in which the command to begin secure communications is removed or overwritten which could then result in email being transferred in plain text over the internet and be readable by third parties.
284 289
 </p>
285 290
 </div>
286 291
 </div>
287
-<div id="outline-container-unnumbered-5" class="outline-3">
288
-<h3 id="unnumbered-5">Add a password to your GPG key</h3>
289
-<div class="outline-text-3" id="text-unnumbered-5">
292
+<div id="outline-container-orgheadline11" class="outline-3">
293
+<h3 id="orgheadline11">Add a password to your GPG key</h3>
294
+<div class="outline-text-3" id="text-orgheadline11">
290 295
 <p>
291 296
 If you didn't use existing GPG keys during the Freedombone installation then you'll need to add a password to your newly generated private key. This is highly recommended. Go through the following sequence of commands to ssh into the Freedombone and then change your GPG password.
292 297
 </p>
@@ -308,9 +313,9 @@ Having a password on your GPG key will prevent someone from reading your email <
308 313
 </div>
309 314
 </div>
310 315
 
311
-<div id="outline-container-unnumbered-6" class="outline-3">
312
-<h3 id="unnumbered-6">Publishing your GPG public key</h3>
313
-<div class="outline-text-3" id="text-unnumbered-6">
316
+<div id="outline-container-orgheadline12" class="outline-3">
317
+<h3 id="orgheadline12">Publishing your GPG public key</h3>
318
+<div class="outline-text-3" id="text-orgheadline12">
314 319
 <p>
315 320
 If you havn't already then you should publish your GPG public key so that others can find it.
316 321
 </p>
@@ -324,9 +329,9 @@ gpg --send-keys username@domainname
324 329
 </div>
325 330
 </div>
326 331
 </div>
327
-<div id="outline-container-unnumbered-7" class="outline-3">
328
-<h3 id="unnumbered-7">Mutt email client</h3>
329
-<div class="outline-text-3" id="text-unnumbered-7">
332
+<div id="outline-container-orgheadline13" class="outline-3">
333
+<h3 id="orgheadline13">Mutt email client</h3>
334
+<div class="outline-text-3" id="text-orgheadline13">
330 335
 <p>
331 336
 Mutt is a terminal based email client which comes already installed onto the Freedombone. To access it you'll need to access it via ssh with:
332 337
 </p>
@@ -353,114 +358,114 @@ Some useful keys to know are:
353 358
 
354 359
 
355 360
 <colgroup>
356
-<col  class="left" />
361
+<col  class="org-left" />
357 362
 
358
-<col  class="left" />
363
+<col  class="org-left" />
359 364
 </colgroup>
360 365
 <tbody>
361 366
 <tr>
362
-<td class="left">"/"</td>
363
-<td class="left">Search for text within headers</td>
367
+<td class="org-left">"/"</td>
368
+<td class="org-left">Search for text within headers</td>
364 369
 </tr>
365 370
 
366 371
 <tr>
367
-<td class="left">*</td>
368
-<td class="left">Move to the last message</td>
372
+<td class="org-left">*</td>
373
+<td class="org-left">Move to the last message</td>
369 374
 </tr>
370 375
 
371 376
 <tr>
372
-<td class="left">TAB</td>
373
-<td class="left">Move to the next unread message</td>
377
+<td class="org-left">TAB</td>
378
+<td class="org-left">Move to the next unread message</td>
374 379
 </tr>
375 380
 
376 381
 <tr>
377
-<td class="left">d</td>
378
-<td class="left">Delete a message</td>
382
+<td class="org-left">d</td>
383
+<td class="org-left">Delete a message</td>
379 384
 </tr>
380 385
 
381 386
 <tr>
382
-<td class="left">u</td>
383
-<td class="left">Undelete a mail which is pending deletion</td>
387
+<td class="org-left">u</td>
388
+<td class="org-left">Undelete a mail which is pending deletion</td>
384 389
 </tr>
385 390
 
386 391
 <tr>
387
-<td class="left">$</td>
388
-<td class="left">Delete all messages selected and check for new messages</td>
392
+<td class="org-left">$</td>
393
+<td class="org-left">Delete all messages selected and check for new messages</td>
389 394
 </tr>
390 395
 
391 396
 <tr>
392
-<td class="left">a</td>
393
-<td class="left">Add to the address book</td>
397
+<td class="org-left">a</td>
398
+<td class="org-left">Add to the address book</td>
394 399
 </tr>
395 400
 
396 401
 <tr>
397
-<td class="left">m</td>
398
-<td class="left">Send a new mail</td>
402
+<td class="org-left">m</td>
403
+<td class="org-left">Send a new mail</td>
399 404
 </tr>
400 405
 
401 406
 <tr>
402
-<td class="left">ESC-m</td>
403
-<td class="left">Mark all messages as having been read</td>
407
+<td class="org-left">ESC-m</td>
408
+<td class="org-left">Mark all messages as having been read</td>
404 409
 </tr>
405 410
 
406 411
 <tr>
407
-<td class="left">S</td>
408
-<td class="left">Mark a message as spam</td>
412
+<td class="org-left">S</td>
413
+<td class="org-left">Mark a message as spam</td>
409 414
 </tr>
410 415
 
411 416
 <tr>
412
-<td class="left">H</td>
413
-<td class="left">Mark a message as ham</td>
417
+<td class="org-left">H</td>
418
+<td class="org-left">Mark a message as ham</td>
414 419
 </tr>
415 420
 
416 421
 <tr>
417
-<td class="left">CTRL-b</td>
418
-<td class="left">Toggle side bar on/off</td>
422
+<td class="org-left">CTRL-b</td>
423
+<td class="org-left">Toggle side bar on/off</td>
419 424
 </tr>
420 425
 
421 426
 <tr>
422
-<td class="left">CTRL-n</td>
423
-<td class="left">Next mailbox (on side bar)</td>
427
+<td class="org-left">CTRL-n</td>
428
+<td class="org-left">Next mailbox (on side bar)</td>
424 429
 </tr>
425 430
 
426 431
 <tr>
427
-<td class="left">CTRL-p</td>
428
-<td class="left">Previous mailbox (on side bar)</td>
432
+<td class="org-left">CTRL-p</td>
433
+<td class="org-left">Previous mailbox (on side bar)</td>
429 434
 </tr>
430 435
 
431 436
 <tr>
432
-<td class="left">CTRL-o</td>
433
-<td class="left">Open mailbox (on side bar)</td>
437
+<td class="org-left">CTRL-o</td>
438
+<td class="org-left">Open mailbox (on side bar)</td>
434 439
 </tr>
435 440
 
436 441
 <tr>
437
-<td class="left">r</td>
438
-<td class="left">Reply to an email</td>
442
+<td class="org-left">r</td>
443
+<td class="org-left">Reply to an email</td>
439 444
 </tr>
440 445
 
441 446
 <tr>
442
-<td class="left">L</td>
443
-<td class="left">Reply to a mailing list email</td>
447
+<td class="org-left">L</td>
448
+<td class="org-left">Reply to a mailing list email</td>
444 449
 </tr>
445 450
 
446 451
 <tr>
447
-<td class="left">]</td>
448
-<td class="left">Expand or collapse all threads</td>
452
+<td class="org-left">]</td>
453
+<td class="org-left">Expand or collapse all threads</td>
449 454
 </tr>
450 455
 
451 456
 <tr>
452
-<td class="left">[</td>
453
-<td class="left">Expand of collapse the current thread</td>
457
+<td class="org-left">[</td>
458
+<td class="org-left">Expand of collapse the current thread</td>
454 459
 </tr>
455 460
 
456 461
 <tr>
457
-<td class="left">CTRL-k</td>
458
-<td class="left">Import a PGP/GPG public key</td>
462
+<td class="org-left">CTRL-k</td>
463
+<td class="org-left">Import a PGP/GPG public key</td>
459 464
 </tr>
460 465
 
461 466
 <tr>
462
-<td class="left">q</td>
463
-<td class="left">Quit</td>
467
+<td class="org-left">q</td>
468
+<td class="org-left">Quit</td>
464 469
 </tr>
465 470
 </tbody>
466 471
 </table>
@@ -479,9 +484,9 @@ When reading emails you will initially need to enter your GPG password. It will
479 484
 </div>
480 485
 </div>
481 486
 
482
-<div id="outline-container-unnumbered-8" class="outline-3">
483
-<h3 id="unnumbered-8">Thunderbird</h3>
484
-<div class="outline-text-3" id="text-unnumbered-8">
487
+<div id="outline-container-orgheadline14" class="outline-3">
488
+<h3 id="orgheadline14">Thunderbird</h3>
489
+<div class="outline-text-3" id="text-orgheadline14">
485 490
 <p>
486 491
 Another common way in which you may want to access email is via Thunderbird.  This may be especially useful if you're trying to convert former Windows users who may previously have been using some version of Outlook.
487 492
 </p>
@@ -491,9 +496,9 @@ The following instructions should be carried out on the client machines (laptop,
491 496
 </p>
492 497
 </div>
493 498
 
494
-<div id="outline-container-unnumbered-9" class="outline-4">
495
-<h4 id="unnumbered-9">Initial setup</h4>
496
-<div class="outline-text-4" id="text-unnumbered-9">
499
+<div id="outline-container-orgheadline15" class="outline-4">
500
+<h4 id="orgheadline15">Initial setup</h4>
501
+<div class="outline-text-4" id="text-orgheadline15">
497 502
 <p>
498 503
 Install <b>Thunderbird</b> and <b>Enigmail</b>.  How you do this just depends upon your distro and software manager or "app store".
499 504
 </p>
@@ -507,7 +512,7 @@ Select "<b>Skip this and use existing email</b>"
507 512
 </p>
508 513
 
509 514
 <p>
510
-Enter your name, email address (myusername@mydomainname.com) and the password for your user (the one from <i>Add a user</i>).
515
+Enter your name, email address (myusername@mydomainname.com) and the password for your user.
511 516
 </p>
512 517
 
513 518
 <p>
@@ -515,7 +520,7 @@ You'll get a message saying "<i>Thunderbird failed to find the settings</i>"
515 520
 </p>
516 521
 
517 522
 <p>
518
-The settings should be as follows, substituting <i>mydomainname.com</i> for your domain name and <i>myusername</i> for the username given previously in <i>Add a user</i>.
523
+The settings should be as follows, substituting <i>mydomainname.com</i> for your domain name and <i>myusername</i> for the username.
519 524
 </p>
520 525
 
521 526
 <ul class="org-ul">
@@ -549,9 +554,9 @@ Select "<b>yes</b>" to change default settings.
549 554
 </p>
550 555
 </div>
551 556
 </div>
552
-<div id="outline-container-unnumbered-10" class="outline-4">
553
-<h4 id="unnumbered-10">Import your GPG keys</h4>
554
-<div class="outline-text-4" id="text-unnumbered-10">
557
+<div id="outline-container-orgheadline16" class="outline-4">
558
+<h4 id="orgheadline16">Import your GPG keys</h4>
559
+<div class="outline-text-4" id="text-orgheadline16">
555 560
 <p>
556 561
 On the Freedombone export your GPG public and private keys.
557 562
 </p>
@@ -600,9 +605,9 @@ shred -zu ~/private_key.gpg
600 605
 </div>
601 606
 </div>
602 607
 
603
-<div id="outline-container-unnumbered-11" class="outline-4">
604
-<h4 id="unnumbered-11">Using for the first time</h4>
605
-<div class="outline-text-4" id="text-unnumbered-11">
608
+<div id="outline-container-orgheadline17" class="outline-4">
609
+<h4 id="orgheadline17">Using for the first time</h4>
610
+<div class="outline-text-4" id="text-orgheadline17">
606 611
 <p>
607 612
 Click on the Thunderbird menu, which looks like three horizontal bars on the right hand side.
608 613
 </p>
@@ -637,9 +642,9 @@ Get into the habit of using email encryption and encourage others to do so.  Rem
637 642
 </div>
638 643
 </div>
639 644
 
640
-<div id="outline-container-unnumbered-12" class="outline-4">
641
-<h4 id="unnumbered-12">Making folders visible</h4>
642
-<div class="outline-text-4" id="text-unnumbered-12">
645
+<div id="outline-container-orgheadline18" class="outline-4">
646
+<h4 id="orgheadline18">Making folders visible</h4>
647
+<div class="outline-text-4" id="text-orgheadline18">
643 648
 <p>
644 649
 By default you won't be able to see any folders which you may have created earlier using the <i>mailinglistrule</i> script.  To make folders visible select:
645 650
 </p>
@@ -655,17 +660,17 @@ Make sure that "<b>show only subscribed folders</b>" is not checked.  Then click
655 660
 </div>
656 661
 </div>
657 662
 
658
-<div id="outline-container-unnumbered-13" class="outline-3">
659
-<h3 id="unnumbered-13">K9 Android client</h3>
660
-<div class="outline-text-3" id="text-unnumbered-13">
663
+<div id="outline-container-orgheadline19" class="outline-3">
664
+<h3 id="orgheadline19">K9 Android client</h3>
665
+<div class="outline-text-3" id="text-orgheadline19">
661 666
 <p>
662 667
 <b>NOTE</b>: Currently the K9 email client will not work with the Freedombone since it doesn't support PGP/MIME encoding. However, there is development work taking place on that feature and it is hoped that K9 may be usable in the near future.
663 668
 </p>
664 669
 </div>
665 670
 
666
-<div id="outline-container-unnumbered-14" class="outline-4">
667
-<h4 id="unnumbered-14">Incoming server settings</h4>
668
-<div class="outline-text-4" id="text-unnumbered-14">
671
+<div id="outline-container-orgheadline20" class="outline-4">
672
+<h4 id="orgheadline20">Incoming server settings</h4>
673
+<div class="outline-text-4" id="text-orgheadline20">
669 674
 <ul class="org-ul">
670 675
 <li>Select settings/account settings</li>
671 676
 <li>Select Fetching mail/incoming server</li>
@@ -677,9 +682,9 @@ Make sure that "<b>show only subscribed folders</b>" is not checked.  Then click
677 682
 </ul>
678 683
 </div>
679 684
 </div>
680
-<div id="outline-container-unnumbered-15" class="outline-4">
681
-<h4 id="unnumbered-15">Outgoing (SMTP) server settings</h4>
682
-<div class="outline-text-4" id="text-unnumbered-15">
685
+<div id="outline-container-orgheadline21" class="outline-4">
686
+<h4 id="orgheadline21">Outgoing (SMTP) server settings</h4>
687
+<div class="outline-text-4" id="text-orgheadline21">
683 688
 <ul class="org-ul">
684 689
 <li>Select settings/account settings</li>
685 690
 <li>Select Sending mail/outgoing server</li>
@@ -692,9 +697,9 @@ Make sure that "<b>show only subscribed folders</b>" is not checked.  Then click
692 697
 </ul>
693 698
 </div>
694 699
 </div>
695
-<div id="outline-container-unnumbered-16" class="outline-4">
696
-<h4 id="unnumbered-16">Folders</h4>
697
-<div class="outline-text-4" id="text-unnumbered-16">
700
+<div id="outline-container-orgheadline22" class="outline-4">
701
+<h4 id="orgheadline22">Folders</h4>
702
+<div class="outline-text-4" id="text-orgheadline22">
698 703
 <p>
699 704
 To view any new folders which you may have created using the <i>mailinglistrule</i> script from your inbox press the <b>K9 icon</b> at the top left to access folders, then press the <b>menu button</b> and select <b>refresh folder list</b>.
700 705
 </p>
@@ -706,9 +711,9 @@ If your folder still doesn't show up then press the <b>menu button</b>, select <
706 711
 </div>
707 712
 </div>
708 713
 
709
-<div id="outline-container-unnumbered-17" class="outline-3">
710
-<h3 id="unnumbered-17">Subscribing to mailing lists</h3>
711
-<div class="outline-text-3" id="text-unnumbered-17">
714
+<div id="outline-container-orgheadline23" class="outline-3">
715
+<h3 id="orgheadline23">Subscribing to mailing lists</h3>
716
+<div class="outline-text-3" id="text-orgheadline23">
712 717
 <p>
713 718
 To subscribe to a mailing list log in as your user (i.e. not the root user).
714 719
 </p>
@@ -726,9 +731,9 @@ The subject tag should be the word or phrase which appears within the brackets i
726 731
 </p>
727 732
 </div>
728 733
 </div>
729
-<div id="outline-container-unnumbered-18" class="outline-3">
730
-<h3 id="unnumbered-18">Adding email addresses to a group/folder</h3>
731
-<div class="outline-text-3" id="text-unnumbered-18">
734
+<div id="outline-container-orgheadline24" class="outline-3">
735
+<h3 id="orgheadline24">Adding email addresses to a group/folder</h3>
736
+<div class="outline-text-3" id="text-orgheadline24">
732 737
 <p>
733 738
 Similar to adding mailing list folders you can also add specified email addresses into a group/folder.
734 739
 </p>
@@ -747,9 +752,9 @@ The group name should be something short so that it is readable within the left
747 752
 </div>
748 753
 </div>
749 754
 
750
-<div id="outline-container-unnumbered-19" class="outline-3">
751
-<h3 id="unnumbered-19">Ignoring incoming emails</h3>
752
-<div class="outline-text-3" id="text-unnumbered-19">
755
+<div id="outline-container-orgheadline25" class="outline-3">
756
+<h3 id="orgheadline25">Ignoring incoming emails</h3>
757
+<div class="outline-text-3" id="text-orgheadline25">
753 758
 <p>
754 759
 It is possible to ignore incoming emails if they are from a particular email address or if the subject line contains particular text.
755 760
 </p>
@@ -780,9 +785,9 @@ You can also reverse this by using the <b>freedombone-unignore</b> command with
780 785
 </div>
781 786
 </div>
782 787
 </div>
783
-<div id="outline-container-unnumbered-20" class="outline-2">
784
-<h2 id="unnumbered-20">Mailing List</h2>
785
-<div class="outline-text-2" id="text-unnumbered-20">
788
+<div id="outline-container-orgheadline3" class="outline-2">
789
+<h2 id="orgheadline3">Mailing List</h2>
790
+<div class="outline-text-2" id="text-orgheadline3">
786 791
 <p>
787 792
 If you want to set up a public mailing list then when installing the system remember to set the <b>PUBLIC_MAILING_LIST</b> variable within <b>freedombone.cfg</b> to the name of your list. The name should have no spaces in it. Public mailing lists are unencrypted so anyone will be able to read the contents, including non subscribers.
788 793
 </p>
@@ -802,12 +807,12 @@ Tip: When using the Mutt email client if you want to send an email in cleartext
802 807
 </p>
803 808
 </div>
804 809
 </div>
805
-<div id="outline-container-unnumbered-21" class="outline-2">
806
-<h2 id="unnumbered-21">Syncing to the Cloud</h2>
807
-<div class="outline-text-2" id="text-unnumbered-21">
808
-</div><div id="outline-container-unnumbered-22" class="outline-3">
809
-<h3 id="unnumbered-22">Initial install</h3>
810
-<div class="outline-text-3" id="text-unnumbered-22">
810
+<div id="outline-container-orgheadline4" class="outline-2">
811
+<h2 id="orgheadline4">Syncing to the Cloud</h2>
812
+<div class="outline-text-2" id="text-orgheadline4">
813
+</div><div id="outline-container-orgheadline26" class="outline-3">
814
+<h3 id="orgheadline26">Initial install</h3>
815
+<div class="outline-text-3" id="text-orgheadline26">
811 816
 <p>
812 817
 Within a browser go to your owncloud domain, then create an administrator account. The username and password can be anything, and ideally should be generated from a password manager.
813 818
 </p>
@@ -820,24 +825,24 @@ You will also need to enter database details:
820 825
 
821 826
 
822 827
 <colgroup>
823
-<col  class="left" />
828
+<col  class="org-left" />
824 829
 
825
-<col  class="left" />
830
+<col  class="org-left" />
826 831
 </colgroup>
827 832
 <tbody>
828 833
 <tr>
829
-<td class="left">Owncloud database user</td>
830
-<td class="left">owncloudadmin</td>
834
+<td class="org-left">Owncloud database user</td>
835
+<td class="org-left">owncloudadmin</td>
831 836
 </tr>
832 837
 
833 838
 <tr>
834
-<td class="left">Owncloud database password</td>
835
-<td class="left">See the <a href="#unnumbered-1">Readme</a> file</td>
839
+<td class="org-left">Owncloud database password</td>
840
+<td class="org-left">See the <a href="#orgheadline1">Readme</a> file</td>
836 841
 </tr>
837 842
 
838 843
 <tr>
839
-<td class="left">Owncloud database name</td>
840
-<td class="left">owncloud</td>
844
+<td class="org-left">Owncloud database name</td>
845
+<td class="org-left">owncloud</td>
841 846
 </tr>
842 847
 </tbody>
843 848
 </table>
@@ -851,9 +856,9 @@ Log out from the administrator account and then log back in as the user you just
851 856
 </p>
852 857
 </div>
853 858
 </div>
854
-<div id="outline-container-unnumbered-23" class="outline-3">
855
-<h3 id="unnumbered-23">On Android</h3>
856
-<div class="outline-text-3" id="text-unnumbered-23">
859
+<div id="outline-container-orgheadline27" class="outline-3">
860
+<h3 id="orgheadline27">On Android</h3>
861
+<div class="outline-text-3" id="text-orgheadline27">
857 862
 <p>
858 863
 Within F-droid search for <b>owncloud</b> and install the client. Also install <b>CalDAV Sync Adapter</b>.
859 864
 </p>
@@ -863,7 +868,7 @@ Open the owncloud app and enter your owncloud domain name (including the https p
863 868
 </p>
864 869
 
865 870
 <p>
866
-Open the calendar app and under <b>settings</b> add a CalDav account with the url:
871
+Open the calendar app (S planner) and under <b>settings</b> select <b>Calendars</b> then <b>Add account</b> then <b>CalDAV Sync Adapter</b>. Enter your owncloud username and password and the following URL:
867 872
 </p>
868 873
 
869 874
 <div class="org-src-container">
@@ -877,9 +882,9 @@ You will also be prompted to enter login details. Your Android and Owncloud cale
877 882
 </p>
878 883
 </div>
879 884
 </div>
880
-<div id="outline-container-unnumbered-24" class="outline-3">
881
-<h3 id="unnumbered-24">On Linux</h3>
882
-<div class="outline-text-3" id="text-unnumbered-24">
885
+<div id="outline-container-orgheadline28" class="outline-3">
886
+<h3 id="orgheadline28">On Linux</h3>
887
+<div class="outline-text-3" id="text-orgheadline28">
883 888
 <p>
884 889
 Open your software center and search for "owncloud client". Enter your owncloud domain name (with the https prefix) and login details.
885 890
 </p>
@@ -890,12 +895,12 @@ You can now drag files into the <b>~/owncloud</b> directory and they will automa
890 895
 </div>
891 896
 </div>
892 897
 </div>
893
-<div id="outline-container-unnumbered-25" class="outline-2">
894
-<h2 id="unnumbered-25">Play Music</h2>
895
-<div class="outline-text-2" id="text-unnumbered-25">
896
-</div><div id="outline-container-unnumbered-26" class="outline-3">
897
-<h3 id="unnumbered-26">With the DLNA service</h3>
898
-<div class="outline-text-3" id="text-unnumbered-26">
898
+<div id="outline-container-orgheadline5" class="outline-2">
899
+<h2 id="orgheadline5">Play Music</h2>
900
+<div class="outline-text-2" id="text-orgheadline5">
901
+</div><div id="outline-container-orgheadline29" class="outline-3">
902
+<h3 id="orgheadline29">With the DLNA service</h3>
903
+<div class="outline-text-3" id="text-orgheadline29">
899 904
 <p>
900 905
 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.
901 906
 </p>
@@ -935,9 +940,9 @@ The DLNA service will only work within your local home network, and isn't remote
935 940
 </div>
936 941
 </div>
937 942
 
938
-<div id="outline-container-unnumbered-27" class="outline-3">
939
-<h3 id="unnumbered-27">With Owncloud</h3>
940
-<div class="outline-text-3" id="text-unnumbered-27">
943
+<div id="outline-container-orgheadline30" class="outline-3">
944
+<h3 id="orgheadline30">With Owncloud</h3>
945
+<div class="outline-text-3" id="text-orgheadline30">
941 946
 <p>
942 947
 The main advantage of playing music via Owncloud is that you can do that from anywhere - not only within your home network.
943 948
 </p>
@@ -949,12 +954,12 @@ By default a music player is installed into Owncloud, so all you need to do is t
949 954
 </div>
950 955
 </div>
951 956
 
952
-<div id="outline-container-unnumbered-28" class="outline-2">
953
-<h2 id="unnumbered-28">Microblogging</h2>
954
-<div class="outline-text-2" id="text-unnumbered-28">
955
-</div><div id="outline-container-unnumbered-29" class="outline-3">
956
-<h3 id="unnumbered-29">Initial configuration</h3>
957
-<div class="outline-text-3" id="text-unnumbered-29">
957
+<div id="outline-container-orgheadline6" class="outline-2">
958
+<h2 id="orgheadline6">Microblogging</h2>
959
+<div class="outline-text-2" id="text-orgheadline6">
960
+</div><div id="outline-container-orgheadline31" class="outline-3">
961
+<h3 id="orgheadline31">Initial configuration</h3>
962
+<div class="outline-text-3" id="text-orgheadline31">
958 963
 <p>
959 964
 To set up your microblog go to:
960 965
 </p>
@@ -973,59 +978,59 @@ and enter the following settings:
973 978
 
974 979
 
975 980
 <colgroup>
976
-<col  class="left" />
981
+<col  class="org-left" />
977 982
 
978
-<col  class="left" />
983
+<col  class="org-left" />
979 984
 </colgroup>
980 985
 <tbody>
981 986
 <tr>
982
-<td class="left">Server SSL</td>
983
-<td class="left">enable</td>
987
+<td class="org-left">Server SSL</td>
988
+<td class="org-left">enable</td>
984 989
 </tr>
985 990
 
986 991
 <tr>
987
-<td class="left">Hostname</td>
988
-<td class="left">localhost</td>
992
+<td class="org-left">Hostname</td>
993
+<td class="org-left">localhost</td>
989 994
 </tr>
990 995
 
991 996
 <tr>
992
-<td class="left">Type</td>
993
-<td class="left">MySql/MariaDB</td>
997
+<td class="org-left">Type</td>
998
+<td class="org-left">MySql/MariaDB</td>
994 999
 </tr>
995 1000
 
996 1001
 <tr>
997
-<td class="left">Name</td>
998
-<td class="left">gnusocial</td>
1002
+<td class="org-left">Name</td>
1003
+<td class="org-left">gnusocial</td>
999 1004
 </tr>
1000 1005
 
1001 1006
 <tr>
1002
-<td class="left">DB username</td>
1003
-<td class="left">root</td>
1007
+<td class="org-left">DB username</td>
1008
+<td class="org-left">root</td>
1004 1009
 </tr>
1005 1010
 
1006 1011
 <tr>
1007
-<td class="left">DB Password</td>
1008
-<td class="left">See the MariaDB password in the <a href="#unnumbered-1">Readme</a> file</td>
1012
+<td class="org-left">DB Password</td>
1013
+<td class="org-left">See the MariaDB password in the <a href="#orgheadline1">Readme</a> file</td>
1009 1014
 </tr>
1010 1015
 
1011 1016
 <tr>
1012
-<td class="left">Administrator nickname</td>
1013
-<td class="left">Your username</td>
1017
+<td class="org-left">Administrator nickname</td>
1018
+<td class="org-left">Your username</td>
1014 1019
 </tr>
1015 1020
 
1016 1021
 <tr>
1017
-<td class="left">Administrator password</td>
1018
-<td class="left">See the <a href="#unnumbered-1">Readme</a> file</td>
1022
+<td class="org-left">Administrator password</td>
1023
+<td class="org-left">See the <a href="#orgheadline1">Readme</a> file</td>
1019 1024
 </tr>
1020 1025
 
1021 1026
 <tr>
1022
-<td class="left">Subscribe to announcements</td>
1023
-<td class="left">ticked</td>
1027
+<td class="org-left">Subscribe to announcements</td>
1028
+<td class="org-left">ticked</td>
1024 1029
 </tr>
1025 1030
 
1026 1031
 <tr>
1027
-<td class="left">Site profile</td>
1028
-<td class="left">Community</td>
1032
+<td class="org-left">Site profile</td>
1033
+<td class="org-left">Community</td>
1029 1034
 </tr>
1030 1035
 </tbody>
1031 1036
 </table>
@@ -1038,36 +1043,36 @@ When the install is complete you will see a lot of warnings but just ignore thos
1038 1043
 
1039 1044
 
1040 1045
 <colgroup>
1041
-<col  class="left" />
1046
+<col  class="org-left" />
1042 1047
 
1043
-<col  class="left" />
1048
+<col  class="org-left" />
1044 1049
 </colgroup>
1045 1050
 <tbody>
1046 1051
 <tr>
1047
-<td class="left">Site settings</td>
1048
-<td class="left">Text limit 140, Dupe Limit 60000</td>
1052
+<td class="org-left">Site settings</td>
1053
+<td class="org-left">Text limit 140, Dupe Limit 60000</td>
1049 1054
 </tr>
1050 1055
 
1051 1056
 <tr>
1052
-<td class="left">User settings</td>
1053
-<td class="left">Bio limit 1000</td>
1057
+<td class="org-left">User settings</td>
1058
+<td class="org-left">Bio limit 1000</td>
1054 1059
 </tr>
1055 1060
 
1056 1061
 <tr>
1057
-<td class="left">Access settings</td>
1058
-<td class="left"><i>Invite only</i> ticked</td>
1062
+<td class="org-left">Access settings</td>
1063
+<td class="org-left"><i>Invite only</i> ticked</td>
1059 1064
 </tr>
1060 1065
 </tbody>
1061 1066
 </table>
1062 1067
 </div>
1063 1068
 </div>
1064 1069
 </div>
1065
-<div id="outline-container-unnumbered-30" class="outline-2">
1066
-<h2 id="unnumbered-30">Social Network</h2>
1067
-<div class="outline-text-2" id="text-unnumbered-30">
1068
-</div><div id="outline-container-unnumbered-31" class="outline-3">
1069
-<h3 id="unnumbered-31">Certificates</h3>
1070
-<div class="outline-text-3" id="text-unnumbered-31">
1070
+<div id="outline-container-orgheadline7" class="outline-2">
1071
+<h2 id="orgheadline7">Social Network</h2>
1072
+<div class="outline-text-2" id="text-orgheadline7">
1073
+</div><div id="outline-container-orgheadline32" class="outline-3">
1074
+<h3 id="orgheadline32">Certificates</h3>
1075
+<div class="outline-text-3" id="text-orgheadline32">
1071 1076
 <p>
1072 1077
 You will need to have a non self-signed SSL certificate in order to use Red Matrix. Put the public certificate in <b>/etc/ssl/certs/yourredmatrixdomainname.crt</b> and the private certificate in <b>/etc/ssl/private/yourredmatrixdomainname.key</b>. If there is an intermediate certificate needed (such as with StartSSL) then this will need to be concatenated onto the end of the crt file, like this:
1073 1078
 </p>
@@ -1084,9 +1089,9 @@ Then change ssl_certificate to <b>/etc/ssl/certs/yourredmatrixdomainname.bundle.
1084 1089
 </p>
1085 1090
 </div>
1086 1091
 </div>
1087
-<div id="outline-container-unnumbered-32" class="outline-3">
1088
-<h3 id="unnumbered-32">Initial install</h3>
1089
-<div class="outline-text-3" id="text-unnumbered-32">
1092
+<div id="outline-container-orgheadline33" class="outline-3">
1093
+<h3 id="orgheadline33">Initial install</h3>
1094
+<div class="outline-text-3" id="text-orgheadline33">
1090 1095
 <p>
1091 1096
 Visit the URL of your Red Matrix site and you should be taken through the rest of the installation procedure.  Note that this may take a few minutes so don't be concerned if it looks as if it has crashed - just leave it running.
1092 1097
 </p>
@@ -1097,19 +1102,19 @@ When installation is complete you can register a new user.
1097 1102
 </div>
1098 1103
 </div>
1099 1104
 </div>
1100
-<div id="outline-container-unnumbered-33" class="outline-2">
1101
-<h2 id="unnumbered-33">Chat Services</h2>
1102
-<div class="outline-text-2" id="text-unnumbered-33">
1103
-</div><div id="outline-container-unnumbered-34" class="outline-3">
1104
-<h3 id="unnumbered-34">IRC</h3>
1105
-<div class="outline-text-3" id="text-unnumbered-34">
1105
+<div id="outline-container-orgheadline8" class="outline-2">
1106
+<h2 id="orgheadline8">Chat Services</h2>
1107
+<div class="outline-text-2" id="text-orgheadline8">
1108
+</div><div id="outline-container-orgheadline34" class="outline-3">
1109
+<h3 id="orgheadline34">IRC</h3>
1110
+<div class="outline-text-3" id="text-orgheadline34">
1106 1111
 <p>
1107 1112
 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.
1108 1113
 </p>
1109 1114
 </div>
1110
-<div id="outline-container-unnumbered-35" class="outline-4">
1111
-<h4 id="unnumbered-35">Irssi</h4>
1112
-<div class="outline-text-4" id="text-unnumbered-35">
1115
+<div id="outline-container-orgheadline35" class="outline-4">
1116
+<h4 id="orgheadline35">Irssi</h4>
1117
+<div class="outline-text-4" id="text-orgheadline35">
1113 1118
 <p>
1114 1119
 If you are using the <a href="http://www.irssi.org/">irssi</a> IRC client then you can use the following commands to connect to your IRC server.
1115 1120
 </p>
@@ -1123,9 +1128,9 @@ If you are using the <a href="http://www.irssi.org/">irssi</a> IRC client then y
1123 1128
 </div>
1124 1129
 </div>
1125 1130
 </div>
1126
-<div id="outline-container-unnumbered-36" class="outline-4">
1127
-<h4 id="unnumbered-36">XChat</h4>
1128
-<div class="outline-text-4" id="text-unnumbered-36">
1131
+<div id="outline-container-orgheadline36" class="outline-4">
1132
+<h4 id="orgheadline36">XChat</h4>
1133
+<div class="outline-text-4" id="text-orgheadline36">
1129 1134
 <p>
1130 1135
 If you are using the XChat client:
1131 1136
 </p>
@@ -1161,12 +1166,12 @@ Click <b>close</b> and then <b>connect</b>.
1161 1166
 </div>
1162 1167
 </div>
1163 1168
 
1164
-<div id="outline-container-unnumbered-37" class="outline-3">
1165
-<h3 id="unnumbered-37">XMPP/Jabber</h3>
1166
-<div class="outline-text-3" id="text-unnumbered-37">
1167
-</div><div id="outline-container-unnumbered-38" class="outline-4">
1168
-<h4 id="unnumbered-38">Managing users</h4>
1169
-<div class="outline-text-4" id="text-unnumbered-38">
1169
+<div id="outline-container-orgheadline41" class="outline-3">
1170
+<h3 id="orgheadline41">XMPP/Jabber</h3>
1171
+<div class="outline-text-3" id="text-orgheadline41">
1172
+</div><div id="outline-container-orgheadline37" class="outline-4">
1173
+<h4 id="orgheadline37">Managing users</h4>
1174
+<div class="outline-text-4" id="text-orgheadline37">
1170 1175
 <p>
1171 1176
 To add a user:
1172 1177
 </p>
@@ -1225,9 +1230,9 @@ prosodyctl status
1225 1230
 </div>
1226 1231
 </div>
1227 1232
 
1228
-<div id="outline-container-unnumbered-39" class="outline-4">
1229
-<h4 id="unnumbered-39">Using with Jitsi</h4>
1230
-<div class="outline-text-4" id="text-unnumbered-39">
1233
+<div id="outline-container-orgheadline38" class="outline-4">
1234
+<h4 id="orgheadline38">Using with Jitsi</h4>
1235
+<div class="outline-text-4" id="text-orgheadline38">
1231 1236
 <p>
1232 1237
 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.
1233 1238
 </p>
@@ -1257,9 +1262,9 @@ You can also <a href="https://www.youtube.com/watch?v=vgx7VSrDGjk">see this vide
1257 1262
 </p>
1258 1263
 </div>
1259 1264
 </div>
1260
-<div id="outline-container-unnumbered-40" class="outline-4">
1261
-<h4 id="unnumbered-40">Using with Ubuntu</h4>
1262
-<div class="outline-text-4" id="text-unnumbered-40">
1265
+<div id="outline-container-orgheadline39" class="outline-4">
1266
+<h4 id="orgheadline39">Using with Ubuntu</h4>
1267
+<div class="outline-text-4" id="text-orgheadline39">
1263 1268
 <p>
1264 1269
 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.
1265 1270
 </p>
@@ -1277,9 +1282,9 @@ Click on <b>Advanced</b> and make sure that <b>Encryption required</b> and <b>Ig
1277 1282
 </p>
1278 1283
 </div>
1279 1284
 </div>
1280
-<div id="outline-container-unnumbered-41" class="outline-4">
1281
-<h4 id="unnumbered-41">Using with Android</h4>
1282
-<div class="outline-text-4" id="text-unnumbered-41">
1285
+<div id="outline-container-orgheadline40" class="outline-4">
1286
+<h4 id="orgheadline40">Using with Android</h4>
1287
+<div class="outline-text-4" id="text-orgheadline40">
1283 1288
 <p>
1284 1289
 Install <a href="https://f-droid.org/">F-Droid</a>
1285 1290
 </p>
@@ -1306,12 +1311,34 @@ Go back to the initial screen and then using the menu you can add contacts and b
1306 1311
 </div>
1307 1312
 </div>
1308 1313
 </div>
1309
-<div id="outline-container-unnumbered-42" class="outline-3">
1310
-<h3 id="unnumbered-42">VoIP (Voice chat)</h3>
1311
-<div class="outline-text-3" id="text-unnumbered-42">
1312
-</div><div id="outline-container-unnumbered-43" class="outline-4">
1313
-<h4 id="unnumbered-43">Using with Ubuntu</h4>
1314
-<div class="outline-text-4" id="text-unnumbered-43">
1314
+<div id="outline-container-orgheadline42" class="outline-3">
1315
+<h3 id="orgheadline42">Tox</h3>
1316
+<div class="outline-text-3" id="text-orgheadline42">
1317
+<p>
1318
+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.
1319
+</p>
1320
+</div>
1321
+<div id="outline-container-orgheadline43" class="outline-4">
1322
+<h4 id="orgheadline43">Using the Toxic client</h4>
1323
+<div class="outline-text-4" id="text-orgheadline43">
1324
+<p>
1325
+To connect to your node use the command:
1326
+</p>
1327
+
1328
+<div class="org-src-container">
1329
+
1330
+<pre class="src src-bash">/connect [yourdomainname] 33445 [your tox node ID]
1331
+</pre>
1332
+</div>
1333
+</div>
1334
+</div>
1335
+</div>
1336
+<div id="outline-container-orgheadline46" class="outline-3">
1337
+<h3 id="orgheadline46">VoIP (Voice chat)</h3>
1338
+<div class="outline-text-3" id="text-orgheadline46">
1339
+</div><div id="outline-container-orgheadline44" class="outline-4">
1340
+<h4 id="orgheadline44">Using with Ubuntu</h4>
1341
+<div class="outline-text-4" id="text-orgheadline44">
1315 1342
 <p>
1316 1343
 Within the software center search for "mumble" and install the client then run it. Skip through the audio setup wizard.
1317 1344
 </p>
@@ -1325,9 +1352,9 @@ Click on "add new" to add a new server and enter the default domain name for the
1325 1352
 </p>
1326 1353
 </div>
1327 1354
 </div>
1328
-<div id="outline-container-unnumbered-44" class="outline-4">
1329
-<h4 id="unnumbered-44">Using with Android</h4>
1330
-<div class="outline-text-4" id="text-unnumbered-44">
1355
+<div id="outline-container-orgheadline45" class="outline-4">
1356
+<h4 id="orgheadline45">Using with Android</h4>
1357
+<div class="outline-text-4" id="text-orgheadline45">
1331 1358
 <p>
1332 1359
 Install <a href="https://f-droid.org/">F-Droid</a>
1333 1360
 </p>