Merge pull request OAI#941 from OAI/encoding-fixes

Fixed encoding stuff

Author: webron

versions/3.0.md

@@ -1247,28 +1247,14 @@ In scenarios where more control is needed over the Content-Type for `multipart`
 
 #### <a name="encodingObject"></a>Encoding Object
 
-An object representing multipart region encoding for `requestBody` objects
+An object representing multipart region encoding for `requestBody` objects.
 
 ##### Patterned Fields
 Field Pattern | Type | Description
 ---|:---:|---
-<a name="encodingObjectProperty"></a>The property to apply encoding to | [Encoding Property](#encodingProperty) <span>&#124;</span> [Encoding](#encoding) | The field name to apply special encoding attributes to.  This field MUST exist in the schema as a property.
+<a name="encodingProperty"></a>{property} | [Encoding Property Object](#encodingPropertyObject) | The property name to which the special encoding are applied.  This field MUST exist in the schema as a property.
 
-#### <a name="encoding"></a>Encoding
-
-A single encoding definition applied to a single schema property
-
-##### Fixed Fields
-Field Name | Type | Description
----|:---:|---
-<a name="encodingContentType"></a>contentType | `string` | The content-type to use for encoding a specific property. Default value depends on the property type: for `string` with `format` being `binary` - `application/octet-stream`; for other primitive types - `plain/text`; for `object` - `application/json`; for `array` - the default is defined based on the inner type.
-<a name="encodingHeaders"></a>Headers | `object` | A string map allowing additional information to be provided as headers, for example `Content-Disposition`.  Note `Content-Type` is described separately and will be ignored from this section.
-<a name="encodingStyle"></a>style | `string` | The content-type to use for encoding a specific property.  See (#parameterContent) for details on the [`style`](#parameterStyle) property. The behavior follows the same values allowed for `query` parameters, including default values.
-<a name="encodingExplode"></a>explode | `boolean` | When this is true, property values of type `array` or `object` generate separate parameters for each value of the array, or key-value-pair of the map.  For other types of properties this property has no effect. When [`style`](#encodingStyle) is `form`, the default value is `true`. For all other styles, the default value is `false`.
-
-This object can be extended with [Specification Extensions](#specificationExtensions). 
-
-##### Encoding Object Examples
+##### Encoding Object Example
 
 ```yaml
 requestBody:
@@ -1303,6 +1289,20 @@ requestBody:
           contentType: image/png, image/jpeg
 ```
 
+#### <a name="encodingPropertyObject"></a>Encoding Property Object
+
+A single encoding definition applied to a single schema property.
+
+##### Fixed Fields
+Field Name | Type | Description
+---|:---:|---
+<a name="encodingContentType"></a>contentType | `string` | The content-type to use for encoding a specific property. Default value depends on the property type: for `string` with `format` being `binary` - `application/octet-stream`; for other primitive types - `plain/text`; for `object` - `application/json`; for `array` - the default is defined based on the inner type.
+<a name="encodingHeaders"></a>Headers | `object` | A string map allowing additional information to be provided as headers, for example `Content-Disposition`.  Note `Content-Type` is described separately and will be ignored from this section.
+<a name="encodingStyle"></a>style | `string` | The content-type to use for encoding a specific property.  See (#parameterContent) for details on the [`style`](#parameterStyle) property. The behavior follows the same values allowed for `query` parameters, including default values.
+<a name="encodingExplode"></a>explode | `boolean` | When this is true, property values of type `array` or `object` generate separate parameters for each value of the array, or key-value-pair of the map.  For other types of properties this property has no effect. When [`style`](#encodingStyle) is `form`, the default value is `true`. For all other styles, the default value is `false`.
+
+This object can be extended with [Specification Extensions](#specificationExtensions). 
+
 #### <a name="responsesObject"></a>Responses Object
 
 A container for the expected responses of an operation.