aboutsummaryrefslogtreecommitdiffhomepage
path: root/doc/md
diff options
context:
space:
mode:
authorArthurHoaro <arthur@hoa.ro>2020-11-03 12:38:38 +0100
committerArthurHoaro <arthur@hoa.ro>2020-11-03 12:43:35 +0100
commit740b32b520e6b1723512c6f9b78cef6575b1725b (patch)
tree01d976a30db84d4aa3cd2c0e6a429cc5ac15a187 /doc/md
parent38b55fbf3d4fdb515d0e82e5a3126d4671652b3e (diff)
downloadShaarli-740b32b520e6b1723512c6f9b78cef6575b1725b.tar.gz
Shaarli-740b32b520e6b1723512c6f9b78cef6575b1725b.tar.zst
Shaarli-740b32b520e6b1723512c6f9b78cef6575b1725b.zip
Default formatter: add a setting to disable auto-linkification
+ update documentation + single parameter for both URL and hashtags Fixes #1094
Diffstat (limited to 'doc/md')
-rw-r--r--doc/md/Shaarli-configuration.md16
1 files changed, 16 insertions, 0 deletions
diff --git a/doc/md/Shaarli-configuration.md b/doc/md/Shaarli-configuration.md
index dbfc3da9..99084728 100644
--- a/doc/md/Shaarli-configuration.md
+++ b/doc/md/Shaarli-configuration.md
@@ -164,6 +164,22 @@ _These settings should not be edited_
164- **trusted_proxies**: List of trusted IP which won't be banned after failed login attemps. Useful if Shaarli is behind a reverse proxy. 164- **trusted_proxies**: List of trusted IP which won't be banned after failed login attemps. Useful if Shaarli is behind a reverse proxy.
165- **allowed_protocols**: List of allowed protocols in shaare URLs or markdown-rendered descriptions. Useful if you want to store `javascript:` links (bookmarklets) in Shaarli (default: `["ftp", "ftps", "magnet"]`). 165- **allowed_protocols**: List of allowed protocols in shaare URLs or markdown-rendered descriptions. Useful if you want to store `javascript:` links (bookmarklets) in Shaarli (default: `["ftp", "ftps", "magnet"]`).
166 166
167### Formatter
168
169Single string value. Default available:
170
171 - `default`: supports line breaks, URL and hashtag auto-links.
172 - `markdown`: supports [Markdown](https://daringfireball.net/projects/markdown/syntax).
173 - `markdownExtra`: adds [extra](https://michelf.ca/projects/php-markdown/extra/) flavor to Markdown.
174
175### Formatter Settings
176
177Additional settings applied to formatters.
178
179#### default
180
181 - **autolink**: boolean to enable or disable automatic linkification of URL and hashtags.
182
167### Resources 183### Resources
168 184
169- **data_dir**: Data directory. 185- **data_dir**: Data directory.