Merge 'upstream/master' into internal/master

jasonrudolph · jasonrudolph · commit 6254d430fb84 · 2014-03-12T15:50:22.000-04:00
diff --git a/content/v3.md b/content/v3.md
@@ -219,7 +219,7 @@ are not websites.
 ### OAuth2 Key/Secret
 
 <pre class="terminal">
-$ curl https://api.github.com/users/whatever?client_id=xxxx&client_secret=yyyy
+$ curl 'https://api.github.com/users/whatever?client_id=xxxx&client_secret=yyyy'
 </pre>
 
 This should only be used in server to server scenarios.  Don't leak your
@@ -289,7 +289,7 @@ Note that for technical reasons not all endpoints respect the `?per_page` parame
 see [events](http://developer.github.com/v3/activity/events/) for example.
 
 <pre class="terminal">
-$ curl https://api.github.com/user/repos?page=2&per_page=100
+$ curl 'https://api.github.com/user/repos?page=2&per_page=100'
 </pre>
 
 Note that page numbering is 1-based and that omitting the `?page`
@@ -382,7 +382,7 @@ associated with your OAuth application, you can send over your client ID and
 secret in the query string.
 
 <pre class="terminal">
-$ curl -i https://api.github.com/users/whatever?client_id=xxxxxxxxxxxxxx&client_secret=yyyyyyyyyyyyyyyyyyyyy
+$ curl -i 'https://api.github.com/users/whatever?client_id=xxxx&client_secret=yyyy'
 
 HTTP/1.1 200 OK
 Date: Mon, 01 Jul 2013 17:27:06 GMT
diff --git a/content/v3/oauth.md b/content/v3/oauth.md
@@ -245,7 +245,7 @@ the error:
       &state=xyz
 
 There's nothing you can do here as users are free to choose not to use
-your application. More often that not, users will just close the window
+your application. More often than not, users will just close the window
 or press back in their browser, so it is likely that you'll never see
 this error.
 
diff --git a/content/v3/repos/hooks.md b/content/v3/repos/hooks.md
@@ -131,6 +131,20 @@ This will trigger a [ping event][ping-event-url] to be sent to the hook.
 
 <%= headers 204 %>
 
+## Receiving Webhooks
+
+In order for GitHub to send Webhook payloads to your service, your server needs to be accessible from the Internet. We also highly suggest using SSL so that we can send encrypted payloads over HTTPS.
+
+### Webhook Headers
+
+GitHub will send along a few HTTP headers to differentiate between event types and payload identifiers.
+
+Name | Description
+-----|-----------|
+`X-GitHub-Event` | The [event type](#events) that was triggered.
+`X-GitHub-Delivery` | A [guid][guid] to identify the payload and event being sent.
+`X-GitHub-Signature` | The value of this header is computed as the HMAC hex digest of the body, using the `secret` config option as the key.
+
 ## PubSubHubbub
 
 GitHub can also serve as a [PubSubHubbub][pubsub] hub for all repositories.
@@ -191,10 +205,11 @@ Name | Type | Description
 ``hub.secret``|`string` | A shared secret key that generates a SHA1 HMAC of the outgoing body content.  You can verify a push came from GitHub by comparing the raw request body with the contents of the `X-Hub-Signature` header.  You can see [our Ruby implementation][ruby-secret], or [the PubSubHubbub documentation][pshb-secret] for more details.
 
 
+[guid]: http://en.wikipedia.org/wiki/Globally_unique_identifier
 [pubsub]: http://code.google.com/p/pubsubhubbub/
 [post-receive]: http://help.github.com/post-receive-hooks/
 [ruby-secret]: https://github.com/github/github-services/blob/14f4da01ce29bc6a02427a9fbf37b08b141e81d9/lib/services/web.rb#L47-L50
 [hub-signature]: https://github.com/github/github-services/blob/f3bb3dd780feb6318c42b2db064ed6d481b70a1f/lib/service/http_helper.rb#L77
 [pshb-secret]: http://pubsubhubbub.googlecode.com/svn/trunk/pubsubhubbub-core-0.3.html#authednotify
 [events-url]: /webhooks/#events
-[ping-event-url]: /webhooks/#ping-event
+[ping-event-url]: /webhooks/#ping-event
diff --git a/lib/resources.rb b/lib/resources.rb
@@ -389,6 +389,7 @@ def text_html(response, status, head = {})
       "open_issues"   => 4,
       "closed_issues" => 8,
       "created_at"    => "2011-04-10T20:09:31Z",
+      "updated_at"  => "2014-03-03T18:58:10Z",
       "due_on"        => nil
     }
 

Original file line number	Diff line number	Diff line change
`@@ -389,6 +389,7 @@ def text_html(response, status, head = {})`
`389`	`389`	`"open_issues" => 4,`
`390`	`390`	`"closed_issues" => 8,`
`391`	`391`	`"created_at" => "2011-04-10T20:09:31Z",`
	`392`	`+ "updated_at" => "2014-03-03T18:58:10Z",`
`392`	`393`	`"due_on" => nil`
`393`	`394`	`}`
`394`	`395`