diff options
Diffstat (limited to 'doc/md/Download-and-Installation.md')
-rw-r--r-- | doc/md/Download-and-Installation.md | 18 |
1 files changed, 14 insertions, 4 deletions
diff --git a/doc/md/Download-and-Installation.md b/doc/md/Download-and-Installation.md index e5e929ef..be848c97 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). | |||
4 | Also, please make sure your server meets the [requirements](Server-requirements) | 4 | Also, please make sure your server meets the [requirements](Server-requirements) |
5 | and is properly [configured](Server-configuration). | 5 | and is properly [configured](Server-configuration). |
6 | 6 | ||
7 | Several releases are available: | 7 | Multiple releases branches are available: |
8 | |||
9 | - latest (last release) | ||
10 | - stable (previous major release) | ||
11 | - master (development) | ||
12 | |||
13 | Using 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,14 +35,16 @@ $ unzip shaarli-v0.9.1-full.zip | |||
28 | $ mv Shaarli /path/to/shaarli/ | 35 | $ mv Shaarli /path/to/shaarli/ |
29 | ``` | 36 | ``` |
30 | 37 | ||
31 | 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).| | 38 | In most cases, download Shaarli from the [releases](https://github.com/shaarli/Shaarli/releases) page. |
39 | Cloning 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 |
47 | $ make translate | ||
39 | ``` | 48 | ``` |
40 | 49 | ||
41 | ## Stable version | 50 | ## Stable version |
@@ -83,13 +92,14 @@ $ git clone https://github.com/shaarli/Shaarli.git -b master /path/to/shaarli/ | |||
83 | # install/update third-party dependencies | 92 | # install/update third-party dependencies |
84 | $ cd /path/to/shaarli | 93 | $ cd /path/to/shaarli |
85 | $ composer install --no-dev --prefer-dist | 94 | $ composer install --no-dev --prefer-dist |
95 | $ make translate | ||
86 | ``` | 96 | ``` |
87 | 97 | ||
88 | ## Finish Installation | 98 | ## Finish Installation |
89 | 99 | ||
90 | Once Shaarli is downloaded and files have been placed at the correct location, open it this location your favorite browser. | 100 | Once Shaarli is downloaded and files have been placed at the correct location, open it this location your favorite browser. |
91 | 101 | ||
92 | ![install screenshot](http://i.imgur.com/wuMpDSN.png) | 102 | ![install screenshot](images/install-shaarli.png) |
93 | 103 | ||
94 | Setup your Shaarli installation, and it's ready to use! | 104 | Setup your Shaarli installation, and it's ready to use! |
95 | 105 | ||