From: Trenton Holmes <797416+stumpylog@users.noreply.github.com>
Date: Wed, 25 Jan 2023 01:54:42 +0000 (-0800)
Subject: Merge remote-tracking branch 'origin/main' into beta
X-Git-Tag: v1.12.0-beta.rc0~1
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=7ecb76dddcbcc9d6fd02e24971b5fe7d9a17dbdf;p=thirdparty%2Fpaperless-ngx.git

Merge remote-tracking branch 'origin/main' into beta
---

7ecb76dddcbcc9d6fd02e24971b5fe7d9a17dbdf
diff --cc docs/configuration.md
index f58da167b7,477fedb2df..73bb7f9bba
--- a/docs/configuration.md
+++ b/docs/configuration.md
@@@ -711,9 -716,9 +716,9 @@@ for details on how to set it
  
  : Enables or disables the advanced natural language processing
  used during automatic classification. If disabled, paperless will
- still preform some basic text pre-processing before matching.
+ still perform some basic text pre-processing before matching.
  
 -See also `PAPERLESS_NLTK_DIR`.
 +: See also `PAPERLESS_NLTK_DIR`.
  
      Defaults to 1.