From: ArthurHoaro Date: Sun, 24 Feb 2019 10:16:02 +0000 (+0100) Subject: Merge pull request #1268 from ArthurHoaro/hotfix/thumb-gd-disable X-Git-Tag: v0.11.0~34 X-Git-Url: https://git.immae.eu/?a=commitdiff_plain;h=c85b9758a6e64e6b95f1da758cd6f896a846e144;hp=5bd62b5d538a5e375bebbcdea0ffef3384143895;p=github%2Fshaarli%2FShaarli.git Merge pull request #1268 from ArthurHoaro/hotfix/thumb-gd-disable Fix thumbnails disabling if PHP GD is not installed --- diff --git a/doc/md/Shaarli-configuration.md b/doc/md/Shaarli-configuration.md index 920c7e27..0bb6c9f0 100644 --- a/doc/md/Shaarli-configuration.md +++ b/doc/md/Shaarli-configuration.md @@ -4,7 +4,7 @@ Once your Shaarli instance is installed, the file `data/config.json.php` is generated: * it contains all settings in JSON format, and can be edited to customize values -* it defines which [plugins](Plugin-System) are enabled[](.html) +* it defines which [plugins](Plugin-System) are enabled * its values override those defined in `index.php` * it is wrap in a PHP comment to prevent anyone accessing it, regardless of server configuration @@ -32,13 +32,13 @@ On a Linux distribution: - 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](Server-configuration) accordingly[](.html) +- if you have a domain / subdomain to serve Shaarli, [configure the server](Server-configuration) accordingly ## Configuration In `data/config.json.php`. -See also [Plugin System](Plugin-System.html). +See also [Plugin System](Plugin-System). ### Credentials