Merge branch 'master' into dev

This commit is contained in:
jonaswinkler 2021-02-10 18:44:02 +01:00
commit 9c0521c455

View File

@ -101,17 +101,17 @@ Then you can start paperless-ng with ``-d`` to have it run in the background.
update to newer versions. In order to enable updates as described above, either update to newer versions. In order to enable updates as described above, either
get the new ``docker-compose.yml`` file from `here <https://github.com/jonaswinkler/paperless-ng/tree/master/docker/compose>`_ get the new ``docker-compose.yml`` file from `here <https://github.com/jonaswinkler/paperless-ng/tree/master/docker/compose>`_
or edit the ``docker-compose.yml`` file, find the line that says or edit the ``docker-compose.yml`` file, find the line that says
.. code:: .. code::
image: jonaswinkler/paperless-ng:0.9.x image: jonaswinkler/paperless-ng:0.9.x
and replace the version with ``latest``: and replace the version with ``latest``:
.. code:: .. code::
image: jonaswinkler/paperless-ng:latest image: jonaswinkler/paperless-ng:latest
Bare Metal Route Bare Metal Route
================ ================
@ -209,7 +209,7 @@ tasks on your paperless instance. You can invoke these commands either by
.. code:: shell-session .. code:: shell-session
$ cd /path/to/paperless $ cd /path/to/paperless
$ docker-compose run --rm webserver <command> <arguments> $ docker-compose exec -u paperless webserver python3 manage.py <command> <arguments>
or or
@ -239,7 +239,7 @@ backup or migration to another DMS.
-c, --compare-checksums -c, --compare-checksums
-f, --use-filename-format -f, --use-filename-format
-d, --delete -d, --delete
``target`` is a folder to which the data gets written. This includes documents, ``target`` is a folder to which the data gets written. This includes documents,
thumbnails and a ``manifest.json`` file. The manifest contains all metadata from thumbnails and a ``manifest.json`` file. The manifest contains all metadata from
the database (correspondents, tags, etc). the database (correspondents, tags, etc).