Ver código fonte

Probably no need to rant about Windows

Bob Mottram 10 anos atrás
pai
commit
5a7a10133e
2 arquivos alterados com 124 adições e 133 exclusões
  1. 0
    2
      usage.org
  2. 124
    131
      website/usage.html

+ 0
- 2
usage.org Ver arquivo

@@ -21,8 +21,6 @@ emacs ~/README
21 21
 You should transfer any passwords to a password manager such as [[http://www.keepassx.org/][KeepassX]] and then delete them from the README file. To save the file after removing passwords use *CTRL-x CTRL-s*.
22 22
 
23 23
 To exit you can either just close the terminal or use *CTRL-x CTRL-c* followed by the *exit* command.
24
-* Operating Systems
25
-Since many of the systems on the Freedombone are web based your choice of operating system for laptops or desktop machines doesn't matter all that much, but some version of GNU/Linux or on mobile devices Android/Cyanogenmod is recommended. Microsoft Windows may be fine for playing games and other trivia but *do not use it for any serious private communications or data storage purpose*. If you are a journalist, political activist, systems administrator or other professional with a need for confidentiality then using Microsoft Windows will put yourself and your sources, colleages or other group members at heightened risk of surveillance.
26 24
 * Using Email
27 25
 ** A technical note about email transport security
28 26
 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 possible attacks against STARTTLS 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.

+ 124
- 131
website/usage.html Ver arquivo

@@ -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
-<!-- 2014-10-27 Mon 22:29 -->
7
+<!-- 2014-10-27 Mon 22:45 -->
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" />
@@ -184,14 +184,14 @@ for the JavaScript code in this tag.
184 184
 <tr>
185 185
 <td class="left"><a href="index.html">Home</a></td>
186 186
 <td class="left"><a href="#unnumbered-1">Readme</a></td>
187
-<td class="left"><a href="#unnumbered-2">Operating Systems</a></td>
188
-<td class="left"><a href="#unnumbered-3">Using Email</a></td>
189
-<td class="left"><a href="#unnumbered-19">Mailing List</a></td>
190
-<td class="left"><a href="#unnumbered-20">Syncing to the Cloud</a></td>
191
-<td class="left"><a href="#unnumbered-24">Play Music</a></td>
192
-<td class="left"><a href="#unnumbered-27">Microblogging</a></td>
193
-<td class="left"><a href="#unnumbered-29">Social Network</a></td>
194
-<td class="left"><a href="#unnumbered-32">Chat Services</a></td>
187
+<td class="left"><i>Operating Systems</i></td>
188
+<td class="left"><a href="#unnumbered-2">Using Email</a></td>
189
+<td class="left"><a href="#unnumbered-18">Mailing List</a></td>
190
+<td class="left"><a href="#unnumbered-19">Syncing to the Cloud</a></td>
191
+<td class="left"><a href="#unnumbered-23">Play Music</a></td>
192
+<td class="left"><a href="#unnumbered-26">Microblogging</a></td>
193
+<td class="left"><a href="#unnumbered-28">Social Network</a></td>
194
+<td class="left"><a href="#unnumbered-31">Chat Services</a></td>
195 195
 </tr>
196 196
 </tbody>
197 197
 </table>
@@ -220,27 +220,19 @@ To exit you can either just close the terminal or use <b>CTRL-x CTRL-c</b> follo
220 220
 </div>
221 221
 </div>
222 222
 <div id="outline-container-unnumbered-2" class="outline-2">
223
-<h2 id="unnumbered-2">Operating Systems</h2>
223
+<h2 id="unnumbered-2">Using Email</h2>
224 224
 <div class="outline-text-2" id="text-unnumbered-2">
225
-<p>
226
-Since many of the systems on the Freedombone are web based your choice of operating system for laptops or desktop machines doesn't matter all that much, but some version of GNU/Linux or on mobile devices Android/Cyanogenmod is recommended. Microsoft Windows may be fine for playing games and other trivia but <b>do not use it for any serious private communications or data storage purpose</b>. If you are a journalist, political activist, systems administrator or other professional with a need for confidentiality then using Microsoft Windows will put yourself and your sources, colleages or other group members at heightened risk of surveillance.
227
-</p>
228
-</div>
229
-</div>
230
-<div id="outline-container-unnumbered-3" class="outline-2">
231
-<h2 id="unnumbered-3">Using Email</h2>
232
-<div class="outline-text-2" id="text-unnumbered-3">
233
-</div><div id="outline-container-unnumbered-4" class="outline-3">
234
-<h3 id="unnumbered-4">A technical note about email transport security</h3>
235
-<div class="outline-text-3" id="text-unnumbered-4">
225
+</div><div id="outline-container-unnumbered-3" class="outline-3">
226
+<h3 id="unnumbered-3">A technical note about email transport security</h3>
227
+<div class="outline-text-3" id="text-unnumbered-3">
236 228
 <p>
237 229
 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 possible attacks against STARTTLS 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.
238 230
 </p>
239 231
 </div>
240 232
 </div>
241
-<div id="outline-container-unnumbered-5" class="outline-3">
242
-<h3 id="unnumbered-5">Add a password to your GPG key</h3>
243
-<div class="outline-text-3" id="text-unnumbered-5">
233
+<div id="outline-container-unnumbered-4" class="outline-3">
234
+<h3 id="unnumbered-4">Add a password to your GPG key</h3>
235
+<div class="outline-text-3" id="text-unnumbered-4">
244 236
 <p>
245 237
 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.
246 238
 </p>
@@ -262,9 +254,9 @@ Having a password on your GPG key will prevent someone from reading your email <
262 254
 </div>
263 255
 </div>
264 256
 
265
-<div id="outline-container-unnumbered-6" class="outline-3">
266
-<h3 id="unnumbered-6">Publishing your GPG public key</h3>
267
-<div class="outline-text-3" id="text-unnumbered-6">
257
+<div id="outline-container-unnumbered-5" class="outline-3">
258
+<h3 id="unnumbered-5">Publishing your GPG public key</h3>
259
+<div class="outline-text-3" id="text-unnumbered-5">
268 260
 <p>
269 261
 If you havn't already then you should publish your GPG public key so that others can find it.
270 262
 </p>
@@ -278,9 +270,9 @@ gpg --send-keys username@domainname
278 270
 </div>
279 271
 </div>
280 272
 </div>
281
-<div id="outline-container-unnumbered-7" class="outline-3">
282
-<h3 id="unnumbered-7">Mutt email client</h3>
283
-<div class="outline-text-3" id="text-unnumbered-7">
273
+<div id="outline-container-unnumbered-6" class="outline-3">
274
+<h3 id="unnumbered-6">Mutt email client</h3>
275
+<div class="outline-text-3" id="text-unnumbered-6">
284 276
 <p>
285 277
 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:
286 278
 </p>
@@ -423,9 +415,9 @@ When reading emails you will initially need to enter your GPG password. It will
423 415
 </div>
424 416
 </div>
425 417
 
426
-<div id="outline-container-unnumbered-8" class="outline-3">
427
-<h3 id="unnumbered-8">Thunderbird</h3>
428
-<div class="outline-text-3" id="text-unnumbered-8">
418
+<div id="outline-container-unnumbered-7" class="outline-3">
419
+<h3 id="unnumbered-7">Thunderbird</h3>
420
+<div class="outline-text-3" id="text-unnumbered-7">
429 421
 <p>
430 422
 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.
431 423
 </p>
@@ -435,9 +427,9 @@ The following instructions should be carried out on the client machines (laptop,
435 427
 </p>
436 428
 </div>
437 429
 
438
-<div id="outline-container-unnumbered-9" class="outline-4">
439
-<h4 id="unnumbered-9">Initial setup</h4>
440
-<div class="outline-text-4" id="text-unnumbered-9">
430
+<div id="outline-container-unnumbered-8" class="outline-4">
431
+<h4 id="unnumbered-8">Initial setup</h4>
432
+<div class="outline-text-4" id="text-unnumbered-8">
441 433
 <p>
442 434
 Install <b>Thunderbird</b> and <b>Enigmail</b>.  How you do this just depends upon your distro and software manager or "app store".
443 435
 </p>
@@ -496,17 +488,18 @@ Select "<b>yes</b>" to change default settings.
496 488
 </p>
497 489
 </div>
498 490
 </div>
499
-
500
-<div id="outline-container-unnumbered-10" class="outline-4">
501
-<h4 id="unnumbered-10">Import your GPG keys</h4>
502
-<div class="outline-text-4" id="text-unnumbered-10">
491
+<div id="outline-container-unnumbered-9" class="outline-4">
492
+<h4 id="unnumbered-9">Import your GPG keys</h4>
493
+<div class="outline-text-4" id="text-unnumbered-9">
503 494
 <p>
504 495
 On the Freedombone export your GPG public and private keys.
505 496
 </p>
506 497
 
507 498
 <div class="org-src-container">
508 499
 
509
-<pre class="src src-bash">gpg --output ~/public_key.gpg --armor --export KEY_ID
500
+<pre class="src src-bash">ssh username@domainname -p 2222
501
+gpg --list-keys username@domainname
502
+gpg --output ~/public_key.gpg --armor --export KEY_ID
510 503
 gpg --output ~/private_key.gpg --armor --export-secret-key KEY_ID
511 504
 </pre>
512 505
 </div>
@@ -546,9 +539,9 @@ shred -zu ~/private_key.gpg
546 539
 </div>
547 540
 </div>
548 541
 
549
-<div id="outline-container-unnumbered-11" class="outline-4">
550
-<h4 id="unnumbered-11">Using for the first time</h4>
551
-<div class="outline-text-4" id="text-unnumbered-11">
542
+<div id="outline-container-unnumbered-10" class="outline-4">
543
+<h4 id="unnumbered-10">Using for the first time</h4>
544
+<div class="outline-text-4" id="text-unnumbered-10">
552 545
 <p>
553 546
 Click on the Thunderbird menu, which looks like three horizontal bars on the right hand side.
554 547
 </p>
@@ -583,9 +576,9 @@ Get into the habit of using email encryption and encourage others to do so.  Rem
583 576
 </div>
584 577
 </div>
585 578
 
586
-<div id="outline-container-unnumbered-12" class="outline-4">
587
-<h4 id="unnumbered-12">Making folders visible</h4>
588
-<div class="outline-text-4" id="text-unnumbered-12">
579
+<div id="outline-container-unnumbered-11" class="outline-4">
580
+<h4 id="unnumbered-11">Making folders visible</h4>
581
+<div class="outline-text-4" id="text-unnumbered-11">
589 582
 <p>
590 583
 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:
591 584
 </p>
@@ -601,17 +594,17 @@ Make sure that "<b>show only subscribed folders</b>" is not checked.  Then click
601 594
 </div>
602 595
 </div>
603 596
 
604
-<div id="outline-container-unnumbered-13" class="outline-3">
605
-<h3 id="unnumbered-13">K9 Android client</h3>
606
-<div class="outline-text-3" id="text-unnumbered-13">
597
+<div id="outline-container-unnumbered-12" class="outline-3">
598
+<h3 id="unnumbered-12">K9 Android client</h3>
599
+<div class="outline-text-3" id="text-unnumbered-12">
607 600
 <p>
608 601
 <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.
609 602
 </p>
610 603
 </div>
611 604
 
612
-<div id="outline-container-unnumbered-14" class="outline-4">
613
-<h4 id="unnumbered-14">Incoming server settings</h4>
614
-<div class="outline-text-4" id="text-unnumbered-14">
605
+<div id="outline-container-unnumbered-13" class="outline-4">
606
+<h4 id="unnumbered-13">Incoming server settings</h4>
607
+<div class="outline-text-4" id="text-unnumbered-13">
615 608
 <ul class="org-ul">
616 609
 <li>Select settings/account settings
617 610
 </li>
@@ -630,9 +623,9 @@ Make sure that "<b>show only subscribed folders</b>" is not checked.  Then click
630 623
 </ul>
631 624
 </div>
632 625
 </div>
633
-<div id="outline-container-unnumbered-15" class="outline-4">
634
-<h4 id="unnumbered-15">Outgoing (SMTP) server settings</h4>
635
-<div class="outline-text-4" id="text-unnumbered-15">
626
+<div id="outline-container-unnumbered-14" class="outline-4">
627
+<h4 id="unnumbered-14">Outgoing (SMTP) server settings</h4>
628
+<div class="outline-text-4" id="text-unnumbered-14">
636 629
 <ul class="org-ul">
637 630
 <li>Select settings/account settings
638 631
 </li>
@@ -653,9 +646,9 @@ Make sure that "<b>show only subscribed folders</b>" is not checked.  Then click
653 646
 </ul>
654 647
 </div>
655 648
 </div>
656
-<div id="outline-container-unnumbered-16" class="outline-4">
657
-<h4 id="unnumbered-16">Folders</h4>
658
-<div class="outline-text-4" id="text-unnumbered-16">
649
+<div id="outline-container-unnumbered-15" class="outline-4">
650
+<h4 id="unnumbered-15">Folders</h4>
651
+<div class="outline-text-4" id="text-unnumbered-15">
659 652
 <p>
660 653
 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>.
661 654
 </p>
@@ -667,9 +660,9 @@ If your folder still doesn't show up then press the <b>menu button</b>, select <
667 660
 </div>
668 661
 </div>
669 662
 
670
-<div id="outline-container-unnumbered-17" class="outline-3">
671
-<h3 id="unnumbered-17">Subscribing to mailing lists</h3>
672
-<div class="outline-text-3" id="text-unnumbered-17">
663
+<div id="outline-container-unnumbered-16" class="outline-3">
664
+<h3 id="unnumbered-16">Subscribing to mailing lists</h3>
665
+<div class="outline-text-3" id="text-unnumbered-16">
673 666
 <p>
674 667
 To subscribe to a mailing list so that it appears within Mutt or Thunderbird.
675 668
 </p>
@@ -687,9 +680,9 @@ The subject tag should be the word or phrase which appears within the brackets i
687 680
 </p>
688 681
 </div>
689 682
 </div>
690
-<div id="outline-container-unnumbered-18" class="outline-3">
691
-<h3 id="unnumbered-18">Adding email addresses to a group/folder</h3>
692
-<div class="outline-text-3" id="text-unnumbered-18">
683
+<div id="outline-container-unnumbered-17" class="outline-3">
684
+<h3 id="unnumbered-17">Adding email addresses to a group/folder</h3>
685
+<div class="outline-text-3" id="text-unnumbered-17">
693 686
 <p>
694 687
 Similar to adding mailing list folders you can also add specified email addresses into a folder.
695 688
 </p>
@@ -709,9 +702,9 @@ The mailing list name should be something short so that it is readable within th
709 702
 </div>
710 703
 </div>
711 704
 
712
-<div id="outline-container-unnumbered-19" class="outline-2">
713
-<h2 id="unnumbered-19">Mailing List</h2>
714
-<div class="outline-text-2" id="text-unnumbered-19">
705
+<div id="outline-container-unnumbered-18" class="outline-2">
706
+<h2 id="unnumbered-18">Mailing List</h2>
707
+<div class="outline-text-2" id="text-unnumbered-18">
715 708
 <p>
716 709
 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.
717 710
 </p>
@@ -731,12 +724,12 @@ Tip: When using the Mutt email client if you want to send an email in cleartext
731 724
 </p>
732 725
 </div>
733 726
 </div>
734
-<div id="outline-container-unnumbered-20" class="outline-2">
735
-<h2 id="unnumbered-20">Syncing to the Cloud</h2>
736
-<div class="outline-text-2" id="text-unnumbered-20">
737
-</div><div id="outline-container-unnumbered-21" class="outline-3">
738
-<h3 id="unnumbered-21">Initial install</h3>
739
-<div class="outline-text-3" id="text-unnumbered-21">
727
+<div id="outline-container-unnumbered-19" class="outline-2">
728
+<h2 id="unnumbered-19">Syncing to the Cloud</h2>
729
+<div class="outline-text-2" id="text-unnumbered-19">
730
+</div><div id="outline-container-unnumbered-20" class="outline-3">
731
+<h3 id="unnumbered-20">Initial install</h3>
732
+<div class="outline-text-3" id="text-unnumbered-20">
740 733
 <p>
741 734
 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.
742 735
 </p>
@@ -780,9 +773,9 @@ Log out from the administrator account and then log back in as the user you just
780 773
 </p>
781 774
 </div>
782 775
 </div>
783
-<div id="outline-container-unnumbered-22" class="outline-3">
784
-<h3 id="unnumbered-22">On Android</h3>
785
-<div class="outline-text-3" id="text-unnumbered-22">
776
+<div id="outline-container-unnumbered-21" class="outline-3">
777
+<h3 id="unnumbered-21">On Android</h3>
778
+<div class="outline-text-3" id="text-unnumbered-21">
786 779
 <p>
787 780
 Within F-droid search for <b>owncloud</b> and install the client. Also install <b>CalDAV Sync Adapter</b>.
788 781
 </p>
@@ -806,9 +799,9 @@ You will also be prompted to enter login details. Your Android and Owncloud cale
806 799
 </p>
807 800
 </div>
808 801
 </div>
809
-<div id="outline-container-unnumbered-23" class="outline-3">
810
-<h3 id="unnumbered-23">On Linux</h3>
811
-<div class="outline-text-3" id="text-unnumbered-23">
802
+<div id="outline-container-unnumbered-22" class="outline-3">
803
+<h3 id="unnumbered-22">On Linux</h3>
804
+<div class="outline-text-3" id="text-unnumbered-22">
812 805
 <p>
813 806
 Open your software center and search for "owncloud client". Enter your owncloud domain name (with the https prefix) and login details.
814 807
 </p>
@@ -819,12 +812,12 @@ You can now drag files into the <b>~/owncloud</b> directory and they will automa
819 812
 </div>
820 813
 </div>
821 814
 </div>
822
-<div id="outline-container-unnumbered-24" class="outline-2">
823
-<h2 id="unnumbered-24">Play Music</h2>
824
-<div class="outline-text-2" id="text-unnumbered-24">
825
-</div><div id="outline-container-unnumbered-25" class="outline-3">
826
-<h3 id="unnumbered-25">With the DLNA service</h3>
827
-<div class="outline-text-3" id="text-unnumbered-25">
815
+<div id="outline-container-unnumbered-23" class="outline-2">
816
+<h2 id="unnumbered-23">Play Music</h2>
817
+<div class="outline-text-2" id="text-unnumbered-23">
818
+</div><div id="outline-container-unnumbered-24" class="outline-3">
819
+<h3 id="unnumbered-24">With the DLNA service</h3>
820
+<div class="outline-text-3" id="text-unnumbered-24">
828 821
 <p>
829 822
 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.
830 823
 </p>
@@ -864,9 +857,9 @@ The DLNA service will only work within your local home network, and isn't remote
864 857
 </div>
865 858
 </div>
866 859
 
867
-<div id="outline-container-unnumbered-26" class="outline-3">
868
-<h3 id="unnumbered-26">With Owncloud</h3>
869
-<div class="outline-text-3" id="text-unnumbered-26">
860
+<div id="outline-container-unnumbered-25" class="outline-3">
861
+<h3 id="unnumbered-25">With Owncloud</h3>
862
+<div class="outline-text-3" id="text-unnumbered-25">
870 863
 <p>
871 864
 The main advantage of playing music via Owncloud is that you can do that from anywhere - not only within your home network.
872 865
 </p>
@@ -878,12 +871,12 @@ By default a music player is installed into Owncloud, so all you need to do is t
878 871
 </div>
879 872
 </div>
880 873
 
881
-<div id="outline-container-unnumbered-27" class="outline-2">
882
-<h2 id="unnumbered-27">Microblogging</h2>
883
-<div class="outline-text-2" id="text-unnumbered-27">
884
-</div><div id="outline-container-unnumbered-28" class="outline-3">
885
-<h3 id="unnumbered-28">Initial configuration</h3>
886
-<div class="outline-text-3" id="text-unnumbered-28">
874
+<div id="outline-container-unnumbered-26" class="outline-2">
875
+<h2 id="unnumbered-26">Microblogging</h2>
876
+<div class="outline-text-2" id="text-unnumbered-26">
877
+</div><div id="outline-container-unnumbered-27" class="outline-3">
878
+<h3 id="unnumbered-27">Initial configuration</h3>
879
+<div class="outline-text-3" id="text-unnumbered-27">
887 880
 <p>
888 881
 To set up your microblog go to:
889 882
 </p>
@@ -991,12 +984,12 @@ When the install is complete you will see a lot of warnings but just ignore thos
991 984
 </div>
992 985
 </div>
993 986
 </div>
994
-<div id="outline-container-unnumbered-29" class="outline-2">
995
-<h2 id="unnumbered-29">Social Network</h2>
996
-<div class="outline-text-2" id="text-unnumbered-29">
997
-</div><div id="outline-container-unnumbered-30" class="outline-3">
998
-<h3 id="unnumbered-30">Certificates</h3>
999
-<div class="outline-text-3" id="text-unnumbered-30">
987
+<div id="outline-container-unnumbered-28" class="outline-2">
988
+<h2 id="unnumbered-28">Social Network</h2>
989
+<div class="outline-text-2" id="text-unnumbered-28">
990
+</div><div id="outline-container-unnumbered-29" class="outline-3">
991
+<h3 id="unnumbered-29">Certificates</h3>
992
+<div class="outline-text-3" id="text-unnumbered-29">
1000 993
 <p>
1001 994
 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:
1002 995
 </p>
@@ -1013,9 +1006,9 @@ Then change ssl_certificate to <b>/etc/ssl/certs/yourredmatrixdomainname.bundle.
1013 1006
 </p>
1014 1007
 </div>
1015 1008
 </div>
1016
-<div id="outline-container-unnumbered-31" class="outline-3">
1017
-<h3 id="unnumbered-31">Initial install</h3>
1018
-<div class="outline-text-3" id="text-unnumbered-31">
1009
+<div id="outline-container-unnumbered-30" class="outline-3">
1010
+<h3 id="unnumbered-30">Initial install</h3>
1011
+<div class="outline-text-3" id="text-unnumbered-30">
1019 1012
 <p>
1020 1013
 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.
1021 1014
 </p>
@@ -1026,19 +1019,19 @@ When installation is complete you can register a new user.
1026 1019
 </div>
1027 1020
 </div>
1028 1021
 </div>
1029
-<div id="outline-container-unnumbered-32" class="outline-2">
1030
-<h2 id="unnumbered-32">Chat Services</h2>
1031
-<div class="outline-text-2" id="text-unnumbered-32">
1032
-</div><div id="outline-container-unnumbered-33" class="outline-3">
1033
-<h3 id="unnumbered-33">IRC</h3>
1034
-<div class="outline-text-3" id="text-unnumbered-33">
1022
+<div id="outline-container-unnumbered-31" class="outline-2">
1023
+<h2 id="unnumbered-31">Chat Services</h2>
1024
+<div class="outline-text-2" id="text-unnumbered-31">
1025
+</div><div id="outline-container-unnumbered-32" class="outline-3">
1026
+<h3 id="unnumbered-32">IRC</h3>
1027
+<div class="outline-text-3" id="text-unnumbered-32">
1035 1028
 <p>
1036 1029
 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.
1037 1030
 </p>
1038 1031
 </div>
1039
-<div id="outline-container-unnumbered-34" class="outline-4">
1040
-<h4 id="unnumbered-34">Irssi</h4>
1041
-<div class="outline-text-4" id="text-unnumbered-34">
1032
+<div id="outline-container-unnumbered-33" class="outline-4">
1033
+<h4 id="unnumbered-33">Irssi</h4>
1034
+<div class="outline-text-4" id="text-unnumbered-33">
1042 1035
 <p>
1043 1036
 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.
1044 1037
 </p>
@@ -1052,9 +1045,9 @@ If you are using the <a href="http://www.irssi.org/">irssi</a> IRC client then y
1052 1045
 </div>
1053 1046
 </div>
1054 1047
 </div>
1055
-<div id="outline-container-unnumbered-35" class="outline-4">
1056
-<h4 id="unnumbered-35">XChat</h4>
1057
-<div class="outline-text-4" id="text-unnumbered-35">
1048
+<div id="outline-container-unnumbered-34" class="outline-4">
1049
+<h4 id="unnumbered-34">XChat</h4>
1050
+<div class="outline-text-4" id="text-unnumbered-34">
1058 1051
 <p>
1059 1052
 If you are using the XChat client:
1060 1053
 </p>
@@ -1090,12 +1083,12 @@ Click <b>close</b> and then <b>connect</b>.
1090 1083
 </div>
1091 1084
 </div>
1092 1085
 
1093
-<div id="outline-container-unnumbered-36" class="outline-3">
1094
-<h3 id="unnumbered-36">XMPP/Jabber</h3>
1095
-<div class="outline-text-3" id="text-unnumbered-36">
1096
-</div><div id="outline-container-unnumbered-37" class="outline-4">
1097
-<h4 id="unnumbered-37">Managing users</h4>
1098
-<div class="outline-text-4" id="text-unnumbered-37">
1086
+<div id="outline-container-unnumbered-35" class="outline-3">
1087
+<h3 id="unnumbered-35">XMPP/Jabber</h3>
1088
+<div class="outline-text-3" id="text-unnumbered-35">
1089
+</div><div id="outline-container-unnumbered-36" class="outline-4">
1090
+<h4 id="unnumbered-36">Managing users</h4>
1091
+<div class="outline-text-4" id="text-unnumbered-36">
1099 1092
 <p>
1100 1093
 To add a user:
1101 1094
 </p>
@@ -1154,9 +1147,9 @@ prosodyctl status
1154 1147
 </div>
1155 1148
 </div>
1156 1149
 
1157
-<div id="outline-container-unnumbered-38" class="outline-4">
1158
-<h4 id="unnumbered-38">Using with Jitsi</h4>
1159
-<div class="outline-text-4" id="text-unnumbered-38">
1150
+<div id="outline-container-unnumbered-37" class="outline-4">
1151
+<h4 id="unnumbered-37">Using with Jitsi</h4>
1152
+<div class="outline-text-4" id="text-unnumbered-37">
1160 1153
 <p>
1161 1154
 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.
1162 1155
 </p>
@@ -1186,9 +1179,9 @@ You can also <a href="https://www.youtube.com/watch?v=vgx7VSrDGjk">see this vide
1186 1179
 </p>
1187 1180
 </div>
1188 1181
 </div>
1189
-<div id="outline-container-unnumbered-39" class="outline-4">
1190
-<h4 id="unnumbered-39">Using with Ubuntu</h4>
1191
-<div class="outline-text-4" id="text-unnumbered-39">
1182
+<div id="outline-container-unnumbered-38" class="outline-4">
1183
+<h4 id="unnumbered-38">Using with Ubuntu</h4>
1184
+<div class="outline-text-4" id="text-unnumbered-38">
1192 1185
 <p>
1193 1186
 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.
1194 1187
 </p>
@@ -1206,9 +1199,9 @@ Click on <b>Advanced</b> and make sure that <b>Encryption required</b> and <b>Ig
1206 1199
 </p>
1207 1200
 </div>
1208 1201
 </div>
1209
-<div id="outline-container-unnumbered-40" class="outline-4">
1210
-<h4 id="unnumbered-40">Using with Android</h4>
1211
-<div class="outline-text-4" id="text-unnumbered-40">
1202
+<div id="outline-container-unnumbered-39" class="outline-4">
1203
+<h4 id="unnumbered-39">Using with Android</h4>
1204
+<div class="outline-text-4" id="text-unnumbered-39">
1212 1205
 <p>
1213 1206
 Install <a href="https://f-droid.org/">F-Droid</a>
1214 1207
 </p>