documentation: update installation instructions for 0.9.1

[github/shaarli/Shaarli.git] / doc / md / Download-and-Installation.md

diff --git a/doc/md/Download-and-Installation.md b/doc/md/Download-and-Installation.md
index 7880aef43aff7a7f7d175436a423af44c3f58bfa..e5e929ef36c7d04f2987de12247d8f2b632777cc 100644 (file)
--- a/doc/md/Download-and-Installation.md
+++ b/doc/md/Download-and-Installation.md
@@ -1,8 +1,16 @@
-To install Shaarli, simply place the files in a directory under your webserver's Document Root (or directly at the document root). Make sure your [server](Server-requirements) is properly [configured](Server-configuration).
+To install Shaarli, simply place the files in a directory under your webserver's
+Document Root (or directly at the document root).
+
+Also, please make sure your server meets the [requirements](Server-requirements)
+and is properly [configured](Server-configuration).
 
 Several releases are available:
 
---------------------------------------------------------
+- by downloading full release archives including all dependencies
+- by downloading Github archives
+- by cloning the Git repository
+
+---
 
 ## Latest release (recommended)
 ### Download as an archive
@@ -10,29 +18,26 @@ Get the latest released version from the [releases](https://github.com/shaarli/S
 
 **Download our *shaarli-full* archive** to include dependencies.
 
-The current latest released version is `v0.8.4`
+The current latest released version is `v0.9.1`
 
 Or in command lines:
 
 ```bash
-$ wget https://github.com/shaarli/Shaarli/releases/download/v0.8.4/shaarli-v0.8.4-full.zip
-$ unzip shaarli-v0.8.4-full.zip
+$ wget https://github.com/shaarli/Shaarli/releases/download/v0.9.1/shaarli-v0.9.1-full.zip
+$ unzip shaarli-v0.9.1-full.zip
 $ mv Shaarli /path/to/shaarli/
 ```
 
-|  !  |In most cases, download Shaarli from the [releases](https://github.com/shaarli/Shaarli/releases) page. Cloning using `git` or downloading Github branches as zip files requires additional steps (see below).|
-|-----|--------------------------|
+In most cases, download Shaarli from the [releases](https://github.com/shaarli/Shaarli/releases) page. Cloning using `git` or downloading Github branches as zip files requires additional steps (see below).|
 
 ### Using git
 
 ```
-mkdir -p /path/to/shaarli && cd /path/to/shaarli/
-git clone -b v0.8 https://github.com/shaarli/Shaarli.git .
-composer install --no-dev
+$ mkdir -p /path/to/shaarli && cd /path/to/shaarli/
+$ git clone -b v0.9 https://github.com/shaarli/Shaarli.git .
+$ composer install --no-dev --prefer-dist
 ```
 
---------------------------------------------------------
-
 ## Stable version
 
 The stable version has been experienced by Shaarli users, and will receive security updates.
@@ -63,11 +68,9 @@ $ mv Shaarli-stable /path/to/shaarli/
 $ git clone https://github.com/shaarli/Shaarli.git -b stable /path/to/shaarli/
 # install/update third-party dependencies
 $ cd /path/to/shaarli/
-$ composer install --no-dev
+$ composer install --no-dev --prefer-dist
 ```
 
---------------------------------------------------------
-
 ## Development version (mainline)
 
 _Use at your own risk!_
@@ -79,11 +82,9 @@ To get the latest changes from the `master` branch:
 $ git clone https://github.com/shaarli/Shaarli.git -b master /path/to/shaarli/
 # install/update third-party dependencies
 $ cd /path/to/shaarli
-$ composer install --no-dev
+$ composer install --no-dev --prefer-dist
 ```
 
---------------------------------------------------------
-
 ## Finish Installation
 
 Once Shaarli is downloaded and files have been placed at the correct location, open it this location your favorite browser.
@@ -92,8 +93,6 @@ Once Shaarli is downloaded and files have been placed at the correct location, o
 
 Setup your Shaarli installation, and it's ready to use!
 
---------------------------------------------------------
-
 ## Updating Shaarli
 
 See [Upgrade and Migration](Upgrade-and-migration)