Skip to content
This repository has been archived by the owner on Sep 4, 2021. It is now read-only.

Docs api example preface #1435

Merged
merged 2 commits into from
Apr 13, 2015
Merged

Docs api example preface #1435

merged 2 commits into from
Apr 13, 2015

Conversation

jvatic
Copy link
Contributor

@jvatic jvatic commented Apr 10, 2015

No description provided.

…o gem

FlynnDocs.api_example_preface(name) will return the contents of
docs/api-examples/{name}.md or an empty string if it doesn't exist.

This should be used when rendering the api examples.

Signed-off-by: Jesse Stuart <jesse@jessestuart.ca>


All requests are authenticated using [basic auth](https://en.wikipedia.org/wiki/Basic_access_authentication) where the user name is blank and the password is your controller key. You may alternatively use the `key` URL parameter with the controller key for event streams (this allows using them via JavaScript in the browser).

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This should include the flynn -a controller env get CONTROLLER_KEY command (I think that's the name, test it to be sure)

@jvatic
Copy link
Contributor Author

jvatic commented Apr 11, 2015

@titanous comment addressed

<h1>Controller</h1>


All requests are authenticated using [basic auth](https://en.wikipedia.org/wiki/Basic_access_authentication) where the user name is blank and the password is your controller key. You may alternatively use the `key` URL parameter with the controller key for event streams (this allows using them via JavaScript in the browser). You can retreive your controller key by running `flynn -a controller env get AUTH_KEY`.
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

s/retreive/retrieve

s/user name/username

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Fixed


All requests are authenticated using [basic auth](https://en.wikipedia.org/wiki/Basic_access_authentication) where the username is blank and the password is your controller key. You may alternatively use the `key` URL parameter with the controller key for event streams (this allows using them via JavaScript in the browser). You can retrieve your controller key by running `flynn -a controller env get AUTH_KEY`.

All paths below are relative to `controller.CLUSTER_DOMAIN`.
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This line needs to be clearer, something like "The API root URL is the controller domain, by default https://controller.$CLUSTER_DOMAIN."

@titanous
Copy link
Contributor

ping

Signed-off-by: Jesse Stuart <jesse@jessestuart.ca>
@jvatic
Copy link
Contributor Author

jvatic commented Apr 13, 2015

updated

@titanous
Copy link
Contributor

LGTM

jvatic added a commit that referenced this pull request Apr 13, 2015
@jvatic jvatic merged commit 23dd333 into master Apr 13, 2015
@jvatic jvatic deleted the docs-api-example-preface branch April 13, 2015 20:25
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants