Merge branch 'master' into feature/images-as-docs

This commit is contained in:
Daniel Quinn 2016-02-13 01:01:10 +00:00
commit 294f104474
2 changed files with 18 additions and 1 deletions

View File

@ -35,6 +35,23 @@ document. Needless to say if you don't know what a virtualenv is, you should
probably figure that out before continuing.
.. _requirements-apple:
Apple-tastic Complications
--------------------------
Some users have `run into problems`_ with installing ImageMagick on Apple
systems using HomeBrew. The solution appears to be to install ghostscript as
well as ImageMagick:
.. _run into problems: https://github.com/danielquinn/paperless/issues/25
.. code:: bash
$ brew install ghostscript
$ brew install imagemagick
.. _requirements-baremetal:
Python-specific Requirements: No Virtualenv

View File

@ -20,7 +20,7 @@ by using ``git``:
.. code:: bash
$ git clone github.com:danielquinn/paperless.git
$ git clone https://github.com/danielquinn/paperless.git
$ cd paperless
or just download the tarball and go that route: