Merge branch 'docs_use_correct_name_for_form-data_type_#1115'

CHANGES

@@ -8,6 +8,7 @@ Development
 
 Version 0.8
 ~~~~~~~~~~~
+- Fix documentation typos (Olof Johansson)
 - Fix a changelog typo (kreynen).
 - Update: bump Flask requirement to <=0.13. Closes #1111.
 - Fix: broken documentation links to Cerberus validation rules.
@@ -1039,7 +1040,7 @@ Released on 14 February, 2014.
 - [new] media files (images, pdf, etc.) can be uploaded as ``media`` document
   fields. When a document is requested, eventual media files will be returned
   as Base64 strings. Upload is done via ``POST``, ``PUT`` and ``PATCH`` using
-  the ``multipart/data-form`` content-type. For optmized performance, by
+  the ``multipart/form-data`` content-type. For optmized performance, by
   default files are stored in GridFS, however custom ``MediaStorage`` classes
   can be provided to support alternative storage systems. Clients and API
   maintainers can exploit the projections feature to include/exclude media

docs/features.rst

@@ -1578,7 +1578,7 @@ File Storage
 ------------
 Media files (images, pdf, etc.) can be uploaded as ``media`` document
 fields. Upload is done via ``POST``, ``PUT`` and
-``PATCH`` as usual, but using the ``multipart/data-form`` content-type.
+``PATCH`` as usual, but using the ``multipart/form-data`` content-type.
 
 Let us assume that the ``accounts`` endpoint has a schema like this:
 
@@ -1741,9 +1741,9 @@ response payloads by sending requests like this one:
 
 .. _multipart:
 
-Note on media files as ``multipart/data-form``
+Note on media files as ``multipart/form-data``
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-If you are uploading media files as ``multipart/data-form`` all the
+If you are uploading media files as ``multipart/form-data`` all the
 additional fields except the file fields will be treated as ``strings``
 for all field validation purposes.  If you have already defined some of
 the resource fields to be of different type (boolean, number, list etc)