free
/
freedombone
Bevaka 1
Stjärnmärk 0
Förgrening 0
Kod Ärenden 0 Pull-förfrågningar 0 Släpp 0 Wiki Activity
Bläddra i källkod

Update usage documentation with new email commands

Bob Mottram 10 år sedan
förälder
d62015c061
incheckning
6543c14bd0
2 ändrade filer med 162 tillägg och 129 borttagningar
Delad Vy Visa Diff Statistik
  1. 23
    5
      doc/EN/usage.org
  2. 139
    124
      website/EN/usage.html

+ 23
- 5
doc/EN/usage.org Visa fil 

@@ -229,26 +229,44 @@ To view any new folders which you may have created using the /mailinglistrule/ s
229 229 
 If your folder still doesn't show up then press the *menu button*, select *show folders* and select *all folders*.
230 230
231 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 234 
 #+BEGIN_SRC bash
235 235 
 ssh username@domainname -p 2222
236 
-addmailinglist <username> <mailinglistname> <subjecttag>
236 
+freedombone-addlist -l <mailing list name> -s <subject tag>
237 237 
 exit
238 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 241 
 ** Adding email addresses to a group/folder
242 242 
 Similar to adding mailing list folders you can also add specified email addresses into a folder.
243 243
244 244 
 #+BEGIN_SRC bash
245 245 
 ssh username@domainname -p 2222
246 
-addemailtofolder <username> <emailaddress> <mailinglistname>
246 
+freedombone-addemail -e <email address> -l <mailing list name>
247 247 
 exit
248 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 270 
 * Mailing List
253 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 Visa fil 

@@ -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-01-27 Tue 22:06 -->
7 
+<!-- 2015-04-05 Sun 12:59 -->
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" />
 
@@ -15,7 +15,8 @@
15 15 
  <!--/*--><![CDATA[/*><!--*/
16 16 
   .title  { text-align: center; }
17 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 20 
   .tag    { background-color: #eee; font-family: monospace;
20 21 
             padding: 2px; font-size: 80%; font-weight: normal; }
21 22 
   .timestamp { color: #bebebe; }
 
@@ -183,12 +184,12 @@ for the JavaScript code in this tag.
183 184 
 <td class="left"><a href="index.html">Home</a></td>
184 185 
 <td class="left"><a href="#unnumbered-1">Readme</a></td>
185 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 193 
 </tr>
193 194 
 </tbody>
194 195 
 </table>
 
@@ -508,12 +509,9 @@ The settings should be as follows, substituting <i>mydomainname.com</i> for your
508 509 
 </p>
509 510
510 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 515 
 </ul>
518 516
519 517 
 <p>
 
@@ -659,20 +657,13 @@ Make sure that "<b>show only subscribed folders</b>" is not checked.  Then click
659 657 
 <h4 id="unnumbered-14">Incoming server settings</h4>
660 658 
 <div class="outline-text-4" id="text-unnumbered-14">
661 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 667 
 </ul>
677 668 
 </div>
678 669 
 </div>
 
@@ -680,22 +671,14 @@ Make sure that "<b>show only subscribed folders</b>" is not checked.  Then click
680 671 
 <h4 id="unnumbered-15">Outgoing (SMTP) server settings</h4>
681 672 
 <div class="outline-text-4" id="text-unnumbered-15">
682 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 682 
 </ul>
700 683 
 </div>
701 684 
 </div>
 
@@ -717,19 +700,19 @@ If your folder still doesn't show up then press the <b>menu button</b>, select <
717 700 
 <h3 id="unnumbered-17">Subscribing to mailing lists</h3>
718 701 
 <div class="outline-text-3" id="text-unnumbered-17">
719 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 704 
 </p>
722 705
723 706 
 <div class="org-src-container">
724 707
725 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 710 
 <span class="org-keyword">exit</span>
728 711 
 </pre>
729 712 
 </div>
730 713
731 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 716 
 </p>
734 717 
 </div>
735 718 
 </div>
 
@@ -743,21 +726,53 @@ Similar to adding mailing list folders you can also add specified email addresse
743 726 
 <div class="org-src-container">
744 727
745 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 730 
 <span class="org-keyword">exit</span>
748 731 
 </pre>
749 732 
 </div>
750 733
751 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 736 
 </p>
754 737 
 </div>
755 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 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 776 
 <p>
762 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 778 
 </p>
 
@@ -777,12 +792,12 @@ Tip: When using the Mutt email client if you want to send an email in cleartext
777 792 
 </p>
778 793 
 </div>
779 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 801 
 <p>
787 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 803 
 </p>
 
@@ -826,9 +841,9 @@ Log out from the administrator account and then log back in as the user you just
826 841 
 </p>
827 842 
 </div>
828 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 847 
 <p>
833 848 
 Within F-droid search for <b>owncloud</b> and install the client. Also install <b>CalDAV Sync Adapter</b>.
834 849 
 </p>
 
@@ -852,9 +867,9 @@ You will also be prompted to enter login details. Your Android and Owncloud cale
852 867 
 </p>
853 868 
 </div>
854 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 873 
 <p>
859 874 
 Open your software center and search for "owncloud client". Enter your owncloud domain name (with the https prefix) and login details.
860 875 
 </p>
 
@@ -865,12 +880,12 @@ You can now drag files into the <b>~/owncloud</b> directory and they will automa
865 880 
 </div>
866 881 
 </div>
867 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 889 
 <p>
875 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 891 
 </p>
 
@@ -910,9 +925,9 @@ The DLNA service will only work within your local home network, and isn't remote
910 925 
 </div>
911 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 931 
 <p>
917 932 
 The main advantage of playing music via Owncloud is that you can do that from anywhere - not only within your home network.
918 933 
 </p>
 
@@ -924,12 +939,12 @@ By default a music player is installed into Owncloud, so all you need to do is t
924 939 
 </div>
925 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 948 
 <p>
934 949 
 To set up your microblog go to:
935 950 
 </p>
 
@@ -1037,12 +1052,12 @@ When the install is complete you will see a lot of warnings but just ignore thos
1037 1052 
 </div>
1038 1053 
 </div>
1039 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 1061 
 <p>
1047 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 1063 
 </p>
 
@@ -1059,9 +1074,9 @@ Then change ssl_certificate to <b>/etc/ssl/certs/yourredmatrixdomainname.bundle.
1059 1074 
 </p>
1060 1075 
 </div>
1061 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 1080 
 <p>
1066 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 1082 
 </p>
 
@@ -1072,19 +1087,19 @@ When installation is complete you can register a new user.
1072 1087 
 </div>
1073 1088 
 </div>
1074 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 1096 
 <p>
1082 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 1098 
 </p>
1084 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 1103 
 <p>
1089 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 1105 
 </p>
 
@@ -1098,9 +1113,9 @@ If you are using the <a href="http://www.irssi.org/">irssi</a> IRC client then y
1098 1113 
 </div>
1099 1114 
 </div>
1100 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 1119 
 <p>
1105 1120 
 If you are using the XChat client:
1106 1121 
 </p>
 
@@ -1136,12 +1151,12 @@ Click <b>close</b> and then <b>connect</b>.
1136 1151 
 </div>
1137 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 1160 
 <p>
1146 1161 
 To add a user:
1147 1162 
 </p>
 
@@ -1200,9 +1215,9 @@ prosodyctl status
1200 1215 
 </div>
1201 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 1221 
 <p>
1207 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 1223 
 </p>
 
@@ -1232,9 +1247,9 @@ You can also <a href="https://www.youtube.com/watch?v=vgx7VSrDGjk">see this vide
1232 1247 
 </p>
1233 1248 
 </div>
1234 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 1253 
 <p>
1239 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 1255 
 </p>
 
@@ -1252,9 +1267,9 @@ Click on <b>Advanced</b> and make sure that <b>Encryption required</b> and <b>Ig
1252 1267 
 </p>
1253 1268 
 </div>
1254 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 1273 
 <p>
1259 1274 
 Install <a href="https://f-droid.org/">F-Droid</a>
1260 1275 
 </p>
 
@@ -1281,12 +1296,12 @@ Go back to the initial screen and then using the menu you can add contacts and b
1281 1296 
 </div>
1282 1297 
 </div>
1283 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 1305 
 <p>
1291 1306 
 Within the software center search for "mumble" and install the client then run it. Skip through the audio setup wizard.
1292 1307 
 </p>
 
@@ -1300,9 +1315,9 @@ Click on "add new" to add a new server and enter the default domain name for the
1300 1315 
 </p>
1301 1316 
 </div>
1302 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 1321 
 <p>
1307 1322 
 Install <a href="https://f-droid.org/">F-Droid</a>
1308 1323 
 </p>