Merge branch 'dev'

diff --cc docker/compose/docker-compose.mariadb-tika.yml
Simple merge

diff --cc docs/administration.md
Simple merge

diff --cc docs/configuration.md
index b1f88aa5ef83d19eca148776ce8d7894e568472c,d6041f0a5a8d811f28ccb74c2986d7d45d6d1105..7e47f21783159944728fe9e673beba5f68d091cb
--- 1/docs/configuration.md
--- 2/docs/configuration.md
+++ b/docs/configuration.md
@@@ -168,8 -166,21 +166,21 @@@ details
  
  : This is where paperless will store log files.
  
 -    Defaults to "`PAPERLESS_DATA_DIR`/log/".
 +    Defaults to `PAPERLESS_DATA_DIR/log/`.
  
+ `PAPERLESS_NLTK_DIR=<path>`
+ 
+ : This is where paperless will search for the data required for NLTK
+ processing, if you are using it. If you are using the Docker image,
+ this should not be changed, as the data is included in the image
+ already.
+ 
+ Previously, the location defaulted to `PAPERLESS_DATA_DIR/nltk`.
+ Unless you are using this in a bare metal install or other setup,
+ this folder is no longer needed and can be removed manually.
+ 
+ Defaults to `/usr/local/share/nltk_data`
+ 
  ## Logging
  
  `PAPERLESS_LOGROTATE_MAX_SIZE=<num>`

diff --cc docs/troubleshooting.md
Simple merge