Merge branch 'gh-pages' into profile-registration-2

json-api · dgeb · Dec 3, 2018 · Oct 7, 2018 · Oct 20, 2018 · Oct 22, 2018
commit 4ec0607d2fa99223112920c552740f89f2146af8
diff --git a/_layouts/page.html b/_layouts/page.html
@@ -18,15 +18,15 @@
     {% else %}
       {% assign page_title = page.title %}
     {% endif %}
-    <title>JSON API &mdash; {{ page_title|strip }}</title>
+    <title>JSON:API &mdash; {{ page_title|strip }}</title>
   </head>
 
   <body>
     {% include site_navigation.html %}
     {% if page.show_masthead %}
       <header>
         <div class="content">
-          <h1 id="json-api">JSON API</h1>
+          <h1 id="json-api">JSON:API</h1>
           <h2>A specification for building APIs in JSON</h2>
           <div class="quicklinks">
             {% for link in site.quicklinks %}

diff --git a/extensions/index.md b/extensions/index.md
@@ -58,7 +58,7 @@ By registering your profile:
 2. it will be given an official url on jsonapi.org. This will be the URL you and
    others use to apply/identify the profile.
 
-3. one of the JSON API's editors will review your submission to check that it
+3. one of the JSON:API's editors will review your submission to check that it
    follows the [profile extension requirements](/format/1.1/#profiles-authoring).
    These requirements can be a bit tricky, so getting an expert review ensures
    that your profile is legal for use with JSON:API.
@@ -108,7 +108,7 @@ self-host the filled out template at this URL.
 
 ## <a href="#prior-extensions" id="prior-extensions" class="headerlink"></a> Prior Extensions
 
-JSON API previously offered experimental support for a different extension
+JSON:API previously offered experimental support for a different extension
 negotiation system than the one now in the specification, and it provided a
 number of extensions for use with that old negotiation system. However, this
 system was always experimental and has now been deprecated.

diff --git a/index.md b/index.md
@@ -116,8 +116,9 @@ specification](/format).
 
 ## <a href="#extensions" id="extensions" class="headerlink"></a> Extensions
 
-The JSON API community has created a collection of extensions that APIs can use
-to provide clients with information or functionality beyond that described in the base JSON API specification. These extensions are called profiles.
+The JSON:API community has created a collection of extensions that APIs can use
+to provide clients with information or functionality beyond that described in the 
+base JSON:API specification. These extensions are called profiles.
 
 You can [browse existing profiles](/extensions/#existing-profiles) or
 [create a new one](/extensions/#profile-creation).