Merge pull request github#739 from github/update-1426621044

hubot · hubot · commit e4390f773e5d · 2015-03-17T14:37:29.000-05:00
diff --git a/content/v3/issues.md b/content/v3/issues.md
@@ -12,6 +12,8 @@ read more about the use of media types in the API [here](/v3/media/).
 
 ## List issues
 
+<%= fetch_content(:prs_as_issues) %>
+
 List all issues across all the authenticated user's visible repositories
 including owned repositories, member repositories, and organization
 repositories:
@@ -44,6 +46,8 @@ Name | Type | Description
 
 ## List issues for a repository
 
+<%= fetch_content(:prs_as_issues) %>
+
     GET /repos/:owner/:repo/issues
 
 ### Parameters
@@ -67,11 +71,7 @@ Name | Type | Description
 
 ## Get a single issue
 
-{{#tip}}
-
-**Note**: Every pull request is an issue, but not every issue is a pull request. If the issue is not a pull request, the response omits the `pull_request` attribute.
-
-{{/tip}}
+<%= fetch_content(:prs_as_issues) %>
 
     GET /repos/:owner/:repo/issues/:number
 
diff --git a/lib/resources.rb b/lib/resources.rb
@@ -131,6 +131,16 @@ def webhook_payload(event_name)
 `content_type` | `string` | The media type used to serialize the payloads. Supported values include `json` and `form`. The default is `form`.
 `secret`       | `string` | If provided, payloads will be delivered with an `X-Hub-Signature` header. The value of this header is computed as the [HMAC hex digest of the body, using the `secret` as the key][hub-signature].
 `insecure_ssl` | `string` | Determines whether the SSL certificate of the host for `url` will be verified when delivering payloads. Supported values include `"0"` (verification is performed) and `"1"` (verification is not performed). The default is `"0"`. **We strongly recommend not setting this to "1" as you are subject to man-in-the-middle and other attacks.**
+''',
+      "PRS_AS_ISSUES" =>
+      '''
+{{#tip}}
+
+**Note**: In the past, pull requests and issues were more closely aligned than they are now. As far as the API is concerned, every pull request is an issue, but not every issue is a pull request.
+
+This endpoint may also return pull requests in the response. If an issue *is* a pull request, the object will include a `pull_request` key.
+
+{{/tip}}
 '''
       }
 
