diff --git a/README.md b/README.md
index d4e7662c..0a3c5828 100644
--- a/README.md
+++ b/README.md
@@ -8,7 +8,7 @@ The Freedombone system can be installed onto a Beaglebone Black, or any system c
- **Social**: Social networking with Red Matrix and GNU Social
- **Media**: Runs media services such as DLNA to play music or videos on your devices
- **Writer**: Host your blog and wiki
- - **Chat**: Encrypted IRC, XMPP and VoIP services for one-to-one and many-to-many chat
+ - **Chat**: Encrypted IRC, XMPP, Tox and VoIP services for one-to-one and many-to-many chat
- **Developer**: Host your own git projects with a Github-like user interface
- **Nonmailbox**: Installs eveything except for the email server
diff --git a/doc/EN/installation.org b/doc/EN/installation.org
index 2467afb3..bae52439 100644
--- a/doc/EN/installation.org
+++ b/doc/EN/installation.org
@@ -177,6 +177,7 @@ On your internet router, typically under firewall settings, open the following p
| Email | 465 |
| Email | 993 |
| VoIP | 64738 |
+| Tox | 33445 |
* Keydrives
After installing for the first time it's a good idea to create some keydrives. These will store your gpg key so that if all else fails you will still be able to restore from backup. There are two ways to do this:
diff --git a/doc/EN/usage.org b/doc/EN/usage.org
index 359f17ed..dd39e1e0 100644
--- a/doc/EN/usage.org
+++ b/doc/EN/usage.org
@@ -130,11 +130,11 @@ Open Thinderbird
Select "*Skip this and use existing email*"
-Enter your name, email address (myusername@mydomainname.com) and the password for your user (the one from [[Add a user]]).
+Enter your name, email address (myusername@mydomainname.com) and the password for your user.
You'll get a message saying "/Thunderbird failed to find the settings/"
-The settings should be as follows, substituting /mydomainname.com/ for your domain name and /myusername/ for the username given previously in [[Add a user]].
+The settings should be as follows, substituting /mydomainname.com/ for your domain name and /myusername/ for the username.
* Incoming: IMAP, mydomainname.com, 993, SSL/TLS, Normal Password
* Outgoing: SMTP, mydomainname.com, 465, SSL/TLS, Normal Password
@@ -481,6 +481,14 @@ From the menu select *Settings* then *Security* then *OTR mode*. Set the mode t
Make sure that *Check server certificate* is not checked.
Go back to the initial screen and then using the menu you can add contacts and begin chatting. Both parties will need to go through the off-the-record question and answer verification before the chat can begin, but that only needs to be done once for each person you're chatting with.
+** Tox
+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.
+*** Using the Toxic client
+To connect to your node use the command:
+
+#+BEGIN_SRC bash
+/connect [yourdomainname] 33445 [your tox node ID]
+#+END_SRC
** VoIP (Voice chat)
*** Using with Ubuntu
Within the software center search for "mumble" and install the client then run it. Skip through the audio setup wizard.
diff --git a/website/EN/installation.html b/website/EN/installation.html
index a083394b..b71195c3 100644
--- a/website/EN/installation.html
+++ b/website/EN/installation.html
@@ -4,7 +4,7 @@
-
+
@@ -547,6 +547,11 @@ On your internet router, typically under firewall settings, open the following p
| VoIP |
64738 |
+
+
+| Tox |
+33445 |
+
diff --git a/website/EN/usage.html b/website/EN/usage.html
index be78ac23..0672c391 100644
--- a/website/EN/usage.html
+++ b/website/EN/usage.html
@@ -4,16 +4,22 @@
-
+
+