Reworked wiki

1 files changed, 65 insertions, 69 deletions

diff --git a/Home.md b/Home.md
index 4cb5e0f..6741b29 100644
--- a/Home.md
+++ b/Home.md
@@ -1,4 +1,4 @@
-Welcome to the Remmina wiki!
+Welcome to the Remmina wiki.
 
 <!-- START doctoc generated TOC please keep comment here to allow auto update -->
 <!-- DON'T EDIT THIS SECTION, INSTEAD RE-RUN doctoc TO UPDATE -->
@@ -25,49 +25,52 @@ Welcome to the Remmina wiki!
 
 # IMPORTANT NOTICE
 
-We are on [gitlab](https://gitlab.com/Remmina/Remmina)
+Remmina is developed on [GitLab](https://gitlab.com/Remmina/Remmina)
 
-From the 20th of June 2018 the following links have to be used instead of GitHub.
+From the 20th of June 2018 the following links have to be used, instead of GitHub.
 
-* [issues URL](https://gitlab.com/Remmina/Remmina/issues)
-* [wiki URL](https://gitlab.com/Remmina/Remmina/wikis/home)
+* [Issues URL](https://gitlab.com/Remmina/Remmina/issues)
+* [Wiki URL](https://gitlab.com/Remmina/Remmina/wikis/home)
 
-# Binary distribution
+Usually Remmina is included in your Linux|GNU distribution, or in an external repository you can add.
 
-Usually Remmina is included in your GNU/Linux distribution or in an external repository. Do not ask for distribution packages or precompiled binaries here. This is a development site.
-
-## For Ubuntu users we have an official PPA with the latest stable Remmina version (>1.3 as of today).
+## Ubuntu
 
+Official PPA with the latest stable Remmina version
 https://launchpad.net/~remmina-ppa-team/+archive/ubuntu/remmina-next
 
-To install it, just copy and paste the following three lines on a terminal window
+Install by copying and pasting this in a terminal:
 ```
 sudo apt-add-repository ppa:remmina-ppa-team/remmina-next
 sudo apt update
 sudo apt install remmina remmina-plugin-rdp remmina-plugin-secret
 ```
-Don't forget to exit/kill al your running instances of remmina. The best way to do it is to **reboot** your PC. Or, if you cannot reboot, kill all running remmina with
+Make sure Remmina is not running. Either **reboot** your PC or, kill the running Remmina with:
 ```
 sudo killall remmina
 ```
-By default the RDP, SSH and SFTP plugins are installed. You can view a list of available plugins with `apt-cache search remmina-plugin`
-
-If you are willing [to test the development version](https://gitlab.com/Remmina/Remmina/wikis/Testing-under-Ubuntu-with-the-remmina-next-daily-PPA), you must use an another ppa.
+List available plugins with `apt-cache search remmina-plugin`. By default RDP, SSH and SFTP are installed.
 
-The remmina-next PPA can be used for Raspberry Pi 2 and 3, provided that you are running one of the supported *ubuntu derivatives on your Raspberry Pi.
+The remmina-next PPA can be used on Raspberry Pi 2 and 3, provided that you are running one of the supported *untu derivatives.
 
+To test a daily built development version, do the above, but start with
+```
+ppa:remmina-ppa-team/remmina-next-daily
+```
 ## Debian
 
 Remmina is available in the official repository (testing and unstable) and in the backports for the Debian Stretch (stable).
 
-### Debian Stable (Stretch)
-The [Debian Backports](https://backports.debian.org/Instructions/) repository must be enabled to install it, see [this blog post](https://www.remmina.org/debian-the-boys-are-backport-in-town/) for more information.
+### Debian
 
-Remmina is not available on Debian stable (Stretch) through the default Debian repositories.
+### Debian Debian 10 Buster (stable), Bullseye (testing), and Sid (unstable).
 
-The [Debian Backports](https://backports.debian.org/Instructions/) repository must be enabled to install it, see [this blog post](https://www.remmina.org/wp/debian-the-boys-are-backport-in-town/) for more information.
+Remmina is in the official stable, testing and unstable repositories.
 
-To install Remmina from Debian Backports, just copy and paste the following lines on a terminal window:
+### Debian 10 Buster (oldstable).
+Here Remmina can be [installed from backports](https://www.remmina.org/debian-the-boys-are-backport-in-town/).
+
+To do so, copy and paste this in a terminal:
 
 ```
 echo 'deb http://ftp.debian.org/debian stretch-backports main' | sudo tee --append /etc/apt/sources.list.d/stretch-backports.list >> /dev/null
@@ -75,34 +78,26 @@ sudo apt update
 sudo apt install -t stretch-backports remmina remmina-plugin-rdp remmina-plugin-secret remmina-plugin-spice
 ```
 
-### Debian Testing (Buster) e Unstable (Sid)
-
-Remmina is available on the official Testing and Unstable repositories.
-
 ## Raspberry Pi
 
-We have our Remmina package repository for Raspbian Buster (10.x), tested on RPi 3B and 3B+, use the following commands to add our repository to your Raspbian:
+Remmina operates its own package repository for Raspbian Buster (10.x), tested on RPi 3B and 3B+,
+Install it by copying and pasting this in a terminal:
 
 ```
 sudo apt install dirmngr
 sudo apt-key adv --fetch-keys https://www.remmina.org/raspbian/remmina_raspbian.asc
 sudo bash -c 'echo "deb https://www.remmina.org/raspbian/ buster main" > /etc/apt/sources.list.d/remmina_raspbian.list'
-```
-
-Then you can install remmina
-```
 sudo apt update
 sudo apt install remmina
 ```
-It's also strongly advised to install gnome-keyring to make Remmina save encrypted passwords in a safer place than .remmina text files.
+It is strongly advised to also install gnome-keyring to let Remmina save encrypted passwords in a safer place than .remmina textfiles in the /Home user folder.
 ```
 sudo apt install gnome-keyring
 ```
 
-On the Raspberry Pi you can also use an Ubuntu derivative, for example Ubuntu Mate, and install Remmina using our ubuntu's PPA remmina-next as explained in this page.
-
+## [Flatpak](https://flathub.org/)
 
-## For users with a distro that supports [Flatpak](https://flathub.org/), including Ubuntu
+This is a system agnostic package that works on just about every distribution.
 
 ```shell
 flatpak remote-add --user --if-not-exists flathub https://flathub.org/repo/flathub.flatpakrepo
@@ -119,57 +114,58 @@ If you use SSH agent (https://github.com/flatpak/flatpak/issues/1438 )
 flatpak run --filesystem=$SSH_AUTH_SOCK --env=SSH_AUTH_SOCK=$SSH_AUTH_SOCK org.remmina.Remmina
 ```
 
-Just be aware that flatpak store data for installed applications (the XDG config/data folders) under `$HOME/.var`
-So for instance, if you previously have installed remmina with another package manager, you will have to transfer what was under `$HOME/.config/remmina` and `$HOME/.local/share/remmina` under, respectively `~/.var/app/org.remmina.Remmina/config/remmina` and `~/.var/app/org.remmina.Remmina/data/remmina`
+Flatpak stores data for installed applications (the XDG config/data folders) under `$HOME/.var`
+If you have previously installed Remmina with another package manager, you will have to transfer what was under `$HOME/.config/remmina` and `$HOME/.local/share/remmina` under, respectively `~/.var/app/org.remmina.Remmina/config/remmina` and `~/.var/app/org.remmina.Remmina/data/remmina`
 
-## For users with a distro that supports [Snap packages](https://snapcraft.io/), including Ubuntu
+##[Snap](https://snapcraft.io/)
 
-_We are still working to deliver a stable Snap package, but we still have many issues with SNAP packaging. If you encounter any issues, try first an other mean of installation and only after report the problem through https://github.com/FreeRDP/Remmina/issues.
-Snap currently lacks some functionalities, read this chapter to find more informations.
-Please also note note that currently the SNAP package does not work under Ubuntu 17.10 + Wayland, see [issue #1414](https://github.com/FreeRDP/Remmina/issues/1414)._
+This also is a system agnostic packagage that works on many distros, but mainly Ubuntu.
 
-Ensure you've `snapd` installed in your system. Then in Ubuntu you can install the last release from the Software center, looking for `remmina`, otherwise you can install it from terminal with:
+If you run into issues, try something else first, and then [report the issues](https://github.com/FreeRDP/Remmina/issues).
+Our Snap package does not work on Ubuntu 17.10 if you use Wayland, see [issue #1414](https://github.com/FreeRDP/Remmina/issues/1414)._
+
+First make sure you have `snapd` installed. Then install the last release from the Ubuntu Software Center by looking for `Remmina`, or install it from a terminal with:
 
 ```shell
 sudo snap install remmina
 ```
-Please note that this is not enough to make remmina fully functional, due to some limitations of the snap subsystem.
+There are some limitations of the Snap subsystem, so some features, for example password storage via keyring is missing and *must* be fixed manually:
 
-Some features, for example password saving via a keyring, are disabled and *must* be manually enabled:
 ```shell
 sudo snap connect remmina:avahi-observe :avahi-observe # servers discovery
 sudo snap connect remmina:cups-control :cups-control # printing
 sudo snap connect remmina:mount-observe :mount-observe # mount management
 sudo snap connect remmina:password-manager-service :password-manager-service # password manager
 ```
-Some features just don't work, for example accessing your personal ~/.ssh directory is not possible for a snap. You have to manually copy your ~/.ssh/* files under ~/snap/remmina/common/.ssh/
+Some features just don't work, for example accessing your personal ~/.ssh directory is not possible for a Snap.
+You have to manually copy your ~/.ssh/* files to ~/snap/remmina/common/.ssh/
 
-If you want to install latest git revision of remmina, you can use it from the `edge` channel:
+If you want to install latest Git revision of Remmina, get it from the `edge` channel:
 
 ```shell
 sudo snap install remmina  --edge
 ```
 
-Or update the current installed version with the selected channel:
+**Or**, update your Remmina Snap install with your channel of choice:
 
 ```shell
 sudo snap refresh remmina --channel=edge # use --channel=stable otherwise
 ```
 
-Snap packages will be updated automatically and will include both latest `FreeRDP` git and latest `libssh 0.7` release (for better security).
+Snaps are updated with the system and include both latest `FreeRDP` Git and the latest `libssh 0.7` release (for better security).
 
 ## Fedora and Red Hat
 
-As of March 2018 Remmina is available on most fedora testing and stable, we still have a (not updated) copr provided by [Hubbitus](https://github.com/Hubbitus) (Pavel Alexeev), to install just execute as root:
+As of March 2018 Remmina is available on most Fedora testing and stable, we still have a (not updated) Copr provided by [Hubbitus](https://github.com/Hubbitus) (Pavel Alexeev), to install paste this in a terminal as root:
 
 ```shell
 dnf copr enable hubbitus/remmina-next
 dnf upgrade --refresh 'remmina*' 'freerdp*'
 ```
 
-~~On Red Hat you can enable the EPEL repository:~~
+## Red Hat
 
-Note: Unlucky Remmina is not yet in EPEL, you can help submitting a request on the [Red Hat bugzilla](https://bugzilla.redhat.com/).
+Install Remmina from the EPEL repository by pasting this in a terminal:
 
 ```shell
 wget http://dl.fedoraproject.org/pub/epel/epel-release-latest-7.noarch.rpm
@@ -197,47 +193,47 @@ emerge -avb net-misc/remmina
 emerge -avk remmina*.tar.bz
 # From cp /usr/portage/packages/net-misc remmina* > /mnt/some-usb-stick to multiple boxes
 emerge -avk =net-misc/remmina-#??Version number
-# if you have a Bin-host/Binary package server defined on your lan
+# if you have a Bin-host/Binary package server defined on your LAN
 ```
 
-* (version???) on other machines as a binary if you have many Gentoo machines... directly from file else bin host
+* (version???) on other machines as a binary if you have many Gentoo machines… directly from file else bin host
 
 ## Arch Linux based
 
-The official Arch Linux package is very well maintaned, if you to use the AUR Install [remmina-git](https://aur.archlinux.org/packages/remmina-git).
+There is an official Arch Linux Remmina package. **Or**, if you to use the AUR, install [remmina-git](https://aur.archlinux.org/packages/remmina-git).
 
 There are also some external, not supported plugins provided by [Muflone](https://github.com/muflone) :
 
-* [remmina-plugin-exec](https://aur.archlinux.org/packages/remmina-plugin-exec/) A protocol plugin for Remmina to execute an external process.
-* [remmina-plugin-folder](https://aur.archlinux.org/packages/remmina-plugin-folder/) A protocol plugin for Remmina to open a folder.
-* [remmina-plugin-open](https://aur.archlinux.org/packages/remmina-plugin-open/) A protocol plugin for Remmina to open a document with its associated application.
-* [remmina-plugin-rdesktop](https://aur.archlinux.org/packages/remmina-plugin-rdesktop/) A protocol plugin for Remmina to open a RDP connection with rdesktop.
-* [remmina-plugin-teamviewer](https://aur.archlinux.org/packages/remmina-plugin-teamviewer/) A protocol plugin for Remmina to launch a TeamViewer connection.
-* [remmina-plugin-ultravnc](https://aur.archlinux.org/packages/remmina-plugin-ultravnc/) A protocol plugin for Remmina to connect via VNC using UltraVNC viewer.
-* [remmina-plugin-url](https://aur.archlinux.org/packages/remmina-plugin-url/) A protocol plugin for Remmina to open an URL in an external browser.
-* [remmina-plugin-webkit](https://aur.archlinux.org/packages/remmina-plugin-webkit/) A protocol plugin for Remmina to launch a GTK+ Webkit browser.
+#### Protocol plugins
+* [remmina-plugin-exec](https://aur.archlinux.org/packages/remmina-plugin-exec/) Execute an external process.
+* [remmina-plugin-folder](https://aur.archlinux.org/packages/remmina-plugin-folder/) Open a folder with Remmina.
+* [remmina-plugin-open](https://aur.archlinux.org/packages/remmina-plugin-open/) Open a document with its associated application with Remmina.
+* [remmina-plugin-rdesktop](https://aur.archlinux.org/packages/remmina-plugin-rdesktop/) Open a RDP connection with rdesktop with Remmina.
+* [remmina-plugin-teamviewer](https://aur.archlinux.org/packages/remmina-plugin-teamviewer/) Launch a TeamViewer connection from Remmina.
+* [remmina-plugin-ultravnc](https://aur.archlinux.org/packages/remmina-plugin-ultravnc/) Connect in Remmina via VNC using the UltraVNC viewer.
+* [remmina-plugin-url](https://aur.archlinux.org/packages/remmina-plugin-url/) Open a URL in an external browser from Remmina.
+* [remmina-plugin-webkit](https://aur.archlinux.org/packages/remmina-plugin-webkit/) Launch a GTK+ Webkit browser from Remmina.
 
 ## Solus
 
-Simply install the newest version of Remmina from the repository with the following command:
+Past this in a terminal to install Remmina on Solus:
 ```shell
 sudo eopkg update-repo
 sudo eopkg install remmina
 ```
 
-# FOR DEVELOPERS, PACKAGERS AND TESTERS
-
-## CURRENT STATUS
+# For developers, packagers and testers
 
-Here, on github, we have three official branches:
+## Current status
 
-"master" branch: the future 1.2.X version, which compiles with current freerdp master branch and will compile with freerdp 2.0 when released. We will do code developments and bugfixes here, on the master branch.
+Here, on GitLab, we have three official branches:
 
-"oldmaster" branch: the 1.1.2 stable version, which compiles with freerdp 1.1 stable. We will only provide security fixes or critical bugs (i.e.: data corruption) fixes on version 1.1.X.
+* "master" branch: This compiles with the current FreeRDP master branch, and will compile with FreeDRP 2.0 when released as stable. Code development and bugfixes is done here, on the master branch.
+* "oldmaster" branch: the 1.1.2 stable version, which compiles with freerdp 1.1 stable. Only security fixes or critical bugs are fixed (i.e.: data corruption).
 
 ~~"gtk2" branch: a special remmina 1.1.1 version compatible with GTK2, compiles with freerdp 1.1 stable~~
 
-## REMMINA BUILDING GUIDES
+## Build from source
 
 * How to compile "master" branch on [Ubuntu 14.04](Compile-on-Ubuntu-14.04) and [Ubuntu 16.04](Compile-on-Ubuntu-16.04).
 * How to compile "master" branch on [Fedora 20](Compile-on-Fedora-20).
@@ -247,4 +243,4 @@ Here, on github, we have three official branches:
 - [Remmina website](https://www.remmina.org/)
 - [Remmina subreddit](https://reddit.com/r/Remmina)
 - [Remmina Development Doc](https://remmina.gitlab.io/remminadoc.gitlab.io)
-
+- [Versions for various operating systems](https://repology.org/project/remmina/versions)