aboutsummaryrefslogtreecommitdiffhomepage
path: root/doc/md
diff options
context:
space:
mode:
Diffstat (limited to 'doc/md')
-rw-r--r--doc/md/Server-configuration.md2
-rw-r--r--doc/md/Shaarli-configuration.md11
2 files changed, 1 insertions, 12 deletions
diff --git a/doc/md/Server-configuration.md b/doc/md/Server-configuration.md
index 78083a46..4753df1d 100644
--- a/doc/md/Server-configuration.md
+++ b/doc/md/Server-configuration.md
@@ -17,7 +17,7 @@ Version | Status | Shaarli compatibility
17:---:|:---:|:---: 17:---:|:---:|:---:
187.2 | Supported | Yes 187.2 | Supported | Yes
197.1 | Supported | Yes 197.1 | Supported | Yes
207.0 | Supported | Yes 207.0 | EOL: 2018-12-03 | Yes (up to Shaarli 0.10.x)
215.6 | EOL: 2018-12-31 | Yes (up to Shaarli 0.10.x) 215.6 | EOL: 2018-12-31 | Yes (up to Shaarli 0.10.x)
225.5 | EOL: 2016-07-10 | Yes 225.5 | EOL: 2016-07-10 | Yes
235.4 | EOL: 2015-09-14 | Yes (up to Shaarli 0.8.x) 235.4 | EOL: 2015-09-14 | Yes (up to Shaarli 0.8.x)
diff --git a/doc/md/Shaarli-configuration.md b/doc/md/Shaarli-configuration.md
index 0bb6c9f0..a931ab1e 100644
--- a/doc/md/Shaarli-configuration.md
+++ b/doc/md/Shaarli-configuration.md
@@ -120,11 +120,6 @@ Must be an associative array: `translation domain => translation path`.
120- **enable_thumbnails**: Enable or disable thumbnail display. 120- **enable_thumbnails**: Enable or disable thumbnail display.
121- **enable_localcache**: Enable or disable local cache. 121- **enable_localcache**: Enable or disable local cache.
122 122
123### Redirector
124
125- **url**: Redirector URL, such as `anonym.to`.
126- **encode_url**: Enable this if the redirector needs encoded URL to work properly.
127
128## Configuration file example 123## Configuration file example
129 124
130```json 125```json
@@ -185,8 +180,6 @@ Must be an associative array: `translation domain => translation path`.
185 "hide_public_links": false, 180 "hide_public_links": false,
186 "hide_timestamps": false, 181 "hide_timestamps": false,
187 "open_shaarli": false, 182 "open_shaarli": false,
188 "redirector": "http://anonym.to/?",
189 "redirector_encode_url": false
190 }, 183 },
191 "general": { 184 "general": {
192 "header_link": "?", 185 "header_link": "?",
@@ -218,10 +211,6 @@ Must be an associative array: `translation domain => translation path`.
218 "enable_thumbnails": true, 211 "enable_thumbnails": true,
219 "enable_localcache": true 212 "enable_localcache": true
220 }, 213 },
221 "redirector": {
222 "url": "http://anonym.to/?",
223 "encode_url": false
224 },
225 "plugins": { 214 "plugins": {
226 "WALLABAG_URL": "http://demo.wallabag.org", 215 "WALLABAG_URL": "http://demo.wallabag.org",
227 "WALLABAG_VERSION": "1" 216 "WALLABAG_VERSION": "1"