Ticket #14762: document-contentfile.diff

docs/ref/files/file.txt

@@ -81 +81 @@
 
 .. currentmodule:: django.core.files.images
 
-Additional ``ImageField`` attributes
+Additional ``ImageFile`` attributes
 ------------------------------------
 
 .. class:: ImageFile(file_object)
@@ -117 +117 @@
         >>> car.photo.save('myphoto.jpg', contents, save=True)
     
     Note that the ``content`` argument must be an instance of
-    :class:`File` or of a subclass of :class:`File`.
+    :class:`File` or of a subclass of :class:`File` such as :class:`ContentFile`.
 
 .. method:: File.delete([save=True])
 
     Remove the file from the model instance and delete the underlying file. The
     ``save`` argument works as above.
+
+``ContentFile`` objects
+-----------------------
+
+.. class:: ContentFile(File)
+
+A ``ContentFile`` is a File-like object that takes string content, rather
+than an actual file::
+
+    from django.core.files import ContentFile
+
+    f1 = ContentFile("my string content")
+    f2 = ContentFile(u"my unicode content encoded as UTF-8".encode('UTF-8'))