Ver código fonte

Update website

Bob Mottram 9 anos atrás
pai
commit
451a133077
1 arquivos alterados com 286 adições e 85 exclusões
  1. 286
    85
      website/EN/usage.html

+ 286
- 85
website/EN/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
-<!-- 2015-09-08 Tue 19:29 -->
7
+<!-- 2015-09-29 Tue 15:14 -->
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" />
@@ -660,17 +660,206 @@ Make sure that "<b>show only subscribed folders</b>" is not checked.  Then click
660 660
 </div>
661 661
 </div>
662 662
 
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">
663
+<div id="outline-container-orgheadline26" class="outline-3">
664
+<h3 id="orgheadline26">K9 Android client</h3>
665
+<div class="outline-text-3" id="text-orgheadline26">
666
+</div><div id="outline-container-orgheadline19" class="outline-4">
667
+<h4 id="orgheadline19">A point about GPG on Android</h4>
668
+<div class="outline-text-4" id="text-orgheadline19">
666 669
 <p>
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.
670
+Before trying to set up email on Android you may want to consider whether you really need to do this. Android (and its variants) is not a particularly secure operating system and whether or not you wish to store GPG keys on it depends on your threat model and in what situations you'll be using your device.
668 671
 </p>
669
-</div>
670 672
 
673
+<p>
674
+If you are going to use email on an Android device then ensure that you have full encryption enabled via the security settings, so that if you subsequently lose it, or if it gets stolen, the chances of encryption keys being exposed are minimised.
675
+</p>
676
+</div>
677
+</div>
671 678
 <div id="outline-container-orgheadline20" class="outline-4">
672
-<h4 id="orgheadline20">Incoming server settings</h4>
679
+<h4 id="orgheadline20">Compiling the development version</h4>
673 680
 <div class="outline-text-4" id="text-orgheadline20">
681
+<p>
682
+To get K9 working with Freedombone you'll need to install development versions of OpenKeychain and K9. At the time of writing the versions available in F-Droid do not support PGP/MIME or the "hidden recipient" feature of GPG. It is hoped that at some stage the patches will be integrated into the mainline or functionally equivalent changes made. Admittedly, this is not at all user friendly, but currently it's the only way to read Freedombone email on Android systems.
683
+</p>
684
+
685
+<p>
686
+Build script for OpenKeychain:
687
+</p>
688
+
689
+<div class="org-src-container">
690
+
691
+<pre class="src src-bash"><span class="org-comment-delimiter">#</span><span class="org-comment">!/bin/</span><span class="org-keyword">bash</span>
692
+
693
+<span class="org-comment-delimiter"># </span><span class="org-comment">This script is intended to be used on Debian systems for building</span>
694
+<span class="org-comment-delimiter"># </span><span class="org-comment">the project. It has been tested with Debian 8</span>
695
+
696
+<span class="org-variable-name">USERNAME</span>=$<span class="org-variable-name">USER</span>
697
+<span class="org-variable-name">SIGNING_NAME</span>=<span class="org-string">'openkeychain'</span>
698
+<span class="org-variable-name">SDK_VERSION</span>=<span class="org-string">'r23.3.4'</span>
699
+<span class="org-variable-name">SDK_DIR</span>=$<span class="org-variable-name">HOME</span>/android-sdk
700
+
701
+<span class="org-builtin">cd</span> ..
702
+
703
+<span class="org-variable-name">PROJECT_HOME</span>=$(<span class="org-sh-quoted-exec">pwd</span>)
704
+
705
+sudo apt-get install build-essential default-jdk <span class="org-sh-escaped-newline">\</span>
706
+     lib32stdc++6 lib32z1 lib32z1-dev
707
+
708
+<span class="org-keyword">if</span> [ <span class="org-negation-char">!</span> -d $<span class="org-variable-name">SDK_DIR</span> ]; <span class="org-keyword">then</span>
709
+    mkdir -p $<span class="org-variable-name">SDK_DIR</span>
710
+<span class="org-keyword">fi</span>
711
+<span class="org-builtin">cd</span> $<span class="org-variable-name">SDK_DIR</span>
712
+
713
+<span class="org-comment-delimiter"># </span><span class="org-comment">download the SDK</span>
714
+<span class="org-keyword">if</span> [[ <span class="org-negation-char">!</span> -f $<span class="org-variable-name">SDK_DIR</span>/android-sdk_$<span class="org-variable-name">SDK_VERSION</span>-linux.tgz ]]; <span class="org-keyword">then</span>
715
+    wget https://dl.google.com/android/android-sdk_$<span class="org-variable-name">SDK_VERSION</span>-linux.tgz
716
+<span class="org-keyword">fi</span>
717
+tar -xzvf android-sdk_$<span class="org-variable-name">SDK_VERSION</span>-linux.tgz
718
+<span class="org-variable-name">SDK_DIR</span>=$<span class="org-variable-name">SDK_DIR</span>/android-sdk-linux
719
+
720
+<span class="org-builtin">echo</span> <span class="org-string">'Check that you have the SDK tools installed for Android 22, SDK 21.1.2'</span>
721
+
722
+<span class="org-builtin">export</span> <span class="org-variable-name">ANDROID_HOME</span>=$<span class="org-variable-name">SDK_DIR</span>
723
+<span class="org-builtin">echo</span> <span class="org-string">"sdk.dir=$SDK_DIR"</span> &gt; $<span class="org-variable-name">ANDROID_HOME</span>/local.properties
724
+<span class="org-builtin">export</span> <span class="org-variable-name">PATH</span>=${<span class="org-variable-name">PATH</span>}:$<span class="org-variable-name">ANDROID_HOME</span>/tools:$<span class="org-variable-name">ANDROID_HOME</span>/platform-tools
725
+
726
+<span class="org-builtin">cd</span> $<span class="org-variable-name">SDK_DIR</span>/tools
727
+./android sdk
728
+
729
+<span class="org-keyword">if</span> [ <span class="org-negation-char">!</span> -f $<span class="org-variable-name">SDK_DIR</span>/tools/android ]; <span class="org-keyword">then</span>
730
+    <span class="org-builtin">echo</span> <span class="org-string">"$SDK_DIR/tools/android not found"</span>
731
+    <span class="org-keyword">exit</span> -1
732
+<span class="org-keyword">fi</span>
733
+<span class="org-builtin">cd</span> $<span class="org-variable-name">SDK_DIR</span>
734
+chmod -R 0755 $<span class="org-variable-name">SDK_DIR</span>
735
+chmod a+rx $<span class="org-variable-name">SDK_DIR</span>/tools
736
+
737
+<span class="org-comment-delimiter"># </span><span class="org-comment">android sdk</span>
738
+<span class="org-builtin">cd</span> $<span class="org-variable-name">PROJECT_HOME</span>
739
+git submodule init &amp;&amp; git submodule update
740
+
741
+<span class="org-keyword">if</span> [ <span class="org-negation-char">!</span> -f $<span class="org-variable-name">SDK_DIR</span>/tools/templates/gradle/wrapper/gradlew ]; <span class="org-keyword">then</span>
742
+    <span class="org-builtin">echo</span> <span class="org-string">"$SDK_DIR/tools/templates/gradle/wrapper/gradlew not found"</span>
743
+    <span class="org-keyword">exit</span> -2
744
+<span class="org-keyword">fi</span>
745
+<span class="org-builtin">.</span> $<span class="org-variable-name">PROJECT_HOME</span>/gradlew assembleDebug
746
+
747
+<span class="org-comment-delimiter"># </span><span class="org-comment">cleaning up</span>
748
+<span class="org-builtin">cd</span> $<span class="org-variable-name">PROJECT_HOME</span>/OpenKeychain/build/outputs/apk
749
+<span class="org-keyword">if</span> [ <span class="org-negation-char">!</span> -f OpenKeychain-debug.apk ]; <span class="org-keyword">then</span>
750
+    <span class="org-builtin">echo</span> <span class="org-string">'OpenKeychain-debug.apk was not found'</span>
751
+    <span class="org-keyword">exit</span> -3
752
+<span class="org-keyword">fi</span>
753
+
754
+<span class="org-builtin">echo</span> <span class="org-string">'Build script ended successfully'</span>
755
+<span class="org-builtin">echo</span> -n <span class="org-string">'apk is available at: '</span>
756
+<span class="org-builtin">echo</span> <span class="org-string">"$PROJECT_HOME/OpenKeychain/build/outputs/apk/OpenKeychain-debug.apk"</span>
757
+<span class="org-keyword">exit</span> 0
758
+</pre>
759
+</div>
760
+
761
+<p>
762
+Build script for K9:
763
+</p>
764
+
765
+<div class="org-src-container">
766
+
767
+<pre class="src src-bash"><span class="org-comment-delimiter">#</span><span class="org-comment">!/bin/</span><span class="org-keyword">bash</span>
768
+
769
+<span class="org-comment-delimiter"># </span><span class="org-comment">This script is intended to be used on Debian systems for building</span>
770
+<span class="org-comment-delimiter"># </span><span class="org-comment">the project. It has been tested with Debian 8</span>
771
+
772
+<span class="org-variable-name">USERNAME</span>=$<span class="org-variable-name">USER</span>
773
+<span class="org-variable-name">SIGNING_NAME</span>=<span class="org-string">'k-9'</span>
774
+<span class="org-variable-name">SDK_VERSION</span>=<span class="org-string">'r24.3.3'</span>
775
+<span class="org-variable-name">SDK_DIR</span>=$<span class="org-variable-name">HOME</span>/android-sdk
776
+
777
+<span class="org-builtin">cd</span> ..
778
+
779
+<span class="org-variable-name">PROJECT_HOME</span>=$(<span class="org-sh-quoted-exec">pwd</span>)
780
+
781
+sudo apt-get install build-essential default-jdk <span class="org-sh-escaped-newline">\</span>
782
+     lib32stdc++6 lib32z1 lib32z1-dev
783
+
784
+<span class="org-keyword">if</span> [ <span class="org-negation-char">!</span> -d $<span class="org-variable-name">SDK_DIR</span> ]; <span class="org-keyword">then</span>
785
+    mkdir -p $<span class="org-variable-name">SDK_DIR</span>
786
+<span class="org-keyword">fi</span>
787
+<span class="org-builtin">cd</span> $<span class="org-variable-name">SDK_DIR</span>
788
+
789
+<span class="org-comment-delimiter"># </span><span class="org-comment">download the SDK</span>
790
+<span class="org-keyword">if</span> [ <span class="org-negation-char">!</span> -f $<span class="org-variable-name">SDK_DIR</span>/android-sdk_$<span class="org-variable-name">SDK_VERSION</span>-linux.tgz ]; <span class="org-keyword">then</span>
791
+    wget https://dl.google.com/android/android-sdk_$<span class="org-variable-name">SDK_VERSION</span>-linux.tgz
792
+    tar -xzvf android-sdk_$<span class="org-variable-name">SDK_VERSION</span>-linux.tgz
793
+<span class="org-keyword">fi</span>
794
+<span class="org-variable-name">SDK_DIR</span>=$<span class="org-variable-name">SDK_DIR</span>/android-sdk-linux
795
+
796
+<span class="org-builtin">echo</span> <span class="org-string">'Check that you have the SDK tools installed for Android 17, SDK 19.1'</span>
797
+<span class="org-keyword">if</span> [ <span class="org-negation-char">!</span> -f $<span class="org-variable-name">SDK_DIR</span>/tools/android ]; <span class="org-keyword">then</span>
798
+    <span class="org-builtin">echo</span> <span class="org-string">"$SDK_DIR/tools/android not found"</span>
799
+    <span class="org-keyword">exit</span> -1
800
+<span class="org-keyword">fi</span>
801
+<span class="org-builtin">cd</span> $<span class="org-variable-name">SDK_DIR</span>
802
+chmod -R 0755 $<span class="org-variable-name">SDK_DIR</span>
803
+chmod a+rx $<span class="org-variable-name">SDK_DIR</span>/tools
804
+
805
+<span class="org-variable-name">ANDROID_HOME</span>=$<span class="org-variable-name">SDK_DIR</span>
806
+<span class="org-builtin">echo</span> <span class="org-string">"sdk.dir=$SDK_DIR"</span> &gt; $<span class="org-variable-name">ANDROID_HOME</span>/local.properties
807
+<span class="org-variable-name">PATH</span>=${<span class="org-variable-name">PATH</span>}:$<span class="org-variable-name">ANDROID_HOME</span>/tools:$<span class="org-variable-name">ANDROID_HOME</span>/platform-tools
808
+
809
+android sdk
810
+<span class="org-builtin">cd</span> $<span class="org-variable-name">PROJECT_HOME</span>
811
+
812
+<span class="org-keyword">if</span> [ <span class="org-negation-char">!</span> -f $<span class="org-variable-name">SDK_DIR</span>/tools/templates/gradle/wrapper/gradlew ]; <span class="org-keyword">then</span>
813
+    <span class="org-builtin">echo</span> <span class="org-string">"$SDK_DIR/tools/templates/gradle/wrapper/gradlew not found"</span>
814
+    <span class="org-keyword">exit</span> -2
815
+<span class="org-keyword">fi</span>
816
+<span class="org-builtin">.</span> $<span class="org-variable-name">PROJECT_HOME</span>/gradlew assembleDebug
817
+
818
+<span class="org-comment-delimiter"># </span><span class="org-comment">cleaning up</span>
819
+<span class="org-builtin">cd</span> $<span class="org-variable-name">PROJECT_HOME</span>/k9mail/build/outputs/apk
820
+<span class="org-keyword">if</span> [ <span class="org-negation-char">!</span> -f k9mail-debug.apk ]; <span class="org-keyword">then</span>
821
+    <span class="org-builtin">echo</span> <span class="org-string">'k9mail-debug.apk was not found'</span>
822
+    <span class="org-keyword">exit</span> -3
823
+<span class="org-keyword">fi</span>
824
+<span class="org-builtin">echo</span> <span class="org-string">'Build script ended successfully'</span>
825
+<span class="org-builtin">echo</span> -n <span class="org-string">'apk is available at: '</span>
826
+<span class="org-builtin">echo</span> <span class="org-string">"$PROJECT_HOME/k9mail/build/outputs/apk/k9mail-debug.apk"</span>
827
+<span class="org-keyword">exit</span> 0
828
+</pre>
829
+</div>
830
+</div>
831
+</div>
832
+
833
+<div id="outline-container-orgheadline21" class="outline-4">
834
+<h4 id="orgheadline21">Import your GPG key into OpenKeychain</h4>
835
+<div class="outline-text-4" id="text-orgheadline21">
836
+<p>
837
+With your device connected to a laptop via USB cable and with USB debugging enabled on it:
838
+</p>
839
+
840
+<div class="org-src-container">
841
+
842
+<pre class="src src-bash">ssh username@domainname -p 2222
843
+gpg --list-keys username@domainname
844
+gpg --output ~/public_key.gpg --armor --export KEY_ID
845
+gpg --output ~/private_key.gpg --armor --export-secret-key KEY_ID
846
+cat ~/public_key.gpg ~/private_key.gpg &gt; ~/mygpgkey.asc
847
+<span class="org-keyword">exit</span>
848
+scp -P 2222 username@domainname:/home/username/mygpgkey.asc ~/
849
+sudo apt-get install android-tools-adb
850
+push ~/mygpgkey.asc /sdcard/
851
+shred -zu ~/mygpgkey.asc
852
+</pre>
853
+</div>
854
+
855
+<p>
856
+Then on your device select OpenKeychain and import your key from file.
857
+</p>
858
+</div>
859
+</div>
860
+<div id="outline-container-orgheadline22" class="outline-4">
861
+<h4 id="orgheadline22">Incoming server settings</h4>
862
+<div class="outline-text-4" id="text-orgheadline22">
674 863
 <ul class="org-ul">
675 864
 <li>Select settings/account settings</li>
676 865
 <li>Select Fetching mail/incoming server</li>
@@ -682,9 +871,9 @@ Make sure that "<b>show only subscribed folders</b>" is not checked.  Then click
682 871
 </ul>
683 872
 </div>
684 873
 </div>
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">
874
+<div id="outline-container-orgheadline23" class="outline-4">
875
+<h4 id="orgheadline23">Outgoing (SMTP) server settings</h4>
876
+<div class="outline-text-4" id="text-orgheadline23">
688 877
 <ul class="org-ul">
689 878
 <li>Select settings/account settings</li>
690 879
 <li>Select Sending mail/outgoing server</li>
@@ -697,9 +886,21 @@ Make sure that "<b>show only subscribed folders</b>" is not checked.  Then click
697 886
 </ul>
698 887
 </div>
699 888
 </div>
700
-<div id="outline-container-orgheadline22" class="outline-4">
701
-<h4 id="orgheadline22">Folders</h4>
702
-<div class="outline-text-4" id="text-orgheadline22">
889
+<div id="outline-container-orgheadline24" class="outline-4">
890
+<h4 id="orgheadline24">Crypto settings</h4>
891
+<div class="outline-text-4" id="text-orgheadline24">
892
+<p>
893
+Select <b>settings</b>, <b>Account settings</b>, <b>OpenKeychain</b> and then select your key and press <b>Allow</b>. You should now be able to decrypt emails by entering your GPG passphrase.
894
+</p>
895
+
896
+<p>
897
+You may also want to change the amount of time for which passwords are remembered, so that you don't need to enter your passphrase very often.
898
+</p>
899
+</div>
900
+</div>
901
+<div id="outline-container-orgheadline25" class="outline-4">
902
+<h4 id="orgheadline25">Folders</h4>
903
+<div class="outline-text-4" id="text-orgheadline25">
703 904
 <p>
704 905
 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>.
705 906
 </p>
@@ -711,9 +912,9 @@ If your folder still doesn't show up then press the <b>menu button</b>, select <
711 912
 </div>
712 913
 </div>
713 914
 
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">
915
+<div id="outline-container-orgheadline27" class="outline-3">
916
+<h3 id="orgheadline27">Subscribing to mailing lists</h3>
917
+<div class="outline-text-3" id="text-orgheadline27">
717 918
 <p>
718 919
 To subscribe to a mailing list log in as your user (i.e. not the root user).
719 920
 </p>
@@ -731,9 +932,9 @@ The subject tag should be the word or phrase which appears within the brackets i
731 932
 </p>
732 933
 </div>
733 934
 </div>
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">
935
+<div id="outline-container-orgheadline28" class="outline-3">
936
+<h3 id="orgheadline28">Adding email addresses to a group/folder</h3>
937
+<div class="outline-text-3" id="text-orgheadline28">
737 938
 <p>
738 939
 Similar to adding mailing list folders you can also add specified email addresses into a group/folder.
739 940
 </p>
@@ -752,9 +953,9 @@ The group name should be something short so that it is readable within the left
752 953
 </div>
753 954
 </div>
754 955
 
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">
956
+<div id="outline-container-orgheadline29" class="outline-3">
957
+<h3 id="orgheadline29">Ignoring incoming emails</h3>
958
+<div class="outline-text-3" id="text-orgheadline29">
758 959
 <p>
759 960
 It is possible to ignore incoming emails if they are from a particular email address or if the subject line contains particular text.
760 961
 </p>
@@ -810,9 +1011,9 @@ Tip: When using the Mutt email client if you want to send an email in cleartext
810 1011
 <div id="outline-container-orgheadline4" class="outline-2">
811 1012
 <h2 id="orgheadline4">Syncing to the Cloud</h2>
812 1013
 <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">
1014
+</div><div id="outline-container-orgheadline30" class="outline-3">
1015
+<h3 id="orgheadline30">Initial install</h3>
1016
+<div class="outline-text-3" id="text-orgheadline30">
816 1017
 <p>
817 1018
 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.
818 1019
 </p>
@@ -856,9 +1057,9 @@ Log out from the administrator account and then log back in as the user you just
856 1057
 </p>
857 1058
 </div>
858 1059
 </div>
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">
1060
+<div id="outline-container-orgheadline31" class="outline-3">
1061
+<h3 id="orgheadline31">On Android</h3>
1062
+<div class="outline-text-3" id="text-orgheadline31">
862 1063
 <p>
863 1064
 Within F-droid search for <b>owncloud</b> and install the client. Also install <b>CalDAV Sync Adapter</b>.
864 1065
 </p>
@@ -882,9 +1083,9 @@ You will also be prompted to enter login details. Your Android and Owncloud cale
882 1083
 </p>
883 1084
 </div>
884 1085
 </div>
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">
1086
+<div id="outline-container-orgheadline32" class="outline-3">
1087
+<h3 id="orgheadline32">On Linux</h3>
1088
+<div class="outline-text-3" id="text-orgheadline32">
888 1089
 <p>
889 1090
 Open your software center and search for "owncloud client". Enter your owncloud domain name (with the https prefix) and login details.
890 1091
 </p>
@@ -898,9 +1099,9 @@ You can now drag files into the <b>~/owncloud</b> directory and they will automa
898 1099
 <div id="outline-container-orgheadline5" class="outline-2">
899 1100
 <h2 id="orgheadline5">Play Music</h2>
900 1101
 <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">
1102
+</div><div id="outline-container-orgheadline33" class="outline-3">
1103
+<h3 id="orgheadline33">With the DLNA service</h3>
1104
+<div class="outline-text-3" id="text-orgheadline33">
904 1105
 <p>
905 1106
 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.
906 1107
 </p>
@@ -940,9 +1141,9 @@ The DLNA service will only work within your local home network, and isn't remote
940 1141
 </div>
941 1142
 </div>
942 1143
 
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">
1144
+<div id="outline-container-orgheadline34" class="outline-3">
1145
+<h3 id="orgheadline34">With Owncloud</h3>
1146
+<div class="outline-text-3" id="text-orgheadline34">
946 1147
 <p>
947 1148
 The main advantage of playing music via Owncloud is that you can do that from anywhere - not only within your home network.
948 1149
 </p>
@@ -957,9 +1158,9 @@ By default a music player is installed into Owncloud, so all you need to do is t
957 1158
 <div id="outline-container-orgheadline6" class="outline-2">
958 1159
 <h2 id="orgheadline6">Microblogging</h2>
959 1160
 <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">
1161
+</div><div id="outline-container-orgheadline35" class="outline-3">
1162
+<h3 id="orgheadline35">Initial configuration</h3>
1163
+<div class="outline-text-3" id="text-orgheadline35">
963 1164
 <p>
964 1165
 To set up your microblog go to:
965 1166
 </p>
@@ -1070,9 +1271,9 @@ When the install is complete you will see a lot of warnings but just ignore thos
1070 1271
 <div id="outline-container-orgheadline7" class="outline-2">
1071 1272
 <h2 id="orgheadline7">Social Network</h2>
1072 1273
 <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">
1274
+</div><div id="outline-container-orgheadline36" class="outline-3">
1275
+<h3 id="orgheadline36">Certificates</h3>
1276
+<div class="outline-text-3" id="text-orgheadline36">
1076 1277
 <p>
1077 1278
 You will need to have a non self-signed SSL certificate in order to use Hubzilla. Put the public certificate in <b>/etc/ssl/certs/yourhubzilladomainname.crt</b> and the private certificate in <b>/etc/ssl/private/yourhubzilladomainname.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:
1078 1279
 </p>
@@ -1089,9 +1290,9 @@ Then change ssl_certificate to <b>/etc/ssl/certs/yourhubzilladomainname.bundle.c
1089 1290
 </p>
1090 1291
 </div>
1091 1292
 </div>
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">
1293
+<div id="outline-container-orgheadline37" class="outline-3">
1294
+<h3 id="orgheadline37">Initial install</h3>
1295
+<div class="outline-text-3" id="text-orgheadline37">
1095 1296
 <p>
1096 1297
 Visit the URL of your Hubzilla 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.
1097 1298
 </p>
@@ -1105,16 +1306,16 @@ When installation is complete you can register a new user.
1105 1306
 <div id="outline-container-orgheadline8" class="outline-2">
1106 1307
 <h2 id="orgheadline8">Chat Services</h2>
1107 1308
 <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">
1309
+</div><div id="outline-container-orgheadline38" class="outline-3">
1310
+<h3 id="orgheadline38">IRC</h3>
1311
+<div class="outline-text-3" id="text-orgheadline38">
1111 1312
 <p>
1112 1313
 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.
1113 1314
 </p>
1114 1315
 </div>
1115
-<div id="outline-container-orgheadline35" class="outline-4">
1116
-<h4 id="orgheadline35">Irssi</h4>
1117
-<div class="outline-text-4" id="text-orgheadline35">
1316
+<div id="outline-container-orgheadline39" class="outline-4">
1317
+<h4 id="orgheadline39">Irssi</h4>
1318
+<div class="outline-text-4" id="text-orgheadline39">
1118 1319
 <p>
1119 1320
 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.
1120 1321
 </p>
@@ -1128,9 +1329,9 @@ If you are using the <a href="http://www.irssi.org/">irssi</a> IRC client then y
1128 1329
 </div>
1129 1330
 </div>
1130 1331
 </div>
1131
-<div id="outline-container-orgheadline36" class="outline-4">
1132
-<h4 id="orgheadline36">XChat</h4>
1133
-<div class="outline-text-4" id="text-orgheadline36">
1332
+<div id="outline-container-orgheadline40" class="outline-4">
1333
+<h4 id="orgheadline40">XChat</h4>
1334
+<div class="outline-text-4" id="text-orgheadline40">
1134 1335
 <p>
1135 1336
 If you are using the XChat client:
1136 1337
 </p>
@@ -1166,12 +1367,12 @@ Click <b>close</b> and then <b>connect</b>.
1166 1367
 </div>
1167 1368
 </div>
1168 1369
 
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">
1370
+<div id="outline-container-orgheadline45" class="outline-3">
1371
+<h3 id="orgheadline45">XMPP/Jabber</h3>
1372
+<div class="outline-text-3" id="text-orgheadline45">
1373
+</div><div id="outline-container-orgheadline41" class="outline-4">
1374
+<h4 id="orgheadline41">Managing users</h4>
1375
+<div class="outline-text-4" id="text-orgheadline41">
1175 1376
 <p>
1176 1377
 To add a user:
1177 1378
 </p>
@@ -1230,9 +1431,9 @@ prosodyctl status
1230 1431
 </div>
1231 1432
 </div>
1232 1433
 
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">
1434
+<div id="outline-container-orgheadline42" class="outline-4">
1435
+<h4 id="orgheadline42">Using with Jitsi</h4>
1436
+<div class="outline-text-4" id="text-orgheadline42">
1236 1437
 <p>
1237 1438
 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.
1238 1439
 </p>
@@ -1262,9 +1463,9 @@ You can also <a href="https://www.youtube.com/watch?v=vgx7VSrDGjk">see this vide
1262 1463
 </p>
1263 1464
 </div>
1264 1465
 </div>
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">
1466
+<div id="outline-container-orgheadline43" class="outline-4">
1467
+<h4 id="orgheadline43">Using with Ubuntu</h4>
1468
+<div class="outline-text-4" id="text-orgheadline43">
1268 1469
 <p>
1269 1470
 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.
1270 1471
 </p>
@@ -1282,9 +1483,9 @@ Click on <b>Advanced</b> and make sure that <b>Encryption required</b> and <b>Ig
1282 1483
 </p>
1283 1484
 </div>
1284 1485
 </div>
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">
1486
+<div id="outline-container-orgheadline44" class="outline-4">
1487
+<h4 id="orgheadline44">Using with Android</h4>
1488
+<div class="outline-text-4" id="text-orgheadline44">
1288 1489
 <p>
1289 1490
 Install <a href="https://f-droid.org/">F-Droid</a>
1290 1491
 </p>
@@ -1311,16 +1512,16 @@ Go back to the initial screen and then using the menu you can add contacts and b
1311 1512
 </div>
1312 1513
 </div>
1313 1514
 </div>
1314
-<div id="outline-container-orgheadline42" class="outline-3">
1315
-<h3 id="orgheadline42">Tox</h3>
1316
-<div class="outline-text-3" id="text-orgheadline42">
1515
+<div id="outline-container-orgheadline46" class="outline-3">
1516
+<h3 id="orgheadline46">Tox</h3>
1517
+<div class="outline-text-3" id="text-orgheadline46">
1317 1518
 <p>
1318 1519
 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 1520
 </p>
1320 1521
 </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">
1522
+<div id="outline-container-orgheadline47" class="outline-4">
1523
+<h4 id="orgheadline47">Using the Toxic client</h4>
1524
+<div class="outline-text-4" id="text-orgheadline47">
1324 1525
 <p>
1325 1526
 To connect to your node use the command:
1326 1527
 </p>
@@ -1333,12 +1534,12 @@ To connect to your node use the command:
1333 1534
 </div>
1334 1535
 </div>
1335 1536
 </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">
1537
+<div id="outline-container-orgheadline50" class="outline-3">
1538
+<h3 id="orgheadline50">VoIP (Voice chat)</h3>
1539
+<div class="outline-text-3" id="text-orgheadline50">
1540
+</div><div id="outline-container-orgheadline48" class="outline-4">
1541
+<h4 id="orgheadline48">Using with Ubuntu</h4>
1542
+<div class="outline-text-4" id="text-orgheadline48">
1342 1543
 <p>
1343 1544
 Within the software center search for "mumble" and install the client then run it. Skip through the audio setup wizard.
1344 1545
 </p>
@@ -1352,9 +1553,9 @@ Click on "add new" to add a new server and enter the default domain name for the
1352 1553
 </p>
1353 1554
 </div>
1354 1555
 </div>
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">
1556
+<div id="outline-container-orgheadline49" class="outline-4">
1557
+<h4 id="orgheadline49">Using with Android</h4>
1558
+<div class="outline-text-4" id="text-orgheadline49">
1358 1559
 <p>
1359 1560
 Install <a href="https://f-droid.org/">F-Droid</a>
1360 1561
 </p>