Merge branch 'master' into master

This commit is contained in:
Piotr Cichosz
2019-05-27 00:28:22 +02:00
committed by GitHub
20 changed files with 317 additions and 166 deletions

View File

@@ -8,7 +8,7 @@ basic documentation is in order. If you follow along in this document and
still have trouble, please open an `issue on GitHub`_ so I can fill in the
gaps.
.. _issue on GitHub: https://github.com/danielquinn/paperless/issues
.. _issue on GitHub: https://github.com/the-paperless-project/paperless/issues
.. _setup-download:
@@ -21,7 +21,7 @@ either by using ``git``:
.. code:: bash
$ git clone https://github.com/danielquinn/paperless.git
$ git clone https://github.com/the-paperless-project/paperless.git
$ cd paperless
or just download the tarball and go that route:
@@ -29,7 +29,7 @@ or just download the tarball and go that route:
.. code:: bash
$ cd to the directory where you want to run Paperless
$ wget https://github.com/danielquinn/paperless/archive/master.zip
$ wget https://github.com/the-paperless-project/paperless/archive/master.zip
$ unzip master.zip
$ cd paperless-master
@@ -152,15 +152,15 @@ Docker Method
instructions in comments in the file. The only change that is a hard
requirement is to specify where the consumption directory should
mount.[#dockercomposeyml]_
.. caution::
If you are using NFS mounts for the consume directory you also need to
change the command to turn off inotify as it doesn't work with NFS
`command: ["document_consumer", "--no-inotify"]`
5. Modify ``docker-compose.env`` and adapt the following environment variables:
``PAPERLESS_PASSPHRASE``