Merge pull request #111 from uploadcare/update-more-texts

Update more texts

README.rst

@@ -30,7 +30,7 @@ asynchronously.
     from django import forms
     from django.db import models
 
-    from pyuploadcare.dj import ImageField
+    from pyuploadcare.dj.models import ImageField
     from pyuploadcare.dj.forms import FileWidget
 
 
@@ -50,8 +50,7 @@ asynchronously.
 Features
 --------
 
-- Python wrapper for Uploadcare [REST](https://uploadcare.com/documentation/rest/)
-  and [Upload](https://uploadcare.com/documentation/upload/) APIs
+- Python wrapper for Uploadcare `REST`_ and `Upload`_ APIs
 - Django widget with useful manual crop and multi-upload;
 - *ucare* console utility;
 - hosted assets (Kudos to `Sławek Ehlert`_!).
@@ -85,3 +84,5 @@ Besides the `Travis CI`_ we use tox. In order to run tests just:
 .. _simple steps: https://pyuploadcare.readthedocs.org/en/latest/quickstart.html
 .. _Sławek Ehlert: https://github.com/slafs
 .. _Travis CI: https://travis-ci.org/uploadcare/pyuploadcare
+.. _REST: https://uploadcare.com/documentation/rest/
+.. _Upload: https://uploadcare.com/documentation/upload/

docs/deprecated.rst

@@ -6,5 +6,5 @@ Deprecated Bits
 
 This part of the documentation contains things that eventually will be deleted.
 
-``UPLOADCARE['widget_variant']`` django setting. Use
+``UPLOADCARE['widget_variant']`` Django setting. Use
 ``UPLOADCARE['widget_build']`` instead.

docs/django-widget.rst

@@ -95,7 +95,7 @@ FileField
 
     from django.db import models
 
-    from pyuploadcare.dj import FileField
+    from pyuploadcare.dj.models import FileField
 
 
     class Candidate(models.Model):
@@ -118,7 +118,7 @@ image. Consult `widget documentation`_ regarding setting up the manual crop:
 
     from django.db import models
 
-    from pyuploadcare.dj import ImageField
+    from pyuploadcare.dj.models import ImageField
 
 
     class Candidate(models.Model):
@@ -160,7 +160,7 @@ uploaded files as a group:
 
     from django.db import models
 
-    from pyuploadcare.dj import FileGroupField
+    from pyuploadcare.dj.models import FileGroupField
 
 
     class Book(models.Model):
@@ -179,7 +179,7 @@ It stores uploaded images as a group:
 
     from django.db import models
 
-    from pyuploadcare.dj import ImageGroupField
+    from pyuploadcare.dj.models import ImageGroupField
 
 
     class Gallery(models.Model):

docs/install.rst

@@ -48,11 +48,13 @@ Some caveats about migration process from version 1.x to 2.x.
 
 A version 2.0 contains the next breaking changes:
 
+* Now, you should import Django models' fields (e.g ``ImageField``) directly from the ``pyuploadcare.dj.models`` module.
+
 * Changed initializing for the ``FileList`` and ``GroupList`` classes. The ``since`` and ``until`` parameters have been removed. Use combination of ``starting_point`` and ``ordering`` instead.
 
 * The ``ucare list`` CLI command has been renamed to ``ucare list_files``. And, according to the previous change, the ``since`` and ``until`` parameters have been removed. The ``starting_point`` and ordering parameters added.
 
-These changes are necessary for working with version 0.5 of REST API.
+These last two changes are necessary for working with version 0.5 of REST API.
 So that means you can’t use these classes correctly with versions prior 0.5
 (but that should not be an issue :)
 

docs/quickstart.rst

@@ -59,7 +59,7 @@ Like that:
 
     from django.db import models
 
-    from pyuploadcare.dj import ImageField
+    from pyuploadcare.dj.models import ImageField
 
 
     class Photo(models.Model):