From 29c557c64ac1e19b4dea68d8fae5bb1ee96166c4 Mon Sep 17 00:00:00 2001 From: Bob Mottram Date: Fri, 30 Jun 2017 22:01:33 +0100 Subject: [PATCH] More concise --- doc/EN/release3.org | 8 ++++---- website/EN/release3.html | 22 +++++++++++----------- 2 files changed, 15 insertions(+), 15 deletions(-) diff --git a/doc/EN/release3.org b/doc/EN/release3.org index d8873ae9..ff8f7cb4 100644 --- a/doc/EN/release3.org +++ b/doc/EN/release3.org @@ -21,11 +21,11 @@ The internet may still be mostly in the clutches of a few giant megacorporations Freedombone version 3 is based on Debian 9 (Stretch). It was released in July 2017 and includes: * Faster initial setup - * More [[./apps.html][installable apps]] than the previous release, including CryptPad, Koel, NextCloud, PostActiv, Friendica and Matrix/RiotWeb + * More [[./apps.html][installable apps]], including CryptPad, Koel, NextCloud, PostActiv, Friendica and Matrix/RiotWeb * Automated [[https://github.com/hardenedlinux/STIG-4-Debian][security tests]] - * Improved XMPP configuration to support all of the XEPs needed by the [[https://conversations.im][Conversations]] app - * Improved account and domain blocking controls for GNU Social and PostActiv for a better federated network experience - * Uses [[https://en.wikipedia.org/wiki/EdDSA][elliptic curve]] based GPG keys by default for better performance on low power single board computers + * Improved XMPP configuration to support the XEPs needed by the [[https://conversations.im][Conversations]] app + * Improved blocking controls for a better federated network experience + * Uses [[https://en.wikipedia.org/wiki/EdDSA][elliptic curve]] based GPG keys for better performance on low power single board computers * Pre-downloaded repos distributed within images for faster and more autonomous app installs * Installation diff --git a/website/EN/release3.html b/website/EN/release3.html index f4fe5a9e..90b1e536 100644 --- a/website/EN/release3.html +++ b/website/EN/release3.html @@ -3,7 +3,7 @@ "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd"> - + @@ -258,17 +258,17 @@ Freedombone version 3 is based on Debian 9 (Stretch). It was released in July 20 -
-

Installation

-
+
+

Installation

+

The simplest way to install is from a pre-made disk image. Images can be downloaded here. You will need to have previously obtained a domain name and have a dynamic DNS account somewhere.

@@ -324,9 +324,9 @@ More detailed installation instructions are linked from t
-
-

Upgrading from a previous install

-
+
+

Upgrading from a previous install

+

To upgrade from the Debian Jessie version first create a master keydrive. Go to the Administrator control panel and select Backup and restore then Backup GPG key to USB (master keydrive). Insert a LUKS encrypted USB drive. When that is done Create a full backup by selecting Backup data to USB drive and using another LUKS encrypted USB drive.