From: Quinn Casey <quinn@quinncasey.com>
Date: Tue, 15 Feb 2022 17:21:04 +0000 (-0800)
Subject: Merge branch 'patch-1' of https://github.com/fignew/paperless-ng into fignew-patch-1
X-Git-Tag: ngx-1.6.0-rc1~111^2
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=f303a1c;p=thirdparty%2Fpaperless-ngx.git

Merge branch 'patch-1' of https://github.com/fignew/paperless-ng into fignew-patch-1
---

f303a1c4233ab1ba6bc72d4861307f68ada9a2b5
diff --cc docs/scanners.rst
index f3be56bca1,f1cea0af67..25b9066a9b
--- a/docs/scanners.rst
+++ b/docs/scanners.rst
@@@ -13,40 -13,37 +13,42 @@@ that works right for you based on recom
  Physical scanners
  =================
  
 -+---------+----------------+-----+-----+-----+------+----------------+
 -| Brand   | Model          | Supports               | Recommended By |
 -+---------+----------------+-----+-----+-----+------+----------------+
 -|         |                | FTP | NFS | SMB | SMTP |                |
 -+=========+================+=====+=====+=====+======+================+
 -| Brother | `ADS-1700W`_   | yes |     | yes | yes  |`holzhannes`_   |
 -+---------+----------------+-----+-----+-----+------+----------------+
 -| Brother | `ADS-1600W`_   | yes |     | yes | yes  |`holzhannes`_   |
 -+---------+----------------+-----+-----+-----+------+----------------+
 -| Brother | `ADS-1500W`_   | yes |     | yes | yes  |`danielquinn`_  |
 -+---------+----------------+-----+-----+-----+------+----------------+
 -| Brother | `ADS-1100W`_   | yes |     |     |      |`ytzelf`_       |
 -+---------+----------------+-----+-----+-----+------+----------------+
 -| Brother | `MFC-J6930DW`_ | yes |     |     |      |`ayounggun`_    |
 -+---------+----------------+-----+-----+-----+------+----------------+
 -| Brother | `MFC-L5850DW`_ | yes |     |     | yes  |`holzhannes`_   |
 -+---------+----------------+-----+-----+-----+------+----------------+
 -| Brother | `MFC-J5910DW`_ | yes |     |     |      |`bmsleight`_    |
 -+---------+----------------+-----+-----+-----+------+----------------+
 -| Brother | `MFC-9142CDN`_ | yes |     | yes |      |`REOLDEV`_      |
 -+---------+----------------+-----+-----+-----+------+----------------+
 -| Epson   | `ES-580W`_     | yes |     | yes | yes  |`fignew`_       |
 -+---------+----------------+-----+-----+-----+------+----------------+
 -| Epson   | `WF-7710DWF`_  | yes |     | yes |      |`Skylinar`_     |
 -+---------+----------------+-----+-----+-----+------+----------------+
 -| Fujitsu | `ix500`_       | yes |     | yes |      |`eonist`_       |
 -+---------+----------------+-----+-----+-----+------+----------------+
 -| Fujitsu | `S1300i`_      | yes |     | yes |      |`jonaswinkler`_ |
 -+---------+----------------+-----+-----+-----+------+----------------+
 ++---------+----------------+-----+-----+-----+------+----------+----------------+
 +| Brand   | Model          | Supports                          | Recommended By |
 ++---------+----------------+-----+-----+-----+------+----------+----------------+
 +|         |                | FTP | NFS | SMB | SMTP | API [1]_ |                |
 ++=========+================+=====+=====+=====+======+==========+================+
- | Brother | `ADS-1700W`_   | yes | no  | yes | yes  |          |`holzhannes`_   |
++| Brother | `ADS-1700W`_   | yes |     | yes | yes  |          |`holzhannes`_   |
 ++---------+----------------+-----+-----+-----+------+----------+----------------+
- | Brother | `ADS-1600W`_   | yes | no  | yes | yes  |          |`holzhannes`_   |
++| Brother | `ADS-1600W`_   | yes |     | yes | yes  |          |`holzhannes`_   |
 ++---------+----------------+-----+-----+-----+------+----------+----------------+
- | Brother | `ADS-1500W`_   | yes | no  | yes | yes  |          |`danielquinn`_  |
++| Brother | `ADS-1500W`_   | yes |     | yes | yes  |          |`danielquinn`_  |
 ++---------+----------------+-----+-----+-----+------+----------+----------------+
- | Brother | `ADS-1100W`_   | yes | no  | no  | no   |          |`ytzelf`_       |
++| Brother | `ADS-1100W`_   | yes |     |     |      |          |`ytzelf`_       |
 ++---------+----------------+-----+-----+-----+------+----------+----------------+
 +| Brother | `MFC-J6930DW`_ | yes |     |     |      |          |`ayounggun`_    |
 ++---------+----------------+-----+-----+-----+------+----------+----------------+
 +| Brother | `MFC-L5850DW`_ | yes |     |     | yes  |          |`holzhannes`_   |
 ++---------+----------------+-----+-----+-----+------+----------+----------------+
 +| Brother | `MFC-L2750DW`_ | yes |     | yes | yes  |          |`muued`_        |
 ++---------+----------------+-----+-----+-----+------+----------+----------------+
 +| Brother | `MFC-J5910DW`_ | yes |     |     |      |          |`bmsleight`_    |
 ++---------+----------------+-----+-----+-----+------+----------+----------------+
 +| Brother | `MFC-9142CDN`_ | yes |     | yes |      |          |`REOLDEV`_      |
 ++---------+----------------+-----+-----+-----+------+----------+----------------+
 +| Fujitsu | `ix500`_       | yes |     | yes |      |          |`eonist`_       |
 ++---------+----------------+-----+-----+-----+------+----------+----------------+
++| Epson   | `ES-580W`_     | yes |     | yes | yes  |          |`fignew`_       |
+++---------+----------------+-----+-----+-----+------+----------+----------------+
 +| Epson   | `WF-7710DWF`_  | yes |     | yes |      |          |`Skylinar`_     |
 ++---------+----------------+-----+-----+-----+------+----------+----------------+
 +| Fujitsu | `S1300i`_      | yes |     | yes |      |          |`jonaswinkler`_ |
 ++---------+----------------+-----+-----+-----+------+----------+----------------+
- | Doxie   | `Q2`_          | no  | no  | no  | no   | yes      |`Unkn0wnCat`_   |
++| Doxie   | `Q2`_          |     |     |     |      | yes      |`Unkn0wnCat`_   |
 ++---------+----------------+-----+-----+-----+------+----------+----------------+
  
  .. _MFC-L5850DW: https://www.brother-usa.com/products/mfcl5850dw
 +.. _MFC-L2750DW: https://www.brother.de/drucker/laserdrucker/mfc-l2750dw
  .. _ADS-1700W: https://www.brother-usa.com/products/ads1700w
  .. _ADS-1600W: https://www.brother-usa.com/products/ads1600w
  .. _ADS-1500W: https://www.brother.ca/en/p/ads1500w
@@@ -54,25 -51,22 +56,27 @@@
  .. _MFC-J6930DW: https://www.brother.ca/en/p/MFCJ6930DW
  .. _MFC-J5910DW: https://www.brother.co.uk/printers/inkjet-printers/mfcj5910dw
  .. _MFC-9142CDN: https://www.brother.co.uk/printers/laser-printers/mfc9140cdn
- .. _ix500: http://www.fujitsu.com/us/products/computing/peripheral/scanners/scansnap/ix500/
+ .. _ES-580W: https://epson.com/Support/Scanners/ES-Series/Epson-WorkForce-ES-580W/s/SPT_B11B258201
  .. _WF-7710DWF: https://www.epson.de/en/products/printers/inkjet-printers/for-home/workforce-wf-7710dwf
+ .. _ix500: http://www.fujitsu.com/us/products/computing/peripheral/scanners/scansnap/ix500/
  .. _S1300i: https://www.fujitsu.com/global/products/computing/peripheral/scanners/soho/s1300i/
 +.. _Q2: https://www.getdoxie.com/product/doxie-q/
  
  
- .. _danielquinn: https://github.com/danielquinn
  .. _ayounggun: https://github.com/ayounggun
  .. _bmsleight: https://github.com/bmsleight
+ .. _danielquinn: https://github.com/danielquinn
  .. _eonist: https://github.com/eonist
+ .. _fignew: https://github.com/fignew
+ .. _holzhannes: https://github.com/holzhannes
+ .. _jonaswinkler: https://github.com/jonaswinkler
  .. _REOLDEV: https://github.com/REOLDEV
  .. _Skylinar: https://github.com/Skylinar
- .. _jonaswinkler: https://github.com/jonaswinkler
- .. _holzhannes: https://github.com/holzhannes
  .. _ytzelf: https://github.com/ytzelf
 +.. _Unkn0wnCat: https://github.com/Unkn0wnCat
 +.. _muued: https://github.com/muued
 +
 +.. [1] Scanners with API Integration allow to push scanned documents directly to :ref:`Paperless API <api-file_uploads>`, sometimes referred to as Webhook or Document POST.
  
  Mobile phone software
  =====================