From: Michael Shamoon <4887959+shamoon@users.noreply.github.com>
Date: Fri, 30 Dec 2022 03:39:38 +0000 (-0800)
Subject: Merge branch 'dev'
X-Git-Tag: v1.11.0~1
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=8c9a74ee0ca03d1f1afd7dee9203648d48bb33c1;p=thirdparty%2Fpaperless-ngx.git

Merge branch 'dev'
---

8c9a74ee0ca03d1f1afd7dee9203648d48bb33c1
diff --cc docs/configuration.md
index b1f88aa5ef,d6041f0a5a..7e47f21783
--- a/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>`