From 4bb01d598b8f76ba5a049c9c72b4e6a80a2414b1 Mon Sep 17 00:00:00 2001
From: Bob Mottram <bob@robotics.uk.to>
Date: Tue, 5 Apr 2016 21:50:30 +0100
Subject: [PATCH] Tidying
---
README.md | 2 +-
doc/EN/usage.org | 2 +-
doc/EN/variants.org | 2 +-
man/freedombone.1.gz | Bin 5337 -> 5335 bytes
website/EN/usage.html | 118 +++++++++++++++++++++++----------------
website/EN/variants.html | 4 +-
6 files changed, 76 insertions(+), 52 deletions(-)
diff --git a/README.md b/README.md
index 50dd9011a..5c83c6ff6 100644
--- a/README.md
+++ b/README.md
@@ -3,7 +3,7 @@
The Freedombone system can be installed onto a Beaglebone Black, or any system capable of running Debian Jessie, and allows you to host your own email and web services. With Freedombone you can enjoy true freedom and independence in the cloud. It comes in a variety of flavours.
- **Full install**: Installs eveything
- - **Mailbox**: An email server with GPG encryption and mailing list
+ - **Mailbox**: An email server with GPG encryption
- **Cloud**: Share files, maintain a calendar and collaborate on document editing
- **Social**: Social networking with Hubzilla and GNU Social
- **Media**: Runs media services such as DLNA to play music or videos on your devices
diff --git a/doc/EN/usage.org b/doc/EN/usage.org
index 46839f8ec..052f8c6d3 100644
--- a/doc/EN/usage.org
+++ b/doc/EN/usage.org
@@ -204,7 +204,7 @@ Select the *IRC Menu* and then change the password. An empty password will allow
** XMPP/Jabber
*** Using with Profanity
-The [[http://profanity.im][Profanity]] shell based user interface and is perhaps the simplest way to use XMPP from a laptop. It's also a good way to ensure that your [[between different devices ][OTR keys]] are the same even when logging in from different laptops or devices, and it also means that if those devices later become compomised then there are no locally stored OTR keys to be found.
+The [[http://profanity.im][Profanity]] shell based user interface and is perhaps the simplest way to use XMPP from a laptop. It's also a good way to ensure that your OTR keys are the same even when logging in from different laptops or devices, and it also means that if those devices later become compomised then there are no locally stored OTR keys to be found.
#+BEGIN_SRC bash
ssh username@domain -p 2222
diff --git a/doc/EN/variants.org b/doc/EN/variants.org
index 7dfcc9ec8..454fb060e 100644
--- a/doc/EN/variants.org
+++ b/doc/EN/variants.org
@@ -22,7 +22,7 @@ Freedombone may be installed either in its entirety or as different variants wit
<center>
<table style="width:80%; border:0">
<tr>
- <td><center><b>Mailbox</b><br>An email server with GPG encryption and mailing list</center></td>
+ <td><center><b>Mailbox</b><br>An email server with GPG encryption</center></td>
<td><center><b>Cloud</b><br>Share files, maintain a calendar and collaborate on document editing</center></td>
</tr>
<tr>
diff --git a/man/freedombone.1.gz b/man/freedombone.1.gz
index 5bda9d1db95f83cafe69e91822488d8be6858ca4..58fe946b45b2e161d1e2914b599886880acc8479 100644
GIT binary patch
delta 2287
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
Jh@KWU000O9S#1CS
delta 2269
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
diff --git a/website/EN/usage.html b/website/EN/usage.html
index c8a8f28b0..5c0dd2260 100644
--- a/website/EN/usage.html
+++ b/website/EN/usage.html
@@ -3,7 +3,7 @@
"http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
<html xmlns="http://www.w3.org/1999/xhtml" lang="en" xml:lang="en">
<head>
-<!-- 2016-04-02 Sat 16:53 -->
+<!-- 2016-04-05 Tue 21:49 -->
<meta http-equiv="Content-Type" content="text/html;charset=utf-8" />
<meta name="viewport" content="width=device-width, initial-scale=1" />
<title></title>
@@ -565,21 +565,45 @@ Check <b>use SSL</b> and <b>accept invalid SSL certificate</b>.
Enter <b>#freedombone</b> as the channel name.
</p>
+<p>
+Enter the password which can be found from the IRC menu of the <b>control panel</b>.
+</p>
+
<p>
Click <b>close</b> and then <b>connect</b>.
</p>
</div>
</div>
-</div>
-<div id="outline-container-orgheadline26" class="outline-3">
-<h3 id="orgheadline26">XMPP/Jabber</h3>
-<div class="outline-text-3" id="text-orgheadline26">
-</div><div id="outline-container-orgheadline21" class="outline-4">
-<h4 id="orgheadline21">Using with Profanity</h4>
+<div id="outline-container-orgheadline21" class="outline-4">
+<h4 id="orgheadline21">Changing or removing the IRC password</h4>
<div class="outline-text-4" id="text-orgheadline21">
<p>
-The <a href="http://profanity.im/">Profanity</a> shell based user interface and is perhaps the simplest way to use XMPP from a laptop.
+By default the IRC server is set up to require a password for users to log in. The password is the same for all users. If you want to change or remove the password:
+</p>
+
+<div class="org-src-container">
+
+<pre class="src src-bash">ssh myusername@mydomain -p 2222
+sudo control
+</pre>
+</div>
+
+<p>
+Select the <b>IRC Menu</b> and then change the password. An empty password will allow anyone to log in, so you can have a globally accessible IRC system if you wish, although you might want to carefully consider whether that's wise.
+</p>
+</div>
+</div>
+</div>
+
+<div id="outline-container-orgheadline27" class="outline-3">
+<h3 id="orgheadline27">XMPP/Jabber</h3>
+<div class="outline-text-3" id="text-orgheadline27">
+</div><div id="outline-container-orgheadline22" class="outline-4">
+<h4 id="orgheadline22">Using with Profanity</h4>
+<div class="outline-text-4" id="text-orgheadline22">
+<p>
+The <a href="http://profanity.im/">Profanity</a> shell based user interface and is perhaps the simplest way to use XMPP from a laptop. It's also a good way to ensure that your OTR keys are the same even when logging in from different laptops or devices, and it also means that if those devices later become compomised then there are no locally stored OTR keys to be found.
</p>
<div class="org-src-container">
@@ -667,9 +691,9 @@ When accessed via the user control panel the client is automatically routed thro
</p>
</div>
</div>
-<div id="outline-container-orgheadline22" class="outline-4">
-<h4 id="orgheadline22">Using with Jitsi</h4>
-<div class="outline-text-4" id="text-orgheadline22">
+<div id="outline-container-orgheadline23" class="outline-4">
+<h4 id="orgheadline23">Using with Jitsi</h4>
+<div class="outline-text-4" id="text-orgheadline23">
<p>
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.
</p>
@@ -699,9 +723,9 @@ You can also <a href="https://www.youtube.com/watch?v=vgx7VSrDGjk">see this vide
</p>
</div>
</div>
-<div id="outline-container-orgheadline23" class="outline-4">
-<h4 id="orgheadline23">Using with Ubuntu</h4>
-<div class="outline-text-4" id="text-orgheadline23">
+<div id="outline-container-orgheadline24" class="outline-4">
+<h4 id="orgheadline24">Using with Ubuntu</h4>
+<div class="outline-text-4" id="text-orgheadline24">
<p>
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.
</p>
@@ -719,17 +743,17 @@ Click on <b>Advanced</b> and make sure that <b>Encryption required</b> and <b>Ig
</p>
</div>
</div>
-<div id="outline-container-orgheadline24" class="outline-4">
-<h4 id="orgheadline24">Using Tor Messenger</h4>
-<div class="outline-text-4" id="text-orgheadline24">
+<div id="outline-container-orgheadline25" class="outline-4">
+<h4 id="orgheadline25">Using Tor Messenger</h4>
+<div class="outline-text-4" id="text-orgheadline25">
<p>
Tor Messenger is a messaging client which supports XMPP, and its onion routing enables you to protect the metadata of chat interactions to some extent by making it difficult for an adversary to know which server is talking to which. You can download Tor Messenger from <a href="https://torproject.org/">torproject.org</a> and the setup is pretty simple.
</p>
</div>
</div>
-<div id="outline-container-orgheadline25" class="outline-4">
-<h4 id="orgheadline25">Using with Android</h4>
-<div class="outline-text-4" id="text-orgheadline25">
+<div id="outline-container-orgheadline26" class="outline-4">
+<h4 id="orgheadline26">Using with Android</h4>
+<div class="outline-text-4" id="text-orgheadline26">
<p>
Install <a href="https://f-droid.org/">F-Droid</a>
</p>
@@ -765,16 +789,16 @@ Then select <b>Next</b>. When chatting you can use the lock icon to encrypt your
</div>
</div>
</div>
-<div id="outline-container-orgheadline27" class="outline-3">
-<h3 id="orgheadline27">Tox</h3>
-<div class="outline-text-3" id="text-orgheadline27">
+<div id="outline-container-orgheadline28" class="outline-3">
+<h3 id="orgheadline28">Tox</h3>
+<div class="outline-text-3" id="text-orgheadline28">
<p>
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.
</p>
</div>
-<div id="outline-container-orgheadline28" class="outline-4">
-<h4 id="orgheadline28">Using the Toxic client</h4>
-<div class="outline-text-4" id="text-orgheadline28">
+<div id="outline-container-orgheadline29" class="outline-4">
+<h4 id="orgheadline29">Using the Toxic client</h4>
+<div class="outline-text-4" id="text-orgheadline29">
<p>
Log into your system with:
</p>
@@ -798,12 +822,12 @@ Then from the menu select <b>Tox Chat</b>. Tox is encrypted by default and also
</div>
</div>
-<div id="outline-container-orgheadline31" class="outline-3">
-<h3 id="orgheadline31">VoIP (Voice chat)</h3>
-<div class="outline-text-3" id="text-orgheadline31">
-</div><div id="outline-container-orgheadline29" class="outline-4">
-<h4 id="orgheadline29">Using with Ubuntu</h4>
-<div class="outline-text-4" id="text-orgheadline29">
+<div id="outline-container-orgheadline32" class="outline-3">
+<h3 id="orgheadline32">VoIP (Voice chat)</h3>
+<div class="outline-text-3" id="text-orgheadline32">
+</div><div id="outline-container-orgheadline30" class="outline-4">
+<h4 id="orgheadline30">Using with Ubuntu</h4>
+<div class="outline-text-4" id="text-orgheadline30">
<p>
Within the software center search for "mumble" and install the client then run it. Skip through the audio setup wizard.
</p>
@@ -817,9 +841,9 @@ Click on "add new" to add a new server and enter the default domain name for the
</p>
</div>
</div>
-<div id="outline-container-orgheadline30" class="outline-4">
-<h4 id="orgheadline30">Using with Android</h4>
-<div class="outline-text-4" id="text-orgheadline30">
+<div id="outline-container-orgheadline31" class="outline-4">
+<h4 id="orgheadline31">Using with Android</h4>
+<div class="outline-text-4" id="text-orgheadline31">
<p>
Install <a href="https://f-droid.org/">F-Droid</a>
</p>
@@ -846,24 +870,24 @@ Selecting the server by pressing on it then connects you to the server so that y
</div>
</div>
</div>
-<div id="outline-container-orgheadline32" class="outline-3">
-<h3 id="orgheadline32">SIP phones</h3>
-<div class="outline-text-3" id="text-orgheadline32">
+<div id="outline-container-orgheadline33" class="outline-3">
+<h3 id="orgheadline33">SIP phones</h3>
+<div class="outline-text-3" id="text-orgheadline33">
<p>
Freedombone also supports SIP phones The username and domain is the same as for your email address, and the SIP password and extension number will appear within the README file in your home directory. Various SIP client options are available, such as CSipSimple on Android and Jitsi on desktop or laptop machines. Ideally use clients which support ZRTP, which will provide the best level of security.
</p>
</div>
-<div id="outline-container-orgheadline33" class="outline-4">
-<h4 id="orgheadline33">About ZRTP</h4>
-<div class="outline-text-4" id="text-orgheadline33">
+<div id="outline-container-orgheadline34" class="outline-4">
+<h4 id="orgheadline34">About ZRTP</h4>
+<div class="outline-text-4" id="text-orgheadline34">
<p>
<a href="https://jitsi.org/Documentation/ZrtpFAQ">ZRTP</a> appears to be the current best standard to end-to-end encrypted voice calls, combining good security with simplicity of use. When the initial cryptographic negotiation between phones is done at the start of a call a short authentication string (SAS) is calculated and displayed at both ends. To check that there isn't anyone intercepting the call and acting as a <i>man in the middle</i> - as <a href="https://en.wikipedia.org/wiki/Stingray_phone_tracker">stingray type devices</a> try to do - the short authentication string can be read out and verbally confirmed between the callers. If it's the same then you can be pretty confident that the call is secure.
</p>
</div>
</div>
-<div id="outline-container-orgheadline34" class="outline-4">
-<h4 id="orgheadline34">Using with CSIPSimple</h4>
-<div class="outline-text-4" id="text-orgheadline34">
+<div id="outline-container-orgheadline35" class="outline-4">
+<h4 id="orgheadline35">Using with CSIPSimple</h4>
+<div class="outline-text-4" id="text-orgheadline35">
<p>
Add an account. Under <b>General Wizards</b> choose <b>Expert</b> and enter the following details:
</p>
@@ -919,9 +943,9 @@ If everything is working the account should appear in green with a status of <b>
</p>
</div>
</div>
-<div id="outline-container-orgheadline35" class="outline-4">
-<h4 id="orgheadline35">Using with Ring</h4>
-<div class="outline-text-4" id="text-orgheadline35">
+<div id="outline-container-orgheadline36" class="outline-4">
+<h4 id="orgheadline36">Using with Ring</h4>
+<div class="outline-text-4" id="text-orgheadline36">
<p>
From the menu select <b>Manage accounts</b>.
</p>
diff --git a/website/EN/variants.html b/website/EN/variants.html
index 2b7a904ce..754299466 100644
--- a/website/EN/variants.html
+++ b/website/EN/variants.html
@@ -3,7 +3,7 @@
"http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
<html xmlns="http://www.w3.org/1999/xhtml" lang="en" xml:lang="en">
<head>
-<!-- 2016-02-27 Sat 22:12 -->
+<!-- 2016-04-05 Tue 21:44 -->
<meta http-equiv="Content-Type" content="text/html;charset=utf-8" />
<meta name="viewport" content="width=device-width, initial-scale=1" />
<title></title>
@@ -169,7 +169,7 @@ Freedombone may be installed either in its entirety or as different variants wit
<center>
<table style="width:80%; border:0">
<tr>
- <td><center><b>Mailbox</b><br>An email server with GPG encryption and mailing list</center></td>
+ <td><center><b>Mailbox</b><br>An email server with GPG encryption</center></td>
<td><center><b>Cloud</b><br>Share files, maintain a calendar and collaborate on document editing</center></td>
</tr>
<tr>
--
GitLab