From 4eb478b9044e4e3bcb43f135863755f8fcdf3791 Mon Sep 17 00:00:00 2001
From: Olof Johansson <olof@ethup.se>
Date: Thu, 22 Feb 2018 11:40:49 +0100
Subject: [PATCH 1/2] docs: Use correct name for form-data mime type

---
 CHANGES           | 2 +-
 docs/features.rst | 6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/CHANGES b/CHANGES
index 57b6e82e3..535e0eeed 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1039,7 +1039,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
diff --git a/docs/features.rst b/docs/features.rst
index 9af6fb414..8e8de04b4 100644
--- a/docs/features.rst
+++ b/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)

From e819153a32ea6702ecdb1591bb6613bc4aa98214 Mon Sep 17 00:00:00 2001
From: Nicola Iarocci <nicola@nicolaiarocci.com>
Date: Sun, 25 Feb 2018 11:39:58 +0300
Subject: [PATCH 2/2] Changelog for #1114 and #1115.

---
 CHANGES | 1 +
 1 file changed, 1 insertion(+)

diff --git a/CHANGES b/CHANGES
index 535e0eeed..0dde81c1b 100644
--- a/CHANGES
+++ b/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.