Merge branch 'gh-pages' into profile-extensions

json-api · ethanresnick · Dec 26, 2015 · Dec 26, 2015 · Dec 26, 2015 · Dec 26, 2015
commit 190079ffb9bb0c271544940201459dc2e355cc62
diff --git a/_format/1.1/index.md b/_format/1.1/index.md
@@ -61,8 +61,10 @@ negotiation and versioning.
 
 ## <a href="#document-structure" id="document-structure" class="headerlink"></a> Document Structure
 
-This section describes the structure of a JSON API document. JSON API documents
-are defined in JavaScript Object Notation (JSON)[[RFC4627](http://tools.ietf.org/html/rfc4627)].
+This section describes the structure of a JSON API document, which is identified
+by the media type [`application/vnd.api+json`](http://www.iana.org/assignments/media-types/application/vnd.api+json).
+JSON API documents are defined in JavaScript Object Notation (JSON)
+[[RFC7159](http://tools.ietf.org/html/rfc7159)].
 
 Although the same media type is used for both request and response documents,
 certain aspects are only applicable to one or the other. These differences are

diff --git a/stylesheets/all.css b/stylesheets/all.css
diff --git a/stylesheets/all.css.map b/stylesheets/all.css.map
diff --git a/stylesheets/all.sass b/stylesheets/all.sass
@@ -389,9 +389,5 @@ footer
   background: #f9f9f9
   border: 1px solid #d1d1d1
   line-height: 16px
-
-  pre
-    margin: 0
-
-  code
-    font-size: 12px
+  margin: 2em 0
+  font-family: Menlo, monospace