From 2b41e37f297e8379f1f41c865ce80c92781de80b Mon Sep 17 00:00:00 2001
From: Theodore Faure <theodore@theodorefaure.com>
Date: Sun, 9 Oct 2016 22:01:13 +0200
Subject: [PATCH] update install pages

---
 admindoc.md              |  5 ++++-
 install_iso.md           | 18 +++++++++---------
 install_iso_fr.md        |  2 +-
 install_on_debian.md     |  7 +++----
 install_on_virtualbox.md | 16 ++++++++--------
 5 files changed, 25 insertions(+), 23 deletions(-)

diff --git a/admindoc.md b/admindoc.md
index b929f136..cb87d8d1 100644
--- a/admindoc.md
+++ b/admindoc.md
@@ -3,10 +3,13 @@
 *For want of anything better, here is an index of interesting pages for the YunoHost server's administrator.*
 
 * [What is Self-hosting](/selfhosting)
+* [Compatible hardware](/hardware)
 * [Installation guide](/install)
    * [On ARM board](/install_on_arm_board)
    * [On Raspberry Pi](/install_on_raspberry)
-* [Compatible hardware](/hardware)
+   * [From the ISO image](/install_iso)
+   * [On Debian](/install_on_debian)
+   * [On VirtualBox](/install_on_virtualbox)
 * [Available applications](/apps)
 * [Administration interface usage](/admin)
 * [Command-line interface usage](/moulinette)
diff --git a/install_iso.md b/install_iso.md
index 63b981a5..0b0fddee 100644
--- a/install_iso.md
+++ b/install_iso.md
@@ -2,21 +2,21 @@
 
 *Find other ways to install YunoHost **[here](/install)**.*
 
-### Pre-requisite
+### Requirements
 
 <img src="/images/laptop.png" width=200>
 <img src="/images/desktop.jpg">
 <img src="/images/nettop.jpg">
 
-<div class="alert alert-danger">This images are based on **Debian Wheezy**. Wheezy **won't be maintained** with YunoHost 2.4.<br />
-It's **strongly adviced** to install YunoHost on **Debian Jessie** with the **[install script](/install_on_debian_en)**.</div>
+<div class="alert alert-danger">These images are based on **Debian Wheezy**. Wheezy **won't be maintained** with YunoHost 2.4.<br />
+It is **strongly recommended** to install YunoHost on **Debian Jessie** with the **[install script](/install_on_debian_en)**.</div>
 
-* An x86-compatible hardware dedicated to YunoHost: laptop, nettop, netbook, desktop.    
-You can reuse any computer with **256MB RAM or more**.
+* A x86-compatible hardware dedicated to YunoHost: laptop, nettop, netbook, desktop.    
+You can use any computer with **256MB RAM or more**.
 * Another computer to read this guide and access to your server.
 * A [reasonable ISP](/isp), preferably with a good and unlimited upstream bandwidth
-* A **USB key** of at least 1GB capacity **OR** a standard **blank CD**
-* One of the latest **YunoHost ISO images**, available here (take the 32 bits one if you don't know which one to choose):
+* A **USB stick** of at least 1GB capacity **OR** a standard **blank CD**
+* One of the latest **YunoHost ISO images**, available here (take the 32 Bits one if you don't know which one to choose):
    <div>
    <b>Torrent:</b>
    <ul>
@@ -42,10 +42,10 @@ You can reuse any computer with **256MB RAM or more**.
 
 ---
 
-For connecting directly on your computer or with [SSH](/ssh) (only local): 
+To connect directly to your computer or with [SSH](/ssh) (only on local network:
 * User: **root**
 * Password: **yunohost**
 
 ---
 
-***If you need help during one of these steps, do not hesitate to use [our support tools](/support).***
+***Need help during one of these steps? [Get support!](/support)***
diff --git a/install_iso_fr.md b/install_iso_fr.md
index 54301bc4..a2f4850b 100644
--- a/install_iso_fr.md
+++ b/install_iso_fr.md
@@ -41,7 +41,7 @@ Il est **fortement conseillé** d’installer YunoHost sur **Debian Jessie** ave
 
 ---
 
-Pour se connecter directement sur l’ordinateur (uniquement en local) : 
+Pour se connecter directement sur l’ordinateur (uniquement en local) :
 * Utilisateur : **root**
 * Mot de passe : **yunohost**
 
diff --git a/install_on_debian.md b/install_on_debian.md
index 3e900f57..599f8671 100644
--- a/install_on_debian.md
+++ b/install_on_debian.md
@@ -2,7 +2,7 @@
 
 *Find other ways to install YunoHost **[here](/install)**.*
 
-### Pre-requisite
+### Requirements
 
 <img width=100 src="/images/debian-logo.png">
 
@@ -10,7 +10,7 @@ An ARM box, a VPS, a dedicated server, a standard x86 computer, an old Macintosh
 
 * with **Debian 8** (Jessie) installed
 * connected to the Internet
-* with a **root access** directly or via SSH
+* with a direct **root access** or via SSH
 
 <img width=650 src="/images/debian_install.png">
 
@@ -24,5 +24,4 @@ An ARM box, a VPS, a dedicated server, a standard x86 computer, an old Macintosh
 
 ---
 
-***If you need help during one of these steps, do not hesitate to use [our support tools](/support).***
-
+***Need help during one of these steps? [Get support!](/support)***
diff --git a/install_on_virtualbox.md b/install_on_virtualbox.md
index 5c1744fb..b267b44b 100644
--- a/install_on_virtualbox.md
+++ b/install_on_virtualbox.md
@@ -2,13 +2,13 @@
 
 *Find other ways to install YunoHost **[here](/install)**.*
 
-## Pre-requisite
+## Requirements
 
 <img src="/images/virtualbox.png" width=200>
 
-* An x86 computer with VirtualBox installed and enough RAM capacity to be able to run a small virtual machine.
-* The latest **YunoHost ISO image**, available here: 
-  * **Torrent** ([i386](http://build.yunohost.org/yunohostv2-latest-i386.iso.torrent), [amd64](http://build.yunohost.org/yunohostv2-latest-amd64.iso.torrent)): share at least to ratio 1 to assure torrents sustainability
+* A x86 computer with VirtualBox installed and enough RAM capacity to be able to run a small virtual machine.
+* The latest **YunoHost ISO image**, available here:
+  * **Torrent** ([i386](http://build.yunohost.org/yunohostv2-latest-i386.iso.torrent), [amd64](http://build.yunohost.org/yunohostv2-latest-amd64.iso.torrent)): share at least to ratio 1 to assure the torrent's sustainability
   * **Direct download** ([i386](http://build.yunohost.org/yunohostv2-latest-i386.iso), [amd64](http://build.yunohost.org/yunohostv2-latest-amd64.iso))
 
 
@@ -28,7 +28,7 @@
 
 ## <small>2.</small> Change network settings
 
-Go to **Settings** > **Network**,  and your interface:
+Go to **Settings** > **Network**:
 
 <img src="/images/virtualbox_2.png" style="max-width:100%;border-radius: 5px;border: 1px solid rgba(0,0,0,0.15);box-shadow: 0 5px 15px rgba(0,0,0,0.35);">
 
@@ -53,7 +53,7 @@ Start the virtual machine
 You will have to select your ISO image `yunohostv2-latest-amd64.iso` here, then you should see the YunoHost's boot screen.
 
 <br>
-   
+
 <img src="/images/virtualbox_3.png" style="max-width:100%;border-radius: 5px;border: 1px solid rgba(0,0,0,0.15);box-shadow: 0 5px 15px rgba(0,0,0,0.35);">
 
 <br>
@@ -73,8 +73,8 @@ After the reboot, you will see this screen:
 <br>
 * The password for root user is "yunohost"
 
-* You can obtain further precisions on post-installation here: **[yunohost.org/postinstall](/postinstall)**
+* You can get more information on the post-installation here: **[yunohost.org/postinstall](/postinstall)**
 
 ---
 
-***If you need help during one of these steps, do not hesitate to use [our support tools](/support).***
+***Need help during one of these steps? [Get support!](/support)***