aboutsummaryrefslogtreecommitdiffhomepage
path: root/doc
diff options
context:
space:
mode:
authorVirtualTam <virtualtam+github@flibidi.net>2017-07-29 16:17:09 +0200
committerGitHub <noreply@github.com>2017-07-29 16:17:09 +0200
commitfccfa09df84011f363311c44fa1b374ba7cd9af8 (patch)
treea5f9a26ce2033182fd0d13c9035b44ff9ebbf9fe /doc
parent57ee53d6c6be4b641764b0a635b2998c6cdc8197 (diff)
parent3a6f91a9ccbdd8f2ed8e33c88c7800f2623cfd3a (diff)
downloadShaarli-fccfa09df84011f363311c44fa1b374ba7cd9af8.tar.gz
Shaarli-fccfa09df84011f363311c44fa1b374ba7cd9af8.tar.zst
Shaarli-fccfa09df84011f363311c44fa1b374ba7cd9af8.zip
Merge pull request #906 from virtualtam/docker/cleanup
docker: remove `dev` image, update documentation
Diffstat (limited to 'doc')
-rw-r--r--doc/Docker.md158
-rw-r--r--doc/REST-API.md105
-rw-r--r--doc/Versioning-and-Branches.md76
-rw-r--r--doc/_Sidebar.md39
-rw-r--r--doc/html/3rd-party-libraries/index.html8
-rw-r--r--doc/html/Backup,-restore,-import-and-export/index.html8
-rw-r--r--doc/html/Bookmarklet/index.html8
-rw-r--r--doc/html/Browsing-and-searching/index.html8
-rw-r--r--doc/html/Coding-guidelines/index.html8
-rw-r--r--doc/html/Community-&-Related-software/index.html8
-rw-r--r--doc/html/Continuous-integration-tools/index.html8
-rw-r--r--doc/html/Development-guidelines/index.html8
-rw-r--r--doc/html/Directory-structure/index.html8
-rw-r--r--doc/html/Download-and-Installation/index.html8
-rw-r--r--doc/html/FAQ/index.html8
-rw-r--r--doc/html/Features/index.html12
-rw-r--r--doc/html/Firefox-share/index.html8
-rw-r--r--doc/html/GnuPG-signature/index.html8
-rw-r--r--doc/html/Plugin-System/index.html8
-rw-r--r--doc/html/Plugins/index.html12
-rw-r--r--doc/html/REST-API/index.html8
-rw-r--r--doc/html/RSS-feeds/index.html8
-rw-r--r--doc/html/Release-Shaarli/index.html8
-rw-r--r--doc/html/Security/index.html8
-rw-r--r--doc/html/Server-configuration/index.html8
-rw-r--r--doc/html/Server-requirements/index.html8
-rw-r--r--doc/html/Server-security/index.html8
-rw-r--r--doc/html/Shaarli-configuration/index.html60
-rw-r--r--doc/html/Static-analysis/index.html8
-rw-r--r--doc/html/Theming/index.html8
-rw-r--r--doc/html/Troubleshooting/index.html8
-rw-r--r--doc/html/Unit-tests/index.html8
-rw-r--r--doc/html/Upgrade-and-migration/index.html8
-rw-r--r--doc/html/Various-hacks/index.html8
-rw-r--r--doc/html/Versioning-and-Branches/index.html8
-rw-r--r--doc/html/docker/docker-101/index.html (renamed from doc/html/Docker-101/index.html)110
-rw-r--r--doc/html/docker/resources/index.html (renamed from doc/html/Docker-resources/index.html)110
-rw-r--r--doc/html/docker/reverse-proxy-configuration/index.html (renamed from doc/html/Reverse-proxy-configuration/index.html)110
-rw-r--r--doc/html/docker/shaarli-images/index.html (renamed from doc/html/Shaarli-images/index.html)111
-rw-r--r--doc/html/index.html10
-rw-r--r--doc/html/mkdocs/search_index.json46
-rw-r--r--doc/html/search.html8
-rw-r--r--doc/html/sitemap.xml80
-rw-r--r--doc/md/docker/docker-101.md (renamed from doc/md/Docker-101.md)0
-rw-r--r--doc/md/docker/resources.md (renamed from doc/md/Docker-resources.md)0
-rw-r--r--doc/md/docker/reverse-proxy-configuration.md (renamed from doc/md/Reverse-proxy-configuration.md)0
-rw-r--r--doc/md/docker/shaarli-images.md (renamed from doc/md/Shaarli-images.md)1
47 files changed, 452 insertions, 820 deletions
diff --git a/doc/Docker.md b/doc/Docker.md
deleted file mode 100644
index a7d2efb5..00000000
--- a/doc/Docker.md
+++ /dev/null
@@ -1,158 +0,0 @@
1#Docker
2- [Docker usage](#docker-usage)[](.html)
3- [Get and run a Shaarli image](#get-and-run-a-shaarli-image)[](.html)
4- [Resources](#resources)[](.html)
5
6## Docker usage
7### Basics
8Install [Docker](https://www.docker.com/), by following the instructions relevant[](.html)
9to your OS / distribution, and start the service.
10
11#### Search an image on [DockerHub](https://hub.docker.com/)[](.html)
12
13```bash
14$ docker search debian
15
16NAME DESCRIPTION STARS OFFICIAL AUTOMATED
17ubuntu Ubuntu is a Debian-based Linux operating s... 2065 [OK][](.html)
18debian Debian is a Linux distribution that's comp... 603 [OK][](.html)
19google/debian 47 [OK][](.html)
20```
21
22#### Show available tags for a repository
23```bash
24$ curl https://index.docker.io/v1/repositories/debian/tags | python -m json.tool
25
26% Total % Received % Xferd Average Speed Time Time Time Current
27Dload Upload Total Spent Left Speed
28100 1283 0 1283 0 0 433 0 --:--:-- 0:00:02 --:--:-- 433
29```
30
31Sample output:
32```json
33[[](.html)
34 {
35 "layer": "85a02782",
36 "name": "stretch"
37 },
38 {
39 "layer": "59abecbc",
40 "name": "testing"
41 },
42 {
43 "layer": "bf0fd686",
44 "name": "unstable"
45 },
46 {
47 "layer": "60c52dbe",
48 "name": "wheezy"
49 },
50 {
51 "layer": "c5b806fe",
52 "name": "wheezy-backports"
53 }
54]
55
56```
57
58#### Pull an image from DockerHub
59```bash
60$ docker pull repository[:tag][](.html)
61
62$ docker pull debian:wheezy
63wheezy: Pulling from debian
644c8cbfd2973e: Pull complete
6560c52dbe9d91: Pull complete
66Digest: sha256:c584131da2ac1948aa3e66468a4424b6aea2f33acba7cec0b631bdb56254c4fe
67Status: Downloaded newer image for debian:wheezy
68```
69
70## Get and run a Shaarli image
71### DockerHub repository
72The images can be found in the [`shaarli/shaarli`](https://hub.docker.com/r/shaarli/shaarli/)[](.html)
73repository.
74
75### Available image tags
76- `latest`: master branch (tarball release)
77- `stable`: stable branch (tarball release)
78- `dev`: master branch (Git clone)
79
80All images rely on:
81- [Debian 8 Jessie](https://hub.docker.com/_/debian/)[](.html)
82- [PHP5-FPM](http://php-fpm.org/)[](.html)
83- [Nginx](http://nginx.org/)[](.html)
84
85### Download from DockerHub
86```bash
87$ docker pull shaarli/shaarli
88latest: Pulling from shaarli/shaarli
8932716d9fcddb: Pull complete
9084899d045435: Pull complete
914b6ad7444763: Pull complete
92e0345ef7a3e0: Pull complete
935c1dd344094f: Pull complete
946422305a200b: Pull complete
957d63f861dbef: Pull complete
963eb97210645c: Pull complete
97869319d746ff: Already exists
98869319d746ff: Pulling fs layer
99902b87aaaec9: Already exists
100Digest: sha256:f836b4627b958b3f83f59c332f22f02fcd495ace3056f2be2c4912bd8704cc98
101Status: Downloaded newer image for shaarli/shaarli:latest
102```
103
104### Create and start a new container from the image
105```bash
106# map the host's :8000 port to the container's :80 port
107$ docker create -p 8000:80 shaarli/shaarli
108d40b7af693d678958adedfb88f87d6ea0237186c23de5c4102a55a8fcb499101
109
110# launch the container in the background
111$ docker start d40b7af693d678958adedfb88f87d6ea0237186c23de5c4102a55a8fcb499101
112d40b7af693d678958adedfb88f87d6ea0237186c23de5c4102a55a8fcb499101
113
114# list active containers
115$ docker ps
116CONTAINER ID IMAGE COMMAND CREATED STATUS PORTS NAMES
117d40b7af693d6 shaarli/shaarli /usr/bin/supervisor 15 seconds ago Up 4 seconds 0.0.0.0:8000->80/tcp backstabbing_galileo
118```
119
120### Stop and destroy a container
121```bash
122$ docker stop backstabbing_galileo # those docker guys are really rude to physicists!
123backstabbing_galileo
124
125# check the container is stopped
126$ docker ps
127CONTAINER ID IMAGE COMMAND CREATED STATUS PORTS NAMES
128
129# list ALL containers
130$ docker ps -a
131CONTAINER ID IMAGE COMMAND CREATED STATUS PORTS NAMES
132d40b7af693d6 shaarli/shaarli /usr/bin/supervisor 5 minutes ago Exited (0) 48 seconds ago backstabbing_galileo
133
134# destroy the container
135$ docker rm backstabbing_galileo # let's put an end to these barbarian practices
136backstabbing_galileo
137
138$ docker ps -a
139CONTAINER ID IMAGE COMMAND CREATED STATUS PORTS NAMES
140```
141
142## Resources
143### Docker
144- [Interactive Docker training portal](https://www.katacoda.com/courses/docker/) on [Katakoda](https://www.katacoda.com/)[](.html)
145- [Where are Docker images stored?](http://blog.thoward37.me/articles/where-are-docker-images-stored/)[](.html)
146- [Dockerfile reference](https://docs.docker.com/reference/builder/)[](.html)
147- [Dockerfile best practices](https://docs.docker.com/articles/dockerfile_best-practices/)[](.html)
148- [Volumes](https://docs.docker.com/userguide/dockervolumes/)[](.html)
149
150### DockerHub
151- [Repositories](https://docs.docker.com/userguide/dockerrepos/)[](.html)
152- [Teams and organizations](https://docs.docker.com/docker-hub/orgs/)[](.html)
153- [GitHub automated build](https://docs.docker.com/docker-hub/github/)[](.html)
154
155### Service management
156- [Using supervisord](https://docs.docker.com/articles/using_supervisord/)[](.html)
157- [Nginx in the foreground](http://nginx.org/en/docs/ngx_core_module.html#daemon)[](.html)
158- [supervisord](http://supervisord.org/)[](.html)
diff --git a/doc/REST-API.md b/doc/REST-API.md
deleted file mode 100644
index d7909978..00000000
--- a/doc/REST-API.md
+++ /dev/null
@@ -1,105 +0,0 @@
1#REST API
2## Usage
3
4See the [REST API documentation](http://shaarli.github.io/api-documentation/).[](.html)
5
6## Authentication
7
8All requests to Shaarli's API must include a JWT token to verify their authenticity.
9
10This token has to be included as an HTTP header called `Authentication: Bearer <jwt token>`.
11
12JWT resources :
13
14 * [jwt.io](https://jwt.io) (including a list of client per language).[](.html)
15 * RFC : https://tools.ietf.org/html/rfc7519
16 * https://float-middle.com/json-web-tokens-jwt-vs-sessions/
17 * HackerNews thread: https://news.ycombinator.com/item?id=11929267
18
19
20### Shaarli JWT Token
21
22JWT tokens are composed by three parts, separated by a dot `.` and encoded in base64:
23
24```
25[header].[payload].[signature][](.html)
26```
27
28#### Header
29
30Shaarli only allow one hash algorithm, so the header will always be the same:
31
32```json
33{
34 "typ": "JWT",
35 "alg": "HS512"
36}
37```
38
39Encoded in base64, it gives:
40
41```
42ewogICAgICAgICJ0eXAiOiAiSldUIiwKICAgICAgICAiYWxnIjogIkhTNTEyIgogICAgfQ==
43```
44
45#### Payload
46
47**Validity duration**
48
49To avoid infinite token validity, JWT tokens must include their creation date in UNIX timestamp format (timezone independant - UTC) under the key `iat` (issued at). This token will be accepted during 9 minutes.
50
51```json
52{
53 "iat": 1468663519
54}
55```
56
57See [RFC reference](https://tools.ietf.org/html/rfc7519#section-4.1.6).[](.html)
58
59
60#### Signature
61
62The signature authenticate the token validity. It contains the base64 of the header and the body, separated by a dot `.`, hashed in SHA512 with the API secret available in Shaarli administration page.
63
64Signature example with PHP:
65
66```php
67$content = base64_encode($header) . '.' . base64_encode($payload);
68$signature = hash_hmac('sha512', $content, $secret);
69```
70
71
72### Complete example
73
74#### PHP
75
76```php
77function generateToken($secret) {
78 $header = base64_encode('{
79 "typ": "JWT",
80 "alg": "HS512"
81 }');
82 $payload = base64_encode('{
83 "iat": '. time() .'
84 }');
85 $signature = hash_hmac('sha512', $header .'.'. $payload , $secret);
86 return $header .'.'. $payload .'.'. $signature;
87}
88
89$secret = 'mysecret';
90$token = generateToken($secret);
91echo $token;
92```
93
94> `ewogICAgICAgICJ0eXAiOiAiSldUIiwKICAgICAgICAiYWxnIjogIkhTNTEyIgogICAgfQ==.ewogICAgICAgICJpYXQiOiAxNDY4NjY3MDQ3CiAgICB9.1d2c54fa947daf594fdbf7591796195652c8bc63bffad7f6a6db2a41c313f495a542cbfb595acade79e83f3810d709b4251d7b940bbc10b531a6e6134af63a68`
95
96```php
97$options = [[](.html)
98 'http' => [[](.html)
99 'method' => 'GET',
100 'jwt' => $token,
101 ],
102];
103$context = stream_context_create($options);
104file_get_contents($apiEndpoint, false, $context);
105```
diff --git a/doc/Versioning-and-Branches.md b/doc/Versioning-and-Branches.md
deleted file mode 100644
index bbc7719e..00000000
--- a/doc/Versioning-and-Branches.md
+++ /dev/null
@@ -1,76 +0,0 @@
1#Versioning and Branches
2[**WORK IN PROGRESS**][](.html)
3
4It's important to understand how Shaarli branches work, especially if you're maintaining a 3rd party tools for Shaarli (theme, plugin, etc.), to be sure stay compatible.
5
6## `master` branch
7
8The `master` branch is the development branch. Any new change MUST go through this branch using Pull Requests.
9
10Remarks:
11
12 * This branch shouldn't be used for production as it isn't necessary stable.
13 * 3rd party aren't required to be compatible with the latest changes.
14 * Official plugins, themes and libraries (contained within Shaarli organization repos) must be compatible with the master branch.
15 * The version in this branch is always `dev`.
16
17## `v0.x` branch
18
19This `v0.x` branch, points to the latest `v0.x.y` release.
20
21Explanation:
22
23When a new version is released, it might contains a major bug which isn't detected right away. For example, a new PHP version is released, containing backward compatibility issue which doesn't work with Shaarli.
24
25In this case, the issue is fixed in the `master` branch, and the fix is backported the to the `v0.x` branch. Then a new release is made from the `v0.x` branch.
26
27This workflow allow us to fix any major bug detected, without having to release bleeding edge feature too soon.
28
29## `latest` branch
30
31This branch point the latest release. It recommended to use it to get the latest tested changes.
32
33## `stable` branch
34
35The `stable` branch doesn't contain any major bug, and is one major digit version behind the latest release.
36
37For example, the current latest release is `v0.8.3`, the stable branch is an alias to the latest `v0.7.x` release. When the `v0.9.0` version will be released, the stable will move to the latest `v0.8.x` release.
38
39Remarks:
40
41 * Shaarli release pace isn't fast, and the stable branch might be a few months behind the latest release.
42
43## Releases
44
45Releases are always made from the latest `v0.x` branch.
46
47Note that for every release, we manually generate a tarball which contains all Shaarli dependencies, making Shaarli's installation only one step.
48
49## Advices on 3rd party git repos workflow
50
51### Versioning
52
53Any time a new Shaarli release is published, you should publish a new release of your repo if the changes affected you since the latest release (take a look at the [changelog](https://github.com/shaarli/Shaarli/releases) (*Draft* means not released yet) and the commit log (like [`tpl` folder](https://github.com/shaarli/Shaarli/commits/master/tpl/default) for themes)). You can either:[](.html)
54
55 - use the Shaarli version number, with your repo version. For example, if Shaarli `v0.8.3` is released, publish a `v0.8.3-1` release, where `v0.8.3` states Shaarli compatibility and `-1` is your own version digit for the current Shaarli version.
56 - use your own versioning scheme, and state Shaarli compatibility in the release description.
57
58Using this, any user will be able to pick the release matching his own Shaarli version.
59
60### Major bugfix backport releases
61
62To be able to support backported fixes, it recommended to use our workflow:
63
64```bash
65# In master, fix the major bug
66git commit -m "Katastrophe"
67git push origin master
68# Get your commit hash
69git log --format="%H" -n 1
70# Create a new branch from your latest release, let's say v0.8.2-1 (the tag name)
71git checkout -b katastrophe v0.8.2-1
72# Backport the fix commit to your brand new branch
73git cherry-pick <fix commit hash>
74git push origin katastrophe
75# Then you just have to make a new release from the `katastrophe` branch tagged `v0.8.3-1`
76```
diff --git a/doc/_Sidebar.md b/doc/_Sidebar.md
deleted file mode 100644
index 8df2e565..00000000
--- a/doc/_Sidebar.md
+++ /dev/null
@@ -1,39 +0,0 @@
1#_Sidebar
2- [Home](Home.html)
3- Setup
4 - [Download and Installation](Download-and-Installation.html)
5 - [Upgrade and migration](Upgrade-and-migration.html)
6 - [Server requirements](Server-requirements.html)
7 - [Server configuration](Server-configuration.html)
8 - [Server security](Server-security.html)
9 - [Shaarli configuration](Shaarli-configuration.html)
10 - [Plugins](Plugins.html)
11- [Docker](Docker.html)
12- [Usage](Usage.html)
13 - [Sharing button](Sharing-button.html) (bookmarklet)
14 - [Browsing and Searching](Browsing-and-Searching.html)
15 - [Firefox share](Firefox-share.html)
16 - [RSS feeds](RSS-feeds.html)
17 - [REST API](REST-API.html)
18- How To
19 - [Backup, restore, import and export](Backup,-restore,-import-and-export.html)
20 - [Copy an existing installation over SSH and serve it locally](Copy-an-existing-installation-over-SSH-and-serve-it-locally.html)
21 - [Create and serve multiple Shaarlis (farm)](Create-and-serve-multiple-Shaarlis-(farm).html)
22 - [Download CSS styles from an OPML list](Download-CSS-styles-from-an-OPML-list.html)
23 - [Datastore hacks](Datastore-hacks.html)
24- [Troubleshooting](Troubleshooting.html)
25- [Development](Development.html)
26 - [GnuPG signature](GnuPG-signature.html)
27 - [Coding guidelines](Coding-guidelines.html)
28 - [Directory structure](Directory-structure.html)
29 - [3rd party libraries](3rd-party-libraries.html)
30 - [Plugin System](Plugin-System.html)
31 - [Release Shaarli](Release-Shaarli.html)
32 - [Versioning and Branches](Versioning-and-Branches.html)
33 - [Security](Security.html)
34 - [Static analysis](Static-analysis.html)
35 - [Theming](Theming.html)
36 - [Unit tests](Unit-tests.html)
37- About
38 - [FAQ](FAQ.html)
39 - [Community & Related software](Community-&-Related-software.html)
diff --git a/doc/html/3rd-party-libraries/index.html b/doc/html/3rd-party-libraries/index.html
index 0d62007d..d7754471 100644
--- a/doc/html/3rd-party-libraries/index.html
+++ b/doc/html/3rd-party-libraries/index.html
@@ -94,19 +94,19 @@
94 <ul class="subnav"> 94 <ul class="subnav">
95 <li class=""> 95 <li class="">
96 96
97 <a class="" href="../Docker-101/">Docker 101</a> 97 <a class="" href="../docker/docker-101/">Docker 101</a>
98 </li> 98 </li>
99 <li class=""> 99 <li class="">
100 100
101 <a class="" href="../Shaarli-images/">Shaarli images</a> 101 <a class="" href="../docker/shaarli-images/">Shaarli images</a>
102 </li> 102 </li>
103 <li class=""> 103 <li class="">
104 104
105 <a class="" href="../Reverse-proxy-configuration/">Reverse proxy configuration</a> 105 <a class="" href="../docker/reverse-proxy-configuration/">Reverse proxy configuration</a>
106 </li> 106 </li>
107 <li class=""> 107 <li class="">
108 108
109 <a class="" href="../Docker-resources/">Docker resources</a> 109 <a class="" href="../docker/resources/">Docker resources</a>
110 </li> 110 </li>
111 </ul> 111 </ul>
112 </li> 112 </li>
diff --git a/doc/html/Backup,-restore,-import-and-export/index.html b/doc/html/Backup,-restore,-import-and-export/index.html
index 33ec9124..caebb6ce 100644
--- a/doc/html/Backup,-restore,-import-and-export/index.html
+++ b/doc/html/Backup,-restore,-import-and-export/index.html
@@ -94,19 +94,19 @@
94 <ul class="subnav"> 94 <ul class="subnav">
95 <li class=""> 95 <li class="">
96 96
97 <a class="" href="../Docker-101/">Docker 101</a> 97 <a class="" href="../docker/docker-101/">Docker 101</a>
98 </li> 98 </li>
99 <li class=""> 99 <li class="">
100 100
101 <a class="" href="../Shaarli-images/">Shaarli images</a> 101 <a class="" href="../docker/shaarli-images/">Shaarli images</a>
102 </li> 102 </li>
103 <li class=""> 103 <li class="">
104 104
105 <a class="" href="../Reverse-proxy-configuration/">Reverse proxy configuration</a> 105 <a class="" href="../docker/reverse-proxy-configuration/">Reverse proxy configuration</a>
106 </li> 106 </li>
107 <li class=""> 107 <li class="">
108 108
109 <a class="" href="../Docker-resources/">Docker resources</a> 109 <a class="" href="../docker/resources/">Docker resources</a>
110 </li> 110 </li>
111 </ul> 111 </ul>
112 </li> 112 </li>
diff --git a/doc/html/Bookmarklet/index.html b/doc/html/Bookmarklet/index.html
index 325d305a..924a8710 100644
--- a/doc/html/Bookmarklet/index.html
+++ b/doc/html/Bookmarklet/index.html
@@ -94,19 +94,19 @@
94 <ul class="subnav"> 94 <ul class="subnav">
95 <li class=""> 95 <li class="">
96 96
97 <a class="" href="../Docker-101/">Docker 101</a> 97 <a class="" href="../docker/docker-101/">Docker 101</a>
98 </li> 98 </li>
99 <li class=""> 99 <li class="">
100 100
101 <a class="" href="../Shaarli-images/">Shaarli images</a> 101 <a class="" href="../docker/shaarli-images/">Shaarli images</a>
102 </li> 102 </li>
103 <li class=""> 103 <li class="">
104 104
105 <a class="" href="../Reverse-proxy-configuration/">Reverse proxy configuration</a> 105 <a class="" href="../docker/reverse-proxy-configuration/">Reverse proxy configuration</a>
106 </li> 106 </li>
107 <li class=""> 107 <li class="">
108 108
109 <a class="" href="../Docker-resources/">Docker resources</a> 109 <a class="" href="../docker/resources/">Docker resources</a>
110 </li> 110 </li>
111 </ul> 111 </ul>
112 </li> 112 </li>
diff --git a/doc/html/Browsing-and-searching/index.html b/doc/html/Browsing-and-searching/index.html
index c8b7386e..f2454103 100644
--- a/doc/html/Browsing-and-searching/index.html
+++ b/doc/html/Browsing-and-searching/index.html
@@ -94,19 +94,19 @@
94 <ul class="subnav"> 94 <ul class="subnav">
95 <li class=""> 95 <li class="">
96 96
97 <a class="" href="../Docker-101/">Docker 101</a> 97 <a class="" href="../docker/docker-101/">Docker 101</a>
98 </li> 98 </li>
99 <li class=""> 99 <li class="">
100 100
101 <a class="" href="../Shaarli-images/">Shaarli images</a> 101 <a class="" href="../docker/shaarli-images/">Shaarli images</a>
102 </li> 102 </li>
103 <li class=""> 103 <li class="">
104 104
105 <a class="" href="../Reverse-proxy-configuration/">Reverse proxy configuration</a> 105 <a class="" href="../docker/reverse-proxy-configuration/">Reverse proxy configuration</a>
106 </li> 106 </li>
107 <li class=""> 107 <li class="">
108 108
109 <a class="" href="../Docker-resources/">Docker resources</a> 109 <a class="" href="../docker/resources/">Docker resources</a>
110 </li> 110 </li>
111 </ul> 111 </ul>
112 </li> 112 </li>
diff --git a/doc/html/Coding-guidelines/index.html b/doc/html/Coding-guidelines/index.html
index dfcdd45c..3e27309b 100644
--- a/doc/html/Coding-guidelines/index.html
+++ b/doc/html/Coding-guidelines/index.html
@@ -94,19 +94,19 @@
94 <ul class="subnav"> 94 <ul class="subnav">
95 <li class=""> 95 <li class="">
96 96
97 <a class="" href="../Docker-101/">Docker 101</a> 97 <a class="" href="../docker/docker-101/">Docker 101</a>
98 </li> 98 </li>
99 <li class=""> 99 <li class="">
100 100
101 <a class="" href="../Shaarli-images/">Shaarli images</a> 101 <a class="" href="../docker/shaarli-images/">Shaarli images</a>
102 </li> 102 </li>
103 <li class=""> 103 <li class="">
104 104
105 <a class="" href="../Reverse-proxy-configuration/">Reverse proxy configuration</a> 105 <a class="" href="../docker/reverse-proxy-configuration/">Reverse proxy configuration</a>
106 </li> 106 </li>
107 <li class=""> 107 <li class="">
108 108
109 <a class="" href="../Docker-resources/">Docker resources</a> 109 <a class="" href="../docker/resources/">Docker resources</a>
110 </li> 110 </li>
111 </ul> 111 </ul>
112 </li> 112 </li>
diff --git a/doc/html/Community-&-Related-software/index.html b/doc/html/Community-&-Related-software/index.html
index 2497433c..e9c3313f 100644
--- a/doc/html/Community-&-Related-software/index.html
+++ b/doc/html/Community-&-Related-software/index.html
@@ -94,19 +94,19 @@
94 <ul class="subnav"> 94 <ul class="subnav">
95 <li class=""> 95 <li class="">
96 96
97 <a class="" href="../Docker-101/">Docker 101</a> 97 <a class="" href="../docker/docker-101/">Docker 101</a>
98 </li> 98 </li>
99 <li class=""> 99 <li class="">
100 100
101 <a class="" href="../Shaarli-images/">Shaarli images</a> 101 <a class="" href="../docker/shaarli-images/">Shaarli images</a>
102 </li> 102 </li>
103 <li class=""> 103 <li class="">
104 104
105 <a class="" href="../Reverse-proxy-configuration/">Reverse proxy configuration</a> 105 <a class="" href="../docker/reverse-proxy-configuration/">Reverse proxy configuration</a>
106 </li> 106 </li>
107 <li class=""> 107 <li class="">
108 108
109 <a class="" href="../Docker-resources/">Docker resources</a> 109 <a class="" href="../docker/resources/">Docker resources</a>
110 </li> 110 </li>
111 </ul> 111 </ul>
112 </li> 112 </li>
diff --git a/doc/html/Continuous-integration-tools/index.html b/doc/html/Continuous-integration-tools/index.html
index 339f37ac..b0599227 100644
--- a/doc/html/Continuous-integration-tools/index.html
+++ b/doc/html/Continuous-integration-tools/index.html
@@ -94,19 +94,19 @@
94 <ul class="subnav"> 94 <ul class="subnav">
95 <li class=""> 95 <li class="">
96 96
97 <a class="" href="../Docker-101/">Docker 101</a> 97 <a class="" href="../docker/docker-101/">Docker 101</a>
98 </li> 98 </li>
99 <li class=""> 99 <li class="">
100 100
101 <a class="" href="../Shaarli-images/">Shaarli images</a> 101 <a class="" href="../docker/shaarli-images/">Shaarli images</a>
102 </li> 102 </li>
103 <li class=""> 103 <li class="">
104 104
105 <a class="" href="../Reverse-proxy-configuration/">Reverse proxy configuration</a> 105 <a class="" href="../docker/reverse-proxy-configuration/">Reverse proxy configuration</a>
106 </li> 106 </li>
107 <li class=""> 107 <li class="">
108 108
109 <a class="" href="../Docker-resources/">Docker resources</a> 109 <a class="" href="../docker/resources/">Docker resources</a>
110 </li> 110 </li>
111 </ul> 111 </ul>
112 </li> 112 </li>
diff --git a/doc/html/Development-guidelines/index.html b/doc/html/Development-guidelines/index.html
index e75c911b..9e1d8ab6 100644
--- a/doc/html/Development-guidelines/index.html
+++ b/doc/html/Development-guidelines/index.html
@@ -94,19 +94,19 @@
94 <ul class="subnav"> 94 <ul class="subnav">
95 <li class=""> 95 <li class="">
96 96
97 <a class="" href="../Docker-101/">Docker 101</a> 97 <a class="" href="../docker/docker-101/">Docker 101</a>
98 </li> 98 </li>
99 <li class=""> 99 <li class="">
100 100
101 <a class="" href="../Shaarli-images/">Shaarli images</a> 101 <a class="" href="../docker/shaarli-images/">Shaarli images</a>
102 </li> 102 </li>
103 <li class=""> 103 <li class="">
104 104
105 <a class="" href="../Reverse-proxy-configuration/">Reverse proxy configuration</a> 105 <a class="" href="../docker/reverse-proxy-configuration/">Reverse proxy configuration</a>
106 </li> 106 </li>
107 <li class=""> 107 <li class="">
108 108
109 <a class="" href="../Docker-resources/">Docker resources</a> 109 <a class="" href="../docker/resources/">Docker resources</a>
110 </li> 110 </li>
111 </ul> 111 </ul>
112 </li> 112 </li>
diff --git a/doc/html/Directory-structure/index.html b/doc/html/Directory-structure/index.html
index ff075ec5..49f26ddb 100644
--- a/doc/html/Directory-structure/index.html
+++ b/doc/html/Directory-structure/index.html
@@ -94,19 +94,19 @@
94 <ul class="subnav"> 94 <ul class="subnav">
95 <li class=""> 95 <li class="">
96 96
97 <a class="" href="../Docker-101/">Docker 101</a> 97 <a class="" href="../docker/docker-101/">Docker 101</a>
98 </li> 98 </li>
99 <li class=""> 99 <li class="">
100 100
101 <a class="" href="../Shaarli-images/">Shaarli images</a> 101 <a class="" href="../docker/shaarli-images/">Shaarli images</a>
102 </li> 102 </li>
103 <li class=""> 103 <li class="">
104 104
105 <a class="" href="../Reverse-proxy-configuration/">Reverse proxy configuration</a> 105 <a class="" href="../docker/reverse-proxy-configuration/">Reverse proxy configuration</a>
106 </li> 106 </li>
107 <li class=""> 107 <li class="">
108 108
109 <a class="" href="../Docker-resources/">Docker resources</a> 109 <a class="" href="../docker/resources/">Docker resources</a>
110 </li> 110 </li>
111 </ul> 111 </ul>
112 </li> 112 </li>
diff --git a/doc/html/Download-and-Installation/index.html b/doc/html/Download-and-Installation/index.html
index 92342681..8bc9a5b9 100644
--- a/doc/html/Download-and-Installation/index.html
+++ b/doc/html/Download-and-Installation/index.html
@@ -128,19 +128,19 @@
128 <ul class="subnav"> 128 <ul class="subnav">
129 <li class=""> 129 <li class="">
130 130
131 <a class="" href="../Docker-101/">Docker 101</a> 131 <a class="" href="../docker/docker-101/">Docker 101</a>
132 </li> 132 </li>
133 <li class=""> 133 <li class="">
134 134
135 <a class="" href="../Shaarli-images/">Shaarli images</a> 135 <a class="" href="../docker/shaarli-images/">Shaarli images</a>
136 </li> 136 </li>
137 <li class=""> 137 <li class="">
138 138
139 <a class="" href="../Reverse-proxy-configuration/">Reverse proxy configuration</a> 139 <a class="" href="../docker/reverse-proxy-configuration/">Reverse proxy configuration</a>
140 </li> 140 </li>
141 <li class=""> 141 <li class="">
142 142
143 <a class="" href="../Docker-resources/">Docker resources</a> 143 <a class="" href="../docker/resources/">Docker resources</a>
144 </li> 144 </li>
145 </ul> 145 </ul>
146 </li> 146 </li>
diff --git a/doc/html/FAQ/index.html b/doc/html/FAQ/index.html
index f8ced260..5b7900bc 100644
--- a/doc/html/FAQ/index.html
+++ b/doc/html/FAQ/index.html
@@ -94,19 +94,19 @@
94 <ul class="subnav"> 94 <ul class="subnav">
95 <li class=""> 95 <li class="">
96 96
97 <a class="" href="../Docker-101/">Docker 101</a> 97 <a class="" href="../docker/docker-101/">Docker 101</a>
98 </li> 98 </li>
99 <li class=""> 99 <li class="">
100 100
101 <a class="" href="../Shaarli-images/">Shaarli images</a> 101 <a class="" href="../docker/shaarli-images/">Shaarli images</a>
102 </li> 102 </li>
103 <li class=""> 103 <li class="">
104 104
105 <a class="" href="../Reverse-proxy-configuration/">Reverse proxy configuration</a> 105 <a class="" href="../docker/reverse-proxy-configuration/">Reverse proxy configuration</a>
106 </li> 106 </li>
107 <li class=""> 107 <li class="">
108 108
109 <a class="" href="../Docker-resources/">Docker resources</a> 109 <a class="" href="../docker/resources/">Docker resources</a>
110 </li> 110 </li>
111 </ul> 111 </ul>
112 </li> 112 </li>
diff --git a/doc/html/Features/index.html b/doc/html/Features/index.html
index e847c546..79030799 100644
--- a/doc/html/Features/index.html
+++ b/doc/html/Features/index.html
@@ -94,19 +94,19 @@
94 <ul class="subnav"> 94 <ul class="subnav">
95 <li class=""> 95 <li class="">
96 96
97 <a class="" href="../Docker-101/">Docker 101</a> 97 <a class="" href="../docker/docker-101/">Docker 101</a>
98 </li> 98 </li>
99 <li class=""> 99 <li class="">
100 100
101 <a class="" href="../Shaarli-images/">Shaarli images</a> 101 <a class="" href="../docker/shaarli-images/">Shaarli images</a>
102 </li> 102 </li>
103 <li class=""> 103 <li class="">
104 104
105 <a class="" href="../Reverse-proxy-configuration/">Reverse proxy configuration</a> 105 <a class="" href="../docker/reverse-proxy-configuration/">Reverse proxy configuration</a>
106 </li> 106 </li>
107 <li class=""> 107 <li class="">
108 108
109 <a class="" href="../Docker-resources/">Docker resources</a> 109 <a class="" href="../docker/resources/">Docker resources</a>
110 </li> 110 </li>
111 </ul> 111 </ul>
112 </li> 112 </li>
@@ -318,7 +318,7 @@
318 <a href="../Bookmarklet/" class="btn btn-neutral float-right" title="Bookmarklet">Next <span class="icon icon-circle-arrow-right"></span></a> 318 <a href="../Bookmarklet/" class="btn btn-neutral float-right" title="Bookmarklet">Next <span class="icon icon-circle-arrow-right"></span></a>
319 319
320 320
321 <a href="../Docker-resources/" class="btn btn-neutral" title="Docker resources"><span class="icon icon-circle-arrow-left"></span> Previous</a> 321 <a href="../docker/resources/" class="btn btn-neutral" title="Docker resources"><span class="icon icon-circle-arrow-left"></span> Previous</a>
322 322
323 </div> 323 </div>
324 324
@@ -346,7 +346,7 @@
346 <a href="https://github.com/shaarli/Shaarli" class="fa fa-github" style="float: left; color: #fcfcfc"> GitHub</a> 346 <a href="https://github.com/shaarli/Shaarli" class="fa fa-github" style="float: left; color: #fcfcfc"> GitHub</a>
347 347
348 348
349 <span><a href="../Docker-resources/" style="color: #fcfcfc;">&laquo; Previous</a></span> 349 <span><a href="../docker/resources/" style="color: #fcfcfc;">&laquo; Previous</a></span>
350 350
351 351
352 <span style="margin-left: 15px"><a href="../Bookmarklet/" style="color: #fcfcfc">Next &raquo;</a></span> 352 <span style="margin-left: 15px"><a href="../Bookmarklet/" style="color: #fcfcfc">Next &raquo;</a></span>
diff --git a/doc/html/Firefox-share/index.html b/doc/html/Firefox-share/index.html
index 9c028ffc..4c84a07c 100644
--- a/doc/html/Firefox-share/index.html
+++ b/doc/html/Firefox-share/index.html
@@ -94,19 +94,19 @@
94 <ul class="subnav"> 94 <ul class="subnav">
95 <li class=""> 95 <li class="">
96 96
97 <a class="" href="../Docker-101/">Docker 101</a> 97 <a class="" href="../docker/docker-101/">Docker 101</a>
98 </li> 98 </li>
99 <li class=""> 99 <li class="">
100 100
101 <a class="" href="../Shaarli-images/">Shaarli images</a> 101 <a class="" href="../docker/shaarli-images/">Shaarli images</a>
102 </li> 102 </li>
103 <li class=""> 103 <li class="">
104 104
105 <a class="" href="../Reverse-proxy-configuration/">Reverse proxy configuration</a> 105 <a class="" href="../docker/reverse-proxy-configuration/">Reverse proxy configuration</a>
106 </li> 106 </li>
107 <li class=""> 107 <li class="">
108 108
109 <a class="" href="../Docker-resources/">Docker resources</a> 109 <a class="" href="../docker/resources/">Docker resources</a>
110 </li> 110 </li>
111 </ul> 111 </ul>
112 </li> 112 </li>
diff --git a/doc/html/GnuPG-signature/index.html b/doc/html/GnuPG-signature/index.html
index 0b2d842a..82e22070 100644
--- a/doc/html/GnuPG-signature/index.html
+++ b/doc/html/GnuPG-signature/index.html
@@ -94,19 +94,19 @@
94 <ul class="subnav"> 94 <ul class="subnav">
95 <li class=""> 95 <li class="">
96 96
97 <a class="" href="../Docker-101/">Docker 101</a> 97 <a class="" href="../docker/docker-101/">Docker 101</a>
98 </li> 98 </li>
99 <li class=""> 99 <li class="">
100 100
101 <a class="" href="../Shaarli-images/">Shaarli images</a> 101 <a class="" href="../docker/shaarli-images/">Shaarli images</a>
102 </li> 102 </li>
103 <li class=""> 103 <li class="">
104 104
105 <a class="" href="../Reverse-proxy-configuration/">Reverse proxy configuration</a> 105 <a class="" href="../docker/reverse-proxy-configuration/">Reverse proxy configuration</a>
106 </li> 106 </li>
107 <li class=""> 107 <li class="">
108 108
109 <a class="" href="../Docker-resources/">Docker resources</a> 109 <a class="" href="../docker/resources/">Docker resources</a>
110 </li> 110 </li>
111 </ul> 111 </ul>
112 </li> 112 </li>
diff --git a/doc/html/Plugin-System/index.html b/doc/html/Plugin-System/index.html
index dbed5908..11ea5ed5 100644
--- a/doc/html/Plugin-System/index.html
+++ b/doc/html/Plugin-System/index.html
@@ -94,19 +94,19 @@
94 <ul class="subnav"> 94 <ul class="subnav">
95 <li class=""> 95 <li class="">
96 96
97 <a class="" href="../Docker-101/">Docker 101</a> 97 <a class="" href="../docker/docker-101/">Docker 101</a>
98 </li> 98 </li>
99 <li class=""> 99 <li class="">
100 100
101 <a class="" href="../Shaarli-images/">Shaarli images</a> 101 <a class="" href="../docker/shaarli-images/">Shaarli images</a>
102 </li> 102 </li>
103 <li class=""> 103 <li class="">
104 104
105 <a class="" href="../Reverse-proxy-configuration/">Reverse proxy configuration</a> 105 <a class="" href="../docker/reverse-proxy-configuration/">Reverse proxy configuration</a>
106 </li> 106 </li>
107 <li class=""> 107 <li class="">
108 108
109 <a class="" href="../Docker-resources/">Docker resources</a> 109 <a class="" href="../docker/resources/">Docker resources</a>
110 </li> 110 </li>
111 </ul> 111 </ul>
112 </li> 112 </li>
diff --git a/doc/html/Plugins/index.html b/doc/html/Plugins/index.html
index 4b63681e..f87cf84c 100644
--- a/doc/html/Plugins/index.html
+++ b/doc/html/Plugins/index.html
@@ -115,19 +115,19 @@
115 <ul class="subnav"> 115 <ul class="subnav">
116 <li class=""> 116 <li class="">
117 117
118 <a class="" href="../Docker-101/">Docker 101</a> 118 <a class="" href="../docker/docker-101/">Docker 101</a>
119 </li> 119 </li>
120 <li class=""> 120 <li class="">
121 121
122 <a class="" href="../Shaarli-images/">Shaarli images</a> 122 <a class="" href="../docker/shaarli-images/">Shaarli images</a>
123 </li> 123 </li>
124 <li class=""> 124 <li class="">
125 125
126 <a class="" href="../Reverse-proxy-configuration/">Reverse proxy configuration</a> 126 <a class="" href="../docker/reverse-proxy-configuration/">Reverse proxy configuration</a>
127 </li> 127 </li>
128 <li class=""> 128 <li class="">
129 129
130 <a class="" href="../Docker-resources/">Docker resources</a> 130 <a class="" href="../docker/resources/">Docker resources</a>
131 </li> 131 </li>
132 </ul> 132 </ul>
133 </li> 133 </li>
@@ -358,7 +358,7 @@ Example:</p>
358 358
359 <div class="rst-footer-buttons" role="navigation" aria-label="footer navigation"> 359 <div class="rst-footer-buttons" role="navigation" aria-label="footer navigation">
360 360
361 <a href="../Docker-101/" class="btn btn-neutral float-right" title="Docker 101">Next <span class="icon icon-circle-arrow-right"></span></a> 361 <a href="../docker/docker-101/" class="btn btn-neutral float-right" title="Docker 101">Next <span class="icon icon-circle-arrow-right"></span></a>
362 362
363 363
364 <a href="../Shaarli-configuration/" class="btn btn-neutral" title="Shaarli configuration"><span class="icon icon-circle-arrow-left"></span> Previous</a> 364 <a href="../Shaarli-configuration/" class="btn btn-neutral" title="Shaarli configuration"><span class="icon icon-circle-arrow-left"></span> Previous</a>
@@ -392,7 +392,7 @@ Example:</p>
392 <span><a href="../Shaarli-configuration/" style="color: #fcfcfc;">&laquo; Previous</a></span> 392 <span><a href="../Shaarli-configuration/" style="color: #fcfcfc;">&laquo; Previous</a></span>
393 393
394 394
395 <span style="margin-left: 15px"><a href="../Docker-101/" style="color: #fcfcfc">Next &raquo;</a></span> 395 <span style="margin-left: 15px"><a href="../docker/docker-101/" style="color: #fcfcfc">Next &raquo;</a></span>
396 396
397 </span> 397 </span>
398</div> 398</div>
diff --git a/doc/html/REST-API/index.html b/doc/html/REST-API/index.html
index 6e2c9518..dae27e5c 100644
--- a/doc/html/REST-API/index.html
+++ b/doc/html/REST-API/index.html
@@ -94,19 +94,19 @@
94 <ul class="subnav"> 94 <ul class="subnav">
95 <li class=""> 95 <li class="">
96 96
97 <a class="" href="../Docker-101/">Docker 101</a> 97 <a class="" href="../docker/docker-101/">Docker 101</a>
98 </li> 98 </li>
99 <li class=""> 99 <li class="">
100 100
101 <a class="" href="../Shaarli-images/">Shaarli images</a> 101 <a class="" href="../docker/shaarli-images/">Shaarli images</a>
102 </li> 102 </li>
103 <li class=""> 103 <li class="">
104 104
105 <a class="" href="../Reverse-proxy-configuration/">Reverse proxy configuration</a> 105 <a class="" href="../docker/reverse-proxy-configuration/">Reverse proxy configuration</a>
106 </li> 106 </li>
107 <li class=""> 107 <li class="">
108 108
109 <a class="" href="../Docker-resources/">Docker resources</a> 109 <a class="" href="../docker/resources/">Docker resources</a>
110 </li> 110 </li>
111 </ul> 111 </ul>
112 </li> 112 </li>
diff --git a/doc/html/RSS-feeds/index.html b/doc/html/RSS-feeds/index.html
index a4b7339f..1e4ea957 100644
--- a/doc/html/RSS-feeds/index.html
+++ b/doc/html/RSS-feeds/index.html
@@ -94,19 +94,19 @@
94 <ul class="subnav"> 94 <ul class="subnav">
95 <li class=""> 95 <li class="">
96 96
97 <a class="" href="../Docker-101/">Docker 101</a> 97 <a class="" href="../docker/docker-101/">Docker 101</a>
98 </li> 98 </li>
99 <li class=""> 99 <li class="">
100 100
101 <a class="" href="../Shaarli-images/">Shaarli images</a> 101 <a class="" href="../docker/shaarli-images/">Shaarli images</a>
102 </li> 102 </li>
103 <li class=""> 103 <li class="">
104 104
105 <a class="" href="../Reverse-proxy-configuration/">Reverse proxy configuration</a> 105 <a class="" href="../docker/reverse-proxy-configuration/">Reverse proxy configuration</a>
106 </li> 106 </li>
107 <li class=""> 107 <li class="">
108 108
109 <a class="" href="../Docker-resources/">Docker resources</a> 109 <a class="" href="../docker/resources/">Docker resources</a>
110 </li> 110 </li>
111 </ul> 111 </ul>
112 </li> 112 </li>
diff --git a/doc/html/Release-Shaarli/index.html b/doc/html/Release-Shaarli/index.html
index 5857a52f..fbb06725 100644
--- a/doc/html/Release-Shaarli/index.html
+++ b/doc/html/Release-Shaarli/index.html
@@ -94,19 +94,19 @@
94 <ul class="subnav"> 94 <ul class="subnav">
95 <li class=""> 95 <li class="">
96 96
97 <a class="" href="../Docker-101/">Docker 101</a> 97 <a class="" href="../docker/docker-101/">Docker 101</a>
98 </li> 98 </li>
99 <li class=""> 99 <li class="">
100 100
101 <a class="" href="../Shaarli-images/">Shaarli images</a> 101 <a class="" href="../docker/shaarli-images/">Shaarli images</a>
102 </li> 102 </li>
103 <li class=""> 103 <li class="">
104 104
105 <a class="" href="../Reverse-proxy-configuration/">Reverse proxy configuration</a> 105 <a class="" href="../docker/reverse-proxy-configuration/">Reverse proxy configuration</a>
106 </li> 106 </li>
107 <li class=""> 107 <li class="">
108 108
109 <a class="" href="../Docker-resources/">Docker resources</a> 109 <a class="" href="../docker/resources/">Docker resources</a>
110 </li> 110 </li>
111 </ul> 111 </ul>
112 </li> 112 </li>
diff --git a/doc/html/Security/index.html b/doc/html/Security/index.html
index c7aec584..bea1ba90 100644
--- a/doc/html/Security/index.html
+++ b/doc/html/Security/index.html
@@ -94,19 +94,19 @@
94 <ul class="subnav"> 94 <ul class="subnav">
95 <li class=""> 95 <li class="">
96 96
97 <a class="" href="../Docker-101/">Docker 101</a> 97 <a class="" href="../docker/docker-101/">Docker 101</a>
98 </li> 98 </li>
99 <li class=""> 99 <li class="">
100 100
101 <a class="" href="../Shaarli-images/">Shaarli images</a> 101 <a class="" href="../docker/shaarli-images/">Shaarli images</a>
102 </li> 102 </li>
103 <li class=""> 103 <li class="">
104 104
105 <a class="" href="../Reverse-proxy-configuration/">Reverse proxy configuration</a> 105 <a class="" href="../docker/reverse-proxy-configuration/">Reverse proxy configuration</a>
106 </li> 106 </li>
107 <li class=""> 107 <li class="">
108 108
109 <a class="" href="../Docker-resources/">Docker resources</a> 109 <a class="" href="../docker/resources/">Docker resources</a>
110 </li> 110 </li>
111 </ul> 111 </ul>
112 </li> 112 </li>
diff --git a/doc/html/Server-configuration/index.html b/doc/html/Server-configuration/index.html
index 6e798b4b..91b20fda 100644
--- a/doc/html/Server-configuration/index.html
+++ b/doc/html/Server-configuration/index.html
@@ -149,19 +149,19 @@
149 <ul class="subnav"> 149 <ul class="subnav">
150 <li class=""> 150 <li class="">
151 151
152 <a class="" href="../Docker-101/">Docker 101</a> 152 <a class="" href="../docker/docker-101/">Docker 101</a>
153 </li> 153 </li>
154 <li class=""> 154 <li class="">
155 155
156 <a class="" href="../Shaarli-images/">Shaarli images</a> 156 <a class="" href="../docker/shaarli-images/">Shaarli images</a>
157 </li> 157 </li>
158 <li class=""> 158 <li class="">
159 159
160 <a class="" href="../Reverse-proxy-configuration/">Reverse proxy configuration</a> 160 <a class="" href="../docker/reverse-proxy-configuration/">Reverse proxy configuration</a>
161 </li> 161 </li>
162 <li class=""> 162 <li class="">
163 163
164 <a class="" href="../Docker-resources/">Docker resources</a> 164 <a class="" href="../docker/resources/">Docker resources</a>
165 </li> 165 </li>
166 </ul> 166 </ul>
167 </li> 167 </li>
diff --git a/doc/html/Server-requirements/index.html b/doc/html/Server-requirements/index.html
index f3bfa185..29bb610b 100644
--- a/doc/html/Server-requirements/index.html
+++ b/doc/html/Server-requirements/index.html
@@ -112,19 +112,19 @@
112 <ul class="subnav"> 112 <ul class="subnav">
113 <li class=""> 113 <li class="">
114 114
115 <a class="" href="../Docker-101/">Docker 101</a> 115 <a class="" href="../docker/docker-101/">Docker 101</a>
116 </li> 116 </li>
117 <li class=""> 117 <li class="">
118 118
119 <a class="" href="../Shaarli-images/">Shaarli images</a> 119 <a class="" href="../docker/shaarli-images/">Shaarli images</a>
120 </li> 120 </li>
121 <li class=""> 121 <li class="">
122 122
123 <a class="" href="../Reverse-proxy-configuration/">Reverse proxy configuration</a> 123 <a class="" href="../docker/reverse-proxy-configuration/">Reverse proxy configuration</a>
124 </li> 124 </li>
125 <li class=""> 125 <li class="">
126 126
127 <a class="" href="../Docker-resources/">Docker resources</a> 127 <a class="" href="../docker/resources/">Docker resources</a>
128 </li> 128 </li>
129 </ul> 129 </ul>
130 </li> 130 </li>
diff --git a/doc/html/Server-security/index.html b/doc/html/Server-security/index.html
index 6d9f25c0..5ec0fdb6 100644
--- a/doc/html/Server-security/index.html
+++ b/doc/html/Server-security/index.html
@@ -118,19 +118,19 @@
118 <ul class="subnav"> 118 <ul class="subnav">
119 <li class=""> 119 <li class="">
120 120
121 <a class="" href="../Docker-101/">Docker 101</a> 121 <a class="" href="../docker/docker-101/">Docker 101</a>
122 </li> 122 </li>
123 <li class=""> 123 <li class="">
124 124
125 <a class="" href="../Shaarli-images/">Shaarli images</a> 125 <a class="" href="../docker/shaarli-images/">Shaarli images</a>
126 </li> 126 </li>
127 <li class=""> 127 <li class="">
128 128
129 <a class="" href="../Reverse-proxy-configuration/">Reverse proxy configuration</a> 129 <a class="" href="../docker/reverse-proxy-configuration/">Reverse proxy configuration</a>
130 </li> 130 </li>
131 <li class=""> 131 <li class="">
132 132
133 <a class="" href="../Docker-resources/">Docker resources</a> 133 <a class="" href="../docker/resources/">Docker resources</a>
134 </li> 134 </li>
135 </ul> 135 </ul>
136 </li> 136 </li>
diff --git a/doc/html/Shaarli-configuration/index.html b/doc/html/Shaarli-configuration/index.html
index 4e556061..cd323a32 100644
--- a/doc/html/Shaarli-configuration/index.html
+++ b/doc/html/Shaarli-configuration/index.html
@@ -134,19 +134,19 @@
134 <ul class="subnav"> 134 <ul class="subnav">
135 <li class=""> 135 <li class="">
136 136
137 <a class="" href="../Docker-101/">Docker 101</a> 137 <a class="" href="../docker/docker-101/">Docker 101</a>
138 </li> 138 </li>
139 <li class=""> 139 <li class="">
140 140
141 <a class="" href="../Shaarli-images/">Shaarli images</a> 141 <a class="" href="../docker/shaarli-images/">Shaarli images</a>
142 </li> 142 </li>
143 <li class=""> 143 <li class="">
144 144
145 <a class="" href="../Reverse-proxy-configuration/">Reverse proxy configuration</a> 145 <a class="" href="../docker/reverse-proxy-configuration/">Reverse proxy configuration</a>
146 </li> 146 </li>
147 <li class=""> 147 <li class="">
148 148
149 <a class="" href="../Docker-resources/">Docker resources</a> 149 <a class="" href="../docker/resources/">Docker resources</a>
150 </li> 150 </li>
151 </ul> 151 </ul>
152 </li> 152 </li>
@@ -323,26 +323,38 @@
323<em> its values override those defined in <code>index.php</code> 323<em> its values override those defined in <code>index.php</code>
324</em> it is wrap in a PHP comment to prevent anyone accessing it, regardless of server configuration</p> 324</em> it is wrap in a PHP comment to prevent anyone accessing it, regardless of server configuration</p>
325<h2 id="file-and-directory-permissions">File and directory permissions</h2> 325<h2 id="file-and-directory-permissions">File and directory permissions</h2>
326<p>The server process running Shaarli must have: 326<p>The server process running Shaarli must have:</p>
327- <code>read</code> access to the following resources: 327<ul>
328 - PHP scripts: <code>index.php</code>, <code>application/*.php</code>, <code>plugins/*.php</code> 328<li><code>read</code> access to the following resources:<ul>
329 - 3rd party PHP and Javascript libraries: <code>inc/*.php</code>, <code>inc/*.js</code> 329<li>PHP scripts: <code>index.php</code>, <code>application/*.php</code>, <code>plugins/*.php</code></li>
330 - static assets: 330<li>3rd party PHP and Javascript libraries: <code>inc/*.php</code>, <code>inc/*.js</code></li>
331 - CSS stylesheets: <code>inc/*.css</code> 331<li>static assets:<ul>
332 - <code>images/*</code> 332<li>CSS stylesheets: <code>inc/*.css</code></li>
333 - RainTPL templates: <code>tpl/*.html</code> 333<li><code>images/*</code></li>
334- <code>read</code>, <code>write</code> and <code>execution</code> access to the following directories: 334</ul>
335 - <code>cache</code> - thumbnail cache 335</li>
336 - <code>data</code> - link data store, configuration options 336<li>RainTPL templates: <code>tpl/*.html</code></li>
337 - <code>pagecache</code> - Atom/RSS feed cache 337</ul>
338 - <code>tmp</code> - RainTPL page cache</p> 338</li>
339<p>On a Linux distribution: 339<li><code>read</code>, <code>write</code> and <code>execution</code> access to the following directories:<ul>
340- the web server user will likely be <code>www</code> or <code>http</code> (for Apache2) 340<li><code>cache</code> - thumbnail cache</li>
341- it will be a member of a group of the same name: <code>www:www</code>, <code>http:http</code> 341<li><code>data</code> - link data store, configuration options</li>
342- to give it access to Shaarli, either: 342<li><code>pagecache</code> - Atom/RSS feed cache</li>
343 - unzip Shaarli in the default web server location (usually <code>/var/www/</code>) and set the web server user as the owner 343<li><code>tmp</code> - RainTPL page cache</li>
344 - put users in the same group as the web server, and set the appropriate access rights 344</ul>
345- if you have a domain / subdomain to serve Shaarli, <a href="../Server-configuration">configure the server</a> accordingly<a href="../.html"></a></p> 345</li>
346</ul>
347<p>On a Linux distribution:</p>
348<ul>
349<li>the web server user will likely be <code>www</code> or <code>http</code> (for Apache2)</li>
350<li>it will be a member of a group of the same name: <code>www:www</code>, <code>http:http</code></li>
351<li>to give it access to Shaarli, either:<ul>
352<li>unzip Shaarli in the default web server location (usually <code>/var/www/</code>) and set the web server user as the owner</li>
353<li>put users in the same group as the web server, and set the appropriate access rights</li>
354</ul>
355</li>
356<li>if you have a domain / subdomain to serve Shaarli, <a href="../Server-configuration">configure the server</a> accordingly<a href="../.html"></a></li>
357</ul>
346<h2 id="configuration">Configuration</h2> 358<h2 id="configuration">Configuration</h2>
347<p>In <code>data/config.json.php</code>.</p> 359<p>In <code>data/config.json.php</code>.</p>
348<p>See also <a href="../Plugin-System.html">Plugin System</a>.</p> 360<p>See also <a href="../Plugin-System.html">Plugin System</a>.</p>
diff --git a/doc/html/Static-analysis/index.html b/doc/html/Static-analysis/index.html
index ddd81f86..e0aff52f 100644
--- a/doc/html/Static-analysis/index.html
+++ b/doc/html/Static-analysis/index.html
@@ -94,19 +94,19 @@
94 <ul class="subnav"> 94 <ul class="subnav">
95 <li class=""> 95 <li class="">
96 96
97 <a class="" href="../Docker-101/">Docker 101</a> 97 <a class="" href="../docker/docker-101/">Docker 101</a>
98 </li> 98 </li>
99 <li class=""> 99 <li class="">
100 100
101 <a class="" href="../Shaarli-images/">Shaarli images</a> 101 <a class="" href="../docker/shaarli-images/">Shaarli images</a>
102 </li> 102 </li>
103 <li class=""> 103 <li class="">
104 104
105 <a class="" href="../Reverse-proxy-configuration/">Reverse proxy configuration</a> 105 <a class="" href="../docker/reverse-proxy-configuration/">Reverse proxy configuration</a>
106 </li> 106 </li>
107 <li class=""> 107 <li class="">
108 108
109 <a class="" href="../Docker-resources/">Docker resources</a> 109 <a class="" href="../docker/resources/">Docker resources</a>
110 </li> 110 </li>
111 </ul> 111 </ul>
112 </li> 112 </li>
diff --git a/doc/html/Theming/index.html b/doc/html/Theming/index.html
index 670dbb80..d6ecb06d 100644
--- a/doc/html/Theming/index.html
+++ b/doc/html/Theming/index.html
@@ -94,19 +94,19 @@
94 <ul class="subnav"> 94 <ul class="subnav">
95 <li class=""> 95 <li class="">
96 96
97 <a class="" href="../Docker-101/">Docker 101</a> 97 <a class="" href="../docker/docker-101/">Docker 101</a>
98 </li> 98 </li>
99 <li class=""> 99 <li class="">
100 100
101 <a class="" href="../Shaarli-images/">Shaarli images</a> 101 <a class="" href="../docker/shaarli-images/">Shaarli images</a>
102 </li> 102 </li>
103 <li class=""> 103 <li class="">
104 104
105 <a class="" href="../Reverse-proxy-configuration/">Reverse proxy configuration</a> 105 <a class="" href="../docker/reverse-proxy-configuration/">Reverse proxy configuration</a>
106 </li> 106 </li>
107 <li class=""> 107 <li class="">
108 108
109 <a class="" href="../Docker-resources/">Docker resources</a> 109 <a class="" href="../docker/resources/">Docker resources</a>
110 </li> 110 </li>
111 </ul> 111 </ul>
112 </li> 112 </li>
diff --git a/doc/html/Troubleshooting/index.html b/doc/html/Troubleshooting/index.html
index f1564362..90705ada 100644
--- a/doc/html/Troubleshooting/index.html
+++ b/doc/html/Troubleshooting/index.html
@@ -94,19 +94,19 @@
94 <ul class="subnav"> 94 <ul class="subnav">
95 <li class=""> 95 <li class="">
96 96
97 <a class="" href="../Docker-101/">Docker 101</a> 97 <a class="" href="../docker/docker-101/">Docker 101</a>
98 </li> 98 </li>
99 <li class=""> 99 <li class="">
100 100
101 <a class="" href="../Shaarli-images/">Shaarli images</a> 101 <a class="" href="../docker/shaarli-images/">Shaarli images</a>
102 </li> 102 </li>
103 <li class=""> 103 <li class="">
104 104
105 <a class="" href="../Reverse-proxy-configuration/">Reverse proxy configuration</a> 105 <a class="" href="../docker/reverse-proxy-configuration/">Reverse proxy configuration</a>
106 </li> 106 </li>
107 <li class=""> 107 <li class="">
108 108
109 <a class="" href="../Docker-resources/">Docker resources</a> 109 <a class="" href="../docker/resources/">Docker resources</a>
110 </li> 110 </li>
111 </ul> 111 </ul>
112 </li> 112 </li>
diff --git a/doc/html/Unit-tests/index.html b/doc/html/Unit-tests/index.html
index ce90ed10..ebc92beb 100644
--- a/doc/html/Unit-tests/index.html
+++ b/doc/html/Unit-tests/index.html
@@ -94,19 +94,19 @@
94 <ul class="subnav"> 94 <ul class="subnav">
95 <li class=""> 95 <li class="">
96 96
97 <a class="" href="../Docker-101/">Docker 101</a> 97 <a class="" href="../docker/docker-101/">Docker 101</a>
98 </li> 98 </li>
99 <li class=""> 99 <li class="">
100 100
101 <a class="" href="../Shaarli-images/">Shaarli images</a> 101 <a class="" href="../docker/shaarli-images/">Shaarli images</a>
102 </li> 102 </li>
103 <li class=""> 103 <li class="">
104 104
105 <a class="" href="../Reverse-proxy-configuration/">Reverse proxy configuration</a> 105 <a class="" href="../docker/reverse-proxy-configuration/">Reverse proxy configuration</a>
106 </li> 106 </li>
107 <li class=""> 107 <li class="">
108 108
109 <a class="" href="../Docker-resources/">Docker resources</a> 109 <a class="" href="../docker/resources/">Docker resources</a>
110 </li> 110 </li>
111 </ul> 111 </ul>
112 </li> 112 </li>
diff --git a/doc/html/Upgrade-and-migration/index.html b/doc/html/Upgrade-and-migration/index.html
index 3319fa72..b190ed38 100644
--- a/doc/html/Upgrade-and-migration/index.html
+++ b/doc/html/Upgrade-and-migration/index.html
@@ -133,19 +133,19 @@
133 <ul class="subnav"> 133 <ul class="subnav">
134 <li class=""> 134 <li class="">
135 135
136 <a class="" href="../Docker-101/">Docker 101</a> 136 <a class="" href="../docker/docker-101/">Docker 101</a>
137 </li> 137 </li>
138 <li class=""> 138 <li class="">
139 139
140 <a class="" href="../Shaarli-images/">Shaarli images</a> 140 <a class="" href="../docker/shaarli-images/">Shaarli images</a>
141 </li> 141 </li>
142 <li class=""> 142 <li class="">
143 143
144 <a class="" href="../Reverse-proxy-configuration/">Reverse proxy configuration</a> 144 <a class="" href="../docker/reverse-proxy-configuration/">Reverse proxy configuration</a>
145 </li> 145 </li>
146 <li class=""> 146 <li class="">
147 147
148 <a class="" href="../Docker-resources/">Docker resources</a> 148 <a class="" href="../docker/resources/">Docker resources</a>
149 </li> 149 </li>
150 </ul> 150 </ul>
151 </li> 151 </li>
diff --git a/doc/html/Various-hacks/index.html b/doc/html/Various-hacks/index.html
index b06207ae..a10358c0 100644
--- a/doc/html/Various-hacks/index.html
+++ b/doc/html/Various-hacks/index.html
@@ -94,19 +94,19 @@
94 <ul class="subnav"> 94 <ul class="subnav">
95 <li class=""> 95 <li class="">
96 96
97 <a class="" href="../Docker-101/">Docker 101</a> 97 <a class="" href="../docker/docker-101/">Docker 101</a>
98 </li> 98 </li>
99 <li class=""> 99 <li class="">
100 100
101 <a class="" href="../Shaarli-images/">Shaarli images</a> 101 <a class="" href="../docker/shaarli-images/">Shaarli images</a>
102 </li> 102 </li>
103 <li class=""> 103 <li class="">
104 104
105 <a class="" href="../Reverse-proxy-configuration/">Reverse proxy configuration</a> 105 <a class="" href="../docker/reverse-proxy-configuration/">Reverse proxy configuration</a>
106 </li> 106 </li>
107 <li class=""> 107 <li class="">
108 108
109 <a class="" href="../Docker-resources/">Docker resources</a> 109 <a class="" href="../docker/resources/">Docker resources</a>
110 </li> 110 </li>
111 </ul> 111 </ul>
112 </li> 112 </li>
diff --git a/doc/html/Versioning-and-Branches/index.html b/doc/html/Versioning-and-Branches/index.html
index 97bdb47e..d3f61ec3 100644
--- a/doc/html/Versioning-and-Branches/index.html
+++ b/doc/html/Versioning-and-Branches/index.html
@@ -94,19 +94,19 @@
94 <ul class="subnav"> 94 <ul class="subnav">
95 <li class=""> 95 <li class="">
96 96
97 <a class="" href="../Docker-101/">Docker 101</a> 97 <a class="" href="../docker/docker-101/">Docker 101</a>
98 </li> 98 </li>
99 <li class=""> 99 <li class="">
100 100
101 <a class="" href="../Shaarli-images/">Shaarli images</a> 101 <a class="" href="../docker/shaarli-images/">Shaarli images</a>
102 </li> 102 </li>
103 <li class=""> 103 <li class="">
104 104
105 <a class="" href="../Reverse-proxy-configuration/">Reverse proxy configuration</a> 105 <a class="" href="../docker/reverse-proxy-configuration/">Reverse proxy configuration</a>
106 </li> 106 </li>
107 <li class=""> 107 <li class="">
108 108
109 <a class="" href="../Docker-resources/">Docker resources</a> 109 <a class="" href="../docker/resources/">Docker resources</a>
110 </li> 110 </li>
111 </ul> 111 </ul>
112 </li> 112 </li>
diff --git a/doc/html/Docker-101/index.html b/doc/html/docker/docker-101/index.html
index 31e57b59..67a3f8e4 100644
--- a/doc/html/Docker-101/index.html
+++ b/doc/html/docker/docker-101/index.html
@@ -7,25 +7,25 @@
7 <meta name="viewport" content="width=device-width, initial-scale=1.0"> 7 <meta name="viewport" content="width=device-width, initial-scale=1.0">
8 8
9 9
10 <link rel="shortcut icon" href="../img/favicon.ico"> 10 <link rel="shortcut icon" href="../../img/favicon.ico">
11 <title>Docker 101 - Shaarli Documentation</title> 11 <title>Docker 101 - Shaarli Documentation</title>
12 <link href='https://fonts.googleapis.com/css?family=Lato:400,700|Roboto+Slab:400,700|Inconsolata:400,700' rel='stylesheet' type='text/css'> 12 <link href='https://fonts.googleapis.com/css?family=Lato:400,700|Roboto+Slab:400,700|Inconsolata:400,700' rel='stylesheet' type='text/css'>
13 13
14 <link rel="stylesheet" href="../css/theme.css" type="text/css" /> 14 <link rel="stylesheet" href="../../css/theme.css" type="text/css" />
15 <link rel="stylesheet" href="../css/theme_extra.css" type="text/css" /> 15 <link rel="stylesheet" href="../../css/theme_extra.css" type="text/css" />
16 <link rel="stylesheet" href="../css/highlight.css"> 16 <link rel="stylesheet" href="../../css/highlight.css">
17 <link href="../github-markdown.css" rel="stylesheet"> 17 <link href="../../github-markdown.css" rel="stylesheet">
18 18
19 <script> 19 <script>
20 // Current page data 20 // Current page data
21 var mkdocs_page_name = "Docker 101"; 21 var mkdocs_page_name = "Docker 101";
22 var mkdocs_page_input_path = "Docker-101.md"; 22 var mkdocs_page_input_path = "docker/docker-101.md";
23 var mkdocs_page_url = "/Docker-101/"; 23 var mkdocs_page_url = "/docker/docker-101/";
24 </script> 24 </script>
25 25
26 <script src="../js/jquery-2.1.1.min.js"></script> 26 <script src="../../js/jquery-2.1.1.min.js"></script>
27 <script src="../js/modernizr-2.8.3.min.js"></script> 27 <script src="../../js/modernizr-2.8.3.min.js"></script>
28 <script type="text/javascript" src="../js/highlight.pack.js"></script> 28 <script type="text/javascript" src="../../js/highlight.pack.js"></script>
29 29
30</head> 30</head>
31 31
@@ -36,9 +36,9 @@
36 36
37 <nav data-toggle="wy-nav-shift" class="wy-nav-side stickynav"> 37 <nav data-toggle="wy-nav-shift" class="wy-nav-side stickynav">
38 <div class="wy-side-nav-search"> 38 <div class="wy-side-nav-search">
39 <a href=".." class="icon icon-home"> Shaarli Documentation</a> 39 <a href="../.." class="icon icon-home"> Shaarli Documentation</a>
40 <div role="search"> 40 <div role="search">
41 <form id ="rtd-search-form" class="wy-form" action="../search.html" method="get"> 41 <form id ="rtd-search-form" class="wy-form" action="../../search.html" method="get">
42 <input type="text" name="q" placeholder="Search docs" /> 42 <input type="text" name="q" placeholder="Search docs" />
43 </form> 43 </form>
44</div> 44</div>
@@ -50,7 +50,7 @@
50 50
51 <li class="toctree-l1"> 51 <li class="toctree-l1">
52 52
53 <a class="" href="..">Home</a> 53 <a class="" href="../..">Home</a>
54 </li> 54 </li>
55 55
56 <li class="toctree-l1"> 56 <li class="toctree-l1">
@@ -59,31 +59,31 @@
59 <ul class="subnav"> 59 <ul class="subnav">
60 <li class=""> 60 <li class="">
61 61
62 <a class="" href="../Download-and-Installation/">Download and Installation</a> 62 <a class="" href="../../Download-and-Installation/">Download and Installation</a>
63 </li> 63 </li>
64 <li class=""> 64 <li class="">
65 65
66 <a class="" href="../Upgrade-and-migration/">Upgrade and migration</a> 66 <a class="" href="../../Upgrade-and-migration/">Upgrade and migration</a>
67 </li> 67 </li>
68 <li class=""> 68 <li class="">
69 69
70 <a class="" href="../Server-requirements/">Server requirements</a> 70 <a class="" href="../../Server-requirements/">Server requirements</a>
71 </li> 71 </li>
72 <li class=""> 72 <li class="">
73 73
74 <a class="" href="../Server-configuration/">Server configuration</a> 74 <a class="" href="../../Server-configuration/">Server configuration</a>
75 </li> 75 </li>
76 <li class=""> 76 <li class="">
77 77
78 <a class="" href="../Server-security/">Server security</a> 78 <a class="" href="../../Server-security/">Server security</a>
79 </li> 79 </li>
80 <li class=""> 80 <li class="">
81 81
82 <a class="" href="../Shaarli-configuration/">Shaarli configuration</a> 82 <a class="" href="../../Shaarli-configuration/">Shaarli configuration</a>
83 </li> 83 </li>
84 <li class=""> 84 <li class="">
85 85
86 <a class="" href="../Plugins/">Plugins</a> 86 <a class="" href="../../Plugins/">Plugins</a>
87 </li> 87 </li>
88 </ul> 88 </ul>
89 </li> 89 </li>
@@ -114,15 +114,15 @@
114 </li> 114 </li>
115 <li class=""> 115 <li class="">
116 116
117 <a class="" href="../Shaarli-images/">Shaarli images</a> 117 <a class="" href="../shaarli-images/">Shaarli images</a>
118 </li> 118 </li>
119 <li class=""> 119 <li class="">
120 120
121 <a class="" href="../Reverse-proxy-configuration/">Reverse proxy configuration</a> 121 <a class="" href="../reverse-proxy-configuration/">Reverse proxy configuration</a>
122 </li> 122 </li>
123 <li class=""> 123 <li class="">
124 124
125 <a class="" href="../Docker-resources/">Docker resources</a> 125 <a class="" href="../resources/">Docker resources</a>
126 </li> 126 </li>
127 </ul> 127 </ul>
128 </li> 128 </li>
@@ -133,27 +133,27 @@
133 <ul class="subnav"> 133 <ul class="subnav">
134 <li class=""> 134 <li class="">
135 135
136 <a class="" href="../Features/">Features</a> 136 <a class="" href="../../Features/">Features</a>
137 </li> 137 </li>
138 <li class=""> 138 <li class="">
139 139
140 <a class="" href="../Bookmarklet/">Bookmarklet</a> 140 <a class="" href="../../Bookmarklet/">Bookmarklet</a>
141 </li> 141 </li>
142 <li class=""> 142 <li class="">
143 143
144 <a class="" href="../Browsing-and-searching/">Browsing and searching</a> 144 <a class="" href="../../Browsing-and-searching/">Browsing and searching</a>
145 </li> 145 </li>
146 <li class=""> 146 <li class="">
147 147
148 <a class="" href="../Firefox-share/">Firefox share</a> 148 <a class="" href="../../Firefox-share/">Firefox share</a>
149 </li> 149 </li>
150 <li class=""> 150 <li class="">
151 151
152 <a class="" href="../RSS-feeds/">RSS feeds</a> 152 <a class="" href="../../RSS-feeds/">RSS feeds</a>
153 </li> 153 </li>
154 <li class=""> 154 <li class="">
155 155
156 <a class="" href="../REST-API/">REST API</a> 156 <a class="" href="../../REST-API/">REST API</a>
157 </li> 157 </li>
158 </ul> 158 </ul>
159 </li> 159 </li>
@@ -164,18 +164,18 @@
164 <ul class="subnav"> 164 <ul class="subnav">
165 <li class=""> 165 <li class="">
166 166
167 <a class="" href="../Backup,-restore,-import-and-export/">Backup, restore, import and export</a> 167 <a class="" href="../../Backup,-restore,-import-and-export/">Backup, restore, import and export</a>
168 </li> 168 </li>
169 <li class=""> 169 <li class="">
170 170
171 <a class="" href="../Various-hacks/">Various hacks</a> 171 <a class="" href="../../Various-hacks/">Various hacks</a>
172 </li> 172 </li>
173 </ul> 173 </ul>
174 </li> 174 </li>
175 175
176 <li class="toctree-l1"> 176 <li class="toctree-l1">
177 177
178 <a class="" href="../Troubleshooting/">Troubleshooting</a> 178 <a class="" href="../../Troubleshooting/">Troubleshooting</a>
179 </li> 179 </li>
180 180
181 <li class="toctree-l1"> 181 <li class="toctree-l1">
@@ -184,55 +184,55 @@
184 <ul class="subnav"> 184 <ul class="subnav">
185 <li class=""> 185 <li class="">
186 186
187 <a class="" href="../Development-guidelines/">Development guidelines</a> 187 <a class="" href="../../Development-guidelines/">Development guidelines</a>
188 </li> 188 </li>
189 <li class=""> 189 <li class="">
190 190
191 <a class="" href="../Continuous-integration-tools/">Continuous integration tools</a> 191 <a class="" href="../../Continuous-integration-tools/">Continuous integration tools</a>
192 </li> 192 </li>
193 <li class=""> 193 <li class="">
194 194
195 <a class="" href="../GnuPG-signature/">GnuPG signature</a> 195 <a class="" href="../../GnuPG-signature/">GnuPG signature</a>
196 </li> 196 </li>
197 <li class=""> 197 <li class="">
198 198
199 <a class="" href="../Coding-guidelines/">Coding guidelines</a> 199 <a class="" href="../../Coding-guidelines/">Coding guidelines</a>
200 </li> 200 </li>
201 <li class=""> 201 <li class="">
202 202
203 <a class="" href="../Directory-structure/">Directory structure</a> 203 <a class="" href="../../Directory-structure/">Directory structure</a>
204 </li> 204 </li>
205 <li class=""> 205 <li class="">
206 206
207 <a class="" href="../3rd-party-libraries/">3rd party libraries</a> 207 <a class="" href="../../3rd-party-libraries/">3rd party libraries</a>
208 </li> 208 </li>
209 <li class=""> 209 <li class="">
210 210
211 <a class="" href="../Plugin-System/">Plugin System</a> 211 <a class="" href="../../Plugin-System/">Plugin System</a>
212 </li> 212 </li>
213 <li class=""> 213 <li class="">
214 214
215 <a class="" href="../Release-Shaarli/">Release Shaarli</a> 215 <a class="" href="../../Release-Shaarli/">Release Shaarli</a>
216 </li> 216 </li>
217 <li class=""> 217 <li class="">
218 218
219 <a class="" href="../Versioning-and-Branches/">Versioning and Branches</a> 219 <a class="" href="../../Versioning-and-Branches/">Versioning and Branches</a>
220 </li> 220 </li>
221 <li class=""> 221 <li class="">
222 222
223 <a class="" href="../Security/">Security</a> 223 <a class="" href="../../Security/">Security</a>
224 </li> 224 </li>
225 <li class=""> 225 <li class="">
226 226
227 <a class="" href="../Static-analysis/">Static analysis</a> 227 <a class="" href="../../Static-analysis/">Static analysis</a>
228 </li> 228 </li>
229 <li class=""> 229 <li class="">
230 230
231 <a class="" href="../Theming/">Theming</a> 231 <a class="" href="../../Theming/">Theming</a>
232 </li> 232 </li>
233 <li class=""> 233 <li class="">
234 234
235 <a class="" href="../Unit-tests/">Unit tests</a> 235 <a class="" href="../../Unit-tests/">Unit tests</a>
236 </li> 236 </li>
237 </ul> 237 </ul>
238 </li> 238 </li>
@@ -243,11 +243,11 @@
243 <ul class="subnav"> 243 <ul class="subnav">
244 <li class=""> 244 <li class="">
245 245
246 <a class="" href="../FAQ/">FAQ</a> 246 <a class="" href="../../FAQ/">FAQ</a>
247 </li> 247 </li>
248 <li class=""> 248 <li class="">
249 249
250 <a class="" href="../Community-&-Related-software/">Community & Related software</a> 250 <a class="" href="../../Community-&-Related-software/">Community & Related software</a>
251 </li> 251 </li>
252 </ul> 252 </ul>
253 </li> 253 </li>
@@ -262,7 +262,7 @@
262 262
263 <nav class="wy-nav-top" role="navigation" aria-label="top navigation"> 263 <nav class="wy-nav-top" role="navigation" aria-label="top navigation">
264 <i data-toggle="wy-nav-top" class="fa fa-bars"></i> 264 <i data-toggle="wy-nav-top" class="fa fa-bars"></i>
265 <a href="..">Shaarli Documentation</a> 265 <a href="../..">Shaarli Documentation</a>
266 </nav> 266 </nav>
267 267
268 268
@@ -270,7 +270,7 @@
270 <div class="rst-content"> 270 <div class="rst-content">
271 <div role="navigation" aria-label="breadcrumbs navigation"> 271 <div role="navigation" aria-label="breadcrumbs navigation">
272 <ul class="wy-breadcrumbs"> 272 <ul class="wy-breadcrumbs">
273 <li><a href="..">Docs</a> &raquo;</li> 273 <li><a href="../..">Docs</a> &raquo;</li>
274 274
275 275
276 276
@@ -281,7 +281,7 @@
281 <li>Docker 101</li> 281 <li>Docker 101</li>
282 <li class="wy-breadcrumbs-aside"> 282 <li class="wy-breadcrumbs-aside">
283 283
284 <a href="https://github.com/shaarli/Shaarli/edit/master/docs/Docker-101.md" 284 <a href="https://github.com/shaarli/Shaarli/edit/master/docs/docker/docker-101.md"
285 class="icon icon-github"> Edit on GitHub</a> 285 class="icon icon-github"> Edit on GitHub</a>
286 286
287 </li> 287 </li>
@@ -354,10 +354,10 @@ Status: Downloaded newer image for debian:wheezy
354 354
355 <div class="rst-footer-buttons" role="navigation" aria-label="footer navigation"> 355 <div class="rst-footer-buttons" role="navigation" aria-label="footer navigation">
356 356
357 <a href="../Shaarli-images/" class="btn btn-neutral float-right" title="Shaarli images">Next <span class="icon icon-circle-arrow-right"></span></a> 357 <a href="../shaarli-images/" class="btn btn-neutral float-right" title="Shaarli images">Next <span class="icon icon-circle-arrow-right"></span></a>
358 358
359 359
360 <a href="../Plugins/" class="btn btn-neutral" title="Plugins"><span class="icon icon-circle-arrow-left"></span> Previous</a> 360 <a href="../../Plugins/" class="btn btn-neutral" title="Plugins"><span class="icon icon-circle-arrow-left"></span> Previous</a>
361 361
362 </div> 362 </div>
363 363
@@ -385,14 +385,14 @@ Status: Downloaded newer image for debian:wheezy
385 <a href="https://github.com/shaarli/Shaarli" class="fa fa-github" style="float: left; color: #fcfcfc"> GitHub</a> 385 <a href="https://github.com/shaarli/Shaarli" class="fa fa-github" style="float: left; color: #fcfcfc"> GitHub</a>
386 386
387 387
388 <span><a href="../Plugins/" style="color: #fcfcfc;">&laquo; Previous</a></span> 388 <span><a href="../../Plugins/" style="color: #fcfcfc;">&laquo; Previous</a></span>
389 389
390 390
391 <span style="margin-left: 15px"><a href="../Shaarli-images/" style="color: #fcfcfc">Next &raquo;</a></span> 391 <span style="margin-left: 15px"><a href="../shaarli-images/" style="color: #fcfcfc">Next &raquo;</a></span>
392 392
393 </span> 393 </span>
394</div> 394</div>
395 <script src="../js/theme.js"></script> 395 <script src="../../js/theme.js"></script>
396 396
397</body> 397</body>
398</html> 398</html>
diff --git a/doc/html/Docker-resources/index.html b/doc/html/docker/resources/index.html
index 169a0297..409c4e51 100644
--- a/doc/html/Docker-resources/index.html
+++ b/doc/html/docker/resources/index.html
@@ -7,25 +7,25 @@
7 <meta name="viewport" content="width=device-width, initial-scale=1.0"> 7 <meta name="viewport" content="width=device-width, initial-scale=1.0">
8 8
9 9
10 <link rel="shortcut icon" href="../img/favicon.ico"> 10 <link rel="shortcut icon" href="../../img/favicon.ico">
11 <title>Docker resources - Shaarli Documentation</title> 11 <title>Docker resources - Shaarli Documentation</title>
12 <link href='https://fonts.googleapis.com/css?family=Lato:400,700|Roboto+Slab:400,700|Inconsolata:400,700' rel='stylesheet' type='text/css'> 12 <link href='https://fonts.googleapis.com/css?family=Lato:400,700|Roboto+Slab:400,700|Inconsolata:400,700' rel='stylesheet' type='text/css'>
13 13
14 <link rel="stylesheet" href="../css/theme.css" type="text/css" /> 14 <link rel="stylesheet" href="../../css/theme.css" type="text/css" />
15 <link rel="stylesheet" href="../css/theme_extra.css" type="text/css" /> 15 <link rel="stylesheet" href="../../css/theme_extra.css" type="text/css" />
16 <link rel="stylesheet" href="../css/highlight.css"> 16 <link rel="stylesheet" href="../../css/highlight.css">
17 <link href="../github-markdown.css" rel="stylesheet"> 17 <link href="../../github-markdown.css" rel="stylesheet">
18 18
19 <script> 19 <script>
20 // Current page data 20 // Current page data
21 var mkdocs_page_name = "Docker resources"; 21 var mkdocs_page_name = "Docker resources";
22 var mkdocs_page_input_path = "Docker-resources.md"; 22 var mkdocs_page_input_path = "docker/resources.md";
23 var mkdocs_page_url = "/Docker-resources/"; 23 var mkdocs_page_url = "/docker/resources/";
24 </script> 24 </script>
25 25
26 <script src="../js/jquery-2.1.1.min.js"></script> 26 <script src="../../js/jquery-2.1.1.min.js"></script>
27 <script src="../js/modernizr-2.8.3.min.js"></script> 27 <script src="../../js/modernizr-2.8.3.min.js"></script>
28 <script type="text/javascript" src="../js/highlight.pack.js"></script> 28 <script type="text/javascript" src="../../js/highlight.pack.js"></script>
29 29
30</head> 30</head>
31 31
@@ -36,9 +36,9 @@
36 36
37 <nav data-toggle="wy-nav-shift" class="wy-nav-side stickynav"> 37 <nav data-toggle="wy-nav-shift" class="wy-nav-side stickynav">
38 <div class="wy-side-nav-search"> 38 <div class="wy-side-nav-search">
39 <a href=".." class="icon icon-home"> Shaarli Documentation</a> 39 <a href="../.." class="icon icon-home"> Shaarli Documentation</a>
40 <div role="search"> 40 <div role="search">
41 <form id ="rtd-search-form" class="wy-form" action="../search.html" method="get"> 41 <form id ="rtd-search-form" class="wy-form" action="../../search.html" method="get">
42 <input type="text" name="q" placeholder="Search docs" /> 42 <input type="text" name="q" placeholder="Search docs" />
43 </form> 43 </form>
44</div> 44</div>
@@ -50,7 +50,7 @@
50 50
51 <li class="toctree-l1"> 51 <li class="toctree-l1">
52 52
53 <a class="" href="..">Home</a> 53 <a class="" href="../..">Home</a>
54 </li> 54 </li>
55 55
56 <li class="toctree-l1"> 56 <li class="toctree-l1">
@@ -59,31 +59,31 @@
59 <ul class="subnav"> 59 <ul class="subnav">
60 <li class=""> 60 <li class="">
61 61
62 <a class="" href="../Download-and-Installation/">Download and Installation</a> 62 <a class="" href="../../Download-and-Installation/">Download and Installation</a>
63 </li> 63 </li>
64 <li class=""> 64 <li class="">
65 65
66 <a class="" href="../Upgrade-and-migration/">Upgrade and migration</a> 66 <a class="" href="../../Upgrade-and-migration/">Upgrade and migration</a>
67 </li> 67 </li>
68 <li class=""> 68 <li class="">
69 69
70 <a class="" href="../Server-requirements/">Server requirements</a> 70 <a class="" href="../../Server-requirements/">Server requirements</a>
71 </li> 71 </li>
72 <li class=""> 72 <li class="">
73 73
74 <a class="" href="../Server-configuration/">Server configuration</a> 74 <a class="" href="../../Server-configuration/">Server configuration</a>
75 </li> 75 </li>
76 <li class=""> 76 <li class="">
77 77
78 <a class="" href="../Server-security/">Server security</a> 78 <a class="" href="../../Server-security/">Server security</a>
79 </li> 79 </li>
80 <li class=""> 80 <li class="">
81 81
82 <a class="" href="../Shaarli-configuration/">Shaarli configuration</a> 82 <a class="" href="../../Shaarli-configuration/">Shaarli configuration</a>
83 </li> 83 </li>
84 <li class=""> 84 <li class="">
85 85
86 <a class="" href="../Plugins/">Plugins</a> 86 <a class="" href="../../Plugins/">Plugins</a>
87 </li> 87 </li>
88 </ul> 88 </ul>
89 </li> 89 </li>
@@ -94,15 +94,15 @@
94 <ul class="subnav"> 94 <ul class="subnav">
95 <li class=""> 95 <li class="">
96 96
97 <a class="" href="../Docker-101/">Docker 101</a> 97 <a class="" href="../docker-101/">Docker 101</a>
98 </li> 98 </li>
99 <li class=""> 99 <li class="">
100 100
101 <a class="" href="../Shaarli-images/">Shaarli images</a> 101 <a class="" href="../shaarli-images/">Shaarli images</a>
102 </li> 102 </li>
103 <li class=""> 103 <li class="">
104 104
105 <a class="" href="../Reverse-proxy-configuration/">Reverse proxy configuration</a> 105 <a class="" href="../reverse-proxy-configuration/">Reverse proxy configuration</a>
106 </li> 106 </li>
107 <li class=" current"> 107 <li class=" current">
108 108
@@ -129,27 +129,27 @@
129 <ul class="subnav"> 129 <ul class="subnav">
130 <li class=""> 130 <li class="">
131 131
132 <a class="" href="../Features/">Features</a> 132 <a class="" href="../../Features/">Features</a>
133 </li> 133 </li>
134 <li class=""> 134 <li class="">
135 135
136 <a class="" href="../Bookmarklet/">Bookmarklet</a> 136 <a class="" href="../../Bookmarklet/">Bookmarklet</a>
137 </li> 137 </li>
138 <li class=""> 138 <li class="">
139 139
140 <a class="" href="../Browsing-and-searching/">Browsing and searching</a> 140 <a class="" href="../../Browsing-and-searching/">Browsing and searching</a>
141 </li> 141 </li>
142 <li class=""> 142 <li class="">
143 143
144 <a class="" href="../Firefox-share/">Firefox share</a> 144 <a class="" href="../../Firefox-share/">Firefox share</a>
145 </li> 145 </li>
146 <li class=""> 146 <li class="">
147 147
148 <a class="" href="../RSS-feeds/">RSS feeds</a> 148 <a class="" href="../../RSS-feeds/">RSS feeds</a>
149 </li> 149 </li>
150 <li class=""> 150 <li class="">
151 151
152 <a class="" href="../REST-API/">REST API</a> 152 <a class="" href="../../REST-API/">REST API</a>
153 </li> 153 </li>
154 </ul> 154 </ul>
155 </li> 155 </li>
@@ -160,18 +160,18 @@
160 <ul class="subnav"> 160 <ul class="subnav">
161 <li class=""> 161 <li class="">
162 162
163 <a class="" href="../Backup,-restore,-import-and-export/">Backup, restore, import and export</a> 163 <a class="" href="../../Backup,-restore,-import-and-export/">Backup, restore, import and export</a>
164 </li> 164 </li>
165 <li class=""> 165 <li class="">
166 166
167 <a class="" href="../Various-hacks/">Various hacks</a> 167 <a class="" href="../../Various-hacks/">Various hacks</a>
168 </li> 168 </li>
169 </ul> 169 </ul>
170 </li> 170 </li>
171 171
172 <li class="toctree-l1"> 172 <li class="toctree-l1">
173 173
174 <a class="" href="../Troubleshooting/">Troubleshooting</a> 174 <a class="" href="../../Troubleshooting/">Troubleshooting</a>
175 </li> 175 </li>
176 176
177 <li class="toctree-l1"> 177 <li class="toctree-l1">
@@ -180,55 +180,55 @@
180 <ul class="subnav"> 180 <ul class="subnav">
181 <li class=""> 181 <li class="">
182 182
183 <a class="" href="../Development-guidelines/">Development guidelines</a> 183 <a class="" href="../../Development-guidelines/">Development guidelines</a>
184 </li> 184 </li>
185 <li class=""> 185 <li class="">
186 186
187 <a class="" href="../Continuous-integration-tools/">Continuous integration tools</a> 187 <a class="" href="../../Continuous-integration-tools/">Continuous integration tools</a>
188 </li> 188 </li>
189 <li class=""> 189 <li class="">
190 190
191 <a class="" href="../GnuPG-signature/">GnuPG signature</a> 191 <a class="" href="../../GnuPG-signature/">GnuPG signature</a>
192 </li> 192 </li>
193 <li class=""> 193 <li class="">
194 194
195 <a class="" href="../Coding-guidelines/">Coding guidelines</a> 195 <a class="" href="../../Coding-guidelines/">Coding guidelines</a>
196 </li> 196 </li>
197 <li class=""> 197 <li class="">
198 198
199 <a class="" href="../Directory-structure/">Directory structure</a> 199 <a class="" href="../../Directory-structure/">Directory structure</a>
200 </li> 200 </li>
201 <li class=""> 201 <li class="">
202 202
203 <a class="" href="../3rd-party-libraries/">3rd party libraries</a> 203 <a class="" href="../../3rd-party-libraries/">3rd party libraries</a>
204 </li> 204 </li>
205 <li class=""> 205 <li class="">
206 206
207 <a class="" href="../Plugin-System/">Plugin System</a> 207 <a class="" href="../../Plugin-System/">Plugin System</a>
208 </li> 208 </li>
209 <li class=""> 209 <li class="">
210 210
211 <a class="" href="../Release-Shaarli/">Release Shaarli</a> 211 <a class="" href="../../Release-Shaarli/">Release Shaarli</a>
212 </li> 212 </li>
213 <li class=""> 213 <li class="">
214 214
215 <a class="" href="../Versioning-and-Branches/">Versioning and Branches</a> 215 <a class="" href="../../Versioning-and-Branches/">Versioning and Branches</a>
216 </li> 216 </li>
217 <li class=""> 217 <li class="">
218 218
219 <a class="" href="../Security/">Security</a> 219 <a class="" href="../../Security/">Security</a>
220 </li> 220 </li>
221 <li class=""> 221 <li class="">
222 222
223 <a class="" href="../Static-analysis/">Static analysis</a> 223 <a class="" href="../../Static-analysis/">Static analysis</a>
224 </li> 224 </li>
225 <li class=""> 225 <li class="">
226 226
227 <a class="" href="../Theming/">Theming</a> 227 <a class="" href="../../Theming/">Theming</a>
228 </li> 228 </li>
229 <li class=""> 229 <li class="">
230 230
231 <a class="" href="../Unit-tests/">Unit tests</a> 231 <a class="" href="../../Unit-tests/">Unit tests</a>
232 </li> 232 </li>
233 </ul> 233 </ul>
234 </li> 234 </li>
@@ -239,11 +239,11 @@
239 <ul class="subnav"> 239 <ul class="subnav">
240 <li class=""> 240 <li class="">
241 241
242 <a class="" href="../FAQ/">FAQ</a> 242 <a class="" href="../../FAQ/">FAQ</a>
243 </li> 243 </li>
244 <li class=""> 244 <li class="">
245 245
246 <a class="" href="../Community-&-Related-software/">Community & Related software</a> 246 <a class="" href="../../Community-&-Related-software/">Community & Related software</a>
247 </li> 247 </li>
248 </ul> 248 </ul>
249 </li> 249 </li>
@@ -258,7 +258,7 @@
258 258
259 <nav class="wy-nav-top" role="navigation" aria-label="top navigation"> 259 <nav class="wy-nav-top" role="navigation" aria-label="top navigation">
260 <i data-toggle="wy-nav-top" class="fa fa-bars"></i> 260 <i data-toggle="wy-nav-top" class="fa fa-bars"></i>
261 <a href="..">Shaarli Documentation</a> 261 <a href="../..">Shaarli Documentation</a>
262 </nav> 262 </nav>
263 263
264 264
@@ -266,7 +266,7 @@
266 <div class="rst-content"> 266 <div class="rst-content">
267 <div role="navigation" aria-label="breadcrumbs navigation"> 267 <div role="navigation" aria-label="breadcrumbs navigation">
268 <ul class="wy-breadcrumbs"> 268 <ul class="wy-breadcrumbs">
269 <li><a href="..">Docs</a> &raquo;</li> 269 <li><a href="../..">Docs</a> &raquo;</li>
270 270
271 271
272 272
@@ -277,7 +277,7 @@
277 <li>Docker resources</li> 277 <li>Docker resources</li>
278 <li class="wy-breadcrumbs-aside"> 278 <li class="wy-breadcrumbs-aside">
279 279
280 <a href="https://github.com/shaarli/Shaarli/edit/master/docs/Docker-resources.md" 280 <a href="https://github.com/shaarli/Shaarli/edit/master/docs/docker/resources.md"
281 class="icon icon-github"> Edit on GitHub</a> 281 class="icon icon-github"> Edit on GitHub</a>
282 282
283 </li> 283 </li>
@@ -314,10 +314,10 @@
314 314
315 <div class="rst-footer-buttons" role="navigation" aria-label="footer navigation"> 315 <div class="rst-footer-buttons" role="navigation" aria-label="footer navigation">
316 316
317 <a href="../Features/" class="btn btn-neutral float-right" title="Features">Next <span class="icon icon-circle-arrow-right"></span></a> 317 <a href="../../Features/" class="btn btn-neutral float-right" title="Features">Next <span class="icon icon-circle-arrow-right"></span></a>
318 318
319 319
320 <a href="../Reverse-proxy-configuration/" class="btn btn-neutral" title="Reverse proxy configuration"><span class="icon icon-circle-arrow-left"></span> Previous</a> 320 <a href="../reverse-proxy-configuration/" class="btn btn-neutral" title="Reverse proxy configuration"><span class="icon icon-circle-arrow-left"></span> Previous</a>
321 321
322 </div> 322 </div>
323 323
@@ -345,14 +345,14 @@
345 <a href="https://github.com/shaarli/Shaarli" class="fa fa-github" style="float: left; color: #fcfcfc"> GitHub</a> 345 <a href="https://github.com/shaarli/Shaarli" class="fa fa-github" style="float: left; color: #fcfcfc"> GitHub</a>
346 346
347 347
348 <span><a href="../Reverse-proxy-configuration/" style="color: #fcfcfc;">&laquo; Previous</a></span> 348 <span><a href="../reverse-proxy-configuration/" style="color: #fcfcfc;">&laquo; Previous</a></span>
349 349
350 350
351 <span style="margin-left: 15px"><a href="../Features/" style="color: #fcfcfc">Next &raquo;</a></span> 351 <span style="margin-left: 15px"><a href="../../Features/" style="color: #fcfcfc">Next &raquo;</a></span>
352 352
353 </span> 353 </span>
354</div> 354</div>
355 <script src="../js/theme.js"></script> 355 <script src="../../js/theme.js"></script>
356 356
357</body> 357</body>
358</html> 358</html>
diff --git a/doc/html/Reverse-proxy-configuration/index.html b/doc/html/docker/reverse-proxy-configuration/index.html
index f573c5cd..fd1187c9 100644
--- a/doc/html/Reverse-proxy-configuration/index.html
+++ b/doc/html/docker/reverse-proxy-configuration/index.html
@@ -7,25 +7,25 @@
7 <meta name="viewport" content="width=device-width, initial-scale=1.0"> 7 <meta name="viewport" content="width=device-width, initial-scale=1.0">
8 8
9 9
10 <link rel="shortcut icon" href="../img/favicon.ico"> 10 <link rel="shortcut icon" href="../../img/favicon.ico">
11 <title>Reverse proxy configuration - Shaarli Documentation</title> 11 <title>Reverse proxy configuration - Shaarli Documentation</title>
12 <link href='https://fonts.googleapis.com/css?family=Lato:400,700|Roboto+Slab:400,700|Inconsolata:400,700' rel='stylesheet' type='text/css'> 12 <link href='https://fonts.googleapis.com/css?family=Lato:400,700|Roboto+Slab:400,700|Inconsolata:400,700' rel='stylesheet' type='text/css'>
13 13
14 <link rel="stylesheet" href="../css/theme.css" type="text/css" /> 14 <link rel="stylesheet" href="../../css/theme.css" type="text/css" />
15 <link rel="stylesheet" href="../css/theme_extra.css" type="text/css" /> 15 <link rel="stylesheet" href="../../css/theme_extra.css" type="text/css" />
16 <link rel="stylesheet" href="../css/highlight.css"> 16 <link rel="stylesheet" href="../../css/highlight.css">
17 <link href="../github-markdown.css" rel="stylesheet"> 17 <link href="../../github-markdown.css" rel="stylesheet">
18 18
19 <script> 19 <script>
20 // Current page data 20 // Current page data
21 var mkdocs_page_name = "Reverse proxy configuration"; 21 var mkdocs_page_name = "Reverse proxy configuration";
22 var mkdocs_page_input_path = "Reverse-proxy-configuration.md"; 22 var mkdocs_page_input_path = "docker/reverse-proxy-configuration.md";
23 var mkdocs_page_url = "/Reverse-proxy-configuration/"; 23 var mkdocs_page_url = "/docker/reverse-proxy-configuration/";
24 </script> 24 </script>
25 25
26 <script src="../js/jquery-2.1.1.min.js"></script> 26 <script src="../../js/jquery-2.1.1.min.js"></script>
27 <script src="../js/modernizr-2.8.3.min.js"></script> 27 <script src="../../js/modernizr-2.8.3.min.js"></script>
28 <script type="text/javascript" src="../js/highlight.pack.js"></script> 28 <script type="text/javascript" src="../../js/highlight.pack.js"></script>
29 29
30</head> 30</head>
31 31
@@ -36,9 +36,9 @@
36 36
37 <nav data-toggle="wy-nav-shift" class="wy-nav-side stickynav"> 37 <nav data-toggle="wy-nav-shift" class="wy-nav-side stickynav">
38 <div class="wy-side-nav-search"> 38 <div class="wy-side-nav-search">
39 <a href=".." class="icon icon-home"> Shaarli Documentation</a> 39 <a href="../.." class="icon icon-home"> Shaarli Documentation</a>
40 <div role="search"> 40 <div role="search">
41 <form id ="rtd-search-form" class="wy-form" action="../search.html" method="get"> 41 <form id ="rtd-search-form" class="wy-form" action="../../search.html" method="get">
42 <input type="text" name="q" placeholder="Search docs" /> 42 <input type="text" name="q" placeholder="Search docs" />
43 </form> 43 </form>
44</div> 44</div>
@@ -50,7 +50,7 @@
50 50
51 <li class="toctree-l1"> 51 <li class="toctree-l1">
52 52
53 <a class="" href="..">Home</a> 53 <a class="" href="../..">Home</a>
54 </li> 54 </li>
55 55
56 <li class="toctree-l1"> 56 <li class="toctree-l1">
@@ -59,31 +59,31 @@
59 <ul class="subnav"> 59 <ul class="subnav">
60 <li class=""> 60 <li class="">
61 61
62 <a class="" href="../Download-and-Installation/">Download and Installation</a> 62 <a class="" href="../../Download-and-Installation/">Download and Installation</a>
63 </li> 63 </li>
64 <li class=""> 64 <li class="">
65 65
66 <a class="" href="../Upgrade-and-migration/">Upgrade and migration</a> 66 <a class="" href="../../Upgrade-and-migration/">Upgrade and migration</a>
67 </li> 67 </li>
68 <li class=""> 68 <li class="">
69 69
70 <a class="" href="../Server-requirements/">Server requirements</a> 70 <a class="" href="../../Server-requirements/">Server requirements</a>
71 </li> 71 </li>
72 <li class=""> 72 <li class="">
73 73
74 <a class="" href="../Server-configuration/">Server configuration</a> 74 <a class="" href="../../Server-configuration/">Server configuration</a>
75 </li> 75 </li>
76 <li class=""> 76 <li class="">
77 77
78 <a class="" href="../Server-security/">Server security</a> 78 <a class="" href="../../Server-security/">Server security</a>
79 </li> 79 </li>
80 <li class=""> 80 <li class="">
81 81
82 <a class="" href="../Shaarli-configuration/">Shaarli configuration</a> 82 <a class="" href="../../Shaarli-configuration/">Shaarli configuration</a>
83 </li> 83 </li>
84 <li class=""> 84 <li class="">
85 85
86 <a class="" href="../Plugins/">Plugins</a> 86 <a class="" href="../../Plugins/">Plugins</a>
87 </li> 87 </li>
88 </ul> 88 </ul>
89 </li> 89 </li>
@@ -94,11 +94,11 @@
94 <ul class="subnav"> 94 <ul class="subnav">
95 <li class=""> 95 <li class="">
96 96
97 <a class="" href="../Docker-101/">Docker 101</a> 97 <a class="" href="../docker-101/">Docker 101</a>
98 </li> 98 </li>
99 <li class=""> 99 <li class="">
100 100
101 <a class="" href="../Shaarli-images/">Shaarli images</a> 101 <a class="" href="../shaarli-images/">Shaarli images</a>
102 </li> 102 </li>
103 <li class=" current"> 103 <li class=" current">
104 104
@@ -115,7 +115,7 @@
115 </li> 115 </li>
116 <li class=""> 116 <li class="">
117 117
118 <a class="" href="../Docker-resources/">Docker resources</a> 118 <a class="" href="../resources/">Docker resources</a>
119 </li> 119 </li>
120 </ul> 120 </ul>
121 </li> 121 </li>
@@ -126,27 +126,27 @@
126 <ul class="subnav"> 126 <ul class="subnav">
127 <li class=""> 127 <li class="">
128 128
129 <a class="" href="../Features/">Features</a> 129 <a class="" href="../../Features/">Features</a>
130 </li> 130 </li>
131 <li class=""> 131 <li class="">
132 132
133 <a class="" href="../Bookmarklet/">Bookmarklet</a> 133 <a class="" href="../../Bookmarklet/">Bookmarklet</a>
134 </li> 134 </li>
135 <li class=""> 135 <li class="">
136 136
137 <a class="" href="../Browsing-and-searching/">Browsing and searching</a> 137 <a class="" href="../../Browsing-and-searching/">Browsing and searching</a>
138 </li> 138 </li>
139 <li class=""> 139 <li class="">
140 140
141 <a class="" href="../Firefox-share/">Firefox share</a> 141 <a class="" href="../../Firefox-share/">Firefox share</a>
142 </li> 142 </li>
143 <li class=""> 143 <li class="">
144 144
145 <a class="" href="../RSS-feeds/">RSS feeds</a> 145 <a class="" href="../../RSS-feeds/">RSS feeds</a>
146 </li> 146 </li>
147 <li class=""> 147 <li class="">
148 148
149 <a class="" href="../REST-API/">REST API</a> 149 <a class="" href="../../REST-API/">REST API</a>
150 </li> 150 </li>
151 </ul> 151 </ul>
152 </li> 152 </li>
@@ -157,18 +157,18 @@
157 <ul class="subnav"> 157 <ul class="subnav">
158 <li class=""> 158 <li class="">
159 159
160 <a class="" href="../Backup,-restore,-import-and-export/">Backup, restore, import and export</a> 160 <a class="" href="../../Backup,-restore,-import-and-export/">Backup, restore, import and export</a>
161 </li> 161 </li>
162 <li class=""> 162 <li class="">
163 163
164 <a class="" href="../Various-hacks/">Various hacks</a> 164 <a class="" href="../../Various-hacks/">Various hacks</a>
165 </li> 165 </li>
166 </ul> 166 </ul>
167 </li> 167 </li>
168 168
169 <li class="toctree-l1"> 169 <li class="toctree-l1">
170 170
171 <a class="" href="../Troubleshooting/">Troubleshooting</a> 171 <a class="" href="../../Troubleshooting/">Troubleshooting</a>
172 </li> 172 </li>
173 173
174 <li class="toctree-l1"> 174 <li class="toctree-l1">
@@ -177,55 +177,55 @@
177 <ul class="subnav"> 177 <ul class="subnav">
178 <li class=""> 178 <li class="">
179 179
180 <a class="" href="../Development-guidelines/">Development guidelines</a> 180 <a class="" href="../../Development-guidelines/">Development guidelines</a>
181 </li> 181 </li>
182 <li class=""> 182 <li class="">
183 183
184 <a class="" href="../Continuous-integration-tools/">Continuous integration tools</a> 184 <a class="" href="../../Continuous-integration-tools/">Continuous integration tools</a>
185 </li> 185 </li>
186 <li class=""> 186 <li class="">
187 187
188 <a class="" href="../GnuPG-signature/">GnuPG signature</a> 188 <a class="" href="../../GnuPG-signature/">GnuPG signature</a>
189 </li> 189 </li>
190 <li class=""> 190 <li class="">
191 191
192 <a class="" href="../Coding-guidelines/">Coding guidelines</a> 192 <a class="" href="../../Coding-guidelines/">Coding guidelines</a>
193 </li> 193 </li>
194 <li class=""> 194 <li class="">
195 195
196 <a class="" href="../Directory-structure/">Directory structure</a> 196 <a class="" href="../../Directory-structure/">Directory structure</a>
197 </li> 197 </li>
198 <li class=""> 198 <li class="">
199 199
200 <a class="" href="../3rd-party-libraries/">3rd party libraries</a> 200 <a class="" href="../../3rd-party-libraries/">3rd party libraries</a>
201 </li> 201 </li>
202 <li class=""> 202 <li class="">
203 203
204 <a class="" href="../Plugin-System/">Plugin System</a> 204 <a class="" href="../../Plugin-System/">Plugin System</a>
205 </li> 205 </li>
206 <li class=""> 206 <li class="">
207 207
208 <a class="" href="../Release-Shaarli/">Release Shaarli</a> 208 <a class="" href="../../Release-Shaarli/">Release Shaarli</a>
209 </li> 209 </li>
210 <li class=""> 210 <li class="">
211 211
212 <a class="" href="../Versioning-and-Branches/">Versioning and Branches</a> 212 <a class="" href="../../Versioning-and-Branches/">Versioning and Branches</a>
213 </li> 213 </li>
214 <li class=""> 214 <li class="">
215 215
216 <a class="" href="../Security/">Security</a> 216 <a class="" href="../../Security/">Security</a>
217 </li> 217 </li>
218 <li class=""> 218 <li class="">
219 219
220 <a class="" href="../Static-analysis/">Static analysis</a> 220 <a class="" href="../../Static-analysis/">Static analysis</a>
221 </li> 221 </li>
222 <li class=""> 222 <li class="">
223 223
224 <a class="" href="../Theming/">Theming</a> 224 <a class="" href="../../Theming/">Theming</a>
225 </li> 225 </li>
226 <li class=""> 226 <li class="">
227 227
228 <a class="" href="../Unit-tests/">Unit tests</a> 228 <a class="" href="../../Unit-tests/">Unit tests</a>
229 </li> 229 </li>
230 </ul> 230 </ul>
231 </li> 231 </li>
@@ -236,11 +236,11 @@
236 <ul class="subnav"> 236 <ul class="subnav">
237 <li class=""> 237 <li class="">
238 238
239 <a class="" href="../FAQ/">FAQ</a> 239 <a class="" href="../../FAQ/">FAQ</a>
240 </li> 240 </li>
241 <li class=""> 241 <li class="">
242 242
243 <a class="" href="../Community-&-Related-software/">Community & Related software</a> 243 <a class="" href="../../Community-&-Related-software/">Community & Related software</a>
244 </li> 244 </li>
245 </ul> 245 </ul>
246 </li> 246 </li>
@@ -255,7 +255,7 @@
255 255
256 <nav class="wy-nav-top" role="navigation" aria-label="top navigation"> 256 <nav class="wy-nav-top" role="navigation" aria-label="top navigation">
257 <i data-toggle="wy-nav-top" class="fa fa-bars"></i> 257 <i data-toggle="wy-nav-top" class="fa fa-bars"></i>
258 <a href="..">Shaarli Documentation</a> 258 <a href="../..">Shaarli Documentation</a>
259 </nav> 259 </nav>
260 260
261 261
@@ -263,7 +263,7 @@
263 <div class="rst-content"> 263 <div class="rst-content">
264 <div role="navigation" aria-label="breadcrumbs navigation"> 264 <div role="navigation" aria-label="breadcrumbs navigation">
265 <ul class="wy-breadcrumbs"> 265 <ul class="wy-breadcrumbs">
266 <li><a href="..">Docs</a> &raquo;</li> 266 <li><a href="../..">Docs</a> &raquo;</li>
267 267
268 268
269 269
@@ -274,7 +274,7 @@
274 <li>Reverse proxy configuration</li> 274 <li>Reverse proxy configuration</li>
275 <li class="wy-breadcrumbs-aside"> 275 <li class="wy-breadcrumbs-aside">
276 276
277 <a href="https://github.com/shaarli/Shaarli/edit/master/docs/Reverse-proxy-configuration.md" 277 <a href="https://github.com/shaarli/Shaarli/edit/master/docs/docker/reverse-proxy-configuration.md"
278 class="icon icon-github"> Edit on GitHub</a> 278 class="icon icon-github"> Edit on GitHub</a>
279 279
280 </li> 280 </li>
@@ -294,10 +294,10 @@
294 294
295 <div class="rst-footer-buttons" role="navigation" aria-label="footer navigation"> 295 <div class="rst-footer-buttons" role="navigation" aria-label="footer navigation">
296 296
297 <a href="../Docker-resources/" class="btn btn-neutral float-right" title="Docker resources">Next <span class="icon icon-circle-arrow-right"></span></a> 297 <a href="../resources/" class="btn btn-neutral float-right" title="Docker resources">Next <span class="icon icon-circle-arrow-right"></span></a>
298 298
299 299
300 <a href="../Shaarli-images/" class="btn btn-neutral" title="Shaarli images"><span class="icon icon-circle-arrow-left"></span> Previous</a> 300 <a href="../shaarli-images/" class="btn btn-neutral" title="Shaarli images"><span class="icon icon-circle-arrow-left"></span> Previous</a>
301 301
302 </div> 302 </div>
303 303
@@ -325,14 +325,14 @@
325 <a href="https://github.com/shaarli/Shaarli" class="fa fa-github" style="float: left; color: #fcfcfc"> GitHub</a> 325 <a href="https://github.com/shaarli/Shaarli" class="fa fa-github" style="float: left; color: #fcfcfc"> GitHub</a>
326 326
327 327
328 <span><a href="../Shaarli-images/" style="color: #fcfcfc;">&laquo; Previous</a></span> 328 <span><a href="../shaarli-images/" style="color: #fcfcfc;">&laquo; Previous</a></span>
329 329
330 330
331 <span style="margin-left: 15px"><a href="../Docker-resources/" style="color: #fcfcfc">Next &raquo;</a></span> 331 <span style="margin-left: 15px"><a href="../resources/" style="color: #fcfcfc">Next &raquo;</a></span>
332 332
333 </span> 333 </span>
334</div> 334</div>
335 <script src="../js/theme.js"></script> 335 <script src="../../js/theme.js"></script>
336 336
337</body> 337</body>
338</html> 338</html>
diff --git a/doc/html/Shaarli-images/index.html b/doc/html/docker/shaarli-images/index.html
index 4a1cf66b..6938b65f 100644
--- a/doc/html/Shaarli-images/index.html
+++ b/doc/html/docker/shaarli-images/index.html
@@ -7,25 +7,25 @@
7 <meta name="viewport" content="width=device-width, initial-scale=1.0"> 7 <meta name="viewport" content="width=device-width, initial-scale=1.0">
8 8
9 9
10 <link rel="shortcut icon" href="../img/favicon.ico"> 10 <link rel="shortcut icon" href="../../img/favicon.ico">
11 <title>Shaarli images - Shaarli Documentation</title> 11 <title>Shaarli images - Shaarli Documentation</title>
12 <link href='https://fonts.googleapis.com/css?family=Lato:400,700|Roboto+Slab:400,700|Inconsolata:400,700' rel='stylesheet' type='text/css'> 12 <link href='https://fonts.googleapis.com/css?family=Lato:400,700|Roboto+Slab:400,700|Inconsolata:400,700' rel='stylesheet' type='text/css'>
13 13
14 <link rel="stylesheet" href="../css/theme.css" type="text/css" /> 14 <link rel="stylesheet" href="../../css/theme.css" type="text/css" />
15 <link rel="stylesheet" href="../css/theme_extra.css" type="text/css" /> 15 <link rel="stylesheet" href="../../css/theme_extra.css" type="text/css" />
16 <link rel="stylesheet" href="../css/highlight.css"> 16 <link rel="stylesheet" href="../../css/highlight.css">
17 <link href="../github-markdown.css" rel="stylesheet"> 17 <link href="../../github-markdown.css" rel="stylesheet">
18 18
19 <script> 19 <script>
20 // Current page data 20 // Current page data
21 var mkdocs_page_name = "Shaarli images"; 21 var mkdocs_page_name = "Shaarli images";
22 var mkdocs_page_input_path = "Shaarli-images.md"; 22 var mkdocs_page_input_path = "docker/shaarli-images.md";
23 var mkdocs_page_url = "/Shaarli-images/"; 23 var mkdocs_page_url = "/docker/shaarli-images/";
24 </script> 24 </script>
25 25
26 <script src="../js/jquery-2.1.1.min.js"></script> 26 <script src="../../js/jquery-2.1.1.min.js"></script>
27 <script src="../js/modernizr-2.8.3.min.js"></script> 27 <script src="../../js/modernizr-2.8.3.min.js"></script>
28 <script type="text/javascript" src="../js/highlight.pack.js"></script> 28 <script type="text/javascript" src="../../js/highlight.pack.js"></script>
29 29
30</head> 30</head>
31 31
@@ -36,9 +36,9 @@
36 36
37 <nav data-toggle="wy-nav-shift" class="wy-nav-side stickynav"> 37 <nav data-toggle="wy-nav-shift" class="wy-nav-side stickynav">
38 <div class="wy-side-nav-search"> 38 <div class="wy-side-nav-search">
39 <a href=".." class="icon icon-home"> Shaarli Documentation</a> 39 <a href="../.." class="icon icon-home"> Shaarli Documentation</a>
40 <div role="search"> 40 <div role="search">
41 <form id ="rtd-search-form" class="wy-form" action="../search.html" method="get"> 41 <form id ="rtd-search-form" class="wy-form" action="../../search.html" method="get">
42 <input type="text" name="q" placeholder="Search docs" /> 42 <input type="text" name="q" placeholder="Search docs" />
43 </form> 43 </form>
44</div> 44</div>
@@ -50,7 +50,7 @@
50 50
51 <li class="toctree-l1"> 51 <li class="toctree-l1">
52 52
53 <a class="" href="..">Home</a> 53 <a class="" href="../..">Home</a>
54 </li> 54 </li>
55 55
56 <li class="toctree-l1"> 56 <li class="toctree-l1">
@@ -59,31 +59,31 @@
59 <ul class="subnav"> 59 <ul class="subnav">
60 <li class=""> 60 <li class="">
61 61
62 <a class="" href="../Download-and-Installation/">Download and Installation</a> 62 <a class="" href="../../Download-and-Installation/">Download and Installation</a>
63 </li> 63 </li>
64 <li class=""> 64 <li class="">
65 65
66 <a class="" href="../Upgrade-and-migration/">Upgrade and migration</a> 66 <a class="" href="../../Upgrade-and-migration/">Upgrade and migration</a>
67 </li> 67 </li>
68 <li class=""> 68 <li class="">
69 69
70 <a class="" href="../Server-requirements/">Server requirements</a> 70 <a class="" href="../../Server-requirements/">Server requirements</a>
71 </li> 71 </li>
72 <li class=""> 72 <li class="">
73 73
74 <a class="" href="../Server-configuration/">Server configuration</a> 74 <a class="" href="../../Server-configuration/">Server configuration</a>
75 </li> 75 </li>
76 <li class=""> 76 <li class="">
77 77
78 <a class="" href="../Server-security/">Server security</a> 78 <a class="" href="../../Server-security/">Server security</a>
79 </li> 79 </li>
80 <li class=""> 80 <li class="">
81 81
82 <a class="" href="../Shaarli-configuration/">Shaarli configuration</a> 82 <a class="" href="../../Shaarli-configuration/">Shaarli configuration</a>
83 </li> 83 </li>
84 <li class=""> 84 <li class="">
85 85
86 <a class="" href="../Plugins/">Plugins</a> 86 <a class="" href="../../Plugins/">Plugins</a>
87 </li> 87 </li>
88 </ul> 88 </ul>
89 </li> 89 </li>
@@ -94,7 +94,7 @@
94 <ul class="subnav"> 94 <ul class="subnav">
95 <li class=""> 95 <li class="">
96 96
97 <a class="" href="../Docker-101/">Docker 101</a> 97 <a class="" href="../docker-101/">Docker 101</a>
98 </li> 98 </li>
99 <li class=" current"> 99 <li class=" current">
100 100
@@ -122,11 +122,11 @@
122 </li> 122 </li>
123 <li class=""> 123 <li class="">
124 124
125 <a class="" href="../Reverse-proxy-configuration/">Reverse proxy configuration</a> 125 <a class="" href="../reverse-proxy-configuration/">Reverse proxy configuration</a>
126 </li> 126 </li>
127 <li class=""> 127 <li class="">
128 128
129 <a class="" href="../Docker-resources/">Docker resources</a> 129 <a class="" href="../resources/">Docker resources</a>
130 </li> 130 </li>
131 </ul> 131 </ul>
132 </li> 132 </li>
@@ -137,27 +137,27 @@
137 <ul class="subnav"> 137 <ul class="subnav">
138 <li class=""> 138 <li class="">
139 139
140 <a class="" href="../Features/">Features</a> 140 <a class="" href="../../Features/">Features</a>
141 </li> 141 </li>
142 <li class=""> 142 <li class="">
143 143
144 <a class="" href="../Bookmarklet/">Bookmarklet</a> 144 <a class="" href="../../Bookmarklet/">Bookmarklet</a>
145 </li> 145 </li>
146 <li class=""> 146 <li class="">
147 147
148 <a class="" href="../Browsing-and-searching/">Browsing and searching</a> 148 <a class="" href="../../Browsing-and-searching/">Browsing and searching</a>
149 </li> 149 </li>
150 <li class=""> 150 <li class="">
151 151
152 <a class="" href="../Firefox-share/">Firefox share</a> 152 <a class="" href="../../Firefox-share/">Firefox share</a>
153 </li> 153 </li>
154 <li class=""> 154 <li class="">
155 155
156 <a class="" href="../RSS-feeds/">RSS feeds</a> 156 <a class="" href="../../RSS-feeds/">RSS feeds</a>
157 </li> 157 </li>
158 <li class=""> 158 <li class="">
159 159
160 <a class="" href="../REST-API/">REST API</a> 160 <a class="" href="../../REST-API/">REST API</a>
161 </li> 161 </li>
162 </ul> 162 </ul>
163 </li> 163 </li>
@@ -168,18 +168,18 @@
168 <ul class="subnav"> 168 <ul class="subnav">
169 <li class=""> 169 <li class="">
170 170
171 <a class="" href="../Backup,-restore,-import-and-export/">Backup, restore, import and export</a> 171 <a class="" href="../../Backup,-restore,-import-and-export/">Backup, restore, import and export</a>
172 </li> 172 </li>
173 <li class=""> 173 <li class="">
174 174
175 <a class="" href="../Various-hacks/">Various hacks</a> 175 <a class="" href="../../Various-hacks/">Various hacks</a>
176 </li> 176 </li>
177 </ul> 177 </ul>
178 </li> 178 </li>
179 179
180 <li class="toctree-l1"> 180 <li class="toctree-l1">
181 181
182 <a class="" href="../Troubleshooting/">Troubleshooting</a> 182 <a class="" href="../../Troubleshooting/">Troubleshooting</a>
183 </li> 183 </li>
184 184
185 <li class="toctree-l1"> 185 <li class="toctree-l1">
@@ -188,55 +188,55 @@
188 <ul class="subnav"> 188 <ul class="subnav">
189 <li class=""> 189 <li class="">
190 190
191 <a class="" href="../Development-guidelines/">Development guidelines</a> 191 <a class="" href="../../Development-guidelines/">Development guidelines</a>
192 </li> 192 </li>
193 <li class=""> 193 <li class="">
194 194
195 <a class="" href="../Continuous-integration-tools/">Continuous integration tools</a> 195 <a class="" href="../../Continuous-integration-tools/">Continuous integration tools</a>
196 </li> 196 </li>
197 <li class=""> 197 <li class="">
198 198
199 <a class="" href="../GnuPG-signature/">GnuPG signature</a> 199 <a class="" href="../../GnuPG-signature/">GnuPG signature</a>
200 </li> 200 </li>
201 <li class=""> 201 <li class="">
202 202
203 <a class="" href="../Coding-guidelines/">Coding guidelines</a> 203 <a class="" href="../../Coding-guidelines/">Coding guidelines</a>
204 </li> 204 </li>
205 <li class=""> 205 <li class="">
206 206
207 <a class="" href="../Directory-structure/">Directory structure</a> 207 <a class="" href="../../Directory-structure/">Directory structure</a>
208 </li> 208 </li>
209 <li class=""> 209 <li class="">
210 210
211 <a class="" href="../3rd-party-libraries/">3rd party libraries</a> 211 <a class="" href="../../3rd-party-libraries/">3rd party libraries</a>
212 </li> 212 </li>
213 <li class=""> 213 <li class="">
214 214
215 <a class="" href="../Plugin-System/">Plugin System</a> 215 <a class="" href="../../Plugin-System/">Plugin System</a>
216 </li> 216 </li>
217 <li class=""> 217 <li class="">
218 218
219 <a class="" href="../Release-Shaarli/">Release Shaarli</a> 219 <a class="" href="../../Release-Shaarli/">Release Shaarli</a>
220 </li> 220 </li>
221 <li class=""> 221 <li class="">
222 222
223 <a class="" href="../Versioning-and-Branches/">Versioning and Branches</a> 223 <a class="" href="../../Versioning-and-Branches/">Versioning and Branches</a>
224 </li> 224 </li>
225 <li class=""> 225 <li class="">
226 226
227 <a class="" href="../Security/">Security</a> 227 <a class="" href="../../Security/">Security</a>
228 </li> 228 </li>
229 <li class=""> 229 <li class="">
230 230
231 <a class="" href="../Static-analysis/">Static analysis</a> 231 <a class="" href="../../Static-analysis/">Static analysis</a>
232 </li> 232 </li>
233 <li class=""> 233 <li class="">
234 234
235 <a class="" href="../Theming/">Theming</a> 235 <a class="" href="../../Theming/">Theming</a>
236 </li> 236 </li>
237 <li class=""> 237 <li class="">
238 238
239 <a class="" href="../Unit-tests/">Unit tests</a> 239 <a class="" href="../../Unit-tests/">Unit tests</a>
240 </li> 240 </li>
241 </ul> 241 </ul>
242 </li> 242 </li>
@@ -247,11 +247,11 @@
247 <ul class="subnav"> 247 <ul class="subnav">
248 <li class=""> 248 <li class="">
249 249
250 <a class="" href="../FAQ/">FAQ</a> 250 <a class="" href="../../FAQ/">FAQ</a>
251 </li> 251 </li>
252 <li class=""> 252 <li class="">
253 253
254 <a class="" href="../Community-&-Related-software/">Community & Related software</a> 254 <a class="" href="../../Community-&-Related-software/">Community & Related software</a>
255 </li> 255 </li>
256 </ul> 256 </ul>
257 </li> 257 </li>
@@ -266,7 +266,7 @@
266 266
267 <nav class="wy-nav-top" role="navigation" aria-label="top navigation"> 267 <nav class="wy-nav-top" role="navigation" aria-label="top navigation">
268 <i data-toggle="wy-nav-top" class="fa fa-bars"></i> 268 <i data-toggle="wy-nav-top" class="fa fa-bars"></i>
269 <a href="..">Shaarli Documentation</a> 269 <a href="../..">Shaarli Documentation</a>
270 </nav> 270 </nav>
271 271
272 272
@@ -274,7 +274,7 @@
274 <div class="rst-content"> 274 <div class="rst-content">
275 <div role="navigation" aria-label="breadcrumbs navigation"> 275 <div role="navigation" aria-label="breadcrumbs navigation">
276 <ul class="wy-breadcrumbs"> 276 <ul class="wy-breadcrumbs">
277 <li><a href="..">Docs</a> &raquo;</li> 277 <li><a href="../..">Docs</a> &raquo;</li>
278 278
279 279
280 280
@@ -285,7 +285,7 @@
285 <li>Shaarli images</li> 285 <li>Shaarli images</li>
286 <li class="wy-breadcrumbs-aside"> 286 <li class="wy-breadcrumbs-aside">
287 287
288 <a href="https://github.com/shaarli/Shaarli/edit/master/docs/Shaarli-images.md" 288 <a href="https://github.com/shaarli/Shaarli/edit/master/docs/docker/shaarli-images.md"
289 class="icon icon-github"> Edit on GitHub</a> 289 class="icon icon-github"> Edit on GitHub</a>
290 290
291 </li> 291 </li>
@@ -303,7 +303,6 @@ repository.</p>
303<ul> 303<ul>
304<li><code>latest</code>: master branch (tarball release)</li> 304<li><code>latest</code>: master branch (tarball release)</li>
305<li><code>stable</code>: stable branch (tarball release)</li> 305<li><code>stable</code>: stable branch (tarball release)</li>
306<li><code>dev</code>: master branch (Git clone)</li>
307</ul> 306</ul>
308<p>All images rely on: 307<p>All images rely on:
309- <a href="https://hub.docker.com/_/debian/">Debian 8 Jessie</a> 308- <a href="https://hub.docker.com/_/debian/">Debian 8 Jessie</a>
@@ -369,10 +368,10 @@ CONTAINER ID IMAGE COMMAND CREATED STATUS
369 368
370 <div class="rst-footer-buttons" role="navigation" aria-label="footer navigation"> 369 <div class="rst-footer-buttons" role="navigation" aria-label="footer navigation">
371 370
372 <a href="../Reverse-proxy-configuration/" class="btn btn-neutral float-right" title="Reverse proxy configuration">Next <span class="icon icon-circle-arrow-right"></span></a> 371 <a href="../reverse-proxy-configuration/" class="btn btn-neutral float-right" title="Reverse proxy configuration">Next <span class="icon icon-circle-arrow-right"></span></a>
373 372
374 373
375 <a href="../Docker-101/" class="btn btn-neutral" title="Docker 101"><span class="icon icon-circle-arrow-left"></span> Previous</a> 374 <a href="../docker-101/" class="btn btn-neutral" title="Docker 101"><span class="icon icon-circle-arrow-left"></span> Previous</a>
376 375
377 </div> 376 </div>
378 377
@@ -400,14 +399,14 @@ CONTAINER ID IMAGE COMMAND CREATED STATUS
400 <a href="https://github.com/shaarli/Shaarli" class="fa fa-github" style="float: left; color: #fcfcfc"> GitHub</a> 399 <a href="https://github.com/shaarli/Shaarli" class="fa fa-github" style="float: left; color: #fcfcfc"> GitHub</a>
401 400
402 401
403 <span><a href="../Docker-101/" style="color: #fcfcfc;">&laquo; Previous</a></span> 402 <span><a href="../docker-101/" style="color: #fcfcfc;">&laquo; Previous</a></span>
404 403
405 404
406 <span style="margin-left: 15px"><a href="../Reverse-proxy-configuration/" style="color: #fcfcfc">Next &raquo;</a></span> 405 <span style="margin-left: 15px"><a href="../reverse-proxy-configuration/" style="color: #fcfcfc">Next &raquo;</a></span>
407 406
408 </span> 407 </span>
409</div> 408</div>
410 <script src="../js/theme.js"></script> 409 <script src="../../js/theme.js"></script>
411 410
412</body> 411</body>
413</html> 412</html>
diff --git a/doc/html/index.html b/doc/html/index.html
index 93f4ba5d..907538cd 100644
--- a/doc/html/index.html
+++ b/doc/html/index.html
@@ -110,19 +110,19 @@
110 <ul class="subnav"> 110 <ul class="subnav">
111 <li class=""> 111 <li class="">
112 112
113 <a class="" href="Docker-101/">Docker 101</a> 113 <a class="" href="docker/docker-101/">Docker 101</a>
114 </li> 114 </li>
115 <li class=""> 115 <li class="">
116 116
117 <a class="" href="Shaarli-images/">Shaarli images</a> 117 <a class="" href="docker/shaarli-images/">Shaarli images</a>
118 </li> 118 </li>
119 <li class=""> 119 <li class="">
120 120
121 <a class="" href="Reverse-proxy-configuration/">Reverse proxy configuration</a> 121 <a class="" href="docker/reverse-proxy-configuration/">Reverse proxy configuration</a>
122 </li> 122 </li>
123 <li class=""> 123 <li class="">
124 124
125 <a class="" href="Docker-resources/">Docker resources</a> 125 <a class="" href="docker/resources/">Docker resources</a>
126 </li> 126 </li>
127 </ul> 127 </ul>
128 </li> 128 </li>
@@ -441,5 +441,5 @@ and <a href="https://github.com/shaarli/Shaarli/pulls">pull requests</a>
441 441
442<!-- 442<!--
443MkDocs version : 0.16.3 443MkDocs version : 0.16.3
444Build Date UTC : 2017-07-04 19:29:47 444Build Date UTC : 2017-07-29 13:33:00
445--> 445-->
diff --git a/doc/html/mkdocs/search_index.json b/doc/html/mkdocs/search_index.json
index 71bc2bcf..d9e8b5b8 100644
--- a/doc/html/mkdocs/search_index.json
+++ b/doc/html/mkdocs/search_index.json
@@ -382,7 +382,7 @@
382 }, 382 },
383 { 383 {
384 "location": "/Shaarli-configuration/", 384 "location": "/Shaarli-configuration/",
385 "text": "Foreword\n\n\nDo not edit configuration options in index.php! Your changes would be lost.\n \n\n\nOnce your Shaarli instance is installed, the file \ndata/config.json.php\n is generated:\n\n it contains all settings in JSON format, and can be edited to customize values\n\n it defines which \nplugins\n are enabled\n\n\n its values override those defined in \nindex.php\n\n\n it is wrap in a PHP comment to prevent anyone accessing it, regardless of server configuration\n\n\nFile and directory permissions\n\n\nThe server process running Shaarli must have:\n- \nread\n access to the following resources:\n - PHP scripts: \nindex.php\n, \napplication/*.php\n, \nplugins/*.php\n\n - 3rd party PHP and Javascript libraries: \ninc/*.php\n, \ninc/*.js\n\n - static assets:\n - CSS stylesheets: \ninc/*.css\n\n - \nimages/*\n\n - RainTPL templates: \ntpl/*.html\n\n- \nread\n, \nwrite\n and \nexecution\n access to the following directories:\n - \ncache\n - thumbnail cache\n - \ndata\n - link data store, configuration options\n - \npagecache\n - Atom/RSS feed cache\n - \ntmp\n - RainTPL page cache\n\n\nOn a Linux distribution:\n- the web server user will likely be \nwww\n or \nhttp\n (for Apache2)\n- it will be a member of a group of the same name: \nwww:www\n, \nhttp:http\n\n- to give it access to Shaarli, either:\n - unzip Shaarli in the default web server location (usually \n/var/www/\n) and set the web server user as the owner\n - put users in the same group as the web server, and set the appropriate access rights\n- if you have a domain / subdomain to serve Shaarli, \nconfigure the server\n accordingly\n\n\nConfiguration\n\n\nIn \ndata/config.json.php\n.\n\n\nSee also \nPlugin System\n.\n\n\nCredentials\n\n\n\n\nYou shouldn't edit those.\n\n\n\n\nlogin\n: Login username.\n\n\nhash\n: Generated password hash.\n\n\nsalt\n: Password salt.\n\n\nGeneral\n\n\ntitle\n: Shaarli's instance title.\n\n\nheader_link\n: Link to the homepage.\n\n\nlinks_per_page\n: Number of shaares displayed per page.\n\n\ntimezone\n: See \nthe list of supported timezones\n.\n\n\nenabled_plugins\n: List of enabled plugins.\n\n\nSecurity\n\n\nsession_protection_disabled\n: Disable session cookie hijacking protection (not recommended). \nIt might be useful if your IP adress often changes.\n\n\nban_after\n: Failed login attempts before being IP banned.\n\n\nban_duration\n: IP ban duration in seconds.\n\n\nopen_shaarli\n: Anyone can add a new link while logged out if enabled.\n\n\ntrusted_proxies\n: List of trusted IP which won't be banned after failed login attemps. Useful if Shaarli is behind a reverse proxy.\n\n\nallowed_protocols\n: List of allowed protocols in shaare URLs or markdown-rendered descriptions. Useful if you want to store \njavascript:\n links (bookmarklets) in Shaarli (default: \n[\"ftp\", \"ftps\", \"magnet\"]\n).\n\n\nResources\n\n\ndata_dir\n: Data directory.\n\n\ndatastore\n: Shaarli's links database file path.\n\n\nhistory\n: Shaarli's operation history file path.\n\nupdates\n: File path for the ran updates file.\n\n\nlog\n: Log file path.\n\n\nupdate_check\n: Last update check file path.\n\n\nraintpl_tpl\n: Templates directory.\n\n\nraintpl_tmp\n: Template engine cache directory.\n\n\nthumbnails_cache\n: Thumbnails cache directory.\n\n\npage_cache\n: Shaarli's internal cache directory.\n\n\nban_file\n: Banned IP file path.\n\n\nUpdates\n\n\ncheck_updates\n: Enable or disable update check to the git repository.\n\n\ncheck_updates_branch\n: Git branch used to check updates (e.g. \nstable\n or \nmaster\n).\n\n\ncheck_updates_interval\n: Look for new version every N seconds (default: every day).\n\n\nPrivacy\n\n\ndefault_private_links\n: Check the private checkbox by default for every new link.\n\n\nhide_public_links\n: All links are hidden while logged out.\n\n\nhide_timestamps\n: Timestamps are hidden.\n\n\nFeed\n\n\nrss_permalinks\n: Enable this to redirect RSS links to Shaarli's permalinks instead of shaared URL.\n\n\nshow_atom\n: Display ATOM feed button.\n\n\nThumbnail\n\n\nenable_thumbnails\n: Enable or disable thumbnail display.\n\n\nenable_localcache\n: Enable or disable local cache.\n\n\nRedirector\n\n\nurl\n: Redirector URL, such as \nanonym.to\n.\n\n\nencode_url\n: Enable this if the redirector needs encoded URL to work properly.\n\n\nConfiguration file example\n\n\n<?php /*\n{\n \"credentials\": {\n \"login\": \"<login>\",\n \"hash\": \"<password hash>\",\n \"salt\": \"<password salt>\"\n },\n \"security\": {\n \"ban_after\": 4,\n \"session_protection_disabled\": false,\n \"ban_duration\": 1800,\n \"trusted_proxies\": [\n \"1.2.3.4\",\n \"5.6.7.8\"\n ],\n \"allowed_protocols\": [\n \"ftp\",\n \"ftps\",\n \"magnet\"\n ]\n },\n \"resources\": {\n \"data_dir\": \"data\",\n \"config\": \"data\\/config.php\",\n \"datastore\": \"data\\/datastore.php\",\n \"ban_file\": \"data\\/ipbans.php\",\n \"updates\": \"data\\/updates.txt\",\n \"log\": \"data\\/log.txt\",\n \"update_check\": \"data\\/lastupdatecheck.txt\",\n \"raintpl_tmp\": \"tmp\\/\",\n \"raintpl_tpl\": \"tpl\\/\",\n \"thumbnails_cache\": \"cache\",\n \"page_cache\": \"pagecache\"\n },\n \"general\": {\n \"check_updates\": true,\n \"rss_permalinks\": true,\n \"links_per_page\": 20,\n \"default_private_links\": true,\n \"enable_thumbnails\": true,\n \"enable_localcache\": true,\n \"check_updates_branch\": \"stable\",\n \"check_updates_interval\": 86400,\n \"enabled_plugins\": [\n \"markdown\",\n \"wallabag\",\n \"archiveorg\"\n ],\n \"timezone\": \"Europe\\/Paris\",\n \"title\": \"My Shaarli\",\n \"header_link\": \"?\"\n },\n \"extras\": {\n \"show_atom\": false,\n \"hide_public_links\": false,\n \"hide_timestamps\": false,\n \"open_shaarli\": false,\n \"redirector\": \"http://anonym.to/?\",\n \"redirector_encode_url\": false\n },\n \"general\": {\n \"header_link\": \"?\",\n \"links_per_page\": 20,\n \"enabled_plugins\": [\n \"markdown\",\n \"wallabag\"\n ],\n \"timezone\": \"Europe\\/Paris\",\n \"title\": \"My Shaarli\"\n },\n \"updates\": {\n \"check_updates\": true,\n \"check_updates_branch\": \"stable\",\n \"check_updates_interval\": 86400\n },\n \"feed\": {\n \"rss_permalinks\": true,\n \"show_atom\": false\n },\n \"privacy\": {\n \"default_private_links\": true,\n \"hide_public_links\": false,\n \"hide_timestamps\": false\n },\n \"thumbnail\": {\n \"enable_thumbnails\": true,\n \"enable_localcache\": true\n },\n \"redirector\": {\n \"url\": \"http://anonym.to/?\",\n \"encode_url\": false\n },\n \"plugins\": {\n \"WALLABAG_URL\": \"http://demo.wallabag.org\",\n \"WALLABAG_VERSION\": \"1\"\n }\n} ?>\n\n\n\n\nAdditional configuration\n\n\nThe playvideos plugin may require that you adapt your server's \n\nContent Security Policy\n \nconfiguration to work properly.", 385 "text": "Foreword\n\n\nDo not edit configuration options in index.php! Your changes would be lost.\n \n\n\nOnce your Shaarli instance is installed, the file \ndata/config.json.php\n is generated:\n\n it contains all settings in JSON format, and can be edited to customize values\n\n it defines which \nplugins\n are enabled\n\n\n its values override those defined in \nindex.php\n\n\n it is wrap in a PHP comment to prevent anyone accessing it, regardless of server configuration\n\n\nFile and directory permissions\n\n\nThe server process running Shaarli must have:\n\n\n\n\nread\n access to the following resources:\n\n\nPHP scripts: \nindex.php\n, \napplication/*.php\n, \nplugins/*.php\n\n\n3rd party PHP and Javascript libraries: \ninc/*.php\n, \ninc/*.js\n\n\nstatic assets:\n\n\nCSS stylesheets: \ninc/*.css\n\n\nimages/*\n\n\n\n\n\n\nRainTPL templates: \ntpl/*.html\n\n\n\n\n\n\nread\n, \nwrite\n and \nexecution\n access to the following directories:\n\n\ncache\n - thumbnail cache\n\n\ndata\n - link data store, configuration options\n\n\npagecache\n - Atom/RSS feed cache\n\n\ntmp\n - RainTPL page cache\n\n\n\n\n\n\n\n\nOn a Linux distribution:\n\n\n\n\nthe web server user will likely be \nwww\n or \nhttp\n (for Apache2)\n\n\nit will be a member of a group of the same name: \nwww:www\n, \nhttp:http\n\n\nto give it access to Shaarli, either:\n\n\nunzip Shaarli in the default web server location (usually \n/var/www/\n) and set the web server user as the owner\n\n\nput users in the same group as the web server, and set the appropriate access rights\n\n\n\n\n\n\nif you have a domain / subdomain to serve Shaarli, \nconfigure the server\n accordingly\n\n\n\n\nConfiguration\n\n\nIn \ndata/config.json.php\n.\n\n\nSee also \nPlugin System\n.\n\n\nCredentials\n\n\n\n\nYou shouldn't edit those.\n\n\n\n\nlogin\n: Login username.\n\n\nhash\n: Generated password hash.\n\n\nsalt\n: Password salt.\n\n\nGeneral\n\n\ntitle\n: Shaarli's instance title.\n\n\nheader_link\n: Link to the homepage.\n\n\nlinks_per_page\n: Number of shaares displayed per page.\n\n\ntimezone\n: See \nthe list of supported timezones\n.\n\n\nenabled_plugins\n: List of enabled plugins.\n\n\nSecurity\n\n\nsession_protection_disabled\n: Disable session cookie hijacking protection (not recommended). \nIt might be useful if your IP adress often changes.\n\n\nban_after\n: Failed login attempts before being IP banned.\n\n\nban_duration\n: IP ban duration in seconds.\n\n\nopen_shaarli\n: Anyone can add a new link while logged out if enabled.\n\n\ntrusted_proxies\n: List of trusted IP which won't be banned after failed login attemps. Useful if Shaarli is behind a reverse proxy.\n\n\nallowed_protocols\n: List of allowed protocols in shaare URLs or markdown-rendered descriptions. Useful if you want to store \njavascript:\n links (bookmarklets) in Shaarli (default: \n[\"ftp\", \"ftps\", \"magnet\"]\n).\n\n\nResources\n\n\ndata_dir\n: Data directory.\n\n\ndatastore\n: Shaarli's links database file path.\n\n\nhistory\n: Shaarli's operation history file path.\n\nupdates\n: File path for the ran updates file.\n\n\nlog\n: Log file path.\n\n\nupdate_check\n: Last update check file path.\n\n\nraintpl_tpl\n: Templates directory.\n\n\nraintpl_tmp\n: Template engine cache directory.\n\n\nthumbnails_cache\n: Thumbnails cache directory.\n\n\npage_cache\n: Shaarli's internal cache directory.\n\n\nban_file\n: Banned IP file path.\n\n\nUpdates\n\n\ncheck_updates\n: Enable or disable update check to the git repository.\n\n\ncheck_updates_branch\n: Git branch used to check updates (e.g. \nstable\n or \nmaster\n).\n\n\ncheck_updates_interval\n: Look for new version every N seconds (default: every day).\n\n\nPrivacy\n\n\ndefault_private_links\n: Check the private checkbox by default for every new link.\n\n\nhide_public_links\n: All links are hidden while logged out.\n\n\nhide_timestamps\n: Timestamps are hidden.\n\n\nFeed\n\n\nrss_permalinks\n: Enable this to redirect RSS links to Shaarli's permalinks instead of shaared URL.\n\n\nshow_atom\n: Display ATOM feed button.\n\n\nThumbnail\n\n\nenable_thumbnails\n: Enable or disable thumbnail display.\n\n\nenable_localcache\n: Enable or disable local cache.\n\n\nRedirector\n\n\nurl\n: Redirector URL, such as \nanonym.to\n.\n\n\nencode_url\n: Enable this if the redirector needs encoded URL to work properly.\n\n\nConfiguration file example\n\n\n<?php /*\n{\n \"credentials\": {\n \"login\": \"<login>\",\n \"hash\": \"<password hash>\",\n \"salt\": \"<password salt>\"\n },\n \"security\": {\n \"ban_after\": 4,\n \"session_protection_disabled\": false,\n \"ban_duration\": 1800,\n \"trusted_proxies\": [\n \"1.2.3.4\",\n \"5.6.7.8\"\n ],\n \"allowed_protocols\": [\n \"ftp\",\n \"ftps\",\n \"magnet\"\n ]\n },\n \"resources\": {\n \"data_dir\": \"data\",\n \"config\": \"data\\/config.php\",\n \"datastore\": \"data\\/datastore.php\",\n \"ban_file\": \"data\\/ipbans.php\",\n \"updates\": \"data\\/updates.txt\",\n \"log\": \"data\\/log.txt\",\n \"update_check\": \"data\\/lastupdatecheck.txt\",\n \"raintpl_tmp\": \"tmp\\/\",\n \"raintpl_tpl\": \"tpl\\/\",\n \"thumbnails_cache\": \"cache\",\n \"page_cache\": \"pagecache\"\n },\n \"general\": {\n \"check_updates\": true,\n \"rss_permalinks\": true,\n \"links_per_page\": 20,\n \"default_private_links\": true,\n \"enable_thumbnails\": true,\n \"enable_localcache\": true,\n \"check_updates_branch\": \"stable\",\n \"check_updates_interval\": 86400,\n \"enabled_plugins\": [\n \"markdown\",\n \"wallabag\",\n \"archiveorg\"\n ],\n \"timezone\": \"Europe\\/Paris\",\n \"title\": \"My Shaarli\",\n \"header_link\": \"?\"\n },\n \"extras\": {\n \"show_atom\": false,\n \"hide_public_links\": false,\n \"hide_timestamps\": false,\n \"open_shaarli\": false,\n \"redirector\": \"http://anonym.to/?\",\n \"redirector_encode_url\": false\n },\n \"general\": {\n \"header_link\": \"?\",\n \"links_per_page\": 20,\n \"enabled_plugins\": [\n \"markdown\",\n \"wallabag\"\n ],\n \"timezone\": \"Europe\\/Paris\",\n \"title\": \"My Shaarli\"\n },\n \"updates\": {\n \"check_updates\": true,\n \"check_updates_branch\": \"stable\",\n \"check_updates_interval\": 86400\n },\n \"feed\": {\n \"rss_permalinks\": true,\n \"show_atom\": false\n },\n \"privacy\": {\n \"default_private_links\": true,\n \"hide_public_links\": false,\n \"hide_timestamps\": false\n },\n \"thumbnail\": {\n \"enable_thumbnails\": true,\n \"enable_localcache\": true\n },\n \"redirector\": {\n \"url\": \"http://anonym.to/?\",\n \"encode_url\": false\n },\n \"plugins\": {\n \"WALLABAG_URL\": \"http://demo.wallabag.org\",\n \"WALLABAG_VERSION\": \"1\"\n }\n} ?>\n\n\n\n\nAdditional configuration\n\n\nThe playvideos plugin may require that you adapt your server's \n\nContent Security Policy\n \nconfiguration to work properly.",
386 "title": "Shaarli configuration" 386 "title": "Shaarli configuration"
387 }, 387 },
388 { 388 {
@@ -392,7 +392,7 @@
392 }, 392 },
393 { 393 {
394 "location": "/Shaarli-configuration/#file-and-directory-permissions", 394 "location": "/Shaarli-configuration/#file-and-directory-permissions",
395 "text": "The server process running Shaarli must have:\n- read access to the following resources:\n - PHP scripts: index.php , application/*.php , plugins/*.php \n - 3rd party PHP and Javascript libraries: inc/*.php , inc/*.js \n - static assets:\n - CSS stylesheets: inc/*.css \n - images/* \n - RainTPL templates: tpl/*.html \n- read , write and execution access to the following directories:\n - cache - thumbnail cache\n - data - link data store, configuration options\n - pagecache - Atom/RSS feed cache\n - tmp - RainTPL page cache On a Linux distribution:\n- the web server user will likely be www or http (for Apache2)\n- it will be a member of a group of the same name: www:www , http:http \n- to give it access to Shaarli, either:\n - unzip Shaarli in the default web server location (usually /var/www/ ) and set the web server user as the owner\n - put users in the same group as the web server, and set the appropriate access rights\n- if you have a domain / subdomain to serve Shaarli, configure the server accordingly", 395 "text": "The server process running Shaarli must have: read access to the following resources: PHP scripts: index.php , application/*.php , plugins/*.php 3rd party PHP and Javascript libraries: inc/*.php , inc/*.js static assets: CSS stylesheets: inc/*.css images/* RainTPL templates: tpl/*.html read , write and execution access to the following directories: cache - thumbnail cache data - link data store, configuration options pagecache - Atom/RSS feed cache tmp - RainTPL page cache On a Linux distribution: the web server user will likely be www or http (for Apache2) it will be a member of a group of the same name: www:www , http:http to give it access to Shaarli, either: unzip Shaarli in the default web server location (usually /var/www/ ) and set the web server user as the owner put users in the same group as the web server, and set the appropriate access rights if you have a domain / subdomain to serve Shaarli, configure the server accordingly",
396 "title": "File and directory permissions" 396 "title": "File and directory permissions"
397 }, 397 },
398 { 398 {
@@ -496,97 +496,97 @@
496 "title": "Third party plugins" 496 "title": "Third party plugins"
497 }, 497 },
498 { 498 {
499 "location": "/Docker-101/", 499 "location": "/docker/docker-101/",
500 "text": "Basics\n\n\nInstall \nDocker\n, by following the instructions relevant\nto your OS / distribution, and start the service.\n\n\nSearch an image on \nDockerHub\n\n\n$ docker search debian\n\nNAME DESCRIPTION STARS OFFICIAL AUTOMATED\nubuntu Ubuntu is a Debian-based Linux operating s... 2065 [OK]\ndebian Debian is a Linux distribution that's comp... 603 [OK]\ngoogle/debian 47 [OK]\n\n\n\n\nShow available tags for a repository\n\n\n$ curl https://index.docker.io/v1/repositories/debian/tags | python -m json.tool\n\n% Total % Received % Xferd Average Speed Time Time Time Current\nDload Upload Total Spent Left Speed\n100 1283 0 1283 0 0 433 0 --:--:-- 0:00:02 --:--:-- 433\n\n\n\n\nSample output:\n\n\n[\n {\n \"layer\": \"85a02782\",\n \"name\": \"stretch\"\n },\n {\n \"layer\": \"59abecbc\",\n \"name\": \"testing\"\n },\n {\n \"layer\": \"bf0fd686\",\n \"name\": \"unstable\"\n },\n {\n \"layer\": \"60c52dbe\",\n \"name\": \"wheezy\"\n },\n {\n \"layer\": \"c5b806fe\",\n \"name\": \"wheezy-backports\"\n }\n]\n\n\n\n\n\nPull an image from DockerHub\n\n\n$ docker pull repository[:tag]\n\n$ docker pull debian:wheezy\nwheezy: Pulling from debian\n4c8cbfd2973e: Pull complete\n60c52dbe9d91: Pull complete\nDigest: sha256:c584131da2ac1948aa3e66468a4424b6aea2f33acba7cec0b631bdb56254c4fe\nStatus: Downloaded newer image for debian:wheezy", 500 "text": "Basics\n\n\nInstall \nDocker\n, by following the instructions relevant\nto your OS / distribution, and start the service.\n\n\nSearch an image on \nDockerHub\n\n\n$ docker search debian\n\nNAME DESCRIPTION STARS OFFICIAL AUTOMATED\nubuntu Ubuntu is a Debian-based Linux operating s... 2065 [OK]\ndebian Debian is a Linux distribution that's comp... 603 [OK]\ngoogle/debian 47 [OK]\n\n\n\n\nShow available tags for a repository\n\n\n$ curl https://index.docker.io/v1/repositories/debian/tags | python -m json.tool\n\n% Total % Received % Xferd Average Speed Time Time Time Current\nDload Upload Total Spent Left Speed\n100 1283 0 1283 0 0 433 0 --:--:-- 0:00:02 --:--:-- 433\n\n\n\n\nSample output:\n\n\n[\n {\n \"layer\": \"85a02782\",\n \"name\": \"stretch\"\n },\n {\n \"layer\": \"59abecbc\",\n \"name\": \"testing\"\n },\n {\n \"layer\": \"bf0fd686\",\n \"name\": \"unstable\"\n },\n {\n \"layer\": \"60c52dbe\",\n \"name\": \"wheezy\"\n },\n {\n \"layer\": \"c5b806fe\",\n \"name\": \"wheezy-backports\"\n }\n]\n\n\n\n\n\nPull an image from DockerHub\n\n\n$ docker pull repository[:tag]\n\n$ docker pull debian:wheezy\nwheezy: Pulling from debian\n4c8cbfd2973e: Pull complete\n60c52dbe9d91: Pull complete\nDigest: sha256:c584131da2ac1948aa3e66468a4424b6aea2f33acba7cec0b631bdb56254c4fe\nStatus: Downloaded newer image for debian:wheezy",
501 "title": "Docker 101" 501 "title": "Docker 101"
502 }, 502 },
503 { 503 {
504 "location": "/Docker-101/#basics", 504 "location": "/docker/docker-101/#basics",
505 "text": "Install Docker , by following the instructions relevant\nto your OS / distribution, and start the service.", 505 "text": "Install Docker , by following the instructions relevant\nto your OS / distribution, and start the service.",
506 "title": "Basics" 506 "title": "Basics"
507 }, 507 },
508 { 508 {
509 "location": "/Docker-101/#search-an-image-on-dockerhub", 509 "location": "/docker/docker-101/#search-an-image-on-dockerhub",
510 "text": "$ docker search debian\n\nNAME DESCRIPTION STARS OFFICIAL AUTOMATED\nubuntu Ubuntu is a Debian-based Linux operating s... 2065 [OK]\ndebian Debian is a Linux distribution that's comp... 603 [OK]\ngoogle/debian 47 [OK]", 510 "text": "$ docker search debian\n\nNAME DESCRIPTION STARS OFFICIAL AUTOMATED\nubuntu Ubuntu is a Debian-based Linux operating s... 2065 [OK]\ndebian Debian is a Linux distribution that's comp... 603 [OK]\ngoogle/debian 47 [OK]",
511 "title": "Search an image on DockerHub" 511 "title": "Search an image on DockerHub"
512 }, 512 },
513 { 513 {
514 "location": "/Docker-101/#show-available-tags-for-a-repository", 514 "location": "/docker/docker-101/#show-available-tags-for-a-repository",
515 "text": "$ curl https://index.docker.io/v1/repositories/debian/tags | python -m json.tool\n\n% Total % Received % Xferd Average Speed Time Time Time Current\nDload Upload Total Spent Left Speed\n100 1283 0 1283 0 0 433 0 --:--:-- 0:00:02 --:--:-- 433 Sample output: [\n {\n \"layer\": \"85a02782\",\n \"name\": \"stretch\"\n },\n {\n \"layer\": \"59abecbc\",\n \"name\": \"testing\"\n },\n {\n \"layer\": \"bf0fd686\",\n \"name\": \"unstable\"\n },\n {\n \"layer\": \"60c52dbe\",\n \"name\": \"wheezy\"\n },\n {\n \"layer\": \"c5b806fe\",\n \"name\": \"wheezy-backports\"\n }\n]", 515 "text": "$ curl https://index.docker.io/v1/repositories/debian/tags | python -m json.tool\n\n% Total % Received % Xferd Average Speed Time Time Time Current\nDload Upload Total Spent Left Speed\n100 1283 0 1283 0 0 433 0 --:--:-- 0:00:02 --:--:-- 433 Sample output: [\n {\n \"layer\": \"85a02782\",\n \"name\": \"stretch\"\n },\n {\n \"layer\": \"59abecbc\",\n \"name\": \"testing\"\n },\n {\n \"layer\": \"bf0fd686\",\n \"name\": \"unstable\"\n },\n {\n \"layer\": \"60c52dbe\",\n \"name\": \"wheezy\"\n },\n {\n \"layer\": \"c5b806fe\",\n \"name\": \"wheezy-backports\"\n }\n]",
516 "title": "Show available tags for a repository" 516 "title": "Show available tags for a repository"
517 }, 517 },
518 { 518 {
519 "location": "/Docker-101/#pull-an-image-from-dockerhub", 519 "location": "/docker/docker-101/#pull-an-image-from-dockerhub",
520 "text": "$ docker pull repository[:tag]\n\n$ docker pull debian:wheezy\nwheezy: Pulling from debian\n4c8cbfd2973e: Pull complete\n60c52dbe9d91: Pull complete\nDigest: sha256:c584131da2ac1948aa3e66468a4424b6aea2f33acba7cec0b631bdb56254c4fe\nStatus: Downloaded newer image for debian:wheezy", 520 "text": "$ docker pull repository[:tag]\n\n$ docker pull debian:wheezy\nwheezy: Pulling from debian\n4c8cbfd2973e: Pull complete\n60c52dbe9d91: Pull complete\nDigest: sha256:c584131da2ac1948aa3e66468a4424b6aea2f33acba7cec0b631bdb56254c4fe\nStatus: Downloaded newer image for debian:wheezy",
521 "title": "Pull an image from DockerHub" 521 "title": "Pull an image from DockerHub"
522 }, 522 },
523 { 523 {
524 "location": "/Shaarli-images/", 524 "location": "/docker/shaarli-images/",
525 "text": "Get and run a Shaarli image\n\n\nDockerHub repository\n\n\nThe images can be found in the \nshaarli/shaarli\n\nrepository.\n\n\nAvailable image tags\n\n\n\n\nlatest\n: master branch (tarball release)\n\n\nstable\n: stable branch (tarball release)\n\n\ndev\n: master branch (Git clone)\n\n\n\n\nAll images rely on:\n- \nDebian 8 Jessie\n\n- \nPHP5-FPM\n\n- \nNginx\n\n\nDownload from DockerHub\n\n\n$ docker pull shaarli/shaarli\nlatest: Pulling from shaarli/shaarli\n32716d9fcddb: Pull complete\n84899d045435: Pull complete\n4b6ad7444763: Pull complete\ne0345ef7a3e0: Pull complete\n5c1dd344094f: Pull complete\n6422305a200b: Pull complete\n7d63f861dbef: Pull complete\n3eb97210645c: Pull complete\n869319d746ff: Already exists\n869319d746ff: Pulling fs layer\n902b87aaaec9: Already exists\nDigest: sha256:f836b4627b958b3f83f59c332f22f02fcd495ace3056f2be2c4912bd8704cc98\nStatus: Downloaded newer image for shaarli/shaarli:latest\n\n\n\n\nCreate and start a new container from the image\n\n\n# map the host's :8000 port to the container's :80 port\n$ docker create -p 8000:80 shaarli/shaarli\nd40b7af693d678958adedfb88f87d6ea0237186c23de5c4102a55a8fcb499101\n\n# launch the container in the background\n$ docker start d40b7af693d678958adedfb88f87d6ea0237186c23de5c4102a55a8fcb499101\nd40b7af693d678958adedfb88f87d6ea0237186c23de5c4102a55a8fcb499101\n\n# list active containers\n$ docker ps\nCONTAINER ID IMAGE COMMAND CREATED STATUS PORTS NAMES\nd40b7af693d6 shaarli/shaarli /usr/bin/supervisor 15 seconds ago Up 4 seconds 0.0.0.0:8000->80/tcp backstabbing_galileo\n\n\n\n\nStop and destroy a container\n\n\n$ docker stop backstabbing_galileo # those docker guys are really rude to physicists!\nbackstabbing_galileo\n\n# check the container is stopped\n$ docker ps\nCONTAINER ID IMAGE COMMAND CREATED STATUS PORTS NAMES\n\n# list ALL containers\n$ docker ps -a\nCONTAINER ID IMAGE COMMAND CREATED STATUS PORTS NAMES\nd40b7af693d6 shaarli/shaarli /usr/bin/supervisor 5 minutes ago Exited (0) 48 seconds ago backstabbing_galileo\n\n# destroy the container\n$ docker rm backstabbing_galileo # let's put an end to these barbarian practices\nbackstabbing_galileo\n\n$ docker ps -a\nCONTAINER ID IMAGE COMMAND CREATED STATUS PORTS NAMES", 525 "text": "Get and run a Shaarli image\n\n\nDockerHub repository\n\n\nThe images can be found in the \nshaarli/shaarli\n\nrepository.\n\n\nAvailable image tags\n\n\n\n\nlatest\n: master branch (tarball release)\n\n\nstable\n: stable branch (tarball release)\n\n\n\n\nAll images rely on:\n- \nDebian 8 Jessie\n\n- \nPHP5-FPM\n\n- \nNginx\n\n\nDownload from DockerHub\n\n\n$ docker pull shaarli/shaarli\nlatest: Pulling from shaarli/shaarli\n32716d9fcddb: Pull complete\n84899d045435: Pull complete\n4b6ad7444763: Pull complete\ne0345ef7a3e0: Pull complete\n5c1dd344094f: Pull complete\n6422305a200b: Pull complete\n7d63f861dbef: Pull complete\n3eb97210645c: Pull complete\n869319d746ff: Already exists\n869319d746ff: Pulling fs layer\n902b87aaaec9: Already exists\nDigest: sha256:f836b4627b958b3f83f59c332f22f02fcd495ace3056f2be2c4912bd8704cc98\nStatus: Downloaded newer image for shaarli/shaarli:latest\n\n\n\n\nCreate and start a new container from the image\n\n\n# map the host's :8000 port to the container's :80 port\n$ docker create -p 8000:80 shaarli/shaarli\nd40b7af693d678958adedfb88f87d6ea0237186c23de5c4102a55a8fcb499101\n\n# launch the container in the background\n$ docker start d40b7af693d678958adedfb88f87d6ea0237186c23de5c4102a55a8fcb499101\nd40b7af693d678958adedfb88f87d6ea0237186c23de5c4102a55a8fcb499101\n\n# list active containers\n$ docker ps\nCONTAINER ID IMAGE COMMAND CREATED STATUS PORTS NAMES\nd40b7af693d6 shaarli/shaarli /usr/bin/supervisor 15 seconds ago Up 4 seconds 0.0.0.0:8000->80/tcp backstabbing_galileo\n\n\n\n\nStop and destroy a container\n\n\n$ docker stop backstabbing_galileo # those docker guys are really rude to physicists!\nbackstabbing_galileo\n\n# check the container is stopped\n$ docker ps\nCONTAINER ID IMAGE COMMAND CREATED STATUS PORTS NAMES\n\n# list ALL containers\n$ docker ps -a\nCONTAINER ID IMAGE COMMAND CREATED STATUS PORTS NAMES\nd40b7af693d6 shaarli/shaarli /usr/bin/supervisor 5 minutes ago Exited (0) 48 seconds ago backstabbing_galileo\n\n# destroy the container\n$ docker rm backstabbing_galileo # let's put an end to these barbarian practices\nbackstabbing_galileo\n\n$ docker ps -a\nCONTAINER ID IMAGE COMMAND CREATED STATUS PORTS NAMES",
526 "title": "Shaarli images" 526 "title": "Shaarli images"
527 }, 527 },
528 { 528 {
529 "location": "/Shaarli-images/#get-and-run-a-shaarli-image", 529 "location": "/docker/shaarli-images/#get-and-run-a-shaarli-image",
530 "text": "", 530 "text": "",
531 "title": "Get and run a Shaarli image" 531 "title": "Get and run a Shaarli image"
532 }, 532 },
533 { 533 {
534 "location": "/Shaarli-images/#dockerhub-repository", 534 "location": "/docker/shaarli-images/#dockerhub-repository",
535 "text": "The images can be found in the shaarli/shaarli \nrepository.", 535 "text": "The images can be found in the shaarli/shaarli \nrepository.",
536 "title": "DockerHub repository" 536 "title": "DockerHub repository"
537 }, 537 },
538 { 538 {
539 "location": "/Shaarli-images/#available-image-tags", 539 "location": "/docker/shaarli-images/#available-image-tags",
540 "text": "latest : master branch (tarball release) stable : stable branch (tarball release) dev : master branch (Git clone) All images rely on:\n- Debian 8 Jessie \n- PHP5-FPM \n- Nginx", 540 "text": "latest : master branch (tarball release) stable : stable branch (tarball release) All images rely on:\n- Debian 8 Jessie \n- PHP5-FPM \n- Nginx",
541 "title": "Available image tags" 541 "title": "Available image tags"
542 }, 542 },
543 { 543 {
544 "location": "/Shaarli-images/#download-from-dockerhub", 544 "location": "/docker/shaarli-images/#download-from-dockerhub",
545 "text": "$ docker pull shaarli/shaarli\nlatest: Pulling from shaarli/shaarli\n32716d9fcddb: Pull complete\n84899d045435: Pull complete\n4b6ad7444763: Pull complete\ne0345ef7a3e0: Pull complete\n5c1dd344094f: Pull complete\n6422305a200b: Pull complete\n7d63f861dbef: Pull complete\n3eb97210645c: Pull complete\n869319d746ff: Already exists\n869319d746ff: Pulling fs layer\n902b87aaaec9: Already exists\nDigest: sha256:f836b4627b958b3f83f59c332f22f02fcd495ace3056f2be2c4912bd8704cc98\nStatus: Downloaded newer image for shaarli/shaarli:latest", 545 "text": "$ docker pull shaarli/shaarli\nlatest: Pulling from shaarli/shaarli\n32716d9fcddb: Pull complete\n84899d045435: Pull complete\n4b6ad7444763: Pull complete\ne0345ef7a3e0: Pull complete\n5c1dd344094f: Pull complete\n6422305a200b: Pull complete\n7d63f861dbef: Pull complete\n3eb97210645c: Pull complete\n869319d746ff: Already exists\n869319d746ff: Pulling fs layer\n902b87aaaec9: Already exists\nDigest: sha256:f836b4627b958b3f83f59c332f22f02fcd495ace3056f2be2c4912bd8704cc98\nStatus: Downloaded newer image for shaarli/shaarli:latest",
546 "title": "Download from DockerHub" 546 "title": "Download from DockerHub"
547 }, 547 },
548 { 548 {
549 "location": "/Shaarli-images/#create-and-start-a-new-container-from-the-image", 549 "location": "/docker/shaarli-images/#create-and-start-a-new-container-from-the-image",
550 "text": "# map the host's :8000 port to the container's :80 port\n$ docker create -p 8000:80 shaarli/shaarli\nd40b7af693d678958adedfb88f87d6ea0237186c23de5c4102a55a8fcb499101\n\n# launch the container in the background\n$ docker start d40b7af693d678958adedfb88f87d6ea0237186c23de5c4102a55a8fcb499101\nd40b7af693d678958adedfb88f87d6ea0237186c23de5c4102a55a8fcb499101\n\n# list active containers\n$ docker ps\nCONTAINER ID IMAGE COMMAND CREATED STATUS PORTS NAMES\nd40b7af693d6 shaarli/shaarli /usr/bin/supervisor 15 seconds ago Up 4 seconds 0.0.0.0:8000->80/tcp backstabbing_galileo", 550 "text": "# map the host's :8000 port to the container's :80 port\n$ docker create -p 8000:80 shaarli/shaarli\nd40b7af693d678958adedfb88f87d6ea0237186c23de5c4102a55a8fcb499101\n\n# launch the container in the background\n$ docker start d40b7af693d678958adedfb88f87d6ea0237186c23de5c4102a55a8fcb499101\nd40b7af693d678958adedfb88f87d6ea0237186c23de5c4102a55a8fcb499101\n\n# list active containers\n$ docker ps\nCONTAINER ID IMAGE COMMAND CREATED STATUS PORTS NAMES\nd40b7af693d6 shaarli/shaarli /usr/bin/supervisor 15 seconds ago Up 4 seconds 0.0.0.0:8000->80/tcp backstabbing_galileo",
551 "title": "Create and start a new container from the image" 551 "title": "Create and start a new container from the image"
552 }, 552 },
553 { 553 {
554 "location": "/Shaarli-images/#stop-and-destroy-a-container", 554 "location": "/docker/shaarli-images/#stop-and-destroy-a-container",
555 "text": "$ docker stop backstabbing_galileo # those docker guys are really rude to physicists!\nbackstabbing_galileo\n\n# check the container is stopped\n$ docker ps\nCONTAINER ID IMAGE COMMAND CREATED STATUS PORTS NAMES\n\n# list ALL containers\n$ docker ps -a\nCONTAINER ID IMAGE COMMAND CREATED STATUS PORTS NAMES\nd40b7af693d6 shaarli/shaarli /usr/bin/supervisor 5 minutes ago Exited (0) 48 seconds ago backstabbing_galileo\n\n# destroy the container\n$ docker rm backstabbing_galileo # let's put an end to these barbarian practices\nbackstabbing_galileo\n\n$ docker ps -a\nCONTAINER ID IMAGE COMMAND CREATED STATUS PORTS NAMES", 555 "text": "$ docker stop backstabbing_galileo # those docker guys are really rude to physicists!\nbackstabbing_galileo\n\n# check the container is stopped\n$ docker ps\nCONTAINER ID IMAGE COMMAND CREATED STATUS PORTS NAMES\n\n# list ALL containers\n$ docker ps -a\nCONTAINER ID IMAGE COMMAND CREATED STATUS PORTS NAMES\nd40b7af693d6 shaarli/shaarli /usr/bin/supervisor 5 minutes ago Exited (0) 48 seconds ago backstabbing_galileo\n\n# destroy the container\n$ docker rm backstabbing_galileo # let's put an end to these barbarian practices\nbackstabbing_galileo\n\n$ docker ps -a\nCONTAINER ID IMAGE COMMAND CREATED STATUS PORTS NAMES",
556 "title": "Stop and destroy a container" 556 "title": "Stop and destroy a container"
557 }, 557 },
558 { 558 {
559 "location": "/Reverse-proxy-configuration/", 559 "location": "/docker/reverse-proxy-configuration/",
560 "text": "TODO, see https://github.com/shaarli/Shaarli/issues/888\n\n\nHAProxy\n\n\nNginx", 560 "text": "TODO, see https://github.com/shaarli/Shaarli/issues/888\n\n\nHAProxy\n\n\nNginx",
561 "title": "Reverse proxy configuration" 561 "title": "Reverse proxy configuration"
562 }, 562 },
563 { 563 {
564 "location": "/Reverse-proxy-configuration/#haproxy", 564 "location": "/docker/reverse-proxy-configuration/#haproxy",
565 "text": "", 565 "text": "",
566 "title": "HAProxy" 566 "title": "HAProxy"
567 }, 567 },
568 { 568 {
569 "location": "/Reverse-proxy-configuration/#nginx", 569 "location": "/docker/reverse-proxy-configuration/#nginx",
570 "text": "", 570 "text": "",
571 "title": "Nginx" 571 "title": "Nginx"
572 }, 572 },
573 { 573 {
574 "location": "/Docker-resources/", 574 "location": "/docker/resources/",
575 "text": "Docker\n\n\n\n\nInteractive Docker training portal\n on \nKatakoda\n\n\nWhere are Docker images stored?\n\n\nDockerfile reference\n\n\nDockerfile best practices\n\n\nVolumes\n\n\n\n\nDockerHub\n\n\n\n\nRepositories\n\n\nTeams and organizations\n\n\nGitHub automated build\n\n\n\n\nService management\n\n\n\n\nUsing supervisord\n\n\nNginx in the foreground\n\n\nsupervisord", 575 "text": "Docker\n\n\n\n\nInteractive Docker training portal\n on \nKatakoda\n\n\nWhere are Docker images stored?\n\n\nDockerfile reference\n\n\nDockerfile best practices\n\n\nVolumes\n\n\n\n\nDockerHub\n\n\n\n\nRepositories\n\n\nTeams and organizations\n\n\nGitHub automated build\n\n\n\n\nService management\n\n\n\n\nUsing supervisord\n\n\nNginx in the foreground\n\n\nsupervisord",
576 "title": "Docker resources" 576 "title": "Docker resources"
577 }, 577 },
578 { 578 {
579 "location": "/Docker-resources/#docker", 579 "location": "/docker/resources/#docker",
580 "text": "Interactive Docker training portal on Katakoda Where are Docker images stored? Dockerfile reference Dockerfile best practices Volumes", 580 "text": "Interactive Docker training portal on Katakoda Where are Docker images stored? Dockerfile reference Dockerfile best practices Volumes",
581 "title": "Docker" 581 "title": "Docker"
582 }, 582 },
583 { 583 {
584 "location": "/Docker-resources/#dockerhub", 584 "location": "/docker/resources/#dockerhub",
585 "text": "Repositories Teams and organizations GitHub automated build", 585 "text": "Repositories Teams and organizations GitHub automated build",
586 "title": "DockerHub" 586 "title": "DockerHub"
587 }, 587 },
588 { 588 {
589 "location": "/Docker-resources/#service-management", 589 "location": "/docker/resources/#service-management",
590 "text": "Using supervisord Nginx in the foreground supervisord", 590 "text": "Using supervisord Nginx in the foreground supervisord",
591 "title": "Service management" 591 "title": "Service management"
592 }, 592 },
diff --git a/doc/html/search.html b/doc/html/search.html
index 49541cda..cf6e46b9 100644
--- a/doc/html/search.html
+++ b/doc/html/search.html
@@ -90,19 +90,19 @@
90 <ul class="subnav"> 90 <ul class="subnav">
91 <li class=""> 91 <li class="">
92 92
93 <a class="" href="Docker-101/">Docker 101</a> 93 <a class="" href="docker/docker-101/">Docker 101</a>
94 </li> 94 </li>
95 <li class=""> 95 <li class="">
96 96
97 <a class="" href="Shaarli-images/">Shaarli images</a> 97 <a class="" href="docker/shaarli-images/">Shaarli images</a>
98 </li> 98 </li>
99 <li class=""> 99 <li class="">
100 100
101 <a class="" href="Reverse-proxy-configuration/">Reverse proxy configuration</a> 101 <a class="" href="docker/reverse-proxy-configuration/">Reverse proxy configuration</a>
102 </li> 102 </li>
103 <li class=""> 103 <li class="">
104 104
105 <a class="" href="Docker-resources/">Docker resources</a> 105 <a class="" href="docker/resources/">Docker resources</a>
106 </li> 106 </li>
107 </ul> 107 </ul>
108 </li> 108 </li>
diff --git a/doc/html/sitemap.xml b/doc/html/sitemap.xml
index cbf35654..945e92e6 100644
--- a/doc/html/sitemap.xml
+++ b/doc/html/sitemap.xml
@@ -4,7 +4,7 @@
4 4
5 <url> 5 <url>
6 <loc>/</loc> 6 <loc>/</loc>
7 <lastmod>2017-07-04</lastmod> 7 <lastmod>2017-07-29</lastmod>
8 <changefreq>daily</changefreq> 8 <changefreq>daily</changefreq>
9 </url> 9 </url>
10 10
@@ -13,43 +13,43 @@
13 13
14 <url> 14 <url>
15 <loc>/Download-and-Installation/</loc> 15 <loc>/Download-and-Installation/</loc>
16 <lastmod>2017-07-04</lastmod> 16 <lastmod>2017-07-29</lastmod>
17 <changefreq>daily</changefreq> 17 <changefreq>daily</changefreq>
18 </url> 18 </url>
19 19
20 <url> 20 <url>
21 <loc>/Upgrade-and-migration/</loc> 21 <loc>/Upgrade-and-migration/</loc>
22 <lastmod>2017-07-04</lastmod> 22 <lastmod>2017-07-29</lastmod>
23 <changefreq>daily</changefreq> 23 <changefreq>daily</changefreq>
24 </url> 24 </url>
25 25
26 <url> 26 <url>
27 <loc>/Server-requirements/</loc> 27 <loc>/Server-requirements/</loc>
28 <lastmod>2017-07-04</lastmod> 28 <lastmod>2017-07-29</lastmod>
29 <changefreq>daily</changefreq> 29 <changefreq>daily</changefreq>
30 </url> 30 </url>
31 31
32 <url> 32 <url>
33 <loc>/Server-configuration/</loc> 33 <loc>/Server-configuration/</loc>
34 <lastmod>2017-07-04</lastmod> 34 <lastmod>2017-07-29</lastmod>
35 <changefreq>daily</changefreq> 35 <changefreq>daily</changefreq>
36 </url> 36 </url>
37 37
38 <url> 38 <url>
39 <loc>/Server-security/</loc> 39 <loc>/Server-security/</loc>
40 <lastmod>2017-07-04</lastmod> 40 <lastmod>2017-07-29</lastmod>
41 <changefreq>daily</changefreq> 41 <changefreq>daily</changefreq>
42 </url> 42 </url>
43 43
44 <url> 44 <url>
45 <loc>/Shaarli-configuration/</loc> 45 <loc>/Shaarli-configuration/</loc>
46 <lastmod>2017-07-04</lastmod> 46 <lastmod>2017-07-29</lastmod>
47 <changefreq>daily</changefreq> 47 <changefreq>daily</changefreq>
48 </url> 48 </url>
49 49
50 <url> 50 <url>
51 <loc>/Plugins/</loc> 51 <loc>/Plugins/</loc>
52 <lastmod>2017-07-04</lastmod> 52 <lastmod>2017-07-29</lastmod>
53 <changefreq>daily</changefreq> 53 <changefreq>daily</changefreq>
54 </url> 54 </url>
55 55
@@ -58,26 +58,26 @@
58 58
59 59
60 <url> 60 <url>
61 <loc>/Docker-101/</loc> 61 <loc>/docker/docker-101/</loc>
62 <lastmod>2017-07-04</lastmod> 62 <lastmod>2017-07-29</lastmod>
63 <changefreq>daily</changefreq> 63 <changefreq>daily</changefreq>
64 </url> 64 </url>
65 65
66 <url> 66 <url>
67 <loc>/Shaarli-images/</loc> 67 <loc>/docker/shaarli-images/</loc>
68 <lastmod>2017-07-04</lastmod> 68 <lastmod>2017-07-29</lastmod>
69 <changefreq>daily</changefreq> 69 <changefreq>daily</changefreq>
70 </url> 70 </url>
71 71
72 <url> 72 <url>
73 <loc>/Reverse-proxy-configuration/</loc> 73 <loc>/docker/reverse-proxy-configuration/</loc>
74 <lastmod>2017-07-04</lastmod> 74 <lastmod>2017-07-29</lastmod>
75 <changefreq>daily</changefreq> 75 <changefreq>daily</changefreq>
76 </url> 76 </url>
77 77
78 <url> 78 <url>
79 <loc>/Docker-resources/</loc> 79 <loc>/docker/resources/</loc>
80 <lastmod>2017-07-04</lastmod> 80 <lastmod>2017-07-29</lastmod>
81 <changefreq>daily</changefreq> 81 <changefreq>daily</changefreq>
82 </url> 82 </url>
83 83
@@ -87,37 +87,37 @@
87 87
88 <url> 88 <url>
89 <loc>/Features/</loc> 89 <loc>/Features/</loc>
90 <lastmod>2017-07-04</lastmod> 90 <lastmod>2017-07-29</lastmod>
91 <changefreq>daily</changefreq> 91 <changefreq>daily</changefreq>
92 </url> 92 </url>
93 93
94 <url> 94 <url>
95 <loc>/Bookmarklet/</loc> 95 <loc>/Bookmarklet/</loc>
96 <lastmod>2017-07-04</lastmod> 96 <lastmod>2017-07-29</lastmod>
97 <changefreq>daily</changefreq> 97 <changefreq>daily</changefreq>
98 </url> 98 </url>
99 99
100 <url> 100 <url>
101 <loc>/Browsing-and-searching/</loc> 101 <loc>/Browsing-and-searching/</loc>
102 <lastmod>2017-07-04</lastmod> 102 <lastmod>2017-07-29</lastmod>
103 <changefreq>daily</changefreq> 103 <changefreq>daily</changefreq>
104 </url> 104 </url>
105 105
106 <url> 106 <url>
107 <loc>/Firefox-share/</loc> 107 <loc>/Firefox-share/</loc>
108 <lastmod>2017-07-04</lastmod> 108 <lastmod>2017-07-29</lastmod>
109 <changefreq>daily</changefreq> 109 <changefreq>daily</changefreq>
110 </url> 110 </url>
111 111
112 <url> 112 <url>
113 <loc>/RSS-feeds/</loc> 113 <loc>/RSS-feeds/</loc>
114 <lastmod>2017-07-04</lastmod> 114 <lastmod>2017-07-29</lastmod>
115 <changefreq>daily</changefreq> 115 <changefreq>daily</changefreq>
116 </url> 116 </url>
117 117
118 <url> 118 <url>
119 <loc>/REST-API/</loc> 119 <loc>/REST-API/</loc>
120 <lastmod>2017-07-04</lastmod> 120 <lastmod>2017-07-29</lastmod>
121 <changefreq>daily</changefreq> 121 <changefreq>daily</changefreq>
122 </url> 122 </url>
123 123
@@ -127,13 +127,13 @@
127 127
128 <url> 128 <url>
129 <loc>/Backup,-restore,-import-and-export/</loc> 129 <loc>/Backup,-restore,-import-and-export/</loc>
130 <lastmod>2017-07-04</lastmod> 130 <lastmod>2017-07-29</lastmod>
131 <changefreq>daily</changefreq> 131 <changefreq>daily</changefreq>
132 </url> 132 </url>
133 133
134 <url> 134 <url>
135 <loc>/Various-hacks/</loc> 135 <loc>/Various-hacks/</loc>
136 <lastmod>2017-07-04</lastmod> 136 <lastmod>2017-07-29</lastmod>
137 <changefreq>daily</changefreq> 137 <changefreq>daily</changefreq>
138 </url> 138 </url>
139 139
@@ -142,7 +142,7 @@
142 142
143 <url> 143 <url>
144 <loc>/Troubleshooting/</loc> 144 <loc>/Troubleshooting/</loc>
145 <lastmod>2017-07-04</lastmod> 145 <lastmod>2017-07-29</lastmod>
146 <changefreq>daily</changefreq> 146 <changefreq>daily</changefreq>
147 </url> 147 </url>
148 148
@@ -151,79 +151,79 @@
151 151
152 <url> 152 <url>
153 <loc>/Development-guidelines/</loc> 153 <loc>/Development-guidelines/</loc>
154 <lastmod>2017-07-04</lastmod> 154 <lastmod>2017-07-29</lastmod>
155 <changefreq>daily</changefreq> 155 <changefreq>daily</changefreq>
156 </url> 156 </url>
157 157
158 <url> 158 <url>
159 <loc>/Continuous-integration-tools/</loc> 159 <loc>/Continuous-integration-tools/</loc>
160 <lastmod>2017-07-04</lastmod> 160 <lastmod>2017-07-29</lastmod>
161 <changefreq>daily</changefreq> 161 <changefreq>daily</changefreq>
162 </url> 162 </url>
163 163
164 <url> 164 <url>
165 <loc>/GnuPG-signature/</loc> 165 <loc>/GnuPG-signature/</loc>
166 <lastmod>2017-07-04</lastmod> 166 <lastmod>2017-07-29</lastmod>
167 <changefreq>daily</changefreq> 167 <changefreq>daily</changefreq>
168 </url> 168 </url>
169 169
170 <url> 170 <url>
171 <loc>/Coding-guidelines/</loc> 171 <loc>/Coding-guidelines/</loc>
172 <lastmod>2017-07-04</lastmod> 172 <lastmod>2017-07-29</lastmod>
173 <changefreq>daily</changefreq> 173 <changefreq>daily</changefreq>
174 </url> 174 </url>
175 175
176 <url> 176 <url>
177 <loc>/Directory-structure/</loc> 177 <loc>/Directory-structure/</loc>
178 <lastmod>2017-07-04</lastmod> 178 <lastmod>2017-07-29</lastmod>
179 <changefreq>daily</changefreq> 179 <changefreq>daily</changefreq>
180 </url> 180 </url>
181 181
182 <url> 182 <url>
183 <loc>/3rd-party-libraries/</loc> 183 <loc>/3rd-party-libraries/</loc>
184 <lastmod>2017-07-04</lastmod> 184 <lastmod>2017-07-29</lastmod>
185 <changefreq>daily</changefreq> 185 <changefreq>daily</changefreq>
186 </url> 186 </url>
187 187
188 <url> 188 <url>
189 <loc>/Plugin-System/</loc> 189 <loc>/Plugin-System/</loc>
190 <lastmod>2017-07-04</lastmod> 190 <lastmod>2017-07-29</lastmod>
191 <changefreq>daily</changefreq> 191 <changefreq>daily</changefreq>
192 </url> 192 </url>
193 193
194 <url> 194 <url>
195 <loc>/Release-Shaarli/</loc> 195 <loc>/Release-Shaarli/</loc>
196 <lastmod>2017-07-04</lastmod> 196 <lastmod>2017-07-29</lastmod>
197 <changefreq>daily</changefreq> 197 <changefreq>daily</changefreq>
198 </url> 198 </url>
199 199
200 <url> 200 <url>
201 <loc>/Versioning-and-Branches/</loc> 201 <loc>/Versioning-and-Branches/</loc>
202 <lastmod>2017-07-04</lastmod> 202 <lastmod>2017-07-29</lastmod>
203 <changefreq>daily</changefreq> 203 <changefreq>daily</changefreq>
204 </url> 204 </url>
205 205
206 <url> 206 <url>
207 <loc>/Security/</loc> 207 <loc>/Security/</loc>
208 <lastmod>2017-07-04</lastmod> 208 <lastmod>2017-07-29</lastmod>
209 <changefreq>daily</changefreq> 209 <changefreq>daily</changefreq>
210 </url> 210 </url>
211 211
212 <url> 212 <url>
213 <loc>/Static-analysis/</loc> 213 <loc>/Static-analysis/</loc>
214 <lastmod>2017-07-04</lastmod> 214 <lastmod>2017-07-29</lastmod>
215 <changefreq>daily</changefreq> 215 <changefreq>daily</changefreq>
216 </url> 216 </url>
217 217
218 <url> 218 <url>
219 <loc>/Theming/</loc> 219 <loc>/Theming/</loc>
220 <lastmod>2017-07-04</lastmod> 220 <lastmod>2017-07-29</lastmod>
221 <changefreq>daily</changefreq> 221 <changefreq>daily</changefreq>
222 </url> 222 </url>
223 223
224 <url> 224 <url>
225 <loc>/Unit-tests/</loc> 225 <loc>/Unit-tests/</loc>
226 <lastmod>2017-07-04</lastmod> 226 <lastmod>2017-07-29</lastmod>
227 <changefreq>daily</changefreq> 227 <changefreq>daily</changefreq>
228 </url> 228 </url>
229 229
@@ -233,13 +233,13 @@
233 233
234 <url> 234 <url>
235 <loc>/FAQ/</loc> 235 <loc>/FAQ/</loc>
236 <lastmod>2017-07-04</lastmod> 236 <lastmod>2017-07-29</lastmod>
237 <changefreq>daily</changefreq> 237 <changefreq>daily</changefreq>
238 </url> 238 </url>
239 239
240 <url> 240 <url>
241 <loc>/Community-&-Related-software/</loc> 241 <loc>/Community-&-Related-software/</loc>
242 <lastmod>2017-07-04</lastmod> 242 <lastmod>2017-07-29</lastmod>
243 <changefreq>daily</changefreq> 243 <changefreq>daily</changefreq>
244 </url> 244 </url>
245 245
diff --git a/doc/md/Docker-101.md b/doc/md/docker/docker-101.md
index b02dd149..b02dd149 100644
--- a/doc/md/Docker-101.md
+++ b/doc/md/docker/docker-101.md
diff --git a/doc/md/Docker-resources.md b/doc/md/docker/resources.md
index 082d4a46..082d4a46 100644
--- a/doc/md/Docker-resources.md
+++ b/doc/md/docker/resources.md
diff --git a/doc/md/Reverse-proxy-configuration.md b/doc/md/docker/reverse-proxy-configuration.md
index 91ffecff..91ffecff 100644
--- a/doc/md/Reverse-proxy-configuration.md
+++ b/doc/md/docker/reverse-proxy-configuration.md
diff --git a/doc/md/Shaarli-images.md b/doc/md/docker/shaarli-images.md
index 25f6cfdd..6d108d21 100644
--- a/doc/md/Shaarli-images.md
+++ b/doc/md/docker/shaarli-images.md
@@ -7,7 +7,6 @@ repository.
7### Available image tags 7### Available image tags
8- `latest`: master branch (tarball release) 8- `latest`: master branch (tarball release)
9- `stable`: stable branch (tarball release) 9- `stable`: stable branch (tarball release)
10- `dev`: master branch (Git clone)
11 10
12All images rely on: 11All images rely on:
13- [Debian 8 Jessie](https://hub.docker.com/_/debian/) 12- [Debian 8 Jessie](https://hub.docker.com/_/debian/)
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-01 11:39:33 +0000