Skip to content

Commit 42c3457

Browse files
gjtorikiangjtorikian
committed
Merge upstream
1 parent c5b6a52 commit 42c3457

2 files changed

Lines changed: 15 additions & 5 deletions

File tree

‎content/v3/enterprise/management_console.md‎

Lines changed: 11 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,11 +33,21 @@ When you boot a virtual machine for the first time, you can use the following en
3333

3434
Note that you need to POST to [`/setup/api/configure`](#start-a-configuration-process) to start the actual configuration process.
3535

36+
{{#warning}}
37+
38+
When using this endpoint, your Enterprise instance must have a password set. This can be accomplished two ways:
39+
40+
1. If you're working directly with the API before accessing the web interface, you must pass in the password parameter to set your password.
41+
2. If you set up your instance via the web interface before accessing the API, your calls to this endpoint do not need the password parameter.
42+
43+
{{/warning}}
44+
3645
### Parameters
3746

3847
Name | Type | Description
3948
-----|------|--------------
4049
`license`|`string` | **Required**. The content of your *.ghl* license file.
50+
`password`|`string` | You **must** provide a password *only if* you are uploading your license for the first time. If you previously set a password through the web interface, you don't need this parameter.
4151
`settings`| `string`| Optional path to a JSON file containing your installation settings.
4252

4353
For a list of the available settings, see [the `/setup/api/settings` endpoint](#retrieve-settings).
@@ -52,7 +62,7 @@ Location: http://<em>hostname</em>/setup/api/configcheck
5262
### Example
5363

5464
<pre class="terminal">
55-
curl -X POST 'http://api_key:<em>your-amazing-password</em>@<em>hostname</em>/setup/api/start' -F license=@<em>/path/to/github-enterprise.ghl</em> -F settings=&lt;<em>/path/to/settings.json</em>
65+
curl -X POST 'http://<em>hostname</em>/setup/api/start' -F license=@<em>/path/to/github-enterprise.ghl</em> -F "password=<em>your-amazing-password</em>" -F settings=&lt;<em>/path/to/settings.json</em>
5666
</pre>
5767

5868
## Upgrade a license

‎content/v3/oauth.md‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -302,21 +302,21 @@ receive this error.
302302
To solve this error, start the [OAuth process over from the beginning](#redirect-users-to-request-github-access)
303303
and get a new code.
304304

305-
## Directing users to review their access for an application
305+
## Directing users to review their access for an OAuth application
306306

307307
Users can review and revoke their application authorizations from the [settings
308308
screen within GitHub][settings]. Integrators can deep link to the authorization
309309
information for their particular app to let their end users review those
310310
details.
311311

312312
To build this link, you'll need your OAuth application's `client_id` you
313-
received from GitHub when you [registered the application][app-registration].
313+
received from GitHub when you [registered the application][apps].
314314

315315
https://github.com/settings/connections/applications/:client_id
316316

317317
[oauth changes blog]: /changes/2013-10-04-oauth-changes-coming/
318318
[basics auth guide]: /guides/basics-of-authentication/
319319
[deployments]: /v3/repos/deployments
320320
[public keys]: /v3/users/keys/
321-
[settings]: https://github.com/settings/applications#authorized
322-
[app-registration]: https://developer.github.com/guides/basics-of-authentication/#registering-your-app
321+
[settings]: https://github.com/settings
322+
[apps]: https://github.com/settings/applications

0 commit comments

Comments
 (0)