Merge branch 'master' into dev

diff --cc docs/administration.rst
index 98548efd4c009537ac7f809f8c25015b3551e677,03a9610d16c066d3a74d8afe8d15ad9494952096..f2c84016eb395c9c77197d7f9563412c507ba311
--- 1/docs/administration.rst
--- 2/docs/administration.rst
+++ b/docs/administration.rst
@@@ -101,17 -101,17 +101,17 @@@ Then you can start paperless-ng with ``
          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>`_
          or edit the ``docker-compose.yml`` file, find the line that says
--        
++
              .. code::
  
                  image: jonaswinkler/paperless-ng:0.9.x
--        
++
          and replace the version with ``latest``:
  
              .. code::
  
                  image: jonaswinkler/paperless-ng:latest
--        
++
  Bare Metal Route
  ================
  
@@@ -239,7 -210,7 +239,7 @@@ backup or migration to another DMS
      -c, --compare-checksums
      -f, --use-filename-format
      -d, --delete
--    
++
  ``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
  the database (correspondents, tags, etc).