diff options
Diffstat (limited to 'doc')
-rw-r--r-- | doc/md/Shaarli-configuration.md | 16 |
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 | |||
169 | Single 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 | |||
177 | Additional 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. |