Use org export command for embedded html

doc/EN/backups.org

@@ -10,11 +10,11 @@
 [[file:images/logo.png]]
 #+END_CENTER
 
-#+BEGIN_HTML
+#+BEGIN_EXPORT html
 <center>
 <h1>Backups</h1>
 </center>
-#+END_HTML
+#+END_EXPORT
 
 #+BEGIN_CENTER
 #+ATTR_HTML: :border -1
@@ -109,8 +109,8 @@ sudo control
 
 Select /Backup and Restore/ then /Restore from remote backup/ and enter the domain name of the remote server that you wish to restore from.
 
-#+BEGIN_HTML
+#+BEGIN_EXPORT html
 <center>
 Return to the <a href="index.html">home page</a>
 </center>
-#+END_HTML
+#+END_EXPORT

doc/EN/code.org

@@ -10,11 +10,11 @@
 [[file:images/logo.png]]
 #+END_CENTER
 
-#+BEGIN_HTML
+#+BEGIN_EXPORT html
 <center>
 <h1>Code</h1>
 </center>
-#+END_HTML
+#+END_EXPORT
 
 Freedombone is really just a couple of [[http://www.gnu.org/software/bash][bash]] scripts which install and configure software on a Debian GNU/Linux system. If you're a system administrator, software engineer or Linux hobbyist you'll probably be familiar with command line scripting and be able to make your own modifications or custom variants to suit your needs. Freedombone is licensed under the [[https://www.gnu.org/licenses/agpl.html][GNU Affero General Public License version 3]] (or later).
 
@@ -28,8 +28,8 @@ Github is closed source. Sooner or later it will probably turn evil or become li
 
 Longer term it is expected that the source code for this project will also be self-hosted, with Github acting only as a mirror to increase visibility.
 
-#+BEGIN_HTML
+#+BEGIN_EXPORT html
 <center>
 Return to the <a href="index.html">home page</a>
 </center>
-#+END_HTML
+#+END_EXPORT

doc/EN/controlpanel.org

@@ -10,11 +10,11 @@
 [[file:images/logo.png]]
 #+END_CENTER
 
-#+BEGIN_HTML
+#+BEGIN_EXPORT html
 <center>
 <h1>Control panel</h1>
 </center>
-#+END_HTML
+#+END_EXPORT
 
 | [[Main menu]]               |
 | [[About screen]]            |

doc/EN/faq.org

@@ -10,11 +10,11 @@
 [[file:images/logo.png]]
 #+END_CENTER
 
-#+BEGIN_HTML
+#+BEGIN_EXPORT html
 <center>
 <h1>Frequently Asked Questions</h1>
 </center>
-#+END_HTML
+#+END_EXPORT
 
 #+BEGIN_CENTER
 #+ATTR_HTML: :border -1
@@ -272,8 +272,8 @@ Welcome to the world of email. Email is really the archetypal decentralized serv
 
 So the situation with email presently is pretty bad, and there's a clear selection pressure against decentralization and towards only a few companies controlling all email services. Longer term the solution is to have more secure protocols which make spamming hard or expensive. Bitmessage is one such system. As an immediate practical workaround you could try buying a domain name and then linking it to your dynamic DNS account (freeDNS, etc) in the hope that the blocking is against dynamic DNS domain names, but there is no guarantee that will work and often blocking may be based upon IP address ranges about which there is little you can do.
 
-#+BEGIN_HTML
+#+BEGIN_EXPORT html
 <center>
 Return to the <a href="index.html">home page</a>
 </center>
-#+END_HTML
+#+END_EXPORT

doc/EN/index.org

@@ -10,7 +10,7 @@
 [[file:images/logo.png]]
 #+END_CENTER
 
-#+BEGIN_HTML
+#+BEGIN_EXPORT html
  <center>
  <table style="width:50%; border:0">
   <tr>
@@ -29,7 +29,7 @@
   </tr>
 </table>
 </center>
-#+END_HTML
+#+END_EXPORT
 
 With the right technology the internet can be a space for free expression, exploration, cooperation, learning and fun. A place to connect with others are share experiences. It doesn't have to be a gloomy surveillance prison owned and run by a diabolical synthesis of money-grabbing megacorporations and prurient government spooks brandishing "bulk/general warrants". Freedombone is designed to help you surmount the contemporary digital privacy conundrums and to increase your online autonomy. It's a self-hosted home server configuration which can be installed onto any computer capable of running [[https://www.debian.org/][Debian]], so if you have an old laptop or netbook which you can leave turned on then you can use Freedombone to provide your own internet services, such as blogging, wiki, email, chat and social networking and have independence from the well known internet companies.
 

doc/EN/installation.org

@@ -10,11 +10,11 @@
 [[file:images/logo.png]]
 #+END_CENTER
 
-#+BEGIN_HTML
+#+BEGIN_EXPORT html
 <center>
 <h1>Installation</h1>
 </center>
-#+END_HTML
+#+END_EXPORT
 
 | [[Building an image for a Single Board Computer or Virtual Machine]] |
 | [[Checklist]]                                                        |
@@ -243,8 +243,8 @@ sudo control
 
 From there you will be able to perform various tasks, such as backups, adding and removing users and so on. You can also do this via commands, which are typically installed as /usr/local/bin/freedombone* and the corresponding manpages.
 
-#+BEGIN_HTML
+#+BEGIN_EXPORT html
 <center>
 Return to the <a href="index.html">home page</a>
 </center>
-#+END_HTML
+#+END_EXPORT

doc/EN/mesh.org

@@ -10,11 +10,11 @@
 [[file:images/logo.png]]
 #+END_CENTER
 
-#+BEGIN_HTML
+#+BEGIN_EXPORT html
 <center>
 <h1>Mesh Network</h1>
 </center>
-#+END_HTML
+#+END_EXPORT
 
 | [[What is a mesh network?]] |
 | [[The Freedombone Mesh]]    |
@@ -195,8 +195,8 @@ After a few seconds your usual internet wifi connection should be re-established
 * Further reading
 For much more extensive details about deploying wireless networks there is an excellent book called [[http://wndw.net][Wireless Networking in the Developing World]] which is worth reading. It's not necessarily exclusively about mesh networks, but may be useful in terms of advice about antennas, reflections, extending wifi range and so on.
 
-#+BEGIN_HTML
+#+BEGIN_EXPORT html
 <center>
 Return to the <a href="index.html">home page</a>
 </center>
-#+END_HTML
+#+END_EXPORT

doc/EN/mirrors.org

@@ -10,11 +10,11 @@
 [[file:images/logo.png]]
 #+END_CENTER
 
-#+BEGIN_HTML
+#+BEGIN_EXPORT html
 <center>
 <h1>Mirrors</h1>
 </center>
-#+END_HTML
+#+END_EXPORT
 
 | [[What are mirrors and why do they exist?]]                         |
 | [[What security do mirrors have?]]                                  |
@@ -39,3 +39,9 @@ Yes. From the control panel select "/Set the main repository/"
 
 * What do I need to do to keep the mirrored repositories updated?
 Nothing. That happens as part of regular automatic updates.
+
+#+BEGIN_EXPORT html
+<center>
+Return to the <a href="index.html">home page</a>
+</center>
+#+END_EXPORT

doc/EN/related.org

@@ -10,13 +10,13 @@
 [[file:images/logo.png]]
 #+END_CENTER
 
-#+BEGIN_HTML
+#+BEGIN_EXPORT html
 <center>
 <h1>Related Projects</h1>
 </center>
-#+END_HTML
+#+END_EXPORT
 
-#+BEGIN_HTML
+#+BEGIN_EXPORT html
  <center>
 The following projects made Freedombone possible.<br>
  <table style="width:80%; border:0">
@@ -46,4 +46,4 @@ The following projects made Freedombone possible.<br>
   </tr>
 </table>
 </center>
-#+END_HTML
+#+END_EXPORT

doc/EN/support.org

@@ -10,11 +10,11 @@
 [[file:images/logo.png]]
 #+END_CENTER
 
-#+BEGIN_HTML
+#+BEGIN_EXPORT html
 <center>
 <h1>Support</h1>
 </center>
-#+END_HTML
+#+END_EXPORT
 
 * Contact details
 
@@ -61,8 +61,8 @@ To add translations modify the json files within the *locale* subdirectory. Then
 ** Packaging
 Helping to package GNU Social and Hubzilla for Debian would be beneficial.
 
-#+BEGIN_HTML
+#+BEGIN_EXPORT html
 <center>
 Return to the <a href="index.html">home page</a>
 </center>
-#+END_HTML
+#+END_EXPORT

doc/EN/test.org

@@ -1,64 +0,0 @@
-#+TITLE:
-#+AUTHOR: Bob Mottram
-#+EMAIL: bob@robotics.uk.to
-#+KEYWORDS: freedombox, debian, beaglebone, red matrix, email, web server, home server, internet, censorship, surveillance, social network, irc, jabber
-#+DESCRIPTION: Turn the Beaglebone Black into a personal communications server
-#+OPTIONS: ^:nil toc:nil
-#+HTML_HEAD: <link rel="stylesheet" type="text/css" href="solarized-light.css" />
-
-#+BEGIN_CENTER
-[[file:images/logo.png]]
-#+END_CENTER
-
-#+BEGIN_HTML
- <center>
- <table style="width:50%; border:0">
-  <tr>
-    <td><center><a href="variants.html">Variants</a></center></td>
-    <td><center><a href="installation.html">Install</a></center></td>
-    <td><center><a href="usage.html">Use</a></center></td>
-    <td><center><a href="backups.html">Backups</a></center></td>
-  </tr>
-  <tr>
-    <td><center><a href="code.html">Code</a></center></td>
-    <td><center><a href="related.html">Related</a></center></td>
-    <td><center><a href="faq.html">F.A.Q.</a></center></td>
-    <td><center><a href="support.html">Contact/Support</a></center></td>
-  </tr>
-</table>
-</center>
-#+END_HTML
-
-With the right technology the internet can be a space for free expression, exploration, cooperation, learning and fun. A place to connect with others are share experiences. It doesn't have to be a gloomy surveillance prison owned and run by a diabolical synthesis of money-grabbing megacorporations and prurient government spooks. Freedombone is designed to help you surmount the contemporary digital privacy conundrums and to increase your online autonomy. It's a self-hosted home server configuration which can be installed onto any computer capable of running [[https://www.debian.org/][Debian]], so if you have an old laptop or netbook which you can leave turned on then you can use Freedombone to provide your own internet services, such as blogging, wiki, email, chat and social networking and have independence from the well known internet companies.
-
-This is personal or family scale computing, which can then federate to global proportions. We need /community controlled/ information systems and to achieve that they must be inexpensive and simple to install and maintain. This is the opposite of the current dominant paradigm of [[https://www.youtube.com/watch?v=XZmGGAbHqa0][titanic server warehouses]] owned by a tiny number of individuals and it's what is sometimes refered to as [[http://mediagoblin.org/news/userops.html]["userops"]] - i.e. a user being able to do what traditionally only a professional systems administrator would be able to.
-
-With a system installed in your home you also have greater legal protection against unwarranted searches. In general as soon as you put your information onto systems which you don't own then you no longer have the same property rights over it, together with "/no reasonable expectation of privacy/". We all know that's a nonsense, and so maybe we should do something about it.
-
-#+BEGIN_QUOTE
-"With the increasing move of our computing to cloud infrastructures, we give up the control of our computing to the managers of those infrastructures. Our terminals (laptops, desktops) might now be running entirely on Free Software, but this is increasingly irrelevant given that most of what actually matters gets executed on a remote closed system that we don’t control. The Free Software community needs to work to help users keep the control of all their computing, by developing suitable alternatives and facilitating their deployment." -- Lucas Nussbaum
-#+END_QUOTE
-
-Today everyone is concerned about privacy on the internet. Wanting privacy doesn't necessarily mean you have "something to hide". It just means having the ability to choose /what information to share, with whom and under what conditions/ and therefore being able to shape your own life story. The loss of ability to choose via the "involuntary sharing" which many people experience when using communications systems built by the well known internet companies, means that you're no longer really running your own affairs and that others may begin to exert an improper amount of influence over you. Mass surveillance is perhaps the ultimate in involuntary sharing and it's only through the use of freedom respecting software together with a solid determination to overcome state and corporate abuses of technology that we can hope to get to the kind of internet in which respect for human dignity is built in as a core feature.
-
-#+BEGIN_CENTER
-[[file:images/nocloud.png]]
-#+END_CENTER
-
-Another problem is the precariousness of the terms of service. Except in rare cases such terms are not easy to read, so many people end up clicking through terms which if explained more clearly they would never agree to. Over the past decade many internet users have had the unpleasant experience of having their blogs, videos or other web content inexplicably removed, typically due to some ill-defined terms of service violation or a false accusation of copyright infringement.
-
-You can bypass all of these dilemmas and take back ownership of your internet content with Freedombone.  Originally based upon the Beaglebone Black, Freedombone is a small and cheap home server which enables you to use email, have your own web site and do social networking without any built-in spying and without having to agree to any legal terms of service other than those of your ISP.  It provides independence and security in an era where those things are in short supply.
-
-#+BEGIN_QUOTE
-"The deepest problem is that the system architecture that has evolved in recent years holds masses of information on many people with no intelligence value, but with vast potential for political abuse." -- Ross Anderson
-#+END_QUOTE
-
-Freedombone is an example of the internet as it was supposed to be: a network of peers, rather than a small number of gigantic server farms with everyone connecting to them. Even if they're well run, centralised server farms become a conspicuous target for /all kinds of nefariousness/ and in any future wars they're bound to be amongst the first facilities to receive the "/shock and awe/" treatment. Also consider just what is being "farmed". If a robust information society is desirable then excessive centralisation of control over information should be avoided.
-
-An emphasis of the Freedombone project is the protection of private communications from indiscriminate mass surveillance, otherwise known as "/bulk intercept/" or "/warrantless wiretapping/". With only a few exceptions data entering and leaving the system is encrypted using settings recommended by [[https://bettercrypto.org][bettercrypto.org]]. Stored emails are encrypted such that only someone knowing your GPG password can read them and a GPG key is created automatically if you don't already have one. The system is firewalled with only the necessary ports being opened. Exclusively [[http://en.wikipedia.org/wiki/Free_software][free software]] is used so that all of it can potentially be security audited and proprietary repositories are disabled by default. There are still numerous security problems with the internet in general and software always contains bugs, but a best attempt has been made to ensure that the Freedombone is at least more secure than average.
-
-#+BEGIN_HTML
-<center>
-This site can also be accessed via a Tor browser at <a href="4fvfozz6g3zmvf76.onion">4fvfozz6g3zmvf76.onion</a>
-</center>
-#+END_HTML

doc/EN/usage.org

@@ -10,11 +10,11 @@
 [[file:images/logo.png]]
 #+END_CENTER
 
-#+BEGIN_HTML
+#+BEGIN_EXPORT html
 <center>
 <h1>Usage</h1>
 </center>
-#+END_HTML
+#+END_EXPORT
 
 | [[Readme]]                                               |
 | [[Improving ssh security]]                               |
@@ -323,8 +323,8 @@ To set up the system open http://rss_reader_onion_address/ and log in with usern
 
 To access the RSS reader from a mobile device you can install a Tor compatible browser such as [[https://f-droid.org/wiki/page/info.guardianproject.orfox][OrFox]]. It will try to automatically change to the mobile version of the user interface, but if that doesn't work then navigate to http://rss_reader_onion_address/mobile. Remember to add the site to the NoScript whitelist, and you may also need to turn HTTPS Everywhere off.
 
-#+BEGIN_HTML
+#+BEGIN_EXPORT html
 <center>
 Return to the <a href="index.html">home page</a>
 </center>
-#+END_HTML
+#+END_EXPORT

doc/EN/usage_email.org

@@ -10,11 +10,11 @@
 [[file:images/logo.png]]
 #+END_CENTER
 
-#+BEGIN_HTML
+#+BEGIN_EXPORT html
 <center>
 <h1>Email</h1>
 </center>
-#+END_HTML
+#+END_EXPORT
 
 | [[Things to be aware of]]                           |
 | [[A technical note about email transport security]] |
@@ -463,8 +463,8 @@ mymailinglistname+subscribe@domainname
 
 Tip: When using the Mutt email client if you want to send an email in cleartext then press *p* (for PGP) on the sending screen and select *clear*. Unsecure email is treated as being the exception rather than the default.
 
-#+BEGIN_HTML
+#+BEGIN_EXPORT html
 <center>
 Return to the <a href="index.html">home page</a>
 </center>
-#+END_HTML
+#+END_EXPORT

doc/EN/variants.org

@@ -10,15 +10,15 @@
 [[file:images/logo.png]]
 #+END_CENTER
 
-#+BEGIN_HTML
+#+BEGIN_EXPORT html
 <center>
 <h1>Variants</h1>
 </center>
-#+END_HTML
+#+END_EXPORT
 
 Freedombone may be installed either in its entirety or as different variants with a more specialised purpose.  So for example if you just want to run a blog but don't care about any other services then you can do that. The following variants are available:
 
-#+BEGIN_HTML
+#+BEGIN_EXPORT html
  <center>
  <table style="width:80%; border:0">
   <tr>
@@ -39,12 +39,12 @@ Freedombone may be installed either in its entirety or as different variants wit
   </tr>
 </table>
 </center>
-#+END_HTML
+#+END_EXPORT
 
 Non-mesh installs also come with an RSS reader which provides strong reading privacy on desktop and mobile via the use of a Tor onion service.
 
-#+BEGIN_HTML
+#+BEGIN_EXPORT html
 <center>
 Return to the <a href="index.html">home page</a>
 </center>
-#+END_HTML
+#+END_EXPORT

website/EN/backups.html

@@ -3,15 +3,15 @@
 "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-15 Mon 09:16 -->
-<meta  http-equiv="Content-Type" content="text/html;charset=utf-8" />
-<meta  name="viewport" content="width=device-width, initial-scale=1" />
+<!-- 2016-02-27 Sat 22:05 -->
+<meta http-equiv="Content-Type" content="text/html;charset=utf-8" />
+<meta name="viewport" content="width=device-width, initial-scale=1" />
 <title></title>
-<meta  name="generator" content="Org-mode" />
-<meta  name="author" content="Bob Mottram" />
-<meta  name="description" content="Turn the Beaglebone Black into a personal communications server"
+<meta name="generator" content="Org-mode" />
+<meta name="author" content="Bob Mottram" />
+<meta name="description" content="Turn the Beaglebone Black into a personal communications server"
  />
-<meta  name="keywords" content="freedombox, debian, beaglebone, red matrix, email, web server, home server, internet, censorship, surveillance, social network, irc, jabber" />
+<meta name="keywords" content="freedombox, debian, beaglebone, red matrix, email, web server, home server, internet, censorship, surveillance, social network, irc, jabber" />
 <style type="text/css">
  <!--/*--><![CDATA[/*><!--*/
   .title  { text-align: center;
@@ -75,8 +75,7 @@
   td.org-left   { text-align: left;   }
   td.org-center { text-align: center; }
   dt { font-weight: bold; }
-  .footpara:nth-child(2) { display: inline; }
-  .footpara { display: block; }
+  .footpara { display: inline; }
   .footdef  { margin-bottom: 1em; }
   .figure { padding: 1em; }
   .figure p { text-align: center; }
@@ -151,7 +150,7 @@ for the JavaScript code in this tag.
 <a name="top" id="top"></a>
 </div>
 <div id="content">
-<div class="center">
+<div class="org-center">
 
 <div class="figure">
 <p><img src="images/logo.png" alt="logo.png" />
@@ -163,7 +162,7 @@ for the JavaScript code in this tag.
 <h1>Backups</h1>
 </center>
 
-<div class="center">
+<div class="org-center">
 <table border="-1" cellspacing="0" cellpadding="6" rules="groups" frame="hsides">
 
 

website/EN/code.html

@@ -3,15 +3,15 @@
 "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-15 Mon 12:25 -->
-<meta  http-equiv="Content-Type" content="text/html;charset=utf-8" />
-<meta  name="viewport" content="width=device-width, initial-scale=1" />
+<!-- 2016-02-27 Sat 22:06 -->
+<meta http-equiv="Content-Type" content="text/html;charset=utf-8" />
+<meta name="viewport" content="width=device-width, initial-scale=1" />
 <title></title>
-<meta  name="generator" content="Org-mode" />
-<meta  name="author" content="Bob Mottram" />
-<meta  name="description" content="Turn the Beaglebone Black into a personal communications server"
+<meta name="generator" content="Org-mode" />
+<meta name="author" content="Bob Mottram" />
+<meta name="description" content="Turn the Beaglebone Black into a personal communications server"
  />
-<meta  name="keywords" content="freedombox, debian, beaglebone, red matrix, email, web server, home server, internet, censorship, surveillance, social network, irc, jabber" />
+<meta name="keywords" content="freedombox, debian, beaglebone, red matrix, email, web server, home server, internet, censorship, surveillance, social network, irc, jabber" />
 <style type="text/css">
  <!--/*--><![CDATA[/*><!--*/
   .title  { text-align: center;
@@ -75,8 +75,7 @@
   td.org-left   { text-align: left;   }
   td.org-center { text-align: center; }
   dt { font-weight: bold; }
-  .footpara:nth-child(2) { display: inline; }
-  .footpara { display: block; }
+  .footpara { display: inline; }
   .footdef  { margin-bottom: 1em; }
   .figure { padding: 1em; }
   .figure p { text-align: center; }
@@ -151,7 +150,7 @@ for the JavaScript code in this tag.
 <a name="top" id="top"></a>
 </div>
 <div id="content">
-<div class="center">
+<div class="org-center">
 
 <div class="figure">
 <p><img src="images/logo.png" alt="logo.png" />

website/EN/controlpanel.html

@@ -3,15 +3,15 @@
 "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-15 Mon 09:16 -->
-<meta  http-equiv="Content-Type" content="text/html;charset=utf-8" />
-<meta  name="viewport" content="width=device-width, initial-scale=1" />
+<!-- 2016-02-27 Sat 22:07 -->
+<meta http-equiv="Content-Type" content="text/html;charset=utf-8" />
+<meta name="viewport" content="width=device-width, initial-scale=1" />
 <title></title>
-<meta  name="generator" content="Org-mode" />
-<meta  name="author" content="Bob Mottram" />
-<meta  name="description" content="Control Panel"
+<meta name="generator" content="Org-mode" />
+<meta name="author" content="Bob Mottram" />
+<meta name="description" content="Control Panel"
  />
-<meta  name="keywords" content="freedombox, debian, beaglebone, red matrix, email, web server, home server, internet, censorship, surveillance, social network, irc, jabber" />
+<meta name="keywords" content="freedombox, debian, beaglebone, red matrix, email, web server, home server, internet, censorship, surveillance, social network, irc, jabber" />
 <style type="text/css">
  <!--/*--><![CDATA[/*><!--*/
   .title  { text-align: center;
@@ -75,8 +75,7 @@
   td.org-left   { text-align: left;   }
   td.org-center { text-align: center; }
   dt { font-weight: bold; }
-  .footpara:nth-child(2) { display: inline; }
-  .footpara { display: block; }
+  .footpara { display: inline; }
   .footdef  { margin-bottom: 1em; }
   .figure { padding: 1em; }
   .figure p { text-align: center; }
@@ -151,7 +150,7 @@ for the JavaScript code in this tag.
 <a name="top" id="top"></a>
 </div>
 <div id="content">
-<div class="center">
+<div class="org-center">
 
 <div class="figure">
 <p><img src="images/logo.png" alt="logo.png" />
@@ -230,7 +229,7 @@ sudo control
 It should look like this:
 </p>
 
-<div class="center">
+<div class="org-center">
 
 <div class="figure">
 <p><img src="images/controlpanel/control_panel.jpg" alt="control_panel.jpg" />
@@ -251,7 +250,7 @@ To select anythng on the control panel use the <b>up and down</b> cursor keys an
 To find out your current domain names select the About screen from the main menu. This is especially useful for finding your onion addresses. For improved security by compartmentalisation, and also simpler implementation, each application has its own onion address.
 </p>
 
-<div class="center">
+<div class="org-center">
 
 <div class="figure">
 <p><img src="images/controlpanel/control_panel_about.jpg" alt="control_panel_about.jpg" />
@@ -276,7 +275,7 @@ The Local Mirrors contains mirrored copies of the git repositories used by the s
 You can add users to mailing lists, or block particular email addresses or subject lines in this menu.
 </p>
 
-<div class="center">
+<div class="org-center">
 
 <div class="figure">
 <p><img src="images/controlpanel/control_panel_filtering.jpg" alt="control_panel_filtering.jpg" />
@@ -293,7 +292,7 @@ You can add users to mailing lists, or block particular email addresses or subje
 This allows you to set the global directory location and obtain an SSL/TLS certificate if necessary.
 </p>
 
-<div class="center">
+<div class="org-center">
 
 <div class="figure">
 <p><img src="images/controlpanel/control_panel_hubzilla.jpg" alt="control_panel_hubzilla.jpg" />
@@ -310,7 +309,7 @@ This allows you to set the global directory location and obtain an SSL/TLS certi
 You can set a password for your IRC server here.
 </p>
 
-<div class="center">
+<div class="org-center">
 
 <div class="figure">
 <p><img src="images/controlpanel/control_panel_irc.jpg" alt="control_panel_irc.jpg" />
@@ -327,7 +326,7 @@ You can set a password for your IRC server here.
 It's possible to add playable media to a USB drive and plug it into the system, then make it accessible to other devices such as tablets or phones on your local network via DLNA.
 </p>
 
-<div class="center">
+<div class="org-center">
 
 <div class="figure">
 <p><img src="images/controlpanel/control_panel_media.jpg" alt="control_panel_media.jpg" />
@@ -344,7 +343,7 @@ It's possible to add playable media to a USB drive and plug it into the system,
 If you don't want to use the default repositories, or don't have access to them, then you can obtain them from another Freedombone server (the details can be found on the other server on the <b>About</b> screen of the control panel).
 </p>
 
-<div class="center">
+<div class="org-center">
 
 <div class="figure">
 <p><img src="images/controlpanel/control_panel_mirrors.jpg" alt="control_panel_mirrors.jpg" />
@@ -361,7 +360,7 @@ If you don't want to use the default repositories, or don't have access to them,
 You can create backups or restore from backup here. It's also possible to create keydrives which store the backup key.
 </p>
 
-<div class="center">
+<div class="org-center">
 
 <div class="figure">
 <p><img src="images/controlpanel/control_panel_backup_restore.jpg" alt="control_panel_backup_restore.jpg" />
@@ -378,7 +377,7 @@ You can create backups or restore from backup here. It's also possible to create
 If you need to generate SSL/TLS certificates or change cypher details due to changing recommendations then you can do that here. If you are changing cypher details be extra careful not to make mistakes/typos, which could reduce the security of your system.
 </p>
 
-<div class="center">
+<div class="org-center">
 
 <div class="figure">
 <p><img src="images/controlpanel/control_panel_security.jpg" alt="control_panel_security.jpg" />
@@ -395,7 +394,7 @@ If you need to generate SSL/TLS certificates or change cypher details due to cha
 Users can be added or removed here.
 </p>
 
-<div class="center">
+<div class="org-center">
 
 <div class="figure">
 <p><img src="images/controlpanel/control_panel_users.jpg" alt="control_panel_users.jpg" />

website/EN/faq.html

@@ -3,15 +3,15 @@
 "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-19 Fri 18:11 -->
-<meta  http-equiv="Content-Type" content="text/html;charset=utf-8" />
-<meta  name="viewport" content="width=device-width, initial-scale=1" />
+<!-- 2016-02-27 Sat 22:07 -->
+<meta http-equiv="Content-Type" content="text/html;charset=utf-8" />
+<meta name="viewport" content="width=device-width, initial-scale=1" />
 <title></title>
-<meta  name="generator" content="Org-mode" />
-<meta  name="author" content="Bob Mottram" />
-<meta  name="description" content="Frequently asked questions"
+<meta name="generator" content="Org-mode" />
+<meta name="author" content="Bob Mottram" />
+<meta name="description" content="Frequently asked questions"
  />
-<meta  name="keywords" content="freedombox, debian, beaglebone, hubzilla, email, web server, home server, internet, censorship, surveillance, social network, irc, jabber" />
+<meta name="keywords" content="freedombox, debian, beaglebone, hubzilla, email, web server, home server, internet, censorship, surveillance, social network, irc, jabber" />
 <style type="text/css">
  <!--/*--><![CDATA[/*><!--*/
   .title  { text-align: center;

website/EN/index.html

@@ -3,15 +3,15 @@
 "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-15 Mon 09:15 -->
-<meta  http-equiv="Content-Type" content="text/html;charset=utf-8" />
-<meta  name="viewport" content="width=device-width, initial-scale=1" />
+<!-- 2016-02-27 Sat 22:08 -->
+<meta http-equiv="Content-Type" content="text/html;charset=utf-8" />
+<meta name="viewport" content="width=device-width, initial-scale=1" />
 <title></title>
-<meta  name="generator" content="Org-mode" />
-<meta  name="author" content="Bob Mottram" />
-<meta  name="description" content="Turn the Beaglebone Black into a personal communications server"
+<meta name="generator" content="Org-mode" />
+<meta name="author" content="Bob Mottram" />
+<meta name="description" content="Turn the Beaglebone Black into a personal communications server"
  />
-<meta  name="keywords" content="freedombox, debian, beaglebone, red matrix, email, web server, home server, internet, censorship, surveillance, social network, irc, jabber" />
+<meta name="keywords" content="freedombox, debian, beaglebone, red matrix, email, web server, home server, internet, censorship, surveillance, social network, irc, jabber" />
 <style type="text/css">
  <!--/*--><![CDATA[/*><!--*/
   .title  { text-align: center;
@@ -75,8 +75,7 @@
   td.org-left   { text-align: left;   }
   td.org-center { text-align: center; }
   dt { font-weight: bold; }
-  .footpara:nth-child(2) { display: inline; }
-  .footpara { display: block; }
+  .footpara { display: inline; }
   .footdef  { margin-bottom: 1em; }
   .figure { padding: 1em; }
   .figure p { text-align: center; }
@@ -151,7 +150,7 @@ for the JavaScript code in this tag.
 <a name="top" id="top"></a>
 </div>
 <div id="content">
-<div class="center">
+<div class="org-center">
 
 <div class="figure">
 <p><img src="images/logo.png" alt="logo.png" />
@@ -200,7 +199,7 @@ With a system installed in your home you also have greater legal protection agai
 Today everyone is concerned about privacy on the internet. Wanting privacy doesn't necessarily mean you have "something to hide". It just means having the ability to choose <i>what information to share, with whom and under what conditions</i> and therefore being able to shape your own life story. The loss of ability to choose via the "involuntary sharing" which many people experience when using communications systems built by the well known internet companies, means that you're no longer really running your own affairs and that others may begin to exert an improper amount of influence over you. Mass surveillance is perhaps the ultimate in involuntary sharing and it's only through the use of freedom respecting software together with a solid determination to overcome state and corporate abuses of technology that we can hope to get to the kind of internet in which respect for human dignity is built in as a core feature.
 </p>
 
-<div class="center">
+<div class="org-center">
 
 <div class="figure">
 <p><img src="images/nocloud.png" alt="nocloud.png" />
@@ -230,7 +229,7 @@ Freedombone is an example of the internet as it was supposed to be: a network of
 An emphasis of the Freedombone project is the protection of private communications from indiscriminate mass surveillance, otherwise known as "<i>bulk intercept</i>" or "<i>warrantless wiretapping</i>". With only a few exceptions data entering and leaving the system is encrypted using settings recommended by <a href="https://bettercrypto.org/">bettercrypto.org</a>. Stored emails are encrypted such that only someone knowing your GPG password can read them and a GPG key is created automatically if you don't already have one. The system is firewalled with only the necessary ports being opened. Exclusively <a href="http://en.wikipedia.org/wiki/Free_software">free software</a> is used so that all of it can potentially be security audited and proprietary repositories are disabled by default. There are still numerous security problems with the internet in general and software always contains bugs, but a best attempt has been made to ensure that the Freedombone is at least more secure than average.
 </p>
 
-<div class="center">
+<div class="org-center">
 <p>
 This site can also be accessed via a Tor browser at <a href="http://4fvfozz6g3zmvf76.onion/"><a href="http://4fvfozz6g3zmvf76.onion/">http://4fvfozz6g3zmvf76.onion/</a></a>
 </p>

website/EN/installation.html

@@ -3,15 +3,15 @@
 "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-15 Mon 09:15 -->
-<meta  http-equiv="Content-Type" content="text/html;charset=utf-8" />
-<meta  name="viewport" content="width=device-width, initial-scale=1" />
+<!-- 2016-02-27 Sat 22:08 -->
+<meta http-equiv="Content-Type" content="text/html;charset=utf-8" />
+<meta name="viewport" content="width=device-width, initial-scale=1" />
 <title></title>
-<meta  name="generator" content="Org-mode" />
-<meta  name="author" content="Bob Mottram" />
-<meta  name="description" content="Turn the Beaglebone Black into a personal communications server"
+<meta name="generator" content="Org-mode" />
+<meta name="author" content="Bob Mottram" />
+<meta name="description" content="Turn the Beaglebone Black into a personal communications server"
  />
-<meta  name="keywords" content="freedombox, debian, beaglebone, hubzilla, email, web server, home server, internet, censorship, surveillance, social network, irc, jabber" />
+<meta name="keywords" content="freedombox, debian, beaglebone, hubzilla, email, web server, home server, internet, censorship, surveillance, social network, irc, jabber" />
 <style type="text/css">
  <!--/*--><![CDATA[/*><!--*/
   .title  { text-align: center;
@@ -75,8 +75,7 @@
   td.org-left   { text-align: left;   }
   td.org-center { text-align: center; }
   dt { font-weight: bold; }
-  .footpara:nth-child(2) { display: inline; }
-  .footpara { display: block; }
+  .footpara { display: inline; }
   .footdef  { margin-bottom: 1em; }
   .figure { padding: 1em; }
   .figure p { text-align: center; }
@@ -151,7 +150,7 @@ for the JavaScript code in this tag.
 <a name="top" id="top"></a>
 </div>
 <div id="content">
-<div class="center">
+<div class="org-center">
 
 <div class="figure">
 <p><img src="images/logo.png" alt="logo.png" />

website/EN/mesh.html

@@ -3,15 +3,15 @@
 "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:09 -->
+<meta http-equiv="Content-Type" content="text/html;charset=utf-8" />
+<meta name="viewport" content="width=device-width, initial-scale=1" />
 <title></title>
-<!-- 2016-01-07 Thu 19:24 -->
-<meta  http-equiv="Content-Type" content="text/html;charset=utf-8" />
-<meta  name="generator" content="Org-mode" />
-<meta  name="author" content="Bob Mottram" />
-<meta  name="description" content="Turn the Beaglebone Black into a personal communications server"
+<meta name="generator" content="Org-mode" />
+<meta name="author" content="Bob Mottram" />
+<meta name="description" content="Turn the Beaglebone Black into a personal communications server"
  />
-<meta  name="keywords" content="freedombox, debian, beaglebone, red matrix, email, web server, home server, internet, censorship, surveillance, social network, irc, jabber" />
-<meta  name="viewport" content="width=device-width, initial-scale=1" />
+<meta name="keywords" content="freedombox, debian, beaglebone, red matrix, email, web server, home server, internet, censorship, surveillance, social network, irc, jabber" />
 <style type="text/css">
  <!--/*--><![CDATA[/*><!--*/
   .title  { text-align: center;
@@ -75,8 +75,7 @@
   td.org-left   { text-align: left;   }
   td.org-center { text-align: center; }
   dt { font-weight: bold; }
-  .footpara:nth-child(2) { display: inline; }
-  .footpara { display: block; }
+  .footpara { display: inline; }
   .footdef  { margin-bottom: 1em; }
   .figure { padding: 1em; }
   .figure p { text-align: center; }
@@ -151,7 +150,7 @@ for the JavaScript code in this tag.
 <a name="top" id="top"></a>
 </div>
 <div id="content">
-<div class="center">
+<div class="org-center">
 
 <div class="figure">
 <p><img src="images/logo.png" alt="logo.png" />

website/EN/mirrors.html

@@ -3,15 +3,15 @@
 "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-01 Mon 16:45 -->
-<meta  http-equiv="Content-Type" content="text/html;charset=utf-8" />
-<meta  name="viewport" content="width=device-width, initial-scale=1" />
+<!-- 2016-02-27 Sat 22:10 -->
+<meta http-equiv="Content-Type" content="text/html;charset=utf-8" />
+<meta name="viewport" content="width=device-width, initial-scale=1" />
 <title></title>
-<meta  name="generator" content="Org-mode" />
-<meta  name="author" content="Bob Mottram" />
-<meta  name="description" content="Mirroring git repositories"
+<meta name="generator" content="Org-mode" />
+<meta name="author" content="Bob Mottram" />
+<meta name="description" content="Mirroring git repositories"
  />
-<meta  name="keywords" content="freedombox, debian, beaglebone, red matrix, email, web server, home server, internet, censorship, surveillance, social network, irc, jabber" />
+<meta name="keywords" content="freedombox, debian, beaglebone, red matrix, email, web server, home server, internet, censorship, surveillance, social network, irc, jabber" />
 <style type="text/css">
  <!--/*--><![CDATA[/*><!--*/
   .title  { text-align: center;
@@ -75,8 +75,7 @@
   td.org-left   { text-align: left;   }
   td.org-center { text-align: center; }
   dt { font-weight: bold; }
-  .footpara:nth-child(2) { display: inline; }
-  .footpara { display: block; }
+  .footpara { display: inline; }
   .footdef  { margin-bottom: 1em; }
   .figure { padding: 1em; }
   .figure p { text-align: center; }
@@ -151,7 +150,7 @@ for the JavaScript code in this tag.
 <a name="top" id="top"></a>
 </div>
 <div id="content">
-<div class="center">
+<div class="org-center">
 
 <div class="figure">
 <p><img src="images/logo.png" alt="logo.png" />
@@ -231,7 +230,7 @@ No. Packages for Debian will still be accessed in the conventional manner.
 Yes. From the control panel select "<i>Set the main repository</i>"
 </p>
 
-<div class="center">
+<div class="org-center">
 
 <div class="figure">
 <p><img src="images/controlpanel/control_panel_mirrors.jpg" alt="control_panel_mirrors.jpg" />
@@ -247,6 +246,10 @@ Yes. From the control panel select "<i>Set the main repository</i>"
 <p>
 Nothing. That happens as part of regular automatic updates.
 </p>
+
+<center>
+Return to the <a href="index.html">home page</a>
+</center>
 </div>
 </div>
 </div>

website/EN/related.html

@@ -3,15 +3,15 @@
 "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:10 -->
+<meta http-equiv="Content-Type" content="text/html;charset=utf-8" />
+<meta name="viewport" content="width=device-width, initial-scale=1" />
 <title></title>
-<!-- 2016-01-07 Thu 20:17 -->
-<meta  http-equiv="Content-Type" content="text/html;charset=utf-8" />
-<meta  name="generator" content="Org-mode" />
-<meta  name="author" content="Bob Mottram" />
-<meta  name="description" content="Turn the Beaglebone Black into a personal communications server"
+<meta name="generator" content="Org-mode" />
+<meta name="author" content="Bob Mottram" />
+<meta name="description" content="Turn the Beaglebone Black into a personal communications server"
  />
-<meta  name="keywords" content="freedombox, debian, beaglebone, hubzilla, email, web server, home server, internet, censorship, surveillance, social network, irc, jabber" />
-<meta  name="viewport" content="width=device-width, initial-scale=1" />
+<meta name="keywords" content="freedombox, debian, beaglebone, hubzilla, email, web server, home server, internet, censorship, surveillance, social network, irc, jabber" />
 <style type="text/css">
  <!--/*--><![CDATA[/*><!--*/
   .title  { text-align: center;
@@ -75,8 +75,7 @@
   td.org-left   { text-align: left;   }
   td.org-center { text-align: center; }
   dt { font-weight: bold; }
-  .footpara:nth-child(2) { display: inline; }
-  .footpara { display: block; }
+  .footpara { display: inline; }
   .footdef  { margin-bottom: 1em; }
   .figure { padding: 1em; }
   .figure p { text-align: center; }
@@ -151,7 +150,7 @@ for the JavaScript code in this tag.
 <a name="top" id="top"></a>
 </div>
 <div id="content">
-<div class="center">
+<div class="org-center">
 
 <div class="figure">
 <p><img src="images/logo.png" alt="logo.png" />

website/EN/support.html

@@ -3,15 +3,15 @@
 "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:11 -->
+<meta http-equiv="Content-Type" content="text/html;charset=utf-8" />
+<meta name="viewport" content="width=device-width, initial-scale=1" />
 <title></title>
-<!-- 2016-01-07 Thu 19:24 -->
-<meta  http-equiv="Content-Type" content="text/html;charset=utf-8" />
-<meta  name="generator" content="Org-mode" />
-<meta  name="author" content="Bob Mottram" />
-<meta  name="description" content="Turn the Beaglebone Black into a personal communications server"
+<meta name="generator" content="Org-mode" />
+<meta name="author" content="Bob Mottram" />
+<meta name="description" content="Turn the Beaglebone Black into a personal communications server"
  />
-<meta  name="keywords" content="freedombox, debian, beaglebone, red matrix, email, web server, home server, internet, censorship, surveillance, social network, irc, jabber" />
-<meta  name="viewport" content="width=device-width, initial-scale=1" />
+<meta name="keywords" content="freedombox, debian, beaglebone, red matrix, email, web server, home server, internet, censorship, surveillance, social network, irc, jabber" />
 <style type="text/css">
  <!--/*--><![CDATA[/*><!--*/
   .title  { text-align: center;
@@ -75,8 +75,7 @@
   td.org-left   { text-align: left;   }
   td.org-center { text-align: center; }
   dt { font-weight: bold; }
-  .footpara:nth-child(2) { display: inline; }
-  .footpara { display: block; }
+  .footpara { display: inline; }
   .footdef  { margin-bottom: 1em; }
   .figure { padding: 1em; }
   .figure p { text-align: center; }
@@ -151,7 +150,7 @@ for the JavaScript code in this tag.
 <a name="top" id="top"></a>
 </div>
 <div id="content">
-<div class="center">
+<div class="org-center">
 
 <div class="figure">
 <p><img src="images/logo.png" alt="logo.png" />
@@ -242,7 +241,7 @@ A better design for this website would be nice to have. Photos, icons or other a
 <div id="outline-container-orgheadline6" class="outline-3">
 <h3 id="orgheadline6">More education and promotion</h3>
 <div class="outline-text-3" id="text-orgheadline6">
-<div class="center">
+<div class="org-center">
 
 <div class="figure">
 <p><img src="./images/educate.png" alt="educate.png" />

website/EN/usage.html

@@ -3,15 +3,15 @@
 "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-24 Wed 16:31 -->
-<meta  http-equiv="Content-Type" content="text/html;charset=utf-8" />
-<meta  name="viewport" content="width=device-width, initial-scale=1" />
+<!-- 2016-02-27 Sat 22:04 -->
+<meta http-equiv="Content-Type" content="text/html;charset=utf-8" />
+<meta name="viewport" content="width=device-width, initial-scale=1" />
 <title></title>
-<meta  name="generator" content="Org-mode" />
-<meta  name="author" content="Bob Mottram" />
-<meta  name="description" content="Turn the Beaglebone Black into a personal communications server"
+<meta name="generator" content="Org-mode" />
+<meta name="author" content="Bob Mottram" />
+<meta name="description" content="Turn the Beaglebone Black into a personal communications server"
  />
-<meta  name="keywords" content="freedombox, debian, beaglebone, hubzilla, email, web server, home server, internet, censorship, surveillance, social network, irc, jabber" />
+<meta name="keywords" content="freedombox, debian, beaglebone, hubzilla, email, web server, home server, internet, censorship, surveillance, social network, irc, jabber" />
 <style type="text/css">
  <!--/*--><![CDATA[/*><!--*/
   .title  { text-align: center;
@@ -75,8 +75,7 @@
   td.org-left   { text-align: left;   }
   td.org-center { text-align: center; }
   dt { font-weight: bold; }
-  .footpara:nth-child(2) { display: inline; }
-  .footpara { display: block; }
+  .footpara { display: inline; }
   .footdef  { margin-bottom: 1em; }
   .figure { padding: 1em; }
   .figure p { text-align: center; }
@@ -151,7 +150,7 @@ for the JavaScript code in this tag.
 <a name="top" id="top"></a>
 </div>
 <div id="content">
-<div class="center">
+<div class="org-center">
 
 <div class="figure">
 <p><img src="images/logo.png" alt="logo.png" />
@@ -528,55 +527,18 @@ IRC is useful for multi-user chat. The classic use case is for software developm
 <h4 id="orgheadline19">Irssi</h4>
 <div class="outline-text-4" id="text-orgheadline19">
 <p>
-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.
+The easiest way to use irssi is to connect to your system, like this:
 </p>
 
 <div class="org-src-container">
 
-<pre class="src src-bash">/server add -auto -ssl yourdomainname 6697
-/connect yourdomainname
-/join freedombone
+<pre class="src src-bash">ssh myusername@mydomain -p 2222
 </pre>
 </div>
 
 <p>
-You can also connect via Tor, and this will help to protect your metadata from mass surveillance and will also allow you to connect even if you are behind a hostile firewall. Note however, that connecting to popular servers such as Freenode is hard to do via Tor (they may block exit nodes to try to stop trolls), so you might want to have a special irssi config file for only connecting to your server.
+Then select <b>IRC</b> from the menu. Irssi is automatically set up to connect to your server and route its messages through the Tor network. Some popular systems such as <b>Freenode</b> reject connections coming from Tor (as a very crude attempt to stop trolls) and so if you want to use those you can exit to the command line from the menu and then just type "irssi" to use the system without Tor.
 </p>
-
-<p>
-Look up the onion address for IRC on your Freedombone system.
-</p>
-
-<div class="org-src-container">
-
-<pre class="src src-bash">ssh username@domain -p 2222
-sudo control
-</pre>
-</div>
-
-<p>
-Go to the <i>About</i> screen and look for the IRC onion address, then exit back to your local system.
-</p>
-
-<div class="org-src-container">
-
-<pre class="src src-bash"><span class="org-keyword">exit</span>
-</pre>
-</div>
-
-<p>
-Once you know the onion address for the IRC server you can then connect to it with:
-</p>
-
-<div class="org-src-container">
-
-<pre class="src src-bash">usewithtor irssi
-/server add -auto myaddress.onion 6697
-/ignore * CTCPS
-/connect myaddress.onion
-/join freedombone
-</pre>
-</div>
 </div>
 </div>
 <div id="outline-container-orgheadline20" class="outline-4">
@@ -749,7 +711,7 @@ Install <a href="https://f-droid.org/">F-Droid</a>
 </p>
 
 <p>
-Search for and install Xabber.
+Search for and install <b>Orbot</b> and <b>Conversations</b>.
 </p>
 
 <p>
@@ -757,15 +719,24 @@ Add an account and enter your Jabber/XMPP ID and password.
 </p>
 
 <p>
-From the menu select <b>Settings</b> then <b>Security</b> then <b>OTR mode</b>.  Set the mode to <b>Required</b>.
+From the menu select <b>Settings</b> then <b>Expert Settings</b>. Select <b>Connect via Tor</b> and depending on your situation you might also want to select <b>Don't save encrypted messages</b>.
 </p>
 
 <p>
-Make sure that <b>Check server certificate</b> is not checked.
+From the menu select <b>Manage accounts</b> and add a new account.
 </p>
 
+<div class="org-src-container">
+
+<pre class="src src-bash">Jabber ID: myusername@mydomain
+Password:  your XMPP password
+Hostname:  mydomain
+Port:      5222
+</pre>
+</div>
+
 <p>
-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.
+Then select <b>Next</b>. When chatting you can use the lock icon to encrypt your conversation. It's also going through Tor, so passive surveillance of the metadata should not be easy for an adversary.
 </p>
 </div>
 </div>
@@ -781,14 +752,18 @@ Tox is an encrypted peer-to-peer messaging system and so should work without Fre
 <h4 id="orgheadline28">Using the Toxic client</h4>
 <div class="outline-text-4" id="text-orgheadline28">
 <p>
-To connect to your node use the command:
+Log into your system with:
 </p>
 
 <div class="org-src-container">
 
-<pre class="src src-bash">/connect [yourdomainname] 33445 [your tox node ID]
+<pre class="src src-bash">ssh myusername@mydomain -p 2222
 </pre>
 </div>
+
+<p>
+Then from the menu select <b>Tox Chat</b>. Tox is encrypted by default and also router through Tor, so it should be reasonably secure both in terms of message content and metadata.
+</p>
 </div>
 </div>
 </div>

website/EN/usage_email.html

@@ -3,15 +3,15 @@
 "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 -->
+<meta http-equiv="Content-Type" content="text/html;charset=utf-8" />
+<meta name="viewport" content="width=device-width, initial-scale=1" />
 <title></title>
-<!-- 2016-01-07 Thu 19:25 -->
-<meta  http-equiv="Content-Type" content="text/html;charset=utf-8" />
-<meta  name="generator" content="Org-mode" />
-<meta  name="author" content="Bob Mottram" />
-<meta  name="description" content="Turn the Beaglebone Black into a personal communications server"
+<meta name="generator" content="Org-mode" />
+<meta name="author" content="Bob Mottram" />
+<meta name="description" content="Turn the Beaglebone Black into a personal communications server"
  />
-<meta  name="keywords" content="freedombox, debian, beaglebone, hubzilla, email, web server, home server, internet, censorship, surveillance, social network, irc, jabber" />
-<meta  name="viewport" content="width=device-width, initial-scale=1" />
+<meta name="keywords" content="freedombox, debian, beaglebone, hubzilla, email, web server, home server, internet, censorship, surveillance, social network, irc, jabber" />
 <style type="text/css">
  <!--/*--><![CDATA[/*><!--*/
   .title  { text-align: center;
@@ -75,8 +75,7 @@
   td.org-left   { text-align: left;   }
   td.org-center { text-align: center; }
   dt { font-weight: bold; }
-  .footpara:nth-child(2) { display: inline; }
-  .footpara { display: block; }
+  .footpara { display: inline; }
   .footdef  { margin-bottom: 1em; }
   .figure { padding: 1em; }
   .figure p { text-align: center; }
@@ -151,7 +150,7 @@ for the JavaScript code in this tag.
 <a name="top" id="top"></a>
 </div>
 <div id="content">
-<div class="center">
+<div class="org-center">
 
 <div class="figure">
 <p><img src="images/logo.png" alt="logo.png" />
@@ -293,7 +292,7 @@ gpg --send-keys username@domainname
 <div id="outline-container-orgheadline5" class="outline-2">
 <h2 id="orgheadline5">Mutt email client</h2>
 <div class="outline-text-2" id="text-orgheadline5">
-<div class="center">
+<div class="org-center">
 
 <div class="figure">
 <p><img src="./images/mutt.jpeg" alt="mutt.jpeg" />

website/EN/variants.html

@@ -3,15 +3,15 @@
 "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-23 Tue 14:15 -->
-<meta  http-equiv="Content-Type" content="text/html;charset=utf-8" />
-<meta  name="viewport" content="width=device-width, initial-scale=1" />
+<!-- 2016-02-27 Sat 22:12 -->
+<meta http-equiv="Content-Type" content="text/html;charset=utf-8" />
+<meta name="viewport" content="width=device-width, initial-scale=1" />
 <title></title>
-<meta  name="generator" content="Org-mode" />
-<meta  name="author" content="Bob Mottram" />
-<meta  name="description" content="Turn the Beaglebone Black into a personal communications server"
+<meta name="generator" content="Org-mode" />
+<meta name="author" content="Bob Mottram" />
+<meta name="description" content="Turn the Beaglebone Black into a personal communications server"
  />
-<meta  name="keywords" content="freedombox, debian, beaglebone, red matrix, email, web server, home server, internet, censorship, surveillance, social network, irc, jabber" />
+<meta name="keywords" content="freedombox, debian, beaglebone, red matrix, email, web server, home server, internet, censorship, surveillance, social network, irc, jabber" />
 <style type="text/css">
  <!--/*--><![CDATA[/*><!--*/
   .title  { text-align: center;
@@ -75,8 +75,7 @@
   td.org-left   { text-align: left;   }
   td.org-center { text-align: center; }
   dt { font-weight: bold; }
-  .footpara:nth-child(2) { display: inline; }
-  .footpara { display: block; }
+  .footpara { display: inline; }
   .footdef  { margin-bottom: 1em; }
   .figure { padding: 1em; }
   .figure p { text-align: center; }
@@ -151,7 +150,7 @@ for the JavaScript code in this tag.
 <a name="top" id="top"></a>
 </div>
 <div id="content">
-<div class="center">
+<div class="org-center">
 
 <div class="figure">
 <p><img src="images/logo.png" alt="logo.png" />