aboutsummaryrefslogtreecommitdiff
path: root/docs/configuration
diff options
context:
space:
mode:
authorMaksim Pechnikov <parallel588@gmail.com>2019-12-14 21:44:10 +0300
committerMaksim Pechnikov <parallel588@gmail.com>2019-12-14 21:44:10 +0300
commit67cb46e15dd5fa16da257a9b0e5166266d10c694 (patch)
tree6801ecba06ea3aac7086c57834e1413e5bb0c84a /docs/configuration
parent2b821036c4bd84cee51c9fcace5a4b3764c3bba1 (diff)
parent8efacfed677ea2f06ac228294faec77a38060976 (diff)
downloadpleroma-67cb46e15dd5fa16da257a9b0e5166266d10c694.tar.gz
Merge branch 'develop' into issue/1383
Diffstat (limited to 'docs/configuration')
-rw-r--r--docs/configuration/cheatsheet.md6
1 files changed, 6 insertions, 0 deletions
diff --git a/docs/configuration/cheatsheet.md b/docs/configuration/cheatsheet.md
index 25945aaa4..824edda77 100644
--- a/docs/configuration/cheatsheet.md
+++ b/docs/configuration/cheatsheet.md
@@ -379,13 +379,19 @@ For each pool, the options are:
## Captcha
### Pleroma.Captcha
+
* `enabled`: Whether the captcha should be shown on registration.
* `method`: The method/service to use for captcha.
* `seconds_valid`: The time in seconds for which the captcha is valid.
### Captcha providers
+#### Pleroma.Captcha.Native
+
+A built-in captcha provider. Enabled by default.
+
#### Pleroma.Captcha.Kocaptcha
+
Kocaptcha is a very simple captcha service with a single API endpoint,
the source code is here: https://github.com/koto-bank/kocaptcha. The default endpoint
`https://captcha.kotobank.ch` is hosted by the developer.