Bob Mottram 8 anos atrás
pai
commit
b6d70aba24
2 arquivos alterados com 181 adições e 177 exclusões
  1. 8
    6
      doc/EN/usage.org
  2. 173
    171
      website/EN/usage.html

+ 8
- 6
doc/EN/usage.org Ver arquivo

@@ -697,12 +697,6 @@ control
697 697
 
698 698
 [[file:images/controlpanel/control_panel_manage_users.jpg]]
699 699
 
700
-#+BEGIN_EXPORT html
701
-<center>
702
-Return to the <a href="index.html">home page</a>
703
-</center>
704
-#+END_EXPORT
705
-
706 700
 * Blocking Ads
707 701
 Everyone except for advertisers hates adverts. Not only are they annoying, but they can consume a lot of bandwidth, be a privacy problem in terms of allowing companies to track your browsing habits and also any badly written scripts they contain may introduce exploitable security holes.
708 702
 
@@ -740,3 +734,11 @@ Edit the DNS settings and add the IPv4 address which you got from the control pa
740 734
 
741 735
 ** Configuring block lists
742 736
 You can configure the block lists which the system uses by going to the *administrator control panel*, selecting *App Settings* then choosing *pihole*. You can also add any extra domain names to the whitelist if they're being wrongly blocked or to the blacklist if they're not blocked by the current lists.
737
+
738
+
739
+
740
+#+BEGIN_EXPORT html
741
+<center>
742
+Return to the <a href="index.html">home page</a>
743
+</center>
744
+#+END_EXPORT

+ 173
- 171
website/EN/usage.html Ver arquivo

@@ -3,7 +3,7 @@
3 3
 "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
4 4
 <html xmlns="http://www.w3.org/1999/xhtml" lang="en" xml:lang="en">
5 5
 <head>
6
-<!-- 2016-10-19 Wed 14:20 -->
6
+<!-- 2016-10-19 Wed 14:30 -->
7 7
 <meta http-equiv="Content-Type" content="text/html;charset=utf-8" />
8 8
 <meta name="viewport" content="width=device-width, initial-scale=1" />
9 9
 <title></title>
@@ -255,15 +255,15 @@ for the JavaScript code in this tag.
255 255
 </colgroup>
256 256
 <tbody>
257 257
 <tr>
258
-<td class="org-left"><a href="#org793a557">Readme</a></td>
258
+<td class="org-left"><a href="#org978e1da">Readme</a></td>
259 259
 </tr>
260 260
 
261 261
 <tr>
262
-<td class="org-left"><a href="#orgfa4f9a2">Improving ssh security</a></td>
262
+<td class="org-left"><a href="#org5e60766">Improving ssh security</a></td>
263 263
 </tr>
264 264
 
265 265
 <tr>
266
-<td class="org-left"><a href="#org53f7d5a">Administrating the system via an onion address (Tor)</a></td>
266
+<td class="org-left"><a href="#org57a9954">Administrating the system via an onion address (Tor)</a></td>
267 267
 </tr>
268 268
 
269 269
 <tr>
@@ -275,50 +275,50 @@ for the JavaScript code in this tag.
275 275
 </tr>
276 276
 
277 277
 <tr>
278
-<td class="org-left"><a href="#org8771c82">Syncing to the Cloud</a></td>
278
+<td class="org-left"><a href="#org210755e">Syncing to the Cloud</a></td>
279 279
 </tr>
280 280
 
281 281
 <tr>
282
-<td class="org-left"><a href="#org0ee649f">Play Music</a></td>
282
+<td class="org-left"><a href="#org67a8424">Play Music</a></td>
283 283
 </tr>
284 284
 
285 285
 <tr>
286
-<td class="org-left"><a href="#orgda6e695">Microblogging (GNU Social)</a></td>
286
+<td class="org-left"><a href="#orgd8e965f">Microblogging (GNU Social)</a></td>
287 287
 </tr>
288 288
 
289 289
 <tr>
290
-<td class="org-left"><a href="#org635e2ca">Sharing things</a></td>
290
+<td class="org-left"><a href="#org6f396d9">Sharing things</a></td>
291 291
 </tr>
292 292
 
293 293
 <tr>
294
-<td class="org-left"><a href="#org324e9de">Social Network</a></td>
294
+<td class="org-left"><a href="#org62d0417">Social Network</a></td>
295 295
 </tr>
296 296
 
297 297
 <tr>
298
-<td class="org-left"><a href="#org96995c7">Chat Services</a></td>
298
+<td class="org-left"><a href="#orgb0ea75b">Chat Services</a></td>
299 299
 </tr>
300 300
 
301 301
 <tr>
302
-<td class="org-left"><a href="#org4a5ea72">RSS Reader</a></td>
302
+<td class="org-left"><a href="#org116ac81">RSS Reader</a></td>
303 303
 </tr>
304 304
 
305 305
 <tr>
306
-<td class="org-left"><a href="#orgbb5307a">Git Projects</a></td>
306
+<td class="org-left"><a href="#org23360bf">Git Projects</a></td>
307 307
 </tr>
308 308
 
309 309
 <tr>
310
-<td class="org-left"><a href="#orgd2f4665">Adding or removing users</a></td>
310
+<td class="org-left"><a href="#org0b0ea7b">Adding or removing users</a></td>
311 311
 </tr>
312 312
 
313 313
 <tr>
314
-<td class="org-left"><a href="#orgde4f72d">Blocking Ads</a></td>
314
+<td class="org-left"><a href="#orgce954f0">Blocking Ads</a></td>
315 315
 </tr>
316 316
 </tbody>
317 317
 </table>
318 318
 
319
-<div id="outline-container-org793a557" class="outline-2">
320
-<h2 id="org793a557">Readme</h2>
321
-<div class="outline-text-2" id="text-org793a557">
319
+<div id="outline-container-org978e1da" class="outline-2">
320
+<h2 id="org978e1da">Readme</h2>
321
+<div class="outline-text-2" id="text-org978e1da">
322 322
 <p>
323 323
 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:
324 324
 </p>
@@ -338,9 +338,9 @@ To exit you can either just close the terminal or use <b>CTRL-x CTRL-c</b> follo
338 338
 </p>
339 339
 </div>
340 340
 </div>
341
-<div id="outline-container-orgfa4f9a2" class="outline-2">
342
-<h2 id="orgfa4f9a2">Improving ssh security</h2>
343
-<div class="outline-text-2" id="text-orgfa4f9a2">
341
+<div id="outline-container-org5e60766" class="outline-2">
342
+<h2 id="org5e60766">Improving ssh security</h2>
343
+<div class="outline-text-2" id="text-org5e60766">
344 344
 <p>
345 345
 To improve ssh security you can generate an ssh key pair on your system and then upload the public key to the Freedombone.
346 346
 </p>
@@ -390,9 +390,9 @@ If you wish to only use ssh keys then log in to the Freedombone, become the root
390 390
 </div>
391 391
 </div>
392 392
 
393
-<div id="outline-container-org53f7d5a" class="outline-2">
394
-<h2 id="org53f7d5a">Administrating the system via an onion address (Tor)</h2>
395
-<div class="outline-text-2" id="text-org53f7d5a">
393
+<div id="outline-container-org57a9954" class="outline-2">
394
+<h2 id="org57a9954">Administrating the system via an onion address (Tor)</h2>
395
+<div class="outline-text-2" id="text-org57a9954">
396 396
 <p>
397 397
 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:
398 398
 </p>
@@ -434,9 +434,9 @@ Subsequently even if dynamic DNS isn't working you may still be able to administ
434 434
 </p>
435 435
 </div>
436 436
 </div>
437
-<div id="outline-container-org8771c82" class="outline-2">
438
-<h2 id="org8771c82">Syncing to the Cloud</h2>
439
-<div class="outline-text-2" id="text-org8771c82">
437
+<div id="outline-container-org210755e" class="outline-2">
438
+<h2 id="org210755e">Syncing to the Cloud</h2>
439
+<div class="outline-text-2" id="text-org210755e">
440 440
 <p>
441 441
 <a href="https://syncthing.net">Syncthing</a> provides a similar capability to proprietary systems such as Dropbox, 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.
442 442
 </p>
@@ -446,9 +446,9 @@ Freedombone provides Syncthing shared directories for each user on the system, p
446 446
 </p>
447 447
 </div>
448 448
 
449
-<div id="outline-container-org15638f0" class="outline-3">
450
-<h3 id="org15638f0">On a laptop</h3>
451
-<div class="outline-text-3" id="text-org15638f0">
449
+<div id="outline-container-org45fcc85" class="outline-3">
450
+<h3 id="org45fcc85">On a laptop</h3>
451
+<div class="outline-text-3" id="text-org45fcc85">
452 452
 <p>
453 453
 Install syncthing:
454 454
 </p>
@@ -501,9 +501,9 @@ Now wait for a few minutes. Eventually you will see two messages appear within t
501 501
 </p>
502 502
 </div>
503 503
 </div>
504
-<div id="outline-container-orgcc6f0f2" class="outline-3">
505
-<h3 id="orgcc6f0f2">On Android</h3>
506
-<div class="outline-text-3" id="text-orgcc6f0f2">
504
+<div id="outline-container-orgf8842d7" class="outline-3">
505
+<h3 id="orgf8842d7">On Android</h3>
506
+<div class="outline-text-3" id="text-orgf8842d7">
507 507
 <p>
508 508
 Install Syncthing and Connectbot from F-droid.
509 509
 </p>
@@ -534,12 +534,12 @@ Now wait for a few minutes or more. Eventually you should receive two notificati
534 534
 </div>
535 535
 </div>
536 536
 </div>
537
-<div id="outline-container-org0ee649f" class="outline-2">
538
-<h2 id="org0ee649f">Play Music</h2>
539
-<div class="outline-text-2" id="text-org0ee649f">
540
-</div><div id="outline-container-orgf7cf2ee" class="outline-3">
541
-<h3 id="orgf7cf2ee">With the DLNA service</h3>
542
-<div class="outline-text-3" id="text-orgf7cf2ee">
537
+<div id="outline-container-org67a8424" class="outline-2">
538
+<h2 id="org67a8424">Play Music</h2>
539
+<div class="outline-text-2" id="text-org67a8424">
540
+</div><div id="outline-container-org3482135" class="outline-3">
541
+<h3 id="org3482135">With the DLNA service</h3>
542
+<div class="outline-text-3" id="text-org3482135">
543 543
 <p>
544 544
 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.
545 545
 </p>
@@ -578,12 +578,12 @@ The DLNA service will only work within your local home network, and isn't remote
578 578
 </div>
579 579
 </div>
580 580
 
581
-<div id="outline-container-orgda6e695" class="outline-2">
582
-<h2 id="orgda6e695">Microblogging (GNU Social)</h2>
583
-<div class="outline-text-2" id="text-orgda6e695">
584
-</div><div id="outline-container-org5b84d51" class="outline-3">
585
-<h3 id="org5b84d51">Initial setup</h3>
586
-<div class="outline-text-3" id="text-org5b84d51">
581
+<div id="outline-container-orgd8e965f" class="outline-2">
582
+<h2 id="orgd8e965f">Microblogging (GNU Social)</h2>
583
+<div class="outline-text-2" id="text-orgd8e965f">
584
+</div><div id="outline-container-org314658b" class="outline-3">
585
+<h3 id="org314658b">Initial setup</h3>
586
+<div class="outline-text-3" id="text-org314658b">
587 587
 <p>
588 588
 To log into your GNU Social site first obtain your username and password from the "microblogging" section of the readme file.
589 589
 </p>
@@ -611,17 +611,17 @@ GNU Social has a clutter-free mobile user interface which can be accessed via a
611 611
 </div>
612 612
 </div>
613 613
 
614
-<div id="outline-container-orge7c1dbe" class="outline-3">
615
-<h3 id="orge7c1dbe">Direct Messages (DMs) and privacy</h3>
616
-<div class="outline-text-3" id="text-orge7c1dbe">
614
+<div id="outline-container-org55654b1" class="outline-3">
615
+<h3 id="org55654b1">Direct Messages (DMs) and privacy</h3>
616
+<div class="outline-text-3" id="text-org55654b1">
617 617
 <p>
618 618
 One important point about GNU Social is that although direct messages (DMs) are treated as being private their security is quite poor. If you want real communications privacy then use other systems such as XMPP+OMEMO/OTR, Tox or email with GPG. GNU Social is primarily about <i>fully public communications</i>.
619 619
 </p>
620 620
 </div>
621 621
 </div>
622
-<div id="outline-container-orge085cda" class="outline-3">
623
-<h3 id="orge085cda">Using with Emacs</h3>
624
-<div class="outline-text-3" id="text-orge085cda">
622
+<div id="outline-container-org98a4c2a" class="outline-3">
623
+<h3 id="org98a4c2a">Using with Emacs</h3>
624
+<div class="outline-text-3" id="text-org98a4c2a">
625 625
 <p>
626 626
 If you are an Emacs user it's also possible to set up GNU Social mode as follows:
627 627
 </p>
@@ -705,9 +705,9 @@ And as a quick reference the main keys are:
705 705
 </div>
706 706
 </div>
707 707
 
708
-<div id="outline-container-org635e2ca" class="outline-2">
709
-<h2 id="org635e2ca">Sharing things</h2>
710
-<div class="outline-text-2" id="text-org635e2ca">
708
+<div id="outline-container-org6f396d9" class="outline-2">
709
+<h2 id="org6f396d9">Sharing things</h2>
710
+<div class="outline-text-2" id="text-org6f396d9">
711 711
 <p>
712 712
 If you have the GNU Social microblogging system installed then it's also possible to share things or services between groups or with particular users. This can be useful for sharing items within a family, club or in a local sharing economy. Sharing things freely, without money, reveals the social basis at the root of all economics which money normally conceals or obscures.
713 713
 </p>
@@ -734,20 +734,20 @@ The "<i>catalog</i>" button then allows you to search for shared things within t
734 734
 </div>
735 735
 </div>
736 736
 
737
-<div id="outline-container-org324e9de" class="outline-2">
738
-<h2 id="org324e9de">Social Network</h2>
739
-<div class="outline-text-2" id="text-org324e9de">
740
-</div><div id="outline-container-orge603013" class="outline-3">
741
-<h3 id="orge603013">Domains</h3>
742
-<div class="outline-text-3" id="text-orge603013">
737
+<div id="outline-container-org62d0417" class="outline-2">
738
+<h2 id="org62d0417">Social Network</h2>
739
+<div class="outline-text-2" id="text-org62d0417">
740
+</div><div id="outline-container-org94712bf" class="outline-3">
741
+<h3 id="org94712bf">Domains</h3>
742
+<div class="outline-text-3" id="text-org94712bf">
743 743
 <p>
744 744
 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.
745 745
 </p>
746 746
 </div>
747 747
 </div>
748
-<div id="outline-container-org0fcf3bf" class="outline-3">
749
-<h3 id="org0fcf3bf">Initial install</h3>
750
-<div class="outline-text-3" id="text-org0fcf3bf">
748
+<div id="outline-container-org8342715" class="outline-3">
749
+<h3 id="org8342715">Initial install</h3>
750
+<div class="outline-text-3" id="text-org8342715">
751 751
 <p>
752 752
 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.
753 753
 </p>
@@ -761,19 +761,19 @@ On first visiting your Hubzilla site you'll see the login screen. The first thin
761 761
 </div>
762 762
 </div>
763 763
 
764
-<div id="outline-container-org96995c7" class="outline-2">
765
-<h2 id="org96995c7">Chat Services</h2>
766
-<div class="outline-text-2" id="text-org96995c7">
767
-</div><div id="outline-container-org2335ce4" class="outline-3">
768
-<h3 id="org2335ce4">IRC</h3>
769
-<div class="outline-text-3" id="text-org2335ce4">
764
+<div id="outline-container-orgb0ea75b" class="outline-2">
765
+<h2 id="orgb0ea75b">Chat Services</h2>
766
+<div class="outline-text-2" id="text-orgb0ea75b">
767
+</div><div id="outline-container-org4a677ce" class="outline-3">
768
+<h3 id="org4a677ce">IRC</h3>
769
+<div class="outline-text-3" id="text-org4a677ce">
770 770
 <p>
771 771
 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.
772 772
 </p>
773 773
 </div>
774
-<div id="outline-container-org35daab1" class="outline-4">
775
-<h4 id="org35daab1">Irssi</h4>
776
-<div class="outline-text-4" id="text-org35daab1">
774
+<div id="outline-container-org2b2d156" class="outline-4">
775
+<h4 id="org2b2d156">Irssi</h4>
776
+<div class="outline-text-4" id="text-org2b2d156">
777 777
 <p>
778 778
 The easiest way to use irssi is to connect to your system, like this:
779 779
 </p>
@@ -788,9 +788,9 @@ Then select <b>IRC</b> from the menu. However, other than via this method using
788 788
 </p>
789 789
 </div>
790 790
 </div>
791
-<div id="outline-container-orgc06c40f" class="outline-4">
792
-<h4 id="orgc06c40f">HexChat</h4>
793
-<div class="outline-text-4" id="text-orgc06c40f">
791
+<div id="outline-container-orga519db3" class="outline-4">
792
+<h4 id="orga519db3">HexChat</h4>
793
+<div class="outline-text-4" id="text-orga519db3">
794 794
 <p>
795 795
 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.
796 796
 </p>
@@ -966,9 +966,9 @@ Click <b>close</b> and then <b>connect</b>.
966 966
 </div>
967 967
 </div>
968 968
 
969
-<div id="outline-container-orgeeb5481" class="outline-4">
970
-<h4 id="orgeeb5481">Emacs</h4>
971
-<div class="outline-text-4" id="text-orgeeb5481">
969
+<div id="outline-container-org261ba5b" class="outline-4">
970
+<h4 id="org261ba5b">Emacs</h4>
971
+<div class="outline-text-4" id="text-org261ba5b">
972 972
 <p>
973 973
 If you are an Emacs user then you can also connect to your IRC server via Emacs.
974 974
 </p>
@@ -999,9 +999,9 @@ Add the following to your Emacs configuration file:
999 999
 </div>
1000 1000
 </div>
1001 1001
 </div>
1002
-<div id="outline-container-orgd863bbd" class="outline-4">
1003
-<h4 id="orgd863bbd">Changing or removing the IRC password</h4>
1004
-<div class="outline-text-4" id="text-orgd863bbd">
1002
+<div id="outline-container-org389e9d5" class="outline-4">
1003
+<h4 id="org389e9d5">Changing or removing the IRC password</h4>
1004
+<div class="outline-text-4" id="text-org389e9d5">
1005 1005
 <p>
1006 1006
 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:
1007 1007
 </p>
@@ -1018,20 +1018,20 @@ Select <i>Administrator controls</i> then <b>IRC Menu</b> and then change the pa
1018 1018
 </div>
1019 1019
 </div>
1020 1020
 
1021
-<div id="outline-container-org77ae3fd" class="outline-3">
1022
-<h3 id="org77ae3fd">XMPP/Jabber</h3>
1023
-<div class="outline-text-3" id="text-org77ae3fd">
1024
-</div><div id="outline-container-org7557f8c" class="outline-4">
1025
-<h4 id="org7557f8c">About XMPP</h4>
1026
-<div class="outline-text-4" id="text-org7557f8c">
1021
+<div id="outline-container-org182f3ad" class="outline-3">
1022
+<h3 id="org182f3ad">XMPP/Jabber</h3>
1023
+<div class="outline-text-3" id="text-org182f3ad">
1024
+</div><div id="outline-container-org7b9ecd5" class="outline-4">
1025
+<h4 id="org7b9ecd5">About XMPP</h4>
1026
+<div class="outline-text-4" id="text-org7b9ecd5">
1027 1027
 <p>
1028 1028
 A well written article on the state of XMPP and how it compares to other chat protocols <a href="https://gultsch.de/xmpp_2016.html">can be found here</a>.
1029 1029
 </p>
1030 1030
 </div>
1031 1031
 </div>
1032
-<div id="outline-container-orge8f75ed" class="outline-4">
1033
-<h4 id="orge8f75ed">Using with Gajim</h4>
1034
-<div class="outline-text-4" id="text-orge8f75ed">
1032
+<div id="outline-container-orgff7f601" class="outline-4">
1033
+<h4 id="orgff7f601">Using with Gajim</h4>
1034
+<div class="outline-text-4" id="text-orgff7f601">
1035 1035
 <p>
1036 1036
 In mid 2016 <a href="https://gajim.org/">Gajim</a> became the first desktop XMPP client to support the <a href="https://en.wikipedia.org/wiki/OMEMO">OMEMO end-to-end security standard</a>, which is superior to the more traditional <a href="https://en.wikipedia.org/wiki/Off-the-Record_Messaging">OTR</a> since it also includes multi-user chat and the ratcheting mechanism pioneered by Open Whisper Systems. To install it:
1037 1037
 </p>
@@ -1075,9 +1075,9 @@ If you wish to use OpenPGP to encrypt your messages then go to <b>Edit/Accounts<
1075 1075
 </div>
1076 1076
 </div>
1077 1077
 
1078
-<div id="outline-container-orgee49297" class="outline-4">
1079
-<h4 id="orgee49297">Using with Profanity</h4>
1080
-<div class="outline-text-4" id="text-orgee49297">
1078
+<div id="outline-container-orgf12caa7" class="outline-4">
1079
+<h4 id="orgf12caa7">Using with Profanity</h4>
1080
+<div class="outline-text-4" id="text-orgf12caa7">
1081 1081
 <p>
1082 1082
 The <a href="https://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.
1083 1083
 </p>
@@ -1159,9 +1159,9 @@ When accessed via the user control panel the client is automatically routed thro
1159 1159
 </p>
1160 1160
 </div>
1161 1161
 </div>
1162
-<div id="outline-container-orgde3af4a" class="outline-4">
1163
-<h4 id="orgde3af4a">Using with Jitsi</h4>
1164
-<div class="outline-text-4" id="text-orgde3af4a">
1162
+<div id="outline-container-org3bab9a8" class="outline-4">
1163
+<h4 id="org3bab9a8">Using with Jitsi</h4>
1164
+<div class="outline-text-4" id="text-org3bab9a8">
1165 1165
 <p>
1166 1166
 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.
1167 1167
 </p>
@@ -1191,9 +1191,9 @@ You can also <a href="https://www.youtube.com/watch?v=vgx7VSrDGjk">see this vide
1191 1191
 </p>
1192 1192
 </div>
1193 1193
 </div>
1194
-<div id="outline-container-org46311b3" class="outline-4">
1195
-<h4 id="org46311b3">Using with Ubuntu</h4>
1196
-<div class="outline-text-4" id="text-org46311b3">
1194
+<div id="outline-container-orgedb929b" class="outline-4">
1195
+<h4 id="orgedb929b">Using with Ubuntu</h4>
1196
+<div class="outline-text-4" id="text-orgedb929b">
1197 1197
 <p>
1198 1198
 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.
1199 1199
 </p>
@@ -1211,17 +1211,17 @@ Click on <b>Advanced</b> and make sure that <b>Encryption required</b> and <b>Ig
1211 1211
 </p>
1212 1212
 </div>
1213 1213
 </div>
1214
-<div id="outline-container-org536cf81" class="outline-4">
1215
-<h4 id="org536cf81">Using Tor Messenger</h4>
1216
-<div class="outline-text-4" id="text-org536cf81">
1214
+<div id="outline-container-orge7735ec" class="outline-4">
1215
+<h4 id="orge7735ec">Using Tor Messenger</h4>
1216
+<div class="outline-text-4" id="text-orge7735ec">
1217 1217
 <p>
1218 1218
 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.
1219 1219
 </p>
1220 1220
 </div>
1221 1221
 </div>
1222
-<div id="outline-container-org14c37f7" class="outline-4">
1223
-<h4 id="org14c37f7">Using with Android/Conversations</h4>
1224
-<div class="outline-text-4" id="text-org14c37f7">
1222
+<div id="outline-container-org5ed7fc8" class="outline-4">
1223
+<h4 id="org5ed7fc8">Using with Android/Conversations</h4>
1224
+<div class="outline-text-4" id="text-org5ed7fc8">
1225 1225
 <p>
1226 1226
 Install <a href="https://f-droid.org/">F-Droid</a>
1227 1227
 </p>
@@ -1256,16 +1256,16 @@ Then select <b>Next</b>. When chatting you can use the lock icon to encrypt your
1256 1256
 </div>
1257 1257
 </div>
1258 1258
 </div>
1259
-<div id="outline-container-orgc1c5aa7" class="outline-3">
1260
-<h3 id="orgc1c5aa7">Tox</h3>
1261
-<div class="outline-text-3" id="text-orgc1c5aa7">
1259
+<div id="outline-container-orgd6ba65f" class="outline-3">
1260
+<h3 id="orgd6ba65f">Tox</h3>
1261
+<div class="outline-text-3" id="text-orgd6ba65f">
1262 1262
 <p>
1263 1263
 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.
1264 1264
 </p>
1265 1265
 </div>
1266
-<div id="outline-container-org4a32972" class="outline-4">
1267
-<h4 id="org4a32972">Using the Toxic client</h4>
1268
-<div class="outline-text-4" id="text-org4a32972">
1266
+<div id="outline-container-orgacb210c" class="outline-4">
1267
+<h4 id="orgacb210c">Using the Toxic client</h4>
1268
+<div class="outline-text-4" id="text-orgacb210c">
1269 1269
 <p>
1270 1270
 Log into your system with:
1271 1271
 </p>
@@ -1288,20 +1288,20 @@ Then from the menu select <b>Tox Chat</b>. Tox is encrypted by default and also
1288 1288
 </div>
1289 1289
 </div>
1290 1290
 
1291
-<div id="outline-container-org99a9dcd" class="outline-3">
1292
-<h3 id="org99a9dcd">VoIP (Voice and text chat)</h3>
1293
-<div class="outline-text-3" id="text-org99a9dcd">
1294
-</div><div id="outline-container-orgd4527e8" class="outline-4">
1295
-<h4 id="orgd4527e8">Text chat</h4>
1296
-<div class="outline-text-4" id="text-orgd4527e8">
1291
+<div id="outline-container-org2682cfe" class="outline-3">
1292
+<h3 id="org2682cfe">VoIP (Voice and text chat)</h3>
1293
+<div class="outline-text-3" id="text-org2682cfe">
1294
+</div><div id="outline-container-org725cb06" class="outline-4">
1295
+<h4 id="org725cb06">Text chat</h4>
1296
+<div class="outline-text-4" id="text-org725cb06">
1297 1297
 <p>
1298 1298
 In addition to voice it is also possible to do text chat via mumble. The security of this is pretty good provided that you do it via Plumble and Orbot on mobile, but compared to other options such as XMPP/Conversations or Tox the security is not as good, since the mumble server currently doesn't support forward secrecy.
1299 1299
 </p>
1300 1300
 </div>
1301 1301
 </div>
1302
-<div id="outline-container-org6dfd5c3" class="outline-4">
1303
-<h4 id="org6dfd5c3">Using with Ubuntu</h4>
1304
-<div class="outline-text-4" id="text-org6dfd5c3">
1302
+<div id="outline-container-org640ab98" class="outline-4">
1303
+<h4 id="org640ab98">Using with Ubuntu</h4>
1304
+<div class="outline-text-4" id="text-org640ab98">
1305 1305
 <p>
1306 1306
 Within the software center search for "mumble" and install the client then run it. Skip through the audio setup wizard.
1307 1307
 </p>
@@ -1311,9 +1311,9 @@ Click on "add new" to add a new server and enter the default domain name for the
1311 1311
 </p>
1312 1312
 </div>
1313 1313
 </div>
1314
-<div id="outline-container-org4a4f7ed" class="outline-4">
1315
-<h4 id="org4a4f7ed">Using with Android</h4>
1316
-<div class="outline-text-4" id="text-org4a4f7ed">
1314
+<div id="outline-container-org3964672" class="outline-4">
1315
+<h4 id="org3964672">Using with Android</h4>
1316
+<div class="outline-text-4" id="text-org3964672">
1317 1317
 <p>
1318 1318
 Install <a href="https://f-droid.org/">F-Droid</a>
1319 1319
 </p>
@@ -1348,24 +1348,24 @@ Selecting the server by pressing on it then connects you to the server so that y
1348 1348
 </div>
1349 1349
 </div>
1350 1350
 </div>
1351
-<div id="outline-container-orgc115d02" class="outline-3">
1352
-<h3 id="orgc115d02">SIP phones</h3>
1353
-<div class="outline-text-3" id="text-orgc115d02">
1351
+<div id="outline-container-org08dc062" class="outline-3">
1352
+<h3 id="org08dc062">SIP phones</h3>
1353
+<div class="outline-text-3" id="text-org08dc062">
1354 1354
 <p>
1355 1355
 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.
1356 1356
 </p>
1357 1357
 </div>
1358
-<div id="outline-container-org0679fdb" class="outline-4">
1359
-<h4 id="org0679fdb">About ZRTP</h4>
1360
-<div class="outline-text-4" id="text-org0679fdb">
1358
+<div id="outline-container-orgbd8d559" class="outline-4">
1359
+<h4 id="orgbd8d559">About ZRTP</h4>
1360
+<div class="outline-text-4" id="text-orgbd8d559">
1361 1361
 <p>
1362 1362
 <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.
1363 1363
 </p>
1364 1364
 </div>
1365 1365
 </div>
1366
-<div id="outline-container-orgd17a001" class="outline-4">
1367
-<h4 id="orgd17a001">Using with CSIPSimple</h4>
1368
-<div class="outline-text-4" id="text-orgd17a001">
1366
+<div id="outline-container-org21f143b" class="outline-4">
1367
+<h4 id="org21f143b">Using with CSIPSimple</h4>
1368
+<div class="outline-text-4" id="text-org21f143b">
1369 1369
 <p>
1370 1370
 Add an account. Under <b>General Wizards</b> choose <b>Expert</b> and enter the following details:
1371 1371
 </p>
@@ -1421,9 +1421,9 @@ If everything is working the account should appear in green with a status of <b>
1421 1421
 </p>
1422 1422
 </div>
1423 1423
 </div>
1424
-<div id="outline-container-orgc99d741" class="outline-4">
1425
-<h4 id="orgc99d741">Using with Ring</h4>
1426
-<div class="outline-text-4" id="text-orgc99d741">
1424
+<div id="outline-container-orga98192f" class="outline-4">
1425
+<h4 id="orga98192f">Using with Ring</h4>
1426
+<div class="outline-text-4" id="text-orga98192f">
1427 1427
 <p>
1428 1428
 From the menu select <b>Manage accounts</b>.
1429 1429
 </p>
@@ -1476,9 +1476,9 @@ Select the <b>Security</b> tab. Under <b>SRTP Key Exchange</b> select <b>ZRTP</b
1476 1476
 </div>
1477 1477
 </div>
1478 1478
 
1479
-<div id="outline-container-org4a5ea72" class="outline-2">
1480
-<h2 id="org4a5ea72">RSS Reader</h2>
1481
-<div class="outline-text-2" id="text-org4a5ea72">
1479
+<div id="outline-container-org116ac81" class="outline-2">
1480
+<h2 id="org116ac81">RSS Reader</h2>
1481
+<div class="outline-text-2" id="text-org116ac81">
1482 1482
 <p>
1483 1483
 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.
1484 1484
 </p>
@@ -1490,9 +1490,9 @@ The way that RSS reading is set up on Freedombone gives you strong reading priva
1490 1490
 </div>
1491 1491
 </div>
1492 1492
 
1493
-<div id="outline-container-org122179e" class="outline-3">
1494
-<h3 id="org122179e">Finding the onion address</h3>
1495
-<div class="outline-text-3" id="text-org122179e">
1493
+<div id="outline-container-org2ead4a3" class="outline-3">
1494
+<h3 id="org2ead4a3">Finding the onion address</h3>
1495
+<div class="outline-text-3" id="text-org2ead4a3">
1496 1496
 <p>
1497 1497
 See the control panel for the RSS reader onion address.
1498 1498
 </p>
@@ -1516,9 +1516,9 @@ To set up the system open <a href="http://rss_reader_onion_address">http://rss_r
1516 1516
 </div>
1517 1517
 </div>
1518 1518
 
1519
-<div id="outline-container-org38a7478" class="outline-3">
1520
-<h3 id="org38a7478">On mobile</h3>
1521
-<div class="outline-text-3" id="text-org38a7478">
1519
+<div id="outline-container-orgb75fe22" class="outline-3">
1520
+<h3 id="orgb75fe22">On mobile</h3>
1521
+<div class="outline-text-3" id="text-orgb75fe22">
1522 1522
 <p>
1523 1523
 To access the RSS reader from a mobile device you can install a Tor compatible browser such as OrFox. It will try to automatically change to the mobile version of the user interface. Remember to add the site to the NoScript whitelist, and you may also need to turn HTTPS Everywhere off.
1524 1524
 </p>
@@ -1530,9 +1530,9 @@ A note for the paranoid is that on mobile devices you get redirected to a differ
1530 1530
 </blockquote>
1531 1531
 </div>
1532 1532
 </div>
1533
-<div id="outline-container-org5114281" class="outline-3">
1534
-<h3 id="org5114281">With Emacs</h3>
1535
-<div class="outline-text-3" id="text-org5114281">
1533
+<div id="outline-container-orgd03a92e" class="outline-3">
1534
+<h3 id="orgd03a92e">With Emacs</h3>
1535
+<div class="outline-text-3" id="text-orgd03a92e">
1536 1536
 <p>
1537 1537
 If you are an Emacs user then you can also read your RSS feeds via the <a href="https://github.com/dk87/avandu">Avandu</a> mode.
1538 1538
 </p>
@@ -1571,9 +1571,9 @@ And ensure that the Tor daemon is installed:
1571 1571
 </div>
1572 1572
 </div>
1573 1573
 </div>
1574
-<div id="outline-container-orgbb5307a" class="outline-2">
1575
-<h2 id="orgbb5307a">Git Projects</h2>
1576
-<div class="outline-text-2" id="text-orgbb5307a">
1574
+<div id="outline-container-org23360bf" class="outline-2">
1575
+<h2 id="org23360bf">Git Projects</h2>
1576
+<div class="outline-text-2" id="text-org23360bf">
1577 1577
 <p>
1578 1578
 Github is ok, but it's proprietary and funded by venture capital. If you been around on the internet for long enough then you know how this story eventually works itself out - i.e. badly for the users. It's really only a question of time. If you're a software developer or do things which involve the Git version control system then it's a good idea to become accustomed to hosting your own repositories, before the inevitable Github shitstorm happens.
1579 1579
 </p>
@@ -1609,9 +1609,9 @@ This will stop any spam accounts being created by random strangers or bots. You
1609 1609
 </p>
1610 1610
 </div>
1611 1611
 </div>
1612
-<div id="outline-container-orgd2f4665" class="outline-2">
1613
-<h2 id="orgd2f4665">Adding or removing users</h2>
1614
-<div class="outline-text-2" id="text-orgd2f4665">
1612
+<div id="outline-container-org0b0ea7b" class="outline-2">
1613
+<h2 id="org0b0ea7b">Adding or removing users</h2>
1614
+<div class="outline-text-2" id="text-org0b0ea7b">
1615 1615
 <p>
1616 1616
 Log into the system with:
1617 1617
 </p>
@@ -1636,16 +1636,12 @@ control
1636 1636
 <p><img src="images/controlpanel/control_panel_manage_users.jpg" alt="control_panel_manage_users.jpg" />
1637 1637
 </p>
1638 1638
 </div>
1639
-
1640
-<center>
1641
-Return to the <a href="index.html">home page</a>
1642
-</center>
1643 1639
 </div>
1644 1640
 </div>
1645 1641
 
1646
-<div id="outline-container-orgde4f72d" class="outline-2">
1647
-<h2 id="orgde4f72d">Blocking Ads</h2>
1648
-<div class="outline-text-2" id="text-orgde4f72d">
1642
+<div id="outline-container-orgce954f0" class="outline-2">
1643
+<h2 id="orgce954f0">Blocking Ads</h2>
1644
+<div class="outline-text-2" id="text-orgce954f0">
1649 1645
 <p>
1650 1646
 Everyone except for advertisers hates adverts. Not only are they annoying, but they can consume a lot of bandwidth, be a privacy problem in terms of allowing companies to track your browsing habits and also any badly written scripts they contain may introduce exploitable security holes.
1651 1647
 </p>
@@ -1655,9 +1651,9 @@ You can block ads for any devices connected to your local network by installing
1655 1651
 </p>
1656 1652
 </div>
1657 1653
 
1658
-<div id="outline-container-org6b74510" class="outline-3">
1659
-<h3 id="org6b74510">Set a static IP address</h3>
1660
-<div class="outline-text-3" id="text-org6b74510">
1654
+<div id="outline-container-orge7951ff" class="outline-3">
1655
+<h3 id="orge7951ff">Set a static IP address</h3>
1656
+<div class="outline-text-3" id="text-orge7951ff">
1661 1657
 <p>
1662 1658
 Once you've done that then ensure that your system has a static local IP address (typically 192.168..) using the option on the control panel. You will also need to know the IP address of your internet router, which is usually <b>192.168.1.1</b> or <b>192.168.1.254</b>.
1663 1659
 </p>
@@ -1668,9 +1664,9 @@ When that's done select <b>About this system</b> from the control panel and see
1668 1664
 </div>
1669 1665
 </div>
1670 1666
 
1671
-<div id="outline-container-orgfb0c651" class="outline-3">
1672
-<h3 id="orgfb0c651">On each client system within your local network</h3>
1673
-<div class="outline-text-3" id="text-orgfb0c651">
1667
+<div id="outline-container-orgbd46825" class="outline-3">
1668
+<h3 id="orgbd46825">On each client system within your local network</h3>
1669
+<div class="outline-text-3" id="text-orgbd46825">
1674 1670
 <div class="org-src-container">
1675 1671
 <pre class="src src-bash">sudo chattr -i /etc/resolv.conf
1676 1672
 sudo nano /etc/resolv.conf
@@ -1697,9 +1693,9 @@ Normally <i>resolv.conf</i> will be overwritten every time your reboot, but you
1697 1693
 </div>
1698 1694
 </div>
1699 1695
 
1700
-<div id="outline-container-org484cdbe" class="outline-3">
1701
-<h3 id="org484cdbe">On your internet router</h3>
1702
-<div class="outline-text-3" id="text-org484cdbe">
1696
+<div id="outline-container-orge0d2e3c" class="outline-3">
1697
+<h3 id="orge0d2e3c">On your internet router</h3>
1698
+<div class="outline-text-3" id="text-orge0d2e3c">
1703 1699
 <p>
1704 1700
 If you can access the settings on your local internet router then this is the simplest way to provide ad blocking for all devices which connect to it.
1705 1701
 </p>
@@ -1710,12 +1706,18 @@ Edit the DNS settings and add the IPv4 address which you got from the control pa
1710 1706
 </div>
1711 1707
 </div>
1712 1708
 
1713
-<div id="outline-container-org3417cb5" class="outline-3">
1714
-<h3 id="org3417cb5">Configuring block lists</h3>
1715
-<div class="outline-text-3" id="text-org3417cb5">
1709
+<div id="outline-container-org55e37a9" class="outline-3">
1710
+<h3 id="org55e37a9">Configuring block lists</h3>
1711
+<div class="outline-text-3" id="text-org55e37a9">
1716 1712
 <p>
1717 1713
 You can configure the block lists which the system uses by going to the <b>administrator control panel</b>, selecting <b>App Settings</b> then choosing <b>pihole</b>. You can also add any extra domain names to the whitelist if they're being wrongly blocked or to the blacklist if they're not blocked by the current lists.
1718 1714
 </p>
1715
+
1716
+
1717
+
1718
+<center>
1719
+Return to the <a href="index.html">home page</a>
1720
+</center>
1719 1721
 </div>
1720 1722
 </div>
1721 1723
 </div>