Sync changes from upstream repository

Hubot · gjtorikian · commit 94106dfc8116 · 2014-11-07T15:20:13.000-08:00
diff --git a/content/v3/git/trees.md b/content/v3/git/trees.md
@@ -16,7 +16,11 @@ title: Git Trees | GitHub API
 <%= headers 200 %>
 <%= json :tree %>
 
-<%= fetch_content(:fetch_more_trees) %>
+{{#tip}}
+
+If `truncated` is `true`, the number of items in the `tree` array exceeded our maximum limit. If you need to fetch more items, you can clone the repository and iterate over the Git data locally.
+
+{{/tip}}
 
 ## Get a Tree Recursively
 
@@ -27,7 +31,12 @@ title: Git Trees | GitHub API
 <%= headers 200 %>
 <%= json :tree_extra %>
 
-<%= fetch_content(:fetch_more_trees) %>
+
+{{#tip}}
+
+If `truncated` is `true`, the number of items in the `tree` array exceeded our maximum limit. If you need to fetch more items, use the non-recursive method of fetching trees, and fetch one sub-tree at a time.
+
+{{/tip}}
 
 ## Create a Tree
 
diff --git a/content/v3/repos.md b/content/v3/repos.md
@@ -113,7 +113,7 @@ Name | Type | Description
 `team_id`|`number` | The id of the team that will be granted access to this repository. This is only valid when creating a repository in an organization.
 `auto_init`|`boolean` | Pass `true` to create an initial commit with empty README. Default: `false`
 `gitignore_template`|`string` | Desired language or platform [.gitignore template](https://github.com/github/gitignore) to apply. Use the name of the template without the extension. For example, "Haskell".
-`license_template`|`string` | Desired [LICENSE template](https://github.com/github/choosealicense.com) to apply. Use the [name of the template](https://github.com/github/choosealicense.com/tree/gh-pages/licenses) without the extension. For example, "mit" or "mozilla".
+`license_template`|`string` | Desired [LICENSE template](https://github.com/github/choosealicense.com) to apply. Use the [name of the template](https://github.com/github/choosealicense.com/tree/gh-pages/_licenses) without the extension. For example, "mit" or "mozilla".
 
 #### Example
 
@@ -139,7 +139,7 @@ Name | Type | Description
 By owner and repository name:
 
     GET /repos/:owner/:repo
-    
+
 By repository id:
 
     GET /repositories/:id
diff --git a/lib/resources.rb b/lib/resources.rb
@@ -118,8 +118,7 @@ def webhook_payload(event_name)
       end
 
       CONTENT ||= {
-        "PUT_CONTENT_LENGTH" => "Note that you'll need to set `Content-Length` to zero when calling out to this endpoint. For more information, see \"[HTTP verbs](/v3/#http-verbs).\"",
-        "FETCH_MORE_TREES" => "{{#tip}}\n\nIf `truncated` is `true`, the number of items in the `tree` array exceeded our maximum limit. If you need to fetch more items, use the non-recursive method of fetching trees, and fetch one sub-tree at a time.\n\n{{/tip}}"
+        "PUT_CONTENT_LENGTH" => "Note that you'll need to set `Content-Length` to zero when calling out to this endpoint. For more information, see \"[HTTP verbs](/v3/#http-verbs).\""
       }
 
       def fetch_content(key)

Original file line number	Diff line number	Diff line change
`@@ -118,8 +118,7 @@ def webhook_payload(event_name)`
`118`	`118`	`end`
`119`	`119`
`120`	`120`	`CONTENT \|\|= {`
`121`		- "PUT_CONTENT_LENGTH" => "Note that you'll need to set `Content-Length` to zero when calling out to this endpoint. For more information, see \"[HTTP verbs](/v3/#http-verbs).\"",
`122`		- "FETCH_MORE_TREES" => "{{#tip}}\n\nIf `truncated` is `true`, the number of items in the `tree` array exceeded our maximum limit. If you need to fetch more items, use the non-recursive method of fetching trees, and fetch one sub-tree at a time.\n\n{{/tip}}"
	`121`	+ "PUT_CONTENT_LENGTH" => "Note that you'll need to set `Content-Length` to zero when calling out to this endpoint. For more information, see \"[HTTP verbs](/v3/#http-verbs).\""
`123`	`122`	`}`
`124`	`123`
`125`	`124`	`def fetch_content(key)`