Merge pull request #1002 from ArthurHoaro/doc/install-docker

Docs: mention Docker in the download & install page

diff --combined doc/md/Download-and-Installation.md
index 59a1b7da4a89b23eaea470b3f6fa0ca5fe842ccd,3453e8b45c72e9804359002365a5ed87553eeb89..be848c97e9ab44f8629b5ffbeb2ad69d82c67b31
--- 1/doc/md/Download-and-Installation.md
--- 2/doc/md/Download-and-Installation.md
+++ b/doc/md/Download-and-Installation.md
@@@ -4,11 -4,18 +4,18 @@@ Document Root (or directly at the docum
  Also, please make sure your server meets the [requirements](Server-requirements)
  and is properly [configured](Server-configuration).
  
- Several releases are available:
+ Multiple releases branches are available:
+ 
+ - latest (last release)
+ - stable (previous major release)
+ - master (development)
+ 
+ Using one of the following methods:
  
  - by downloading full release archives including all dependencies
  - by downloading Github archives
  - by cloning the Git repository
+ - using Docker: [see the documentation](docker/shaarli-images)
  
  ---
  
@@@ -28,15 -35,15 +35,16 @@@ $ unzip shaarli-v0.9.1-full.zi
  $ 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.9 https://github.com/shaarli/Shaarli.git .
+ $ git clone -b latest https://github.com/shaarli/Shaarli.git .
  $ composer install --no-dev --prefer-dist
 +$ make translate
  ```
  
  ## Stable version
@@@ -84,14 -91,13 +92,14 @@@ $ git clone https://github.com/shaarli/
  # install/update third-party dependencies
  $ cd /path/to/shaarli
  $ composer install --no-dev --prefer-dist
 +$ make translate
  ```
  
  ## Finish Installation
  
  Once Shaarli is downloaded and files have been placed at the correct location, open it this location your favorite browser.
  
 -![install screenshot](http://i.imgur.com/wuMpDSN.png)
 +![install screenshot](images/install-shaarli.png)
  
  Setup your Shaarli installation, and it's ready to use!