Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Browse files

Merge branch 'integration' into handbook-async

  • Loading branch information...
commit d991302013d5ae5a72d0a5db0021f3a0d7d5534d 2 parents 7764124 + 62ec6e4
@Swaagie Swaagie authored
Showing with 22 additions and 20 deletions.
  1. +8 −6 content/a-quickstart/faq.md
  2. +14 −14 content/features/webhooks.md
View
14 content/a-quickstart/faq.md
@@ -219,13 +219,15 @@ jitsu env set TZ America/Los_Angeles
## How do subdomains work and what are the valid subdomains?
Valid subdomains are strings 1-n characters long that begin and end with
-alphanumerical characters while the remaining letters can be alphanumerics or a
-hyphen, underscore, or period.
+alphanumerical characters while the remaining letters can be alphanumerics,
+hyphen or a underscore.
-If a user submits an app whose subdomain is `helloworld.jit.su` he will be able
-to register applications that prepend something to `helloworld` (for example
-`static.helloworld.jit.su`) while other users won't. This is to prevent domain
-hijacking.
+Valid subdomains would be
+- helloworld.nodejitsu.com
+- hello-world.nodejitsu.com
+- hello_world.nodejitsu.com
+
+_Note: the use of periods in subdomains is deprecated._
---
View
28 content/features/webhooks.md
@@ -7,8 +7,8 @@ Access the `Admin` section on your open source node.js Github repository. Click
four fields:
* Username, which defaults to your Github username
-* Password, your password or a valid [Nodejitsu API authentication
- token](https://handbook.nodejitsu.com/api#create-an-api-token)
+* Password, your password or a valid [Nodejitsu API authentication
+token](https://handbook.nodejitsu.com/api#create-an-api-token) (`jitsu tokens create github`)
* Branch, where you can define the branch you wish to deploy and defaults to master
* Endpoint, which defaults to https://webhooks.nodejitsu.com
@@ -165,7 +165,7 @@ Authentication can use a pair of `user:pass` or `user:apiToken`.
<a name="deploy-accept"></a>
#### Accept
-<table>
+<table class="rounded striped">
<tr>
<th>Content-type</th>
<th>Description</th>
@@ -179,7 +179,7 @@ Authentication can use a pair of `user:pass` or `user:apiToken`.
<a name="deploy-headers"></a>
#### Response Headers
-<table>
+<table class="rounded striped">
<tr>
<th>Header</th>
<th>Type</th>
@@ -200,7 +200,7 @@ Authentication can use a pair of `user:pass` or `user:apiToken`.
<a name="deploy-errors"></a>
#### Errors
-<table>
+<table class="rounded striped">
<tr>
<th>Error</th>
<th>Status Code</th>
@@ -272,7 +272,7 @@ curl -u dscape https:/webhooks.nodejitsu.com/1/status/dscape/webhooks/hello-wor
<a name="status-qs"></a>
#### Query String Parameters
-<table>
+<table class="rounded striped">
<tr>
<th>Key</th>
<th>Type</th>
@@ -293,7 +293,7 @@ curl -u dscape https:/webhooks.nodejitsu.com/1/status/dscape/webhooks/hello-wor
<a name="status-headers"></a>
#### Response Headers
-<table>
+<table class="rounded striped">
<tr>
<th>Header</th>
<th>Type</th>
@@ -314,7 +314,7 @@ curl -u dscape https:/webhooks.nodejitsu.com/1/status/dscape/webhooks/hello-wor
<a name="status-errors"></a>
#### Errors
-<table>
+<table class="rounded striped">
<tr>
<th>Error</th>
<th>Status Code</th>
@@ -375,7 +375,7 @@ curl -u dscape https://webhooks.nodejitsu.com/1/status/dscape/changes?include_do
<a name="changes-qs"></a>
#### Query String Parameters
-<table>
+<table class="rounded striped">
<tr>
<th>Key</th>
<th>Type</th>
@@ -391,7 +391,7 @@ curl -u dscape https://webhooks.nodejitsu.com/1/status/dscape/changes?include_do
<a name="changes-headers"></a>
#### Response Headers
-<table>
+<table class="rounded striped">
<tr>
<th>Header</th>
<th>Type</th>
@@ -412,7 +412,7 @@ curl -u dscape https://webhooks.nodejitsu.com/1/status/dscape/changes?include_do
<a name="changes-errors"></a>
#### Errors
-<table>
+<table class="rounded striped">
<tr>
<th>Error</th>
<th>Status Code</th>
@@ -487,7 +487,7 @@ file).
Bottom line if you want to do deployments for private repositories do not
specify `app` or you will fail.
-<table>
+<table class="rounded striped">
<tr>
<th>Key</th>
<th>Type</th>
@@ -503,7 +503,7 @@ specify `app` or you will fail.
<a name="auth-headers"></a>
#### Response Headers
-<table>
+<table class="rounded striped">
<tr>
<th>Header</th>
<th>Type</th>
@@ -524,7 +524,7 @@ specify `app` or you will fail.
<a name="auth-errors"></a>
#### Errors
-<table>
+<table class="rounded striped">
<tr>
<th>Error</th>
<th>Status Code</th>
Please sign in to comment.
Something went wrong with that request. Please try again.