Merge branch 'master' of https://github.com/github/developer.github.com into internal-master

pengwynn · pengwynn · commit f2e586468c15 · 2014-02-28T15:14:23.000-06:00
diff --git a/content/v3/oauth.md b/content/v3/oauth.md
@@ -198,76 +198,6 @@ can specify multiple scopes by separating them with a comma:
       scope=user,public_repo
 
 ## Common errors for the authorization request
-<<<<<<< HEAD
-
-There are a few things that can go wrong in the process of obtaining an
-OAuth token for a user. In the initial authorization request phase,
-these are some errors you might see:
-
-### Application Suspended
-
-If the OAuth application you set up has been suspended (due to reported
-abuse, spam, or a mis-use of the API), GitHub will redirect to the
-registered callback URL with the following parameters summerizing the
-error:
-
-    http://your-application.com/callback?error=application_suspended
-
-Please contact [support](https://github.com/contact) to solve issues
-with suspended applications.
-
-### Redirect URI mismatch
-
-If you provide a redirect_uri that doesn't match what you've registered
-with your application, GitHub will redirect to the registered callback
-URL with the following parameters summerizing the error:
-
-    http://your-application.com/callback?error=redirect_uri_mismatch
-
-To correct this error, either provide a redirect_uri that matches what
-you registered or leave out this parameter to use the default one
-registered with your application.
-
-### Access denied
-
-If the user rejects access to your application, GItHub will redirect to
-the registered callback URL with the following parameters summerizing
-the error:
-
-    http://your-application.com/callback?error=access_denied
-
-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
-or press back in their browser, so it is likely that you'll never see
-this error.
-
-## Common errors for the access token request
-
-In the second phase of exchanging a code for an access token, there are
-an additional set of errors that can occur. The format of these
-responses is determined by the accept header you pass. The following
-examples only show JSON responses.
-
-### Invalid client credentials
-
-If the client\_id and or client\_secret you pass are incorrect you will
-receive this error response.
-
-<%= json :error => :invalid_client_credentials %>
-
-To solve this error, go back and make sure you have the correct
-credentials for your oauth application. Double check the `client_id` and
-`client_secret` to make sure they are correct and being passed correctly
-to GitHub.
-
-### Bad verification code
-
-If the verification code you pass is incorrect, expired, or doesn't
-match what you received in the first request for authorization you will
-receive this error.
-
-<%= json :error => :bad_verification_code %>
-=======
 
 There are a few things that can go wrong in the process of obtaining an
 OAuth token for a user. In the initial authorization request phase,
@@ -368,8 +298,6 @@ receive this error.
          :error_uri         => "http://developer.github.com/v3/oauth/#bad-verification-code"
 %>
 
->>>>>>> master
-
 To solve this error, start the [OAuth process over from the beginning](#redirect-users-to-request-github-access)
 and get a new code.
 
diff --git a/content/webhooks/creating/index.md b/content/webhooks/creating/index.md
@@ -25,8 +25,10 @@ you'll set up your server to receive and manage the payload.
 To set up a webhook on GitHub, head over to the **Settings** page of your repository,
 and click on **Webhooks & services**. After that, click on **Add webhook**.
 
-You'll be presented with a page that lists all the capabilities your webhook
-can take advantage of. We'll go through each of these below.
+Alternatively, you can choose to build and manage a webhook [through the Webhooks API][webhook-api].
+
+Webhooks require a few configuration options before you can use of them.
+We'll go through each of these settings below.
 
 ## Payload URL
 
@@ -54,4 +56,6 @@ When you're finished, click on **Add webhook**. Phew! Now that the webhook is cr
 it's time to set up our local server to test the webhook. Head on over to
 [Configuring Your Server](/webhooks/configuring/) to learn how to do that.
 
-[hooks-api]: http://developer.github.com/v3/repos/hooks/#events
+[webhook-api]: /v3/repos/hooks/
+[hooks-api]: /webhooks/#events
+
diff --git a/static/search-index.json b/static/search-index.json
