From e9cdcf131c8b3653ff889d48a5ba107521ca7c80 Mon Sep 17 00:00:00 2001
From: Till Maas <opensource@till.name>
Date: Tue, 4 Sep 2018 14:33:26 +0200
Subject: [PATCH] Update installation instructions

- sort sections for different third-party methods
- Mention that Fedora can now just be installed via dnf
- Fix some typos
---
 doc/020_installation.rst | 95 +++++++++++++++++++++-------------------
 1 file changed, 50 insertions(+), 45 deletions(-)

diff --git a/doc/020_installation.rst b/doc/020_installation.rst
index 1ded4fdf9..1d93be0d9 100644
--- a/doc/020_installation.rst
+++ b/doc/020_installation.rst
@@ -24,19 +24,9 @@ These are up to date binaries, built in a reproducible and verifiable way, that
 you can download and run without having to do additional installation work.
 
 Please see the :ref:`official_binaries` section below for various downloads.
-Official bianaries can be updated in place by using the ``restic self-update``
+Official binaries can be updated in place by using the ``restic self-update``
 command.
 
-Mac OS X
-========
-
-If you are using Mac OS X, you can install restic using the
-`homebrew <http://brew.sh/>`__ package manager:
-
-.. code-block:: console
-
-    $ brew install restic
-
 Arch Linux
 ==========
 
@@ -47,17 +37,6 @@ which can be installed from AUR, e.g. with ``pacaur``:
 
     $ pacaur -S restic-git
 
-Nix & NixOS
-===========
-
-If you are using `Nix <https://nixos.org/nix/>`__ or `NixOS <https://nixos.org/>`__
-there is a package available named ``restic``.
-It can be installed uisng ``nix-env``:
-
-.. code-block:: console
-
-    $ nix-env --install restic 
-
 Debian
 ======
 
@@ -72,7 +51,55 @@ installed from the official repos, e.g. with ``apt-get``:
 .. warning:: Please be aware that, at the time of writing, Debian *stable*
    has ``restic`` version 0.3.3 which is very old. The *testing* and *unstable*
    branches have recent versions of ``restic``.
-   
+
+Fedora
+======
+
+restic can be installed using ``dnf``:
+
+.. code-block:: console
+
+    $ dnf install restic
+
+If you used restic from copr previously, remove the copr repo as follows to
+avoid any conflicts:
+
+.. code-block:: console
+
+   $ dnf copr remove copart/restic
+
+Mac OS X
+========
+
+If you are using Mac OS X, you can install restic using the
+`homebrew <http://brew.sh/>`__ package manager:
+
+.. code-block:: console
+
+    $ brew install restic
+
+Nix & NixOS
+===========
+
+If you are using `Nix <https://nixos.org/nix/>`__ or `NixOS <https://nixos.org/>`__
+there is a package available named ``restic``.
+It can be installed using ``nix-env``:
+
+.. code-block:: console
+
+    $ nix-env --install restic
+
+OpenBSD
+=======
+
+On OpenBSD 6.3 and greater, you can install restic using ``pkg_add``:
+
+.. code-block:: console
+
+    # pkg_add restic
+
+.. _official_binaries:
+
 RHEL & CentOS
 =============
 
@@ -96,17 +123,6 @@ For CentOS7 use:
 
     $ yum-config-manager --add-repo https://copr.fedorainfracloud.org/coprs/copart/restic/repo/epel-7/copart-restic-epel-7.repo
 
-Fedora
-======
-
-restic can be installed via copr repository.
-
-.. code-block:: console
-
-    $ dnf install dnf-plugin-core
-    $ dnf copr enable copart/restic
-    $ dnf install restic
-
 Solus
 =====
 
@@ -115,17 +131,6 @@ restic can be installed from the official repo of Solus via the ``eopkg`` packag
 .. code-block:: console
 
     $ eopkg install restic
-    
-OpenBSD
-=======
-
-On OpenBSD 6.3 and greater, you can install restic using ``pkg_add``:
-
-.. code-block:: console
-
-    # pkg_add restic
-
-.. _official_binaries:
 
 Official Binaries
 *****************