]> git.ipfire.org Git - thirdparty/paperless-ngx.git/commitdiff
Merge remote-tracking branch 'origin/main' into beta
authorTrenton Holmes <797416+stumpylog@users.noreply.github.com>
Wed, 25 Jan 2023 01:54:42 +0000 (17:54 -0800)
committerTrenton Holmes <797416+stumpylog@users.noreply.github.com>
Wed, 25 Jan 2023 01:54:42 +0000 (17:54 -0800)
1  2 
docs/administration.md
docs/configuration.md
docs/setup.md
docs/usage.md

Simple merge
index f58da167b7e6bb44897cdd67d4a1fe7931655c92,477fedb2df8f8602ca6d823bb3e0d14a084aeda8..73bb7f9bba6e6f0249a07101acd565d92d62b502
@@@ -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.
  
diff --cc docs/setup.md
Simple merge
diff --cc docs/usage.md
Simple merge