aboutsummaryrefslogtreecommitdiffhomepage
path: root/doc/md
diff options
context:
space:
mode:
authorArthurHoaro <arthur@hoa.ro>2017-10-22 12:50:04 +0200
committerArthurHoaro <arthur@hoa.ro>2017-10-22 12:50:04 +0200
commitcfcc38192aff2bcabafa5cc67f18a5026255c96d (patch)
tree2c8e2dd6748d9ad1b8c32df8c2dc67694e2c1f60 /doc/md
parent72cfe44436f4316112fc4aabfe8940aa7b4adcab (diff)
downloadShaarli-cfcc38192aff2bcabafa5cc67f18a5026255c96d.tar.gz
Shaarli-cfcc38192aff2bcabafa5cc67f18a5026255c96d.tar.zst
Shaarli-cfcc38192aff2bcabafa5cc67f18a5026255c96d.zip
Doc: mention Docker docs in the download & install page
Diffstat (limited to 'doc/md')
-rw-r--r--doc/md/Download-and-Installation.md14
1 files changed, 11 insertions, 3 deletions
diff --git a/doc/md/Download-and-Installation.md b/doc/md/Download-and-Installation.md
index e5e929ef..3453e8b4 100644
--- 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).
4Also, please make sure your server meets the [requirements](Server-requirements) 4Also, please make sure your server meets the [requirements](Server-requirements)
5and is properly [configured](Server-configuration). 5and is properly [configured](Server-configuration).
6 6
7Several releases are available: 7Multiple releases branches are available:
8
9- latest (last release)
10- stable (previous major release)
11- master (development)
12
13Using one of the following methods:
8 14
9- by downloading full release archives including all dependencies 15- by downloading full release archives including all dependencies
10- by downloading Github archives 16- by downloading Github archives
11- by cloning the Git repository 17- by cloning the Git repository
18- using Docker: [see the documentation](docker/shaarli-images)
12 19
13--- 20---
14 21
@@ -28,13 +35,14 @@ $ unzip shaarli-v0.9.1-full.zip
28$ mv Shaarli /path/to/shaarli/ 35$ mv Shaarli /path/to/shaarli/
29``` 36```
30 37
31In 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).| 38In most cases, download Shaarli from the [releases](https://github.com/shaarli/Shaarli/releases) page.
39Cloning using `git` or downloading Github branches as zip files requires additional steps (see below).
32 40
33### Using git 41### Using git
34 42
35``` 43```
36$ mkdir -p /path/to/shaarli && cd /path/to/shaarli/ 44$ mkdir -p /path/to/shaarli && cd /path/to/shaarli/
37$ git clone -b v0.9 https://github.com/shaarli/Shaarli.git . 45$ git clone -b latest https://github.com/shaarli/Shaarli.git .
38$ composer install --no-dev --prefer-dist 46$ composer install --no-dev --prefer-dist
39``` 47```
40 48