From 46db3d583bda2866d55656b2ae32716b36c7c8a0 Mon Sep 17 00:00:00 2001 From: Bob Mottram Date: Fri, 30 Jun 2017 22:05:24 +0100 Subject: [PATCH] Wording --- doc/EN/release3.org | 2 +- website/EN/release3.html | 16 ++++++++-------- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/doc/EN/release3.org b/doc/EN/release3.org index ff8f7cb4..214b24ec 100644 --- a/doc/EN/release3.org +++ b/doc/EN/release3.org @@ -23,7 +23,7 @@ Freedombone version 3 is based on Debian 9 (Stretch). It was released in July 20 * Faster initial setup * 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 the XEPs needed by the [[https://conversations.im][Conversations]] app + * Improved XMPP configuration for better support of 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 diff --git a/website/EN/release3.html b/website/EN/release3.html index 90b1e536..830f49d6 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"> - + @@ -260,15 +260,15 @@ Freedombone version 3 is based on Debian 9 (Stretch). It was released in July 20
  • Faster initial setup
  • More installable apps, including CryptPad, Koel, NextCloud, PostActiv, Friendica and Matrix/RiotWeb
  • Automated security tests
    • -
  • Improved XMPP configuration to support the XEPs needed by the Conversations app
    • +
  • Improved XMPP configuration for better support of the Conversations app
  • Improved blocking controls for a better federated network experience
  • Uses 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

    -
    +
    +

    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.