Sync changes from upstream repository

Author: Hubot

content/changes/2016-06-22-issue-locking-api-is-now-official.md

@@ -0,0 +1,14 @@
+---
+title: Issue locking and unlocking APIs are now official
+author_name: davidcelis
+---
+
+We're making the [Issue locking and unlocking APIs][issue-locking-blog-post] part of the official GitHub API.
+
+During the preview period you needed to provide the `application/vnd.github.the-key-preview+sha` preview media type in the `Accept` header to opt-in to the new endpoints. Now that the preview period has ended, you no longer need to specify this custom [media type][custom-media-types].
+
+If you have any questions or feedback, please [get in touch with us][contact]!
+
+[issue-locking-blog-post]: /changes/2016-02-11-issue-locking-api/
+[custom-media-types]: /v3/media/
+[contact]: https://github.com/contact?form[subject]=Issue+Locking+and+Unlocking+API

content/v3/issues.md

@@ -283,10 +283,10 @@ The `assignees` key will only be present in issue payloads if this header is pas
 {{/tip}}
 {% endif %}
 
-{% if page.version == 'dotcom' %}
-
+{% if page.version == 'dotcom' or page.version >= 2.6 %}
 ## Lock an issue
 
+{% if page.version == 2.6 %}
 {{#tip}}
 
   <a name="preview-period"></a>
@@ -300,6 +300,7 @@ The `assignees` key will only be present in issue payloads if this header is pas
       application/vnd.github.the-key-preview+json
 
 {{/tip}}
+{% endif %}
 
 Users with push access can lock an issue's conversation.
 
@@ -313,6 +314,7 @@ Users with push access can lock an issue's conversation.
 
 ## Unlock an issue
 
+{% if page.version == 2.6 %}
 {{#tip}}
 
   <a name="preview-period"></a>
@@ -326,6 +328,7 @@ Users with push access can lock an issue's conversation.
       application/vnd.github.the-key-preview+json
 
 {{/tip}}
+{% endif %}
 
 Users with push access can unlock an issue's conversation.