diff --git a/AUTHORS b/AUTHORS index c0e3594..9c0ca3d 100644 --- a/AUTHORS +++ b/AUTHORS @@ -1,6 +1,6 @@ - 472 ArthurHoaro - 201 VirtualTam - 132 nodiscc + 506 ArthurHoaro + 204 VirtualTam + 147 nodiscc 56 Sébastien Sauvage 15 Florian Eula 13 Emilien Klein @@ -8,15 +8,18 @@ 8 Christophe HENRY 4 Alexandre Alapetite 4 David Sferruzza + 3 Lucas Cimon 3 Teromene + 3 kalvn 2 Chris Kuethe 2 Knah Tsaeb 2 Mathieu Chabanon 2 Miloš Jovanović 2 Qwerty + 2 Stephen Muth 2 Timo Van Neerden 2 julienCXX - 2 kalvn + 2 philipp-r 1 Adrien Oliva 1 Alexis J 1 BoboTiG @@ -38,4 +41,3 @@ 1 Sbgodin 1 TsT 1 dimtion - 1 philipp-r diff --git a/doc/Docker.md b/doc/Docker.md deleted file mode 100644 index a7d2efb..0000000 --- a/doc/Docker.md +++ /dev/null @@ -1,158 +0,0 @@ -#Docker -- [Docker usage](#docker-usage)[](.html) -- [Get and run a Shaarli image](#get-and-run-a-shaarli-image)[](.html) -- [Resources](#resources)[](.html) - -## Docker usage -### Basics -Install [Docker](https://www.docker.com/), by following the instructions relevant[](.html) -to your OS / distribution, and start the service. - -#### Search an image on [DockerHub](https://hub.docker.com/)[](.html) - -```bash -$ docker search debian - -NAME DESCRIPTION STARS OFFICIAL AUTOMATED -ubuntu Ubuntu is a Debian-based Linux operating s... 2065 [OK][](.html) -debian Debian is a Linux distribution that's comp... 603 [OK][](.html) -google/debian 47 [OK][](.html) -``` - -#### Show available tags for a repository -```bash -$ curl https://index.docker.io/v1/repositories/debian/tags | python -m json.tool - -% Total % Received % Xferd Average Speed Time Time Time Current -Dload Upload Total Spent Left Speed -100 1283 0 1283 0 0 433 0 --:--:-- 0:00:02 --:--:-- 433 -``` - -Sample output: -```json -[[](.html) - { - "layer": "85a02782", - "name": "stretch" - }, - { - "layer": "59abecbc", - "name": "testing" - }, - { - "layer": "bf0fd686", - "name": "unstable" - }, - { - "layer": "60c52dbe", - "name": "wheezy" - }, - { - "layer": "c5b806fe", - "name": "wheezy-backports" - } -] - -``` - -#### Pull an image from DockerHub -```bash -$ docker pull repository[:tag][](.html) - -$ docker pull debian:wheezy -wheezy: Pulling from debian -4c8cbfd2973e: Pull complete -60c52dbe9d91: Pull complete -Digest: sha256:c584131da2ac1948aa3e66468a4424b6aea2f33acba7cec0b631bdb56254c4fe -Status: Downloaded newer image for debian:wheezy -``` - -## Get and run a Shaarli image -### DockerHub repository -The images can be found in the [`shaarli/shaarli`](https://hub.docker.com/r/shaarli/shaarli/)[](.html) -repository. - -### Available image tags -- `latest`: master branch (tarball release) -- `stable`: stable branch (tarball release) -- `dev`: master branch (Git clone) - -All images rely on: -- [Debian 8 Jessie](https://hub.docker.com/_/debian/)[](.html) -- [PHP5-FPM](http://php-fpm.org/)[](.html) -- [Nginx](http://nginx.org/)[](.html) - -### Download from DockerHub -```bash -$ docker pull shaarli/shaarli -latest: Pulling from shaarli/shaarli -32716d9fcddb: Pull complete -84899d045435: Pull complete -4b6ad7444763: Pull complete -e0345ef7a3e0: Pull complete -5c1dd344094f: Pull complete -6422305a200b: Pull complete -7d63f861dbef: Pull complete -3eb97210645c: Pull complete -869319d746ff: Already exists -869319d746ff: Pulling fs layer -902b87aaaec9: Already exists -Digest: sha256:f836b4627b958b3f83f59c332f22f02fcd495ace3056f2be2c4912bd8704cc98 -Status: Downloaded newer image for shaarli/shaarli:latest -``` - -### Create and start a new container from the image -```bash -# map the host's :8000 port to the container's :80 port -$ docker create -p 8000:80 shaarli/shaarli -d40b7af693d678958adedfb88f87d6ea0237186c23de5c4102a55a8fcb499101 - -# launch the container in the background -$ docker start d40b7af693d678958adedfb88f87d6ea0237186c23de5c4102a55a8fcb499101 -d40b7af693d678958adedfb88f87d6ea0237186c23de5c4102a55a8fcb499101 - -# list active containers -$ docker ps -CONTAINER ID IMAGE COMMAND CREATED STATUS PORTS NAMES -d40b7af693d6 shaarli/shaarli /usr/bin/supervisor 15 seconds ago Up 4 seconds 0.0.0.0:8000->80/tcp backstabbing_galileo -``` - -### Stop and destroy a container -```bash -$ docker stop backstabbing_galileo # those docker guys are really rude to physicists! -backstabbing_galileo - -# check the container is stopped -$ docker ps -CONTAINER ID IMAGE COMMAND CREATED STATUS PORTS NAMES - -# list ALL containers -$ docker ps -a -CONTAINER ID IMAGE COMMAND CREATED STATUS PORTS NAMES -d40b7af693d6 shaarli/shaarli /usr/bin/supervisor 5 minutes ago Exited (0) 48 seconds ago backstabbing_galileo - -# destroy the container -$ docker rm backstabbing_galileo # let's put an end to these barbarian practices -backstabbing_galileo - -$ docker ps -a -CONTAINER ID IMAGE COMMAND CREATED STATUS PORTS NAMES -``` - -## Resources -### Docker -- [Interactive Docker training portal](https://www.katacoda.com/courses/docker/) on [Katakoda](https://www.katacoda.com/)[](.html) -- [Where are Docker images stored?](http://blog.thoward37.me/articles/where-are-docker-images-stored/)[](.html) -- [Dockerfile reference](https://docs.docker.com/reference/builder/)[](.html) -- [Dockerfile best practices](https://docs.docker.com/articles/dockerfile_best-practices/)[](.html) -- [Volumes](https://docs.docker.com/userguide/dockervolumes/)[](.html) - -### DockerHub -- [Repositories](https://docs.docker.com/userguide/dockerrepos/)[](.html) -- [Teams and organizations](https://docs.docker.com/docker-hub/orgs/)[](.html) -- [GitHub automated build](https://docs.docker.com/docker-hub/github/)[](.html) - -### Service management -- [Using supervisord](https://docs.docker.com/articles/using_supervisord/)[](.html) -- [Nginx in the foreground](http://nginx.org/en/docs/ngx_core_module.html#daemon)[](.html) -- [supervisord](http://supervisord.org/)[](.html) diff --git a/doc/REST-API.md b/doc/REST-API.md deleted file mode 100644 index d790997..0000000 --- a/doc/REST-API.md +++ /dev/null @@ -1,105 +0,0 @@ -#REST API -## Usage - -See the [REST API documentation](http://shaarli.github.io/api-documentation/).[](.html) - -## Authentication - -All requests to Shaarli's API must include a JWT token to verify their authenticity. - -This token has to be included as an HTTP header called `Authentication: Bearer `. - -JWT resources : - - * [jwt.io](https://jwt.io) (including a list of client per language).[](.html) - * RFC : https://tools.ietf.org/html/rfc7519 - * https://float-middle.com/json-web-tokens-jwt-vs-sessions/ - * HackerNews thread: https://news.ycombinator.com/item?id=11929267 - - -### Shaarli JWT Token - -JWT tokens are composed by three parts, separated by a dot `.` and encoded in base64: - -``` -[header].[payload].[signature][](.html) -``` - -#### Header - -Shaarli only allow one hash algorithm, so the header will always be the same: - -```json -{ - "typ": "JWT", - "alg": "HS512" -} -``` - -Encoded in base64, it gives: - -``` -ewogICAgICAgICJ0eXAiOiAiSldUIiwKICAgICAgICAiYWxnIjogIkhTNTEyIgogICAgfQ== -``` - -#### Payload - -**Validity duration** - -To 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. - -```json -{ - "iat": 1468663519 -} -``` - -See [RFC reference](https://tools.ietf.org/html/rfc7519#section-4.1.6).[](.html) - - -#### Signature - -The 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. - -Signature example with PHP: - -```php -$content = base64_encode($header) . '.' . base64_encode($payload); -$signature = hash_hmac('sha512', $content, $secret); -``` - - -### Complete example - -#### PHP - -```php -function generateToken($secret) { - $header = base64_encode('{ - "typ": "JWT", - "alg": "HS512" - }'); - $payload = base64_encode('{ - "iat": '. time() .' - }'); - $signature = hash_hmac('sha512', $header .'.'. $payload , $secret); - return $header .'.'. $payload .'.'. $signature; -} - -$secret = 'mysecret'; -$token = generateToken($secret); -echo $token; -``` - -> `ewogICAgICAgICJ0eXAiOiAiSldUIiwKICAgICAgICAiYWxnIjogIkhTNTEyIgogICAgfQ==.ewogICAgICAgICJpYXQiOiAxNDY4NjY3MDQ3CiAgICB9.1d2c54fa947daf594fdbf7591796195652c8bc63bffad7f6a6db2a41c313f495a542cbfb595acade79e83f3810d709b4251d7b940bbc10b531a6e6134af63a68` - -```php -$options = [[](.html) - 'http' => [[](.html) - 'method' => 'GET', - 'jwt' => $token, - ], -]; -$context = stream_context_create($options); -file_get_contents($apiEndpoint, false, $context); -``` diff --git a/doc/Versioning-and-Branches.md b/doc/Versioning-and-Branches.md deleted file mode 100644 index bbc7719..0000000 --- a/doc/Versioning-and-Branches.md +++ /dev/null @@ -1,76 +0,0 @@ -#Versioning and Branches -[**WORK IN PROGRESS**][](.html) - -It'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. - -## `master` branch - -The `master` branch is the development branch. Any new change MUST go through this branch using Pull Requests. - -Remarks: - - * This branch shouldn't be used for production as it isn't necessary stable. - * 3rd party aren't required to be compatible with the latest changes. - * Official plugins, themes and libraries (contained within Shaarli organization repos) must be compatible with the master branch. - * The version in this branch is always `dev`. - -## `v0.x` branch - -This `v0.x` branch, points to the latest `v0.x.y` release. - -Explanation: - -When 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. - -In 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. - -This workflow allow us to fix any major bug detected, without having to release bleeding edge feature too soon. - -## `latest` branch - -This branch point the latest release. It recommended to use it to get the latest tested changes. - -## `stable` branch - -The `stable` branch doesn't contain any major bug, and is one major digit version behind the latest release. - -For 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. - -Remarks: - - * Shaarli release pace isn't fast, and the stable branch might be a few months behind the latest release. - -## Releases - -Releases are always made from the latest `v0.x` branch. - -Note that for every release, we manually generate a tarball which contains all Shaarli dependencies, making Shaarli's installation only one step. - -## Advices on 3rd party git repos workflow - -### Versioning - -Any 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) - - - 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. - - use your own versioning scheme, and state Shaarli compatibility in the release description. - -Using this, any user will be able to pick the release matching his own Shaarli version. - -### Major bugfix backport releases - -To be able to support backported fixes, it recommended to use our workflow: - -```bash -# In master, fix the major bug -git commit -m "Katastrophe" -git push origin master -# Get your commit hash -git log --format="%H" -n 1 -# Create a new branch from your latest release, let's say v0.8.2-1 (the tag name) -git checkout -b katastrophe v0.8.2-1 -# Backport the fix commit to your brand new branch -git cherry-pick -git push origin katastrophe -# Then you just have to make a new release from the `katastrophe` branch tagged `v0.8.3-1` -``` diff --git a/doc/_Sidebar.md b/doc/_Sidebar.md deleted file mode 100644 index 8df2e56..0000000 --- a/doc/_Sidebar.md +++ /dev/null @@ -1,39 +0,0 @@ -#_Sidebar -- [Home](Home.html) -- Setup - - [Download and Installation](Download-and-Installation.html) - - [Upgrade and migration](Upgrade-and-migration.html) - - [Server requirements](Server-requirements.html) - - [Server configuration](Server-configuration.html) - - [Server security](Server-security.html) - - [Shaarli configuration](Shaarli-configuration.html) - - [Plugins](Plugins.html) -- [Docker](Docker.html) -- [Usage](Usage.html) - - [Sharing button](Sharing-button.html) (bookmarklet) - - [Browsing and Searching](Browsing-and-Searching.html) - - [Firefox share](Firefox-share.html) - - [RSS feeds](RSS-feeds.html) - - [REST API](REST-API.html) -- How To - - [Backup, restore, import and export](Backup,-restore,-import-and-export.html) - - [Copy an existing installation over SSH and serve it locally](Copy-an-existing-installation-over-SSH-and-serve-it-locally.html) - - [Create and serve multiple Shaarlis (farm)](Create-and-serve-multiple-Shaarlis-(farm).html) - - [Download CSS styles from an OPML list](Download-CSS-styles-from-an-OPML-list.html) - - [Datastore hacks](Datastore-hacks.html) -- [Troubleshooting](Troubleshooting.html) -- [Development](Development.html) - - [GnuPG signature](GnuPG-signature.html) - - [Coding guidelines](Coding-guidelines.html) - - [Directory structure](Directory-structure.html) - - [3rd party libraries](3rd-party-libraries.html) - - [Plugin System](Plugin-System.html) - - [Release Shaarli](Release-Shaarli.html) - - [Versioning and Branches](Versioning-and-Branches.html) - - [Security](Security.html) - - [Static analysis](Static-analysis.html) - - [Theming](Theming.html) - - [Unit tests](Unit-tests.html) -- About - - [FAQ](FAQ.html) - - [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 0d62007..d775447 100644 --- a/doc/html/3rd-party-libraries/index.html +++ b/doc/html/3rd-party-libraries/index.html @@ -94,19 +94,19 @@ diff --git a/doc/html/Backup,-restore,-import-and-export/index.html b/doc/html/Backup,-restore,-import-and-export/index.html index 33ec912..caebb6c 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 @@ diff --git a/doc/html/Bookmarklet/index.html b/doc/html/Bookmarklet/index.html index 325d305..924a871 100644 --- a/doc/html/Bookmarklet/index.html +++ b/doc/html/Bookmarklet/index.html @@ -94,19 +94,19 @@ diff --git a/doc/html/Browsing-and-searching/index.html b/doc/html/Browsing-and-searching/index.html index c8b7386..f245410 100644 --- a/doc/html/Browsing-and-searching/index.html +++ b/doc/html/Browsing-and-searching/index.html @@ -94,19 +94,19 @@ diff --git a/doc/html/Coding-guidelines/index.html b/doc/html/Coding-guidelines/index.html index dfcdd45..3e27309 100644 --- a/doc/html/Coding-guidelines/index.html +++ b/doc/html/Coding-guidelines/index.html @@ -94,19 +94,19 @@ diff --git a/doc/html/Community-&-Related-software/index.html b/doc/html/Community-&-Related-software/index.html index 2497433..e9c3313 100644 --- a/doc/html/Community-&-Related-software/index.html +++ b/doc/html/Community-&-Related-software/index.html @@ -94,19 +94,19 @@ diff --git a/doc/html/Continuous-integration-tools/index.html b/doc/html/Continuous-integration-tools/index.html index 339f37a..b059922 100644 --- a/doc/html/Continuous-integration-tools/index.html +++ b/doc/html/Continuous-integration-tools/index.html @@ -94,19 +94,19 @@ diff --git a/doc/html/Development-guidelines/index.html b/doc/html/Development-guidelines/index.html index e75c911..9e1d8ab 100644 --- a/doc/html/Development-guidelines/index.html +++ b/doc/html/Development-guidelines/index.html @@ -94,19 +94,19 @@ diff --git a/doc/html/Directory-structure/index.html b/doc/html/Directory-structure/index.html index ff075ec..49f26dd 100644 --- a/doc/html/Directory-structure/index.html +++ b/doc/html/Directory-structure/index.html @@ -94,19 +94,19 @@ diff --git a/doc/html/Download-and-Installation/index.html b/doc/html/Download-and-Installation/index.html index 9234268..8bc9a5b 100644 --- a/doc/html/Download-and-Installation/index.html +++ b/doc/html/Download-and-Installation/index.html @@ -128,19 +128,19 @@ diff --git a/doc/html/FAQ/index.html b/doc/html/FAQ/index.html index f8ced26..5b7900b 100644 --- a/doc/html/FAQ/index.html +++ b/doc/html/FAQ/index.html @@ -94,19 +94,19 @@ diff --git a/doc/html/Features/index.html b/doc/html/Features/index.html index e847c54..7903079 100644 --- a/doc/html/Features/index.html +++ b/doc/html/Features/index.html @@ -94,19 +94,19 @@ @@ -318,7 +318,7 @@ Next - Previous + Previous @@ -346,7 +346,7 @@ GitHub - « Previous + « Previous Next » diff --git a/doc/html/Firefox-share/index.html b/doc/html/Firefox-share/index.html index 9c028ff..4c84a07 100644 --- a/doc/html/Firefox-share/index.html +++ b/doc/html/Firefox-share/index.html @@ -94,19 +94,19 @@ diff --git a/doc/html/GnuPG-signature/index.html b/doc/html/GnuPG-signature/index.html index 0b2d842..82e2207 100644 --- a/doc/html/GnuPG-signature/index.html +++ b/doc/html/GnuPG-signature/index.html @@ -94,19 +94,19 @@ diff --git a/doc/html/Plugin-System/index.html b/doc/html/Plugin-System/index.html index dbed590..11ea5ed 100644 --- a/doc/html/Plugin-System/index.html +++ b/doc/html/Plugin-System/index.html @@ -94,19 +94,19 @@ diff --git a/doc/html/Plugins/index.html b/doc/html/Plugins/index.html index 4b63681..f87cf84 100644 --- a/doc/html/Plugins/index.html +++ b/doc/html/Plugins/index.html @@ -115,19 +115,19 @@ @@ -358,7 +358,7 @@ Example:

diff --git a/doc/html/REST-API/index.html b/doc/html/REST-API/index.html index 6e2c951..dae27e5 100644 --- a/doc/html/REST-API/index.html +++ b/doc/html/REST-API/index.html @@ -94,19 +94,19 @@ diff --git a/doc/html/RSS-feeds/index.html b/doc/html/RSS-feeds/index.html index a4b7339..1e4ea95 100644 --- a/doc/html/RSS-feeds/index.html +++ b/doc/html/RSS-feeds/index.html @@ -94,19 +94,19 @@ diff --git a/doc/html/Release-Shaarli/index.html b/doc/html/Release-Shaarli/index.html index 5857a52..fbb0672 100644 --- a/doc/html/Release-Shaarli/index.html +++ b/doc/html/Release-Shaarli/index.html @@ -94,19 +94,19 @@ diff --git a/doc/html/Security/index.html b/doc/html/Security/index.html index c7aec58..bea1ba9 100644 --- a/doc/html/Security/index.html +++ b/doc/html/Security/index.html @@ -94,19 +94,19 @@ diff --git a/doc/html/Server-configuration/index.html b/doc/html/Server-configuration/index.html index 6e798b4..91b20fd 100644 --- a/doc/html/Server-configuration/index.html +++ b/doc/html/Server-configuration/index.html @@ -149,19 +149,19 @@ diff --git a/doc/html/Server-requirements/index.html b/doc/html/Server-requirements/index.html index f3bfa18..29bb610 100644 --- a/doc/html/Server-requirements/index.html +++ b/doc/html/Server-requirements/index.html @@ -112,19 +112,19 @@ diff --git a/doc/html/Server-security/index.html b/doc/html/Server-security/index.html index 6d9f25c..5ec0fdb 100644 --- a/doc/html/Server-security/index.html +++ b/doc/html/Server-security/index.html @@ -118,19 +118,19 @@ diff --git a/doc/html/Shaarli-configuration/index.html b/doc/html/Shaarli-configuration/index.html index 4e55606..cd323a3 100644 --- a/doc/html/Shaarli-configuration/index.html +++ b/doc/html/Shaarli-configuration/index.html @@ -134,19 +134,19 @@ @@ -323,26 +323,38 @@ its values override those defined in index.php it is wrap in a PHP comment to prevent anyone accessing it, regardless of server configuration

File and directory permissions

-

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

+

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
    • +

Configuration

In data/config.json.php.

See also Plugin System.

diff --git a/doc/html/Static-analysis/index.html b/doc/html/Static-analysis/index.html index ddd81f8..e0aff52 100644 --- a/doc/html/Static-analysis/index.html +++ b/doc/html/Static-analysis/index.html @@ -94,19 +94,19 @@ diff --git a/doc/html/Theming/index.html b/doc/html/Theming/index.html index 670dbb8..d6ecb06 100644 --- a/doc/html/Theming/index.html +++ b/doc/html/Theming/index.html @@ -94,19 +94,19 @@ diff --git a/doc/html/Troubleshooting/index.html b/doc/html/Troubleshooting/index.html index f156436..90705ad 100644 --- a/doc/html/Troubleshooting/index.html +++ b/doc/html/Troubleshooting/index.html @@ -94,19 +94,19 @@ diff --git a/doc/html/Unit-tests/index.html b/doc/html/Unit-tests/index.html index ce90ed1..ebc92be 100644 --- a/doc/html/Unit-tests/index.html +++ b/doc/html/Unit-tests/index.html @@ -94,19 +94,19 @@ diff --git a/doc/html/Upgrade-and-migration/index.html b/doc/html/Upgrade-and-migration/index.html index 3319fa7..b190ed3 100644 --- a/doc/html/Upgrade-and-migration/index.html +++ b/doc/html/Upgrade-and-migration/index.html @@ -133,19 +133,19 @@ diff --git a/doc/html/Various-hacks/index.html b/doc/html/Various-hacks/index.html index b06207a..a10358c 100644 --- a/doc/html/Various-hacks/index.html +++ b/doc/html/Various-hacks/index.html @@ -94,19 +94,19 @@ diff --git a/doc/html/Versioning-and-Branches/index.html b/doc/html/Versioning-and-Branches/index.html index 97bdb47..d3f61ec 100644 --- a/doc/html/Versioning-and-Branches/index.html +++ b/doc/html/Versioning-and-Branches/index.html @@ -94,19 +94,19 @@ diff --git a/doc/html/Docker-101/index.html b/doc/html/docker/docker-101/index.html similarity index 71% rename from doc/html/Docker-101/index.html rename to doc/html/docker/docker-101/index.html index 31e57b5..67a3f8e 100644 --- a/doc/html/Docker-101/index.html +++ b/doc/html/docker/docker-101/index.html @@ -7,25 +7,25 @@ - + Docker 101 - Shaarli Documentation - - - - + + + + - - - + + + @@ -36,9 +36,9 @@