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

[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 59a1b7da4a89b23eaea470b3f6fa0ca5fe842ccd..be848c97e9ab44f8629b5ffbeb2ad69d82c67b31 100644 (file)
--- a/doc/md/Download-and-Installation.md
+++ b/doc/md/Download-and-Installation.md
@@ -4,11 +4,18 @@ 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:
+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,13 +35,14 @@ $ 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.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
 ```