From: Michael Shamoon <4887959+shamoon@users.noreply.github.com> Date: Mon, 14 Feb 2022 22:17:52 +0000 (-0800) Subject: Merge branch 'patch-1' of https://github.com/muued/paperless-ng into muued-patch-1 X-Git-Tag: ngx-1.6.0-rc1~121^2 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=f2f7b71;p=thirdparty%2Fpaperless-ngx.git Merge branch 'patch-1' of https://github.com/muued/paperless-ng into muued-patch-1 --- f2f7b71367ea8bd731dc069f265f7382c056e049 diff --cc docs/scanners.rst index f29cb0328f,6a234d8f6c..f48392457a --- a/docs/scanners.rst +++ b/docs/scanners.rst @@@ -13,37 -13,38 +13,40 @@@ that works right for you based on recom Physical scanners ================= -+---------+----------------+-----+-----+-----+------+----------------+ -| Brand | Model | Supports | Recommended By | -+---------+----------------+-----+-----+-----+------+----------------+ -| | | FTP | NFS | SMB | SMTP | | -+=========+================+=====+=====+=====+======+================+ -| Brother | `ADS-1700W`_ | yes | no | yes | yes |`holzhannes`_ | -+---------+----------------+-----+-----+-----+------+----------------+ -| Brother | `ADS-1600W`_ | yes | no | yes | yes |`holzhannes`_ | -+---------+----------------+-----+-----+-----+------+----------------+ -| Brother | `ADS-1500W`_ | yes | no | yes | yes |`danielquinn`_ | -+---------+----------------+-----+-----+-----+------+----------------+ -| Brother | `ADS-1100W`_ | yes | no | no | no |`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 | `WF-7710DWF`_ | yes | | yes | |`Skylinar`_ | -+---------+----------------+-----+-----+-----+------+----------------+ -| 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-1600W`_ | yes | no | yes | yes | |`holzhannes`_ | ++---------+----------------+-----+-----+-----+------+----------+----------------+ +| Brother | `ADS-1500W`_ | yes | no | yes | yes | |`danielquinn`_ | ++---------+----------------+-----+-----+-----+------+----------+----------------+ +| Brother | `ADS-1100W`_ | yes | no | no | no | |`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 | `WF-7710DWF`_ | yes | | yes | | |`Skylinar`_ | ++---------+----------------+-----+-----+-----+------+----------+----------------+ +| Fujitsu | `S1300i`_ | yes | | yes | | |`jonaswinkler`_ | ++---------+----------------+-----+-----+-----+------+----------+----------------+ +| Doxie | `Q2`_ | no | no | no | no | 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 @@@ -66,10 -66,8 +69,11 @@@ .. _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 `, sometimes referred to as Webhook or Document POST. + Mobile phone software =====================