Merge branch 'master' of github.com:erikr/django-random-filestorage

mxsasha · Aug 7, 2014 · bdedb7e · bdedb7e
2 parents 3003d5e + deeb5b4
commit bdedb7e
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 7 deletions.
diff --git a/README.rst b/README.rst
@@ -80,5 +80,8 @@ Once a user knows the random string that was used to name the file, they could p
 they could just as well download the file and provide it to others in some other way.
 
 If you would like stricter control over who accesses certain files, you'll have to prevent direct access to (part of)
-the media directory, and serve those files through a Django view instead. However, this comes at an additional
-performance cost.
+the media directory. You can serve those files through a Django view instead, but this comes at an additional
+performance cost. A more performant but more complex alternative is to use Apache sendfile_ or nginx X-accel_.
+
+.. _sendfile: https://tn123.org/mod_xsendfile/
+.. _X-accel: http://wiki.nginx.org/X-accel
diff --git a/docs/installation.rst b/docs/installation.rst
@@ -2,11 +2,10 @@
 Installation
 ============
 
-At the command line::
+At the command line, ideally in a virtualenv::
 
-    $ easy_install django-random-filestorage
+    $ pip install django-random-filestorage
 
-Or, if you have virtualenvwrapper installed::
+Or if you don't have a virtualenv or pip but only setuptools::
 
-    $ mkvirtualenv django-random-filestorage
-    $ pip install django-random-filestorage
+    $ easy_install django-random-filestorage