Просмотр исходного кода

Update usage documentation with new email commands

Bob Mottram 10 лет назад
Родитель
Сommit
6543c14bd0
2 измененных файлов: 162 добавлений и 129 удалений
  1. 23
    5
      doc/EN/usage.org
  2. 139
    124
      website/EN/usage.html

+ 23
- 5
doc/EN/usage.org Просмотреть файл

229
 If your folder still doesn't show up then press the *menu button*, select *show folders* and select *all folders*.
229
 If your folder still doesn't show up then press the *menu button*, select *show folders* and select *all folders*.
230
 
230
 
231
 ** Subscribing to mailing lists
231
 ** Subscribing to mailing lists
232
-To subscribe to a mailing list so that it appears within Mutt or Thunderbird.
232
+To subscribe to a mailing list log in as your user (i.e. not the root user).
233
 
233
 
234
 #+BEGIN_SRC bash
234
 #+BEGIN_SRC bash
235
 ssh username@domainname -p 2222
235
 ssh username@domainname -p 2222
236
-addmailinglist <username> <mailinglistname> <subjecttag>
236
+freedombone-addlist -l <mailing list name> -s <subject tag>
237
 exit
237
 exit
238
 #+END_SRC
238
 #+END_SRC
239
 
239
 
240
-The subject tag should be the word or phrase which appears within the brackets in the subject line of emails from the mailing list. The mailing list name should be something short so that it is readable within the left side column of the mutt email client.
240
+The subject tag should be the word or phrase which appears within the brackets in the subject line of emails from the mailing list. The mailing list name should be something short so that it is readable within the left side column of the mutt email client, and contain no spaces.
241
 ** Adding email addresses to a group/folder
241
 ** Adding email addresses to a group/folder
242
 Similar to adding mailing list folders you can also add specified email addresses into a folder.
242
 Similar to adding mailing list folders you can also add specified email addresses into a folder.
243
 
243
 
244
 #+BEGIN_SRC bash
244
 #+BEGIN_SRC bash
245
 ssh username@domainname -p 2222
245
 ssh username@domainname -p 2222
246
-addemailtofolder <username> <emailaddress> <mailinglistname>
246
+freedombone-addemail -e <email address> -l <mailing list name>
247
 exit
247
 exit
248
 #+END_SRC
248
 #+END_SRC
249
 
249
 
250
-The mailing list name should be something short so that it is readable within the left side column of the mutt email client.
250
+The mailing list name should be something short so that it is readable within the left side column of the mutt email client, and not contain any spaces.
251
 
251
 
252
+** Ignoring incoming emails
253
+It is possible to ignore incoming emails if they are from a particular email address or if the subject line contains particular text.
254
+
255
+#+BEGIN_SRC bash
256
+ssh username@domainname -p 2222
257
+freedombone-ignore -e baduser@baddomain
258
+exit
259
+#+END_SRC
260
+
261
+Or:
262
+
263
+#+BEGIN_SRC bash
264
+ssh username@domainname -p 2222
265
+freedombone-ignore -t "make $$$ now!"
266
+exit
267
+#+END_SRC
268
+
269
+You can also reverse this by using the *freedombone-unignore* command with the same options.
252
 * Mailing List
270
 * Mailing List
253
 If you want to set up a public mailing list then when installing the system remember to set the *PUBLIC_MAILING_LIST* variable within *freedombone.cfg* 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.
271
 If you want to set up a public mailing list then when installing the system remember to set the *PUBLIC_MAILING_LIST* variable within *freedombone.cfg* 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.
254
 
272
 

+ 139
- 124
website/EN/usage.html Просмотреть файл

4
 <html xmlns="http://www.w3.org/1999/xhtml" lang="en" xml:lang="en">
4
 <html xmlns="http://www.w3.org/1999/xhtml" lang="en" xml:lang="en">
5
 <head>
5
 <head>
6
 <title></title>
6
 <title></title>
7
-<!-- 2015-01-27 Tue 22:06 -->
7
+<!-- 2015-04-05 Sun 12:59 -->
8
 <meta  http-equiv="Content-Type" content="text/html;charset=utf-8" />
8
 <meta  http-equiv="Content-Type" content="text/html;charset=utf-8" />
9
 <meta  name="generator" content="Org-mode" />
9
 <meta  name="generator" content="Org-mode" />
10
 <meta  name="author" content="Bob Mottram" />
10
 <meta  name="author" content="Bob Mottram" />
15
  <!--/*--><![CDATA[/*><!--*/
15
  <!--/*--><![CDATA[/*><!--*/
16
   .title  { text-align: center; }
16
   .title  { text-align: center; }
17
   .todo   { font-family: monospace; color: red; }
17
   .todo   { font-family: monospace; color: red; }
18
-  .done   { color: green; }
18
+  .done   { font-family: monospace; color: green; }
19
+  .priority { font-family: monospace; color: orange; }
19
   .tag    { background-color: #eee; font-family: monospace;
20
   .tag    { background-color: #eee; font-family: monospace;
20
             padding: 2px; font-size: 80%; font-weight: normal; }
21
             padding: 2px; font-size: 80%; font-weight: normal; }
21
   .timestamp { color: #bebebe; }
22
   .timestamp { color: #bebebe; }
183
 <td class="left"><a href="index.html">Home</a></td>
184
 <td class="left"><a href="index.html">Home</a></td>
184
 <td class="left"><a href="#unnumbered-1">Readme</a></td>
185
 <td class="left"><a href="#unnumbered-1">Readme</a></td>
185
 <td class="left"><a href="#unnumbered-3">Using Email</a></td>
186
 <td class="left"><a href="#unnumbered-3">Using Email</a></td>
186
-<td class="left"><a href="#unnumbered-19">Mailing List</a></td>
187
-<td class="left"><a href="#unnumbered-20">Syncing to the Cloud</a></td>
188
-<td class="left"><a href="#unnumbered-24">Play Music</a></td>
189
-<td class="left"><a href="#unnumbered-27">Microblogging</a></td>
190
-<td class="left"><a href="#unnumbered-29">Social Network</a></td>
191
-<td class="left"><a href="#unnumbered-32">Chat Services</a></td>
187
+<td class="left"><a href="#unnumbered-20">Mailing List</a></td>
188
+<td class="left"><a href="#unnumbered-21">Syncing to the Cloud</a></td>
189
+<td class="left"><a href="#unnumbered-25">Play Music</a></td>
190
+<td class="left"><a href="#unnumbered-28">Microblogging</a></td>
191
+<td class="left"><a href="#unnumbered-30">Social Network</a></td>
192
+<td class="left"><a href="#unnumbered-33">Chat Services</a></td>
192
 </tr>
193
 </tr>
193
 </tbody>
194
 </tbody>
194
 </table>
195
 </table>
508
 </p>
509
 </p>
509
 
510
 
510
 <ul class="org-ul">
511
 <ul class="org-ul">
511
-<li>Incoming: IMAP, mydomainname.com, 993, SSL/TLS, Normal Password
512
-</li>
513
-<li>Outgoing: SMTP, mydomainname.com, 465, SSL/TLS, Normal Password
514
-</li>
515
-<li>Username: myusername
516
-</li>
512
+<li>Incoming: IMAP, mydomainname.com, 993, SSL/TLS, Normal Password</li>
513
+<li>Outgoing: SMTP, mydomainname.com, 465, SSL/TLS, Normal Password</li>
514
+<li>Username: myusername</li>
517
 </ul>
515
 </ul>
518
 
516
 
519
 <p>
517
 <p>
659
 <h4 id="unnumbered-14">Incoming server settings</h4>
657
 <h4 id="unnumbered-14">Incoming server settings</h4>
660
 <div class="outline-text-4" id="text-unnumbered-14">
658
 <div class="outline-text-4" id="text-unnumbered-14">
661
 <ul class="org-ul">
659
 <ul class="org-ul">
662
-<li>Select settings/account settings
663
-</li>
664
-<li>Select Fetching mail/incoming server
665
-</li>
666
-<li>Enter your username and password
667
-</li>
668
-<li>IMAP server should be your domain name
669
-</li>
670
-<li>Security: SSL/TLS (always)
671
-</li>
672
-<li>Authentication: Plain
673
-</li>
674
-<li>Port: 993
675
-</li>
660
+<li>Select settings/account settings</li>
661
+<li>Select Fetching mail/incoming server</li>
662
+<li>Enter your username and password</li>
663
+<li>IMAP server should be your domain name</li>
664
+<li>Security: SSL/TLS (always)</li>
665
+<li>Authentication: Plain</li>
666
+<li>Port: 993</li>
676
 </ul>
667
 </ul>
677
 </div>
668
 </div>
678
 </div>
669
 </div>
680
 <h4 id="unnumbered-15">Outgoing (SMTP) server settings</h4>
671
 <h4 id="unnumbered-15">Outgoing (SMTP) server settings</h4>
681
 <div class="outline-text-4" id="text-unnumbered-15">
672
 <div class="outline-text-4" id="text-unnumbered-15">
682
 <ul class="org-ul">
673
 <ul class="org-ul">
683
-<li>Select settings/account settings
684
-</li>
685
-<li>Select Sending mail/outgoing server
686
-</li>
687
-<li>Set SMTP server to your domain name
688
-</li>
689
-<li>Set Security to SSL/TLS (always)
690
-</li>
691
-<li>Set port to 465
692
-</li>
693
-<li>Set authentication to PLAIN
694
-</li>
695
-<li>Enter your username and password
696
-</li>
697
-<li>Accept the SSL certificate
698
-</li>
674
+<li>Select settings/account settings</li>
675
+<li>Select Sending mail/outgoing server</li>
676
+<li>Set SMTP server to your domain name</li>
677
+<li>Set Security to SSL/TLS (always)</li>
678
+<li>Set port to 465</li>
679
+<li>Set authentication to PLAIN</li>
680
+<li>Enter your username and password</li>
681
+<li>Accept the SSL certificate</li>
699
 </ul>
682
 </ul>
700
 </div>
683
 </div>
701
 </div>
684
 </div>
717
 <h3 id="unnumbered-17">Subscribing to mailing lists</h3>
700
 <h3 id="unnumbered-17">Subscribing to mailing lists</h3>
718
 <div class="outline-text-3" id="text-unnumbered-17">
701
 <div class="outline-text-3" id="text-unnumbered-17">
719
 <p>
702
 <p>
720
-To subscribe to a mailing list so that it appears within Mutt or Thunderbird.
703
+To subscribe to a mailing list log in as your user (i.e. not the root user).
721
 </p>
704
 </p>
722
 
705
 
723
 <div class="org-src-container">
706
 <div class="org-src-container">
724
 
707
 
725
 <pre class="src src-bash">ssh username@domainname -p 2222
708
 <pre class="src src-bash">ssh username@domainname -p 2222
726
-addmailinglist &lt;username&gt; &lt;mailinglistname&gt; &lt;subjecttag&gt;
709
+freedombone-addlist -l &lt;mailing list name&gt; -s &lt;subject tag&gt;
727
 <span class="org-keyword">exit</span>
710
 <span class="org-keyword">exit</span>
728
 </pre>
711
 </pre>
729
 </div>
712
 </div>
730
 
713
 
731
 <p>
714
 <p>
732
-The subject tag should be the word or phrase which appears within the brackets in the subject line of emails from the mailing list. The mailing list name should be something short so that it is readable within the left side column of the mutt email client.
715
+The subject tag should be the word or phrase which appears within the brackets in the subject line of emails from the mailing list. The mailing list name should be something short so that it is readable within the left side column of the mutt email client, and contain no spaces.
733
 </p>
716
 </p>
734
 </div>
717
 </div>
735
 </div>
718
 </div>
743
 <div class="org-src-container">
726
 <div class="org-src-container">
744
 
727
 
745
 <pre class="src src-bash">ssh username@domainname -p 2222
728
 <pre class="src src-bash">ssh username@domainname -p 2222
746
-addemailtofolder &lt;username&gt; &lt;emailaddress&gt; &lt;mailinglistname&gt;
729
+freedombone-addemail -e &lt;email address&gt; -l &lt;mailing list name&gt;
747
 <span class="org-keyword">exit</span>
730
 <span class="org-keyword">exit</span>
748
 </pre>
731
 </pre>
749
 </div>
732
 </div>
750
 
733
 
751
 <p>
734
 <p>
752
-The mailing list name should be something short so that it is readable within the left side column of the mutt email client.
735
+The mailing list name should be something short so that it is readable within the left side column of the mutt email client, and not contain any spaces.
753
 </p>
736
 </p>
754
 </div>
737
 </div>
755
 </div>
738
 </div>
739
+
740
+<div id="outline-container-unnumbered-19" class="outline-3">
741
+<h3 id="unnumbered-19">Ignoring incoming emails</h3>
742
+<div class="outline-text-3" id="text-unnumbered-19">
743
+<p>
744
+It is possible to ignore incoming emails if they are from a particular email address or if the subject line contains particular text.
745
+</p>
746
+
747
+<div class="org-src-container">
748
+
749
+<pre class="src src-bash">ssh username@domainname -p 2222
750
+freedombone-ignore -e baduser@baddomain
751
+<span class="org-keyword">exit</span>
752
+</pre>
756
 </div>
753
 </div>
757
 
754
 
758
-<div id="outline-container-unnumbered-19" class="outline-2">
759
-<h2 id="unnumbered-19">Mailing List</h2>
760
-<div class="outline-text-2" id="text-unnumbered-19">
755
+<p>
756
+Or:
757
+</p>
758
+
759
+<div class="org-src-container">
760
+
761
+<pre class="src src-bash">ssh username@domainname -p 2222
762
+freedombone-ignore -t <span class="org-string">"make $$$ now!"</span>
763
+<span class="org-keyword">exit</span>
764
+</pre>
765
+</div>
766
+
767
+<p>
768
+You can also reverse this by using the <b>freedombone-unignore</b> command with the same options.
769
+</p>
770
+</div>
771
+</div>
772
+</div>
773
+<div id="outline-container-unnumbered-20" class="outline-2">
774
+<h2 id="unnumbered-20">Mailing List</h2>
775
+<div class="outline-text-2" id="text-unnumbered-20">
761
 <p>
776
 <p>
762
 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.
777
 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.
763
 </p>
778
 </p>
777
 </p>
792
 </p>
778
 </div>
793
 </div>
779
 </div>
794
 </div>
780
-<div id="outline-container-unnumbered-20" class="outline-2">
781
-<h2 id="unnumbered-20">Syncing to the Cloud</h2>
782
-<div class="outline-text-2" id="text-unnumbered-20">
783
-</div><div id="outline-container-unnumbered-21" class="outline-3">
784
-<h3 id="unnumbered-21">Initial install</h3>
785
-<div class="outline-text-3" id="text-unnumbered-21">
795
+<div id="outline-container-unnumbered-21" class="outline-2">
796
+<h2 id="unnumbered-21">Syncing to the Cloud</h2>
797
+<div class="outline-text-2" id="text-unnumbered-21">
798
+</div><div id="outline-container-unnumbered-22" class="outline-3">
799
+<h3 id="unnumbered-22">Initial install</h3>
800
+<div class="outline-text-3" id="text-unnumbered-22">
786
 <p>
801
 <p>
787
 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.
802
 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.
788
 </p>
803
 </p>
826
 </p>
841
 </p>
827
 </div>
842
 </div>
828
 </div>
843
 </div>
829
-<div id="outline-container-unnumbered-22" class="outline-3">
830
-<h3 id="unnumbered-22">On Android</h3>
831
-<div class="outline-text-3" id="text-unnumbered-22">
844
+<div id="outline-container-unnumbered-23" class="outline-3">
845
+<h3 id="unnumbered-23">On Android</h3>
846
+<div class="outline-text-3" id="text-unnumbered-23">
832
 <p>
847
 <p>
833
 Within F-droid search for <b>owncloud</b> and install the client. Also install <b>CalDAV Sync Adapter</b>.
848
 Within F-droid search for <b>owncloud</b> and install the client. Also install <b>CalDAV Sync Adapter</b>.
834
 </p>
849
 </p>
852
 </p>
867
 </p>
853
 </div>
868
 </div>
854
 </div>
869
 </div>
855
-<div id="outline-container-unnumbered-23" class="outline-3">
856
-<h3 id="unnumbered-23">On Linux</h3>
857
-<div class="outline-text-3" id="text-unnumbered-23">
870
+<div id="outline-container-unnumbered-24" class="outline-3">
871
+<h3 id="unnumbered-24">On Linux</h3>
872
+<div class="outline-text-3" id="text-unnumbered-24">
858
 <p>
873
 <p>
859
 Open your software center and search for "owncloud client". Enter your owncloud domain name (with the https prefix) and login details.
874
 Open your software center and search for "owncloud client". Enter your owncloud domain name (with the https prefix) and login details.
860
 </p>
875
 </p>
865
 </div>
880
 </div>
866
 </div>
881
 </div>
867
 </div>
882
 </div>
868
-<div id="outline-container-unnumbered-24" class="outline-2">
869
-<h2 id="unnumbered-24">Play Music</h2>
870
-<div class="outline-text-2" id="text-unnumbered-24">
871
-</div><div id="outline-container-unnumbered-25" class="outline-3">
872
-<h3 id="unnumbered-25">With the DLNA service</h3>
873
-<div class="outline-text-3" id="text-unnumbered-25">
883
+<div id="outline-container-unnumbered-25" class="outline-2">
884
+<h2 id="unnumbered-25">Play Music</h2>
885
+<div class="outline-text-2" id="text-unnumbered-25">
886
+</div><div id="outline-container-unnumbered-26" class="outline-3">
887
+<h3 id="unnumbered-26">With the DLNA service</h3>
888
+<div class="outline-text-3" id="text-unnumbered-26">
874
 <p>
889
 <p>
875
 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.
890
 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.
876
 </p>
891
 </p>
910
 </div>
925
 </div>
911
 </div>
926
 </div>
912
 
927
 
913
-<div id="outline-container-unnumbered-26" class="outline-3">
914
-<h3 id="unnumbered-26">With Owncloud</h3>
915
-<div class="outline-text-3" id="text-unnumbered-26">
928
+<div id="outline-container-unnumbered-27" class="outline-3">
929
+<h3 id="unnumbered-27">With Owncloud</h3>
930
+<div class="outline-text-3" id="text-unnumbered-27">
916
 <p>
931
 <p>
917
 The main advantage of playing music via Owncloud is that you can do that from anywhere - not only within your home network.
932
 The main advantage of playing music via Owncloud is that you can do that from anywhere - not only within your home network.
918
 </p>
933
 </p>
924
 </div>
939
 </div>
925
 </div>
940
 </div>
926
 
941
 
927
-<div id="outline-container-unnumbered-27" class="outline-2">
928
-<h2 id="unnumbered-27">Microblogging</h2>
929
-<div class="outline-text-2" id="text-unnumbered-27">
930
-</div><div id="outline-container-unnumbered-28" class="outline-3">
931
-<h3 id="unnumbered-28">Initial configuration</h3>
932
-<div class="outline-text-3" id="text-unnumbered-28">
942
+<div id="outline-container-unnumbered-28" class="outline-2">
943
+<h2 id="unnumbered-28">Microblogging</h2>
944
+<div class="outline-text-2" id="text-unnumbered-28">
945
+</div><div id="outline-container-unnumbered-29" class="outline-3">
946
+<h3 id="unnumbered-29">Initial configuration</h3>
947
+<div class="outline-text-3" id="text-unnumbered-29">
933
 <p>
948
 <p>
934
 To set up your microblog go to:
949
 To set up your microblog go to:
935
 </p>
950
 </p>
1037
 </div>
1052
 </div>
1038
 </div>
1053
 </div>
1039
 </div>
1054
 </div>
1040
-<div id="outline-container-unnumbered-29" class="outline-2">
1041
-<h2 id="unnumbered-29">Social Network</h2>
1042
-<div class="outline-text-2" id="text-unnumbered-29">
1043
-</div><div id="outline-container-unnumbered-30" class="outline-3">
1044
-<h3 id="unnumbered-30">Certificates</h3>
1045
-<div class="outline-text-3" id="text-unnumbered-30">
1055
+<div id="outline-container-unnumbered-30" class="outline-2">
1056
+<h2 id="unnumbered-30">Social Network</h2>
1057
+<div class="outline-text-2" id="text-unnumbered-30">
1058
+</div><div id="outline-container-unnumbered-31" class="outline-3">
1059
+<h3 id="unnumbered-31">Certificates</h3>
1060
+<div class="outline-text-3" id="text-unnumbered-31">
1046
 <p>
1061
 <p>
1047
 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:
1062
 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:
1048
 </p>
1063
 </p>
1059
 </p>
1074
 </p>
1060
 </div>
1075
 </div>
1061
 </div>
1076
 </div>
1062
-<div id="outline-container-unnumbered-31" class="outline-3">
1063
-<h3 id="unnumbered-31">Initial install</h3>
1064
-<div class="outline-text-3" id="text-unnumbered-31">
1077
+<div id="outline-container-unnumbered-32" class="outline-3">
1078
+<h3 id="unnumbered-32">Initial install</h3>
1079
+<div class="outline-text-3" id="text-unnumbered-32">
1065
 <p>
1080
 <p>
1066
 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.
1081
 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.
1067
 </p>
1082
 </p>
1072
 </div>
1087
 </div>
1073
 </div>
1088
 </div>
1074
 </div>
1089
 </div>
1075
-<div id="outline-container-unnumbered-32" class="outline-2">
1076
-<h2 id="unnumbered-32">Chat Services</h2>
1077
-<div class="outline-text-2" id="text-unnumbered-32">
1078
-</div><div id="outline-container-unnumbered-33" class="outline-3">
1079
-<h3 id="unnumbered-33">IRC</h3>
1080
-<div class="outline-text-3" id="text-unnumbered-33">
1090
+<div id="outline-container-unnumbered-33" class="outline-2">
1091
+<h2 id="unnumbered-33">Chat Services</h2>
1092
+<div class="outline-text-2" id="text-unnumbered-33">
1093
+</div><div id="outline-container-unnumbered-34" class="outline-3">
1094
+<h3 id="unnumbered-34">IRC</h3>
1095
+<div class="outline-text-3" id="text-unnumbered-34">
1081
 <p>
1096
 <p>
1082
 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.
1097
 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.
1083
 </p>
1098
 </p>
1084
 </div>
1099
 </div>
1085
-<div id="outline-container-unnumbered-34" class="outline-4">
1086
-<h4 id="unnumbered-34">Irssi</h4>
1087
-<div class="outline-text-4" id="text-unnumbered-34">
1100
+<div id="outline-container-unnumbered-35" class="outline-4">
1101
+<h4 id="unnumbered-35">Irssi</h4>
1102
+<div class="outline-text-4" id="text-unnumbered-35">
1088
 <p>
1103
 <p>
1089
 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.
1104
 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.
1090
 </p>
1105
 </p>
1098
 </div>
1113
 </div>
1099
 </div>
1114
 </div>
1100
 </div>
1115
 </div>
1101
-<div id="outline-container-unnumbered-35" class="outline-4">
1102
-<h4 id="unnumbered-35">XChat</h4>
1103
-<div class="outline-text-4" id="text-unnumbered-35">
1116
+<div id="outline-container-unnumbered-36" class="outline-4">
1117
+<h4 id="unnumbered-36">XChat</h4>
1118
+<div class="outline-text-4" id="text-unnumbered-36">
1104
 <p>
1119
 <p>
1105
 If you are using the XChat client:
1120
 If you are using the XChat client:
1106
 </p>
1121
 </p>
1136
 </div>
1151
 </div>
1137
 </div>
1152
 </div>
1138
 
1153
 
1139
-<div id="outline-container-unnumbered-36" class="outline-3">
1140
-<h3 id="unnumbered-36">XMPP/Jabber</h3>
1141
-<div class="outline-text-3" id="text-unnumbered-36">
1142
-</div><div id="outline-container-unnumbered-37" class="outline-4">
1143
-<h4 id="unnumbered-37">Managing users</h4>
1144
-<div class="outline-text-4" id="text-unnumbered-37">
1154
+<div id="outline-container-unnumbered-37" class="outline-3">
1155
+<h3 id="unnumbered-37">XMPP/Jabber</h3>
1156
+<div class="outline-text-3" id="text-unnumbered-37">
1157
+</div><div id="outline-container-unnumbered-38" class="outline-4">
1158
+<h4 id="unnumbered-38">Managing users</h4>
1159
+<div class="outline-text-4" id="text-unnumbered-38">
1145
 <p>
1160
 <p>
1146
 To add a user:
1161
 To add a user:
1147
 </p>
1162
 </p>
1200
 </div>
1215
 </div>
1201
 </div>
1216
 </div>
1202
 
1217
 
1203
-<div id="outline-container-unnumbered-38" class="outline-4">
1204
-<h4 id="unnumbered-38">Using with Jitsi</h4>
1205
-<div class="outline-text-4" id="text-unnumbered-38">
1218
+<div id="outline-container-unnumbered-39" class="outline-4">
1219
+<h4 id="unnumbered-39">Using with Jitsi</h4>
1220
+<div class="outline-text-4" id="text-unnumbered-39">
1206
 <p>
1221
 <p>
1207
 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.
1222
 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.
1208
 </p>
1223
 </p>
1232
 </p>
1247
 </p>
1233
 </div>
1248
 </div>
1234
 </div>
1249
 </div>
1235
-<div id="outline-container-unnumbered-39" class="outline-4">
1236
-<h4 id="unnumbered-39">Using with Ubuntu</h4>
1237
-<div class="outline-text-4" id="text-unnumbered-39">
1250
+<div id="outline-container-unnumbered-40" class="outline-4">
1251
+<h4 id="unnumbered-40">Using with Ubuntu</h4>
1252
+<div class="outline-text-4" id="text-unnumbered-40">
1238
 <p>
1253
 <p>
1239
 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.
1254
 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.
1240
 </p>
1255
 </p>
1252
 </p>
1267
 </p>
1253
 </div>
1268
 </div>
1254
 </div>
1269
 </div>
1255
-<div id="outline-container-unnumbered-40" class="outline-4">
1256
-<h4 id="unnumbered-40">Using with Android</h4>
1257
-<div class="outline-text-4" id="text-unnumbered-40">
1270
+<div id="outline-container-unnumbered-41" class="outline-4">
1271
+<h4 id="unnumbered-41">Using with Android</h4>
1272
+<div class="outline-text-4" id="text-unnumbered-41">
1258
 <p>
1273
 <p>
1259
 Install <a href="https://f-droid.org/">F-Droid</a>
1274
 Install <a href="https://f-droid.org/">F-Droid</a>
1260
 </p>
1275
 </p>
1281
 </div>
1296
 </div>
1282
 </div>
1297
 </div>
1283
 </div>
1298
 </div>
1284
-<div id="outline-container-unnumbered-41" class="outline-3">
1285
-<h3 id="unnumbered-41">VoIP (Voice chat)</h3>
1286
-<div class="outline-text-3" id="text-unnumbered-41">
1287
-</div><div id="outline-container-unnumbered-42" class="outline-4">
1288
-<h4 id="unnumbered-42">Using with Ubuntu</h4>
1289
-<div class="outline-text-4" id="text-unnumbered-42">
1299
+<div id="outline-container-unnumbered-42" class="outline-3">
1300
+<h3 id="unnumbered-42">VoIP (Voice chat)</h3>
1301
+<div class="outline-text-3" id="text-unnumbered-42">
1302
+</div><div id="outline-container-unnumbered-43" class="outline-4">
1303
+<h4 id="unnumbered-43">Using with Ubuntu</h4>
1304
+<div class="outline-text-4" id="text-unnumbered-43">
1290
 <p>
1305
 <p>
1291
 Within the software center search for "mumble" and install the client then run it. Skip through the audio setup wizard.
1306
 Within the software center search for "mumble" and install the client then run it. Skip through the audio setup wizard.
1292
 </p>
1307
 </p>
1300
 </p>
1315
 </p>
1301
 </div>
1316
 </div>
1302
 </div>
1317
 </div>
1303
-<div id="outline-container-unnumbered-43" class="outline-4">
1304
-<h4 id="unnumbered-43">Using with Android</h4>
1305
-<div class="outline-text-4" id="text-unnumbered-43">
1318
+<div id="outline-container-unnumbered-44" class="outline-4">
1319
+<h4 id="unnumbered-44">Using with Android</h4>
1320
+<div class="outline-text-4" id="text-unnumbered-44">
1306
 <p>
1321
 <p>
1307
 Install <a href="https://f-droid.org/">F-Droid</a>
1322
 Install <a href="https://f-droid.org/">F-Droid</a>
1308
 </p>
1323
 </p>