jetpack 5.3

Signed-off-by: Anthony G. Basile <blueness@gentoo.org>

63 files changed, 3572 insertions, 69 deletions

diff --git a/plugins/jetpack/json-endpoints/class.wpcom-json-api-autosave-post-v1-1-endpoint.php b/plugins/jetpack/json-endpoints/class.wpcom-json-api-autosave-post-v1-1-endpoint.php
index 2db3931a..7747c214 100644
--- a/plugins/jetpack/json-endpoints/class.wpcom-json-api-autosave-post-v1-1-endpoint.php
+++ b/plugins/jetpack/json-endpoints/class.wpcom-json-api-autosave-post-v1-1-endpoint.php
@@ -1,4 +1,42 @@
 <?php
+
+new WPCOM_JSON_API_Autosave_Post_v1_1_Endpoint( array(
+	'description' => 'Create a post autosave.',
+	'group'       => '__do_not_document',
+	'stat'        => 'posts:autosave',
+	'min_version' => '1.1',
+	'method'      => 'POST',
+	'path'        => '/sites/%s/posts/%d/autosave',
+	'path_labels' => array(
+		'$site'    => '(int|string) Site ID or domain',
+		'$post_ID' => '(int) The post ID',
+	),
+	'request_format' => array(
+		'content' => '(HTML) The post content.',
+		'title'   => '(HTML) The post title.',
+		'excerpt' => '(HTML) The post excerpt.',
+	),
+	'response_format' => array(
+		'ID'          => '(int) autodraft post ID',
+		'post_ID'     => '(int) post ID',
+		'preview_URL' => '(string) preview URL for the post',
+		'modified'    => '(ISO 8601 datetime) modified time',
+	),
+
+	'example_request' => 'https://public-api.wordpress.com/rest/v1.1/sites/82974409/posts/1/autosave',
+
+	'example_request_data' => array(
+		'headers' => array(
+			'authorization' => 'Bearer YOUR_API_TOKEN'
+		),
+
+		'body' => array(
+			'title'    => 'Howdy',
+			'content'    => 'Hello. I am a test post. I was created by the API',
+		)
+	)
+) );
+
 class WPCOM_JSON_API_Autosave_Post_v1_1_Endpoint extends WPCOM_JSON_API_Post_v1_1_Endpoint {
 	function __construct( $args ) {
 		parent::__construct( $args );
diff --git a/plugins/jetpack/json-endpoints/class.wpcom-json-api-bulk-delete-post-endpoint.php b/plugins/jetpack/json-endpoints/class.wpcom-json-api-bulk-delete-post-endpoint.php
new file mode 100644
index 00000000..50c9de92
--- /dev/null
+++ b/plugins/jetpack/json-endpoints/class.wpcom-json-api-bulk-delete-post-endpoint.php
@@ -0,0 +1,54 @@
+<?php
+
+new WPCOM_JSON_API_Bulk_Delete_Post_Endpoint( array(
+	'description' => 'Delete multiple posts. Note: If the trash is enabled, this request will send non-trashed posts to the trash. Trashed posts will be permanently deleted.',
+	'group'       => 'posts',
+	'stat'        => 'posts:1:bulk-delete',
+	'min_version' => '1.1',
+	'max_version' => '1.1',
+	'method'      => 'POST',
+	'path'        => '/sites/%s/posts/delete',
+	'path_labels' => array(
+		'$site'    => '(int|string) Site ID or domain',
+	),
+	'request_format' => array(
+		'post_ids' => '(array) An array of Post IDs to delete or trash.',
+	),
+
+	'example_request'      => 'https://public-api.wordpress.com/rest/v1.1/sites/82974409/posts/delete',
+
+	'example_request_data' => array(
+		'headers' => array(
+			'authorization' => 'Bearer YOUR_API_TOKEN'
+		),
+
+		'body' => array(
+			'post_ids' => array( 881, 882 ),
+		),
+
+	)
+) );
+
+class WPCOM_JSON_API_Bulk_Delete_Post_Endpoint extends WPCOM_JSON_API_Update_Post_v1_1_Endpoint {
+	// /sites/%s/posts/delete
+	function callback( $path = '', $blog_id = 0 ) {
+		$blog_id = $this->api->switch_to_blog_and_validate_user( $this->api->get_blog_id( $blog_id ) );
+		if ( is_wp_error( $blog_id ) ) {
+			return $blog_id;
+		}
+
+		$input = $this->input();
+
+		$post_ids = (array) $input['post_ids'];
+
+		$result = array(
+			'results' => array(),
+		);
+
+		foreach( $post_ids as $post_id ) {
+			$result['results'][ $post_id ] = $this->delete_post( $path, $blog_id, $post_id );
+		}
+
+		return $result;
+	}
+}
diff --git a/plugins/jetpack/json-endpoints/class.wpcom-json-api-comment-endpoint.php b/plugins/jetpack/json-endpoints/class.wpcom-json-api-comment-endpoint.php
index b89a2355..d3424c14 100644
--- a/plugins/jetpack/json-endpoints/class.wpcom-json-api-comment-endpoint.php
+++ b/plugins/jetpack/json-endpoints/class.wpcom-json-api-comment-endpoint.php
@@ -4,14 +4,15 @@
 abstract class WPCOM_JSON_API_Comment_Endpoint extends WPCOM_JSON_API_Endpoint {
 	public $comment_object_format = array(
 		// explicitly document and cast all output
-		'ID'        => '(int) The comment ID.',
-		'post'      => "(object>post_reference) A reference to the comment's post.",
-		'author'    => '(object>author) The author of the comment.',
-		'date'      => "(ISO 8601 datetime) The comment's creation time.",
-		'URL'       => '(URL) The full permalink URL to the comment.',
-		'short_URL' => '(URL) The wp.me short URL.',
-		'content'   => '(HTML) <code>context</code> dependent.',
-		'status'    => array(
+		'ID'          => '(int) The comment ID.',
+		'post'        => "(object>post_reference) A reference to the comment's post.",
+		'author'      => '(object>author) The author of the comment.',
+		'date'        => "(ISO 8601 datetime) The comment's creation time.",
+		'URL'         => '(URL) The full permalink URL to the comment.',
+		'short_URL'   => '(URL) The wp.me short URL.',
+		'content'     => '(HTML) <code>context</code> dependent.',
+		'raw_content' => '(string) Raw comment content.',
+		'status'      => array(
 			'approved'   => 'The comment has been approved.',
 			'unapproved' => 'The comment has been held for review in the moderation queue.',
 			'spam'       => 'The comment has been marked as spam.',
@@ -127,7 +128,7 @@ abstract class WPCOM_JSON_API_Comment_Endpoint extends WPCOM_JSON_API_Endpoint {
 				);
 				break;
 			case 'author' :
-				$response[$key] = (object) $this->get_author( $comment, 'edit' === $context && current_user_can( 'edit_comment', $comment->comment_ID ) );
+				$response[$key] = (object) $this->get_author( $comment, current_user_can( 'edit_comment', $comment->comment_ID ) );
 				break;
 			case 'date' :
 				$response[$key] = (string) $this->format_date( $comment->comment_date_gmt, $comment->comment_date );
@@ -148,6 +149,9 @@ abstract class WPCOM_JSON_API_Comment_Endpoint extends WPCOM_JSON_API_Endpoint {
 					$response[$key] = (string) $comment->comment_content;
 				}
 				break;
+			case 'raw_content':
+				$response[$key] = (string) $comment->comment_content;
+				break;
 			case 'status' :
 				$response[$key] = (string) $status;
 				break;
diff --git a/plugins/jetpack/json-endpoints/class.wpcom-json-api-delete-media-endpoint.php b/plugins/jetpack/json-endpoints/class.wpcom-json-api-delete-media-endpoint.php
index 10d8ae2d..c32be52f 100644
--- a/plugins/jetpack/json-endpoints/class.wpcom-json-api-delete-media-endpoint.php
+++ b/plugins/jetpack/json-endpoints/class.wpcom-json-api-delete-media-endpoint.php
@@ -1,5 +1,39 @@
 <?php
 
+new WPCOM_JSON_API_Delete_Media_Endpoint( array(
+	'description' => 'Delete a piece of media.',
+	'group'       => 'media',
+	'stat'        => 'media:1:delete',
+	'method'      => 'POST',
+	'path'        => '/sites/%s/media/%d/delete',
+	'deprecated'  => true,
+	'new_version' => '1.1',
+	'max_version' => '1',
+	'path_labels' => array(
+		'$site'    => '(int|string) Site ID or domain',
+		'$media_ID' => '(int) The media ID',
+	),
+
+	'response_format' => array(
+		'status' => '(string) Returns deleted if the media was successfully deleted',
+		'id'    => '(int) The ID of the media item',
+		'date' =>  '(ISO 8601 datetime) The date the media was uploaded',
+		'parent'           => '(int) ID of the post this media is attached to',
+		'link'             => '(string) URL to the file',
+		'title'            => '(string) File name',
+		'caption'          => '(string) User provided caption of the file',
+		'description'      => '(string) Description of the file',
+		'metadata'         => '(array) Misc array of information about the file, such as exif data or sizes',
+	),
+
+	'example_request'      => 'https://public-api.wordpress.com/rest/v1.1/sites/82974409/media/$media_ID/delete',
+	'example_request_data' =>  array(
+		'headers' => array(
+			'authorization' => 'Bearer YOUR_API_TOKEN'
+		)
+	)
+) );
+
 class WPCOM_JSON_API_Delete_Media_Endpoint extends WPCOM_JSON_API_Endpoint {
 	function callback( $path = '', $blog_id = 0, $media_id = 0 ) {
 		$blog_id = $this->api->switch_to_blog_and_validate_user( $this->api->get_blog_id( $blog_id ) );
diff --git a/plugins/jetpack/json-endpoints/class.wpcom-json-api-delete-media-v1-1-endpoint.php b/plugins/jetpack/json-endpoints/class.wpcom-json-api-delete-media-v1-1-endpoint.php
index 5675a3fa..cf402f0d 100644
--- a/plugins/jetpack/json-endpoints/class.wpcom-json-api-delete-media-v1-1-endpoint.php
+++ b/plugins/jetpack/json-endpoints/class.wpcom-json-api-delete-media-v1-1-endpoint.php
@@ -1,5 +1,50 @@
 <?php
 
+new WPCOM_JSON_API_Delete_Media_v1_1_Endpoint( array(
+	'description' => 'Delete a piece of media. Note: Media is deleted and not trashed.',
+	'group'       => 'media',
+	'stat'        => 'media:1:delete',
+	'min_version' => '1.1',
+	'max_version' => '1.1',
+	'method'      => 'POST',
+	'path'        => '/sites/%s/media/%d/delete',
+	'path_labels' => array(
+		'$site'    => '(int|string) Site ID or domain',
+		'$media_ID' => '(int) The media ID',
+	),
+
+	'response_format' => array(
+		'status'           => '(string) Returns deleted if the media was successfully deleted',
+		'ID'               => '(int) The ID of the media item',
+		'date'             => '(ISO 8601 datetime) The date the media was uploaded',
+		'post_ID'          => '(int) ID of the post this media is attached to',
+		'author_ID'        => '(int) ID of the user who uploaded the media',
+		'URL'              => '(string) URL to the file',
+		'guid'             => '(string) Unique identifier',
+		'file'			   => '(string) File name',
+		'extension'        => '(string) File extension',
+		'mime_type'        => '(string) File mime type',
+		'title'            => '(string) File name',
+		'caption'          => '(string) User-provided caption of the file',
+		'description'      => '(string) Description of the file',
+		'alt'              => '(string)  Alternative text for image files.',
+		'thumbnails'       => '(object) Media item thumbnail URL options',
+		'height'           => '(int) (Image & video only) Height of the media item',
+		'width'            => '(int) (Image & video only) Width of the media item',
+		'length'           => '(int) (Video & audio only) Duration of the media item, in seconds',
+		'exif'             => '(array) (Image & audio only) Exif (meta) information about the media item',
+		'videopress_guid'  => '(string) (Video only) VideoPress GUID of the video when uploaded on a blog with VideoPress',
+		'videopress_processing_done'  => '(bool) (Video only) If the video is Uuploaded on a blog with VideoPress, this will return the status of processing on the Video'
+	),
+
+	'example_request'      => 'https://public-api.wordpress.com/rest/v1.1/sites/82974409/media/$media_ID/delete',
+	'example_request_data' =>  array(
+		'headers' => array(
+			'authorization' => 'Bearer YOUR_API_TOKEN'
+		)
+	)
+) );
+
 class WPCOM_JSON_API_Delete_Media_v1_1_Endpoint extends WPCOM_JSON_API_Endpoint {
 	function callback( $path = '', $blog_id = 0, $media_id = 0 ) {
 		$blog_id = $this->api->switch_to_blog_and_validate_user( $this->api->get_blog_id( $blog_id ) );
diff --git a/plugins/jetpack/json-endpoints/class.wpcom-json-api-edit-media-v1-2-endpoint.php b/plugins/jetpack/json-endpoints/class.wpcom-json-api-edit-media-v1-2-endpoint.php
index e226afa9..368e4541 100644
--- a/plugins/jetpack/json-endpoints/class.wpcom-json-api-edit-media-v1-2-endpoint.php
+++ b/plugins/jetpack/json-endpoints/class.wpcom-json-api-edit-media-v1-2-endpoint.php
@@ -2,6 +2,78 @@
 
 jetpack_require_lib( 'class.media' );
 
+new WPCOM_JSON_API_Edit_Media_v1_2_Endpoint( array(
+	'description' => 'Edit a media item.',
+	'group'       => 'media',
+	'stat'        => 'media:1:POST',
+	'min_version' => '1',
+	'max_version' => '1.2',
+	'method'      => 'POST',
+	'path'        => '/sites/%s/media/%d/edit',
+	'path_labels' => array(
+		'$site'    => '(int|string) Site ID or domain',
+		'$media_ID' => '(int) The ID of the media item',
+	),
+
+	'request_format' => array(
+		'parent_id'   => '(int) ID of the post this media is attached to',
+		'title'       => '(string) The file name.',
+		'caption'     => '(string) File caption.',
+		'description' => '(HTML) Description of the file.',
+		'alt'         => "(string) Alternative text for image files.",
+		'artist'      => "(string) Audio Only. Artist metadata for the audio track.",
+		'album'       => "(string) Audio Only. Album metadata for the audio track.",
+		'media'       => "(object) An object file to attach to the post. To upload media, " .
+		                   "the entire request should be multipart/form-data encoded. " .
+		                   "Multiple media items will be displayed in a gallery. Accepts " .
+		                   "jpg, jpeg, png, gif, pdf, doc, ppt, odt, pptx, docx, pps, ppsx, xls, xlsx, key. " .
+		                   "Audio and Video may also be available. See <code>allowed_file_types</code> " .
+		                   "in the options response of the site endpoint. " .
+		                   "<br /><br /><strong>Example</strong>:<br />" .
+						   "<code>curl \<br />--form 'title=Image' \<br />--form 'media=@/path/to/file.jpg' \<br />-H 'Authorization: BEARER your-token' \<br />'https://public-api.wordpress.com/rest/v1/sites/123/posts/new'</code>",
+		'attrs'       => "(object) An Object of attributes (`title`, `description` and `caption`) " .
+		                   "are supported to assign to the media uploaded via the `media` or `media_url`",
+		'media_url'   => "(string) An URL of the image to attach to a post.",
+	),
+
+	'response_format' => array(
+		'ID'               => '(int) The ID of the media item',
+		'date'             => '(ISO 8601 datetime) The date the media was uploaded',
+		'post_ID'          => '(int) ID of the post this media is attached to',
+		'author_ID'        => '(int) ID of the user who uploaded the media',
+		'URL'              => '(string) URL to the file',
+		'guid'             => '(string) Unique identifier',
+		'file'             => '(string) File name',
+		'extension'        => '(string) File extension',
+		'mime_type'        => '(string) File mime type',
+		'title'            => '(string) File name',
+		'caption'          => '(string) User provided caption of the file',
+		'description'      => '(string) Description of the file',
+		'alt'              => '(string)  Alternative text for image files.',
+		'thumbnails'       => '(object) Media item thumbnail URL options',
+		'height'           => '(int) (Image & video only) Height of the media item',
+		'width'            => '(int) (Image & video only) Width of the media item',
+		'length'           => '(int) (Video & audio only) Duration of the media item, in seconds',
+		'exif'             => '(array) (Image & audio only) Exif (meta) information about the media item',
+		'videopress_guid'  => '(string) (Video only) VideoPress GUID of the video when uploaded on a blog with VideoPress',
+		'videopress_processing_done'  => '(bool) (Video only) If the video is uploaded on a blog with VideoPress, this will return the status of processing on the video.',
+		'revision_history' => '(object) An object with `items` and `original` keys. ' .
+		                        '`original` is an object with data about the original image. ' .
+		                        '`items` is an array of snapshots of the previous images of this Media. ' .
+		                        'Each item has the `URL`, `file, `extension`, `date`, and `mime_type` fields.'
+	),
+
+	'example_request'      => 'https://public-api.wordpress.com/rest/v1.2/sites/82974409/media/446',
+	'example_request_data' =>  array(
+		'headers' => array(
+			'authorization' => 'Bearer YOUR_API_TOKEN'
+		),
+		'body' => array(
+			'title' => 'Updated Title'
+		)
+	)
+) );
+
 class WPCOM_JSON_API_Edit_Media_v1_2_Endpoint extends WPCOM_JSON_API_Update_Media_v1_1_Endpoint {
 	/**
 	 * Update the media post grabbing the post values from
diff --git a/plugins/jetpack/json-endpoints/class.wpcom-json-api-get-autosave-v1-1-endpoint.php b/plugins/jetpack/json-endpoints/class.wpcom-json-api-get-autosave-v1-1-endpoint.php
index 806d7fa2..6b58a08d 100644
--- a/plugins/jetpack/json-endpoints/class.wpcom-json-api-get-autosave-v1-1-endpoint.php
+++ b/plugins/jetpack/json-endpoints/class.wpcom-json-api-get-autosave-v1-1-endpoint.php
@@ -1,4 +1,30 @@
 <?php
+
+new WPCOM_JSON_API_Get_Autosave_v1_1_Endpoint( array(
+	'description' => 'Get the most recent autosave for a post.',
+	'group'       => '__do_not_document',
+	'stat'        => 'posts:autosave',
+	'min_version' => '1.1',
+	'method'      => 'GET',
+	'path'        => '/sites/%s/posts/%d/autosave',
+	'path_labels' => array(
+		'$site'    => '(int|string) Site ID or domain',
+		'$post_ID' => '(int) The post ID',
+	),
+	'response_format' => array(
+		'ID'          => '(int) autodraft post ID',
+		'post_ID'     => '(int) post ID',
+		'author_ID'   => '(int) author ID',
+		'title'       => '(HTML) The post title.',
+		'content'     => '(HTML) The post content.',
+		'excerpt'     => '(HTML) The post excerpt.',
+		'preview_URL' => '(string) preview URL for the post',
+		'modified'    => '(ISO 8601 datetime) modified time',
+	),
+
+	'example_request' => 'https://public-api.wordpress.com/rest/v1.1/sites/82974409/posts/1/autosave',
+) );
+
 class WPCOM_JSON_API_Get_Autosave_v1_1_Endpoint extends WPCOM_JSON_API_Post_v1_1_Endpoint {
 	function __construct( $args ) {
 		parent::__construct( $args );
diff --git a/plugins/jetpack/json-endpoints/class.wpcom-json-api-get-comment-endpoint.php b/plugins/jetpack/json-endpoints/class.wpcom-json-api-get-comment-endpoint.php
index 97a129e3..3a928bfd 100644
--- a/plugins/jetpack/json-endpoints/class.wpcom-json-api-get-comment-endpoint.php
+++ b/plugins/jetpack/json-endpoints/class.wpcom-json-api-get-comment-endpoint.php
@@ -1,5 +1,20 @@
 <?php
 
+new WPCOM_JSON_API_Get_Comment_Endpoint( array(
+	'description' => 'Get a single comment.',
+	'group'       => 'comments',
+	'stat'        => 'comments:1',
+
+	'method'      => 'GET',
+	'path'        => '/sites/%s/comments/%d',
+	'path_labels' => array(
+		'$site'       => '(int|string) Site ID or domain',
+		'$comment_ID' => '(int) The comment ID'
+	),
+
+	'example_request' => 'https://public-api.wordpress.com/rest/v1/sites/en.blog.wordpress.com/comments/147564'
+) );
+
 class WPCOM_JSON_API_Get_Comment_Endpoint extends WPCOM_JSON_API_Comment_Endpoint {
 	// /sites/%s/comments/%d -> $blog_id, $comment_id
 	function callback( $path = '', $blog_id = 0, $comment_id = 0 ) {
diff --git a/plugins/jetpack/json-endpoints/class.wpcom-json-api-get-comments-tree-endpoint.php b/plugins/jetpack/json-endpoints/class.wpcom-json-api-get-comments-tree-endpoint.php
new file mode 100644
index 00000000..b27be56e
--- /dev/null
+++ b/plugins/jetpack/json-endpoints/class.wpcom-json-api-get-comments-tree-endpoint.php
@@ -0,0 +1,185 @@
+<?php
+
+new WPCOM_JSON_API_Get_Comments_Tree_Endpoint( array(
+	'description' => 'Get a comments tree for site.',
+	'group'       => 'comments-tree',
+	'stat'        => 'comments-tree:1',
+
+	'method'      => 'GET',
+	'path'        =>  '/sites/%s/comments-tree',
+	'path_labels' => array(
+		'$site'   => '(int|string) Site ID or domain',
+	),
+	'query_parameters' => array(
+		'status' => '(string) Filter returned comments based on this value (allowed values: all, approved, pending, trash, spam).'
+	),
+	'response_format' => array(
+		'comments_count' => '(int) Total number of comments on the site',
+		'comments_tree' => '(array) Array of arrays representing the comments tree for given site (max 50000)',
+		'trackbacks_count' => '(int) Total number of trackbacks on the site',
+		'trackbacks_tree' => '(array) Array of arrays representing the trackbacks tree for given site (max 50000)',
+		'pingbacks_count' => '(int) Total number of pingbacks on the site',
+		'pingbacks_tree' => '(array) Array of arrays representing the pingbacks tree for given site (max 50000)',
+	),
+
+	'example_request' => 'https://public-api.wordpress.com/rest/v1/sites/en.blog.wordpress.com/comments-tree?status=approved'
+) );
+
+class WPCOM_JSON_API_Get_Comments_Tree_Endpoint extends WPCOM_JSON_API_Endpoint {
+	/**
+	 * Retrieves a list of comment data for a given site.
+	 *
+	 * @param string $status Filter by status: all, approved, pending, spam or trash.
+	 * @param int $start_at first comment to search from going back in time
+	 *
+	 * @return array
+	 */
+	function get_site_tree( $status, $start_at = PHP_INT_MAX ) {
+		global $wpdb;
+		$max_comment_count = 50000;
+		$db_status = $this->get_comment_db_status( $status );
+
+		$db_comment_rows = $wpdb->get_results(
+			$wpdb->prepare(
+				"SELECT comment_ID, comment_post_ID, comment_parent, comment_type " .
+				"FROM $wpdb->comments AS comments " .
+				"INNER JOIN $wpdb->posts AS posts ON comments.comment_post_ID = posts.ID " .
+				"WHERE comment_ID <= %d AND ( %s = 'all' OR comment_approved = %s ) " .
+				"ORDER BY comment_ID DESC " .
+				"LIMIT %d",
+				(int) $start_at, $db_status, $db_status, $max_comment_count
+			),
+			ARRAY_N
+		);
+
+		$comments = array();
+		$trackbacks = array();
+		$pingbacks = array();
+		foreach ( $db_comment_rows as $row ) {
+			list( $comment_id, $comment_post_id, $comment_parent, $comment_type ) = $row;
+			switch ( $comment_type ) {
+				case 'trackback':
+					$trackbacks[] = array( $comment_id, $comment_post_id, $comment_parent );
+					break;
+				case 'pingback':
+					$pingbacks[] = array( $comment_id, $comment_post_id, $comment_parent );
+					break;
+				default:
+					$comments[] = array( $comment_id, $comment_post_id, $comment_parent );
+			}
+		}
+
+		return array(
+			'comments_count' => $this->get_site_tree_total_count( $status, 'comment' ),
+			'comments_tree' => array_map( array( $this, 'array_map_all_as_ints' ), $comments ),
+			'trackbacks_count' => $this->get_site_tree_total_count( $status, 'trackback' ),
+			'trackbacks_tree' => array_map( array( $this, 'array_map_all_as_ints' ), $trackbacks ),
+			'pingbacks_count' => $this->get_site_tree_total_count( $status, 'pingback' ),
+			'pingbacks_tree' => array_map( array( $this, 'array_map_all_as_ints' ), $pingbacks ),
+		);
+	}
+
+	/**
+	 * Ensure all values are integers.
+	 *
+	 * @param array $comments Collection of comments.
+	 *
+	 * @return array Comments with values as integers.
+	 */
+	function array_map_all_as_ints( $comments ) {
+		return array_map( 'intval', $comments );
+	}
+
+	/**
+	 * Retrieves a total count of comments by type for the given site.
+	 *
+	 * @param string $status Filter by status: all, approved, pending, spam or trash.
+	 * @param string $type Comment type: 'trackback', 'pingback', or 'comment'.
+	 *
+	 * @return int Total count of comments for a site.
+	 */
+	function get_site_tree_total_count( $status, $type ) {
+		global $wpdb;
+		$db_status = $this->get_comment_db_status( $status );
+		$type = $this->get_sanitized_comment_type( $type );
+		// An empty value in the comments_type column denotes a regular comment.
+		$type = ( 'comment' === $type ) ? '' : $type;
+
+		$result = $wpdb->get_var(
+			$wpdb->prepare(
+				"SELECT COUNT(1) " .
+				"FROM $wpdb->comments AS comments " .
+				"INNER JOIN $wpdb->posts AS posts ON comments.comment_post_ID = posts.ID " .
+				"WHERE comment_type = %s AND ( %s = 'all' OR comment_approved = %s )",
+				$type, $db_status, $db_status
+			)
+		);
+		return intval( $result );
+	}
+
+	/**
+	 * Ensure a valid status is converted to a database-supported value if necessary.
+	 *
+	 * @param string $status Should be one of: all, approved, pending, spam or trash.
+	 *
+	 * @return string Corresponding value that exists in database.
+	 */
+	function get_comment_db_status( $status ) {
+		if ( 'approved' === $status ) {
+			return '1';
+		}
+		if ( 'pending' === $status ) {
+			return '0';
+		}
+		return $status;
+	}
+
+	/**
+	 * Determine if the passed comment status is valid or not.
+	 *
+	 * @param string $status
+	 *
+	 * @return boolean
+	 */
+	function validate_status_param( $status ) {
+		return in_array( $status, array( 'all', 'approved', 'pending', 'spam', 'trash' ) );
+	}
+
+	/**
+	 * Sanitize a given comment type.
+	 *
+	 * @param string Comment type: can be 'trackback', 'pingback', or 'comment'.
+	 *
+	 * @return string Sanitized comment type.
+	 */
+	function get_sanitized_comment_type( $type = 'comment' ) {
+		if ( in_array( $type, array( 'trackback', 'pingback', 'comment' ) ) ) {
+			return $type;
+		}
+		return 'comment';
+	}
+
+	/**
+	 * Endpoint callback for /sites/%s/comments-tree
+	 *
+	 * @param string $path
+	 * @param int    $blog_id
+	 *
+	 * @return array Site tree results by status.
+	 */
+	function callback( $path = '', $blog_id = 0 ) {
+		$blog_id = $this->api->switch_to_blog_and_validate_user( $this->api->get_blog_id( $blog_id ) );
+		if ( is_wp_error( $blog_id ) ) {
+			return $blog_id;
+		}
+
+		$args = $this->query_args();
+		$comment_status = empty( $args['status'] ) ? 'all' : $args['status'];
+
+		if ( ! $this->validate_status_param( $comment_status ) ) {
+			return new WP_Error( 'invalid_status', "Invalid comment status value provided: '$comment_status'.", 400 );
+		}
+
+		return $this->get_site_tree( $comment_status );
+	}
+}
diff --git a/plugins/jetpack/json-endpoints/class.wpcom-json-api-get-customcss.php b/plugins/jetpack/json-endpoints/class.wpcom-json-api-get-customcss.php
index b3063cd8..ecc9f998 100644
--- a/plugins/jetpack/json-endpoints/class.wpcom-json-api-get-customcss.php
+++ b/plugins/jetpack/json-endpoints/class.wpcom-json-api-get-customcss.php
@@ -5,6 +5,30 @@
  * https://public-api.wordpress.com/rest/v1.1/sites/$site/customcss/
  */
 
+new WPCOM_JSON_API_Get_CustomCss_Endpoint( array (
+	'description'      => 'Retrieve custom-css data for a site.',
+	'group'            => '__do_not_document',
+	'stat'             => 'customcss:1:get',
+	'method'           => 'GET',
+	'min_version'      => '1.1',
+	'path'             => '/sites/%s/customcss',
+	'path_labels'      => array(
+		'$site' => '(string) Site ID or domain.',
+	),
+	'response_format'  => array(
+		'css' => '(string) The raw CSS.',
+		'preprocessor' => '(string) The name of the preprocessor if any.',
+		'add_to_existing' => '(bool) False to skip the existing styles.',
+	),
+	'example_request'  => 'https://public-api.wordpress.com/rest/v1.1/sites/12345678/customcss',
+	'example_response' => '
+	{
+		"css": ".site-title { color: #fff; }",
+		"preprocessor": "sass",
+		"add_to_existing": "true"
+	}'
+) );
+
 class WPCOM_JSON_API_Get_CustomCss_Endpoint extends WPCOM_JSON_API_Endpoint {
 	/**
 	 * API callback.
diff --git a/plugins/jetpack/json-endpoints/class.wpcom-json-api-get-media-endpoint.php b/plugins/jetpack/json-endpoints/class.wpcom-json-api-get-media-endpoint.php
index 1935445e..cee9dac5 100644
--- a/plugins/jetpack/json-endpoints/class.wpcom-json-api-get-media-endpoint.php
+++ b/plugins/jetpack/json-endpoints/class.wpcom-json-api-get-media-endpoint.php
@@ -1,5 +1,37 @@
 <?php
 
+new WPCOM_JSON_API_Get_Media_Endpoint( array(
+	'description' => 'Get a single media item (by ID).',
+	'group'       => 'media',
+	'stat'        => 'media:1',
+	'method'      => 'GET',
+	'path'        => '/sites/%s/media/%d',
+	'deprecated'  => true,
+	'new_version' => '1.1',
+	'max_version' => '1',
+	'path_labels' => array(
+		'$site'    => '(int|string) Site ID or domain',
+		'$media_ID' => '(int) The ID of the media item',
+	),
+	'response_format' => array(
+		'id'    => '(int) The ID of the media item',
+		'date' =>  '(ISO 8601 datetime) The date the media was uploaded',
+		'parent'           => '(int) ID of the post this media is attached to',
+		'link'             => '(string) URL to the file',
+		'title'            => '(string) Filename',
+		'caption'          => '(string) User-provided caption of the file',
+		'description'      => '(string) Description of the file',
+		'metadata'         => '(array) Array of metadata about the file, such as Exif data or sizes',
+	),
+
+	'example_request'      => 'https://public-api.wordpress.com/rest/v1/sites/82974409/media/934',
+	'example_request_data' =>  array(
+		'headers' => array(
+			'authorization' => 'Bearer YOUR_API_TOKEN'
+		)
+	)
+) );
+
 class WPCOM_JSON_API_Get_Media_Endpoint extends WPCOM_JSON_API_Endpoint {
 	function callback( $path = '', $blog_id = 0, $media_id = 0 ) {
 		$blog_id = $this->api->switch_to_blog_and_validate_user( $this->api->get_blog_id( $blog_id ) );
diff --git a/plugins/jetpack/json-endpoints/class.wpcom-json-api-get-media-v1-1-endpoint.php b/plugins/jetpack/json-endpoints/class.wpcom-json-api-get-media-v1-1-endpoint.php
index 861cf5de..62d8681e 100644
--- a/plugins/jetpack/json-endpoints/class.wpcom-json-api-get-media-v1-1-endpoint.php
+++ b/plugins/jetpack/json-endpoints/class.wpcom-json-api-get-media-v1-1-endpoint.php
@@ -1,5 +1,48 @@
 <?php
 
+new WPCOM_JSON_API_Get_Media_v1_1_Endpoint( array(
+	'description' => 'Get a single media item (by ID).',
+	'group'       => 'media',
+	'stat'        => 'media:1',
+	'min_version' => '1.1',
+	'max_version' => '1.1',
+	'method'      => 'GET',
+	'path'        => '/sites/%s/media/%d',
+	'path_labels' => array(
+		'$site'    => '(int|string) Site ID or domain',
+		'$media_ID' => '(int) The ID of the media item',
+	),
+	'response_format' => array(
+		'ID'               => '(int) The ID of the media item',
+		'date'             => '(ISO 8601 datetime) The date the media was uploaded',
+		'post_ID'          => '(int) ID of the post this media is attached to',
+		'author_ID'        => '(int) ID of the user who uploaded the media',
+		'URL'              => '(string) URL to the file',
+		'guid'             => '(string) Unique identifier',
+		'file'			   => '(string) Filename',
+		'extension'        => '(string) File extension',
+		'mime_type'        => '(string) File MIME type',
+		'title'            => '(string) Filename',
+		'caption'          => '(string) User-provided caption of the file',
+		'description'      => '(string) Description of the file',
+		'alt'              => '(string)  Alternative text for image files.',
+		'thumbnails'       => '(object) Media item thumbnail URL options',
+		'height'           => '(int) (Image & video only) Height of the media item',
+		'width'            => '(int) (Image & video only) Width of the media item',
+		'length'           => '(int) (Video & audio only) Duration of the media item, in seconds',
+		'exif'             => '(array) (Image & audio only) Exif (meta) information about the media item',
+		'videopress_guid'  => '(string) (Video only) VideoPress GUID of the video when uploaded on a blog with VideoPress',
+		'videopress_processing_done'  => '(bool) (Video only) If the video is uploaded on a blog with VideoPress, this will return the status of processing on the video.'
+	),
+
+	'example_request'      => 'https://public-api.wordpress.com/rest/v1.1/sites/82974409/media/934',
+	'example_request_data' =>  array(
+		'headers' => array(
+			'authorization' => 'Bearer YOUR_API_TOKEN'
+		)
+	)
+) );
+
 class WPCOM_JSON_API_Get_Media_v1_1_Endpoint extends WPCOM_JSON_API_Endpoint {
 	function callback( $path = '', $blog_id = 0, $media_id = 0 ) {
 		$blog_id = $this->api->switch_to_blog_and_validate_user( $this->api->get_blog_id( $blog_id ) );
diff --git a/plugins/jetpack/json-endpoints/class.wpcom-json-api-get-media-v1-2-endpoint.php b/plugins/jetpack/json-endpoints/class.wpcom-json-api-get-media-v1-2-endpoint.php
index e8219cf3..06c0b2d3 100644
--- a/plugins/jetpack/json-endpoints/class.wpcom-json-api-get-media-v1-2-endpoint.php
+++ b/plugins/jetpack/json-endpoints/class.wpcom-json-api-get-media-v1-2-endpoint.php
@@ -1,6 +1,54 @@
 <?php
+
 require_once( JETPACK__PLUGIN_DIR . 'sal/class.json-api-date.php' );
 
+new WPCOM_JSON_API_Get_Media_v1_2_Endpoint( array(
+	'description' => 'Get a single media item (by ID).',
+	'group'       => 'media',
+	'stat'        => 'media:1',
+	'min_version' => '1.2',
+	'max_version' => '1.2',
+	'method'      => 'GET',
+	'path'        => '/sites/%s/media/%d',
+	'path_labels' => array(
+		'$site'    => '(int|string) Site ID or domain',
+		'$media_ID' => '(int) The ID of the media item',
+	),
+	'response_format' => array(
+		'ID'               => '(int) The ID of the media item',
+		'date'             => '(ISO 8601 datetime) The date the media was uploaded',
+		'post_ID'          => '(int) ID of the post this media is attached to',
+		'author_ID'        => '(int) ID of the user who uploaded the media',
+		'URL'              => '(string) URL to the file',
+		'guid'             => '(string) Unique identifier',
+		'file'             => '(string) Filename',
+		'extension'        => '(string) File extension',
+		'mime_type'        => '(string) File MIME type',
+		'title'            => '(string) Filename',
+		'caption'          => '(string) User-provided caption of the file',
+		'description'      => '(string) Description of the file',
+		'alt'              => '(string)  Alternative text for image files.',
+		'thumbnails'       => '(object) Media item thumbnail URL options',
+		'height'           => '(int) (Image & video only) Height of the media item',
+		'width'            => '(int) (Image & video only) Width of the media item',
+		'length'           => '(int) (Video & audio only) Duration of the media item, in seconds',
+		'exif'             => '(array) (Image & audio only) Exif (meta) information about the media item',
+		'videopress_guid'  => '(string) (Video only) VideoPress GUID of the video when uploaded on a blog with VideoPress',
+		'videopress_processing_done'  => '(bool) (Video only) If the video is uploaded on a blog with VideoPress, this will return the status of processing on the video.',
+		'revision_history' => '(object) An object with `items` and `original` keys. ' .
+		                        '`original` is an object with data about the original image. ' .
+		                        '`items` is an array of snapshots of the previous images of this Media. ' .
+		                        'Each item has the `URL`, `file, `extension`, `date`, and `mime_type` fields.'
+	),
+
+	'example_request'      => 'https://public-api.wordpress.com/rest/v1.2/sites/82974409/media/934',
+	'example_request_data' =>  array(
+		'headers' => array(
+			'authorization' => 'Bearer YOUR_API_TOKEN'
+		)
+	)
+) );
+
 class WPCOM_JSON_API_Get_Media_v1_2_Endpoint extends WPCOM_JSON_API_Get_Media_v1_1_Endpoint {
 	function callback( $path = '', $blog_id = 0, $media_id = 0 ) {
 		$response = parent::callback( $path, $blog_id, $media_id );
diff --git a/plugins/jetpack/json-endpoints/class.wpcom-json-api-get-post-counts-v1-1-endpoint.php b/plugins/jetpack/json-endpoints/class.wpcom-json-api-get-post-counts-v1-1-endpoint.php
index 6770b2cc..5e83b41d 100644
--- a/plugins/jetpack/json-endpoints/class.wpcom-json-api-get-post-counts-v1-1-endpoint.php
+++ b/plugins/jetpack/json-endpoints/class.wpcom-json-api-get-post-counts-v1-1-endpoint.php
@@ -1,5 +1,34 @@
 <?php
 
+new WPCOM_JSON_API_GET_Post_Counts_V1_1_Endpoint( array(
+	'description'   => 'Get number of posts in the post type groups by post status',
+	'group'         => 'sites',
+	'stat'          => 'sites:X:post-counts:X',
+	'force'         => 'wpcom',
+	'method'        => 'GET',
+	'min_version'   => '1.1',
+	'max_version'   => '1.2',
+	'path'          => '/sites/%s/post-counts/%s',
+	'path_labels'   => array(
+		'$site'       => '(int|string) Site ID or domain',
+		'$post_type'  => '(string) Post Type',
+	),
+
+	'query_parameters' => array(
+		'context' => false,
+		'author' => '(int) author ID',
+	),
+
+	'example_request' => 'https://public-api.wordpress.com/rest/v1.2/sites/en.blog.wordpress.com/post-counts/page',
+
+	'response_format' => array(
+		'counts' => array(
+			'all' => '(array) Number of posts by any author in the post type grouped by post status',
+			'mine' => '(array) Number of posts by the current user in the post type grouped by post status'
+		)
+	)
+) );
+
 class WPCOM_JSON_API_GET_Post_Counts_V1_1_Endpoint extends WPCOM_JSON_API_Endpoint {
 
 	private $whitelist = array( 'publish' );
@@ -67,6 +96,7 @@ class WPCOM_JSON_API_GET_Post_Counts_V1_1_Endpoint extends WPCOM_JSON_API_Endpoi
 		return $return;
 	}
 
+	// /sites/%s/post-counts/%s
 	public function callback( $path = '', $blog_id = 0, $post_type = 'post' ) {
 		if ( ! get_current_user_id() ) {
 			return new WP_Error( 'authorization_required', __( 'An active access token must be used to retrieve post counts.', 'jetpack' ), 403 );
diff --git a/plugins/jetpack/json-endpoints/class.wpcom-json-api-get-post-endpoint.php b/plugins/jetpack/json-endpoints/class.wpcom-json-api-get-post-endpoint.php
index 47ccd17b..f82b2f43 100644
--- a/plugins/jetpack/json-endpoints/class.wpcom-json-api-get-post-endpoint.php
+++ b/plugins/jetpack/json-endpoints/class.wpcom-json-api-get-post-endpoint.php
@@ -1,4 +1,51 @@
 <?php
+
+new WPCOM_JSON_API_Get_Post_Endpoint( array(
+	'description' => 'Get a single post (by ID).',
+	'group'       => 'posts',
+	'stat'        => 'posts:1',
+	'new_version' => '1.1',
+	'max_version' => '1',
+	'method'      => 'GET',
+	'path'        => '/sites/%s/posts/%d',
+	'path_labels' => array(
+		'$site'    => '(int|string) Site ID or domain',
+		'$post_ID' => '(int) The post ID',
+	),
+
+	'example_request'  => 'https://public-api.wordpress.com/rest/v1/sites/en.blog.wordpress.com/posts/7'
+) );
+
+new WPCOM_JSON_API_Get_Post_Endpoint( array(
+	'description' => 'Get a single post (by name)',
+	'group'       => '__do_not_document',
+	'stat'        => 'posts:name',
+	'method'      => 'GET',
+	'path'        => '/sites/%s/posts/name:%s',
+	'path_labels' => array(
+		'$site'      => '(int|string) Site ID or domain',
+		'$post_name' => '(string) The post name (a.k.a. slug)',
+	),
+
+	'example_request' => 'https://public-api.wordpress.com/rest/v1/sites/en.blog.wordpress.com/posts/name:blogging-and-stuff',
+) );
+
+new WPCOM_JSON_API_Get_Post_Endpoint( array(
+	'description' => 'Get a single post (by slug).',
+	'group'       => 'posts',
+	'stat'        => 'posts:slug',
+	'new_version' => '1.1',
+	'max_version' => '1',
+	'method'      => 'GET',
+	'path'        => '/sites/%s/posts/slug:%s',
+	'path_labels' => array(
+		'$site'      => '(int|string) Site ID or domain',
+		'$post_slug' => '(string) The post slug (a.k.a. sanitized name)',
+	),
+
+	'example_request' => 'https://public-api.wordpress.com/rest/v1/sites/en.blog.wordpress.com/posts/slug:blogging-and-stuff',
+) );
+
 class WPCOM_JSON_API_Get_Post_Endpoint extends WPCOM_JSON_API_Post_Endpoint {
 	// /sites/%s/posts/%d      -> $blog_id, $post_id
 	// /sites/%s/posts/name:%s -> $blog_id, $post_id // not documented
diff --git a/plugins/jetpack/json-endpoints/class.wpcom-json-api-get-post-v1-1-endpoint.php b/plugins/jetpack/json-endpoints/class.wpcom-json-api-get-post-v1-1-endpoint.php
index 6f3152cd..572567d7 100644
--- a/plugins/jetpack/json-endpoints/class.wpcom-json-api-get-post-v1-1-endpoint.php
+++ b/plugins/jetpack/json-endpoints/class.wpcom-json-api-get-post-v1-1-endpoint.php
@@ -1,4 +1,35 @@
 <?php
+
+new WPCOM_JSON_API_Get_Post_v1_1_Endpoint( array(
+	'description' => 'Get a single post (by ID).',
+	'min_version' => '1.1',
+	'max_version' => '1.1',
+	'group'       => 'posts',
+	'stat'        => 'posts:1',
+	'method'      => 'GET',
+	'path'        => '/sites/%s/posts/%d',
+	'path_labels' => array(
+		'$site'    => '(int|string) Site ID or domain',
+		'$post_ID' => '(int) The post ID',
+	),
+	'example_request'  => 'https://public-api.wordpress.com/rest/v1.1/sites/en.blog.wordpress.com/posts/7'
+) );
+
+new WPCOM_JSON_API_Get_Post_v1_1_Endpoint( array(
+	'description' => 'Get a single post (by slug).',
+	'min_version' => '1.1',
+	'max_version' => '1.1',
+	'group'       => 'posts',
+	'stat'        => 'posts:slug',
+	'method'      => 'GET',
+	'path'        => '/sites/%s/posts/slug:%s',
+	'path_labels' => array(
+		'$site'      => '(int|string) Site ID or domain',
+		'$post_slug' => '(string) The post slug (a.k.a. sanitized name)',
+	),
+	'example_request' => 'https://public-api.wordpress.com/rest/v1.1/sites/en.blog.wordpress.com/posts/slug:blogging-and-stuff',
+) );
+
 class WPCOM_JSON_API_Get_Post_v1_1_Endpoint extends WPCOM_JSON_API_Post_v1_1_Endpoint {
 	// /sites/%s/posts/%d      -> $blog_id, $post_id
 	// /sites/%s/posts/slug:%s -> $blog_id, $post_id
diff --git a/plugins/jetpack/json-endpoints/class.wpcom-json-api-get-site-endpoint.php b/plugins/jetpack/json-endpoints/class.wpcom-json-api-get-site-endpoint.php
index 0f4ea160..c69b3e0b 100644
--- a/plugins/jetpack/json-endpoints/class.wpcom-json-api-get-site-endpoint.php
+++ b/plugins/jetpack/json-endpoints/class.wpcom-json-api-get-site-endpoint.php
@@ -1,4 +1,28 @@
 <?php
+
+new WPCOM_JSON_API_GET_Site_Endpoint( array(
+	'description' => 'Get information about a site.',
+	'group'       => 'sites',
+	'stat'        => 'sites:X',
+	'allowed_if_flagged' => true,
+	'method'      => 'GET',
+	'max_version' => '1.1',
+	'new_version' => '1.2',
+	'path'        => '/sites/%s',
+	'path_labels' => array(
+		'$site' => '(int|string) Site ID or domain',
+	),
+	'allow_jetpack_site_auth' => true,
+	'query_parameters' => array(
+		'context' => false,
+		'options' => '(string) Optional. Returns specified options only. Comma-separated list. Example: options=login_url,timezone',
+	),
+
+	'response_format' => WPCOM_JSON_API_GET_Site_Endpoint::$site_format,
+
+	'example_request' => 'https://public-api.wordpress.com/rest/v1/sites/en.blog.wordpress.com/',
+) );
+
 class WPCOM_JSON_API_GET_Site_Endpoint extends WPCOM_JSON_API_Endpoint {
 
 	public static $site_format = array(
@@ -156,7 +180,7 @@ class WPCOM_JSON_API_GET_Site_Endpoint extends WPCOM_JSON_API_Endpoint {
 	/**
 	 * Collects the necessary information to return for a site's response.
 	 *
-	 * @return (array)
+	 * @return array
 	 */
 	public function build_current_site_response() {
 
@@ -555,6 +579,26 @@ class WPCOM_JSON_API_GET_Site_Endpoint extends WPCOM_JSON_API_Endpoint {
 	}
 }
 
+new WPCOM_JSON_API_List_Post_Formats_Endpoint( array(
+	'description' => 'Get a list of post formats supported by a site.',
+	'group'       => '__do_not_document',
+	'stat'        => 'sites:X:post-formats',
+
+	'method'      => 'GET',
+	'path'        => '/sites/%s/post-formats',
+	'path_labels' => array(
+		'$site' => '(int|string) Site ID or domain',
+	),
+
+	'query_parameters' => array(
+		'context' => false,
+	),
+
+	'response_format' => array(
+		'formats' => '(object) An object of supported post formats, each key a supported format slug mapped to its display string.',
+	)
+) );
+
 class WPCOM_JSON_API_List_Post_Formats_Endpoint extends WPCOM_JSON_API_Endpoint {
 	// /sites/%s/post-formats -> $blog_id
 	function callback( $path = '', $blog_id = 0 ) {
@@ -585,6 +629,25 @@ class WPCOM_JSON_API_List_Post_Formats_Endpoint extends WPCOM_JSON_API_Endpoint
 	}
 }
 
+new WPCOM_JSON_API_List_Page_Templates_Endpoint( array(
+	'description' => 'Get a list of page templates supported by a site.',
+	'group'       => 'sites',
+	'stat'        => 'sites:X:post-templates',
+
+	'method'      => 'GET',
+	'path'        => '/sites/%s/page-templates',
+	'path_labels' => array(
+		'$site' => '(int|string) Site ID or domain',
+	),
+	'query_parameters' => array(
+		'context' => false,
+	),
+	'response_format' => array(
+		'templates' => '(array) A list of supported page templates. Contains label and file.',
+	),
+	'example_request' => 'https://public-api.wordpress.com/rest/v1.1/sites/33534099/page-templates'
+) );
+
 class WPCOM_JSON_API_List_Page_Templates_Endpoint extends WPCOM_JSON_API_Endpoint {
 	// /sites/%s/page-templates -> $blog_id
 	function callback( $path = '', $blog_id = 0 ) {
diff --git a/plugins/jetpack/json-endpoints/class.wpcom-json-api-get-site-v1-2-endpoint.php b/plugins/jetpack/json-endpoints/class.wpcom-json-api-get-site-v1-2-endpoint.php
index e705e0eb..316b6282 100644
--- a/plugins/jetpack/json-endpoints/class.wpcom-json-api-get-site-v1-2-endpoint.php
+++ b/plugins/jetpack/json-endpoints/class.wpcom-json-api-get-site-v1-2-endpoint.php
@@ -1,16 +1,37 @@
 <?php
 
+new WPCOM_JSON_API_GET_Site_V1_2_Endpoint( array(
+	'description' => 'Get information about a site.',
+	'group'       => 'sites',
+	'stat'        => 'sites:X',
+	'allowed_if_flagged' => true,
+	'method'      => 'GET',
+	'min_version' => '1.2',
+	'path'        => '/sites/%s',
+	'path_labels' => array(
+		'$site' => '(int|string) Site ID or domain',
+	),
+
+	'query_parameters' => array(
+		'context' => false,
+	),
+
+	'response_format' => WPCOM_JSON_API_GET_Site_V1_2_Endpoint::$site_format,
+
+	'example_request' => 'https://public-api.wordpress.com/rest/v1.2/sites/en.blog.wordpress.com/',
+) );
+
 class WPCOM_JSON_API_GET_Site_V1_2_Endpoint extends WPCOM_JSON_API_GET_Site_Endpoint {
 
 	public static $site_format = array(
- 		'ID'                => '(int) Site ID',
- 		'name'              => '(string) Title of site',
- 		'description'       => '(string) Tagline or description of site',
- 		'URL'               => '(string) Full URL to the site',
- 		'capabilities'      => '(array) Array of capabilities for the current user on this site.',
- 		'jetpack'           => '(bool)  Whether the site is a Jetpack site or not',
- 		'is_multisite'      => '(bool) Whether the site is a Multisite site or not. Always true for WP.com sites.',
- 		'post_count'        => '(int) The number of posts the site has',
+		'ID'                => '(int) Site ID',
+		'name'              => '(string) Title of site',
+		'description'       => '(string) Tagline or description of site',
+		'URL'               => '(string) Full URL to the site',
+		'capabilities'      => '(array) Array of capabilities for the current user on this site.',
+		'jetpack'           => '(bool)  Whether the site is a Jetpack site or not',
+		'is_multisite'      => '(bool) Whether the site is a Multisite site or not. Always true for WP.com sites.',
+		'post_count'        => '(int) The number of posts the site has',
 		'subscribers_count' => '(int) The number of subscribers the site has',
 		'locale'            => '(string) Primary locale code of the site',
 		'icon'              => '(array) An array of icon formats for the site',
diff --git a/plugins/jetpack/json-endpoints/class.wpcom-json-api-get-taxonomies-endpoint.php b/plugins/jetpack/json-endpoints/class.wpcom-json-api-get-taxonomies-endpoint.php
index e9db059a..80b2469b 100644
--- a/plugins/jetpack/json-endpoints/class.wpcom-json-api-get-taxonomies-endpoint.php
+++ b/plugins/jetpack/json-endpoints/class.wpcom-json-api-get-taxonomies-endpoint.php
@@ -1,5 +1,65 @@
 <?php
 
+new WPCOM_JSON_API_Get_Taxonomies_Endpoint( array(
+	'description' => "Get a list of a site's categories.",
+	'group'       => 'taxonomy',
+	'stat'        => 'categories',
+	'method'      => 'GET',
+	'path'        => '/sites/%s/categories',
+	'path_labels' => array(
+		'$site'     => '(int|string) Site ID or domain'
+	),
+	'query_parameters' => array(
+		'number'   => '(int=100) The number of categories to return. Limit: 1000.',
+		'offset'   => '(int=0) 0-indexed offset.',
+		'page'     => '(int) Return the Nth 1-indexed page of categories. Takes precedence over the <code>offset</code> parameter.',
+		'search'   => '(string) Limit response to include only categories whose names or slugs match the provided search query.',
+		'order'    => array(
+			'ASC'  => 'Return categories in ascending order.',
+			'DESC' => 'Return categories in descending order.',
+		),
+		'order_by' => array(
+			'name'  => 'Order by the name of each category.',
+			'count' => 'Order by the number of posts in each category.',
+		),
+	),
+	'response_format' => array(
+		'found'      => '(int) The number of categories returned.',
+		'categories' => '(array) Array of category objects.',
+	),
+	'example_request'  => 'https://public-api.wordpress.com/rest/v1/sites/en.blog.wordpress.com/categories/?number=5'
+) );
+
+new WPCOM_JSON_API_Get_Taxonomies_Endpoint( array(
+	'description' => "Get a list of a site's tags.",
+	'group'       => 'taxonomy',
+	'stat'        => 'tags',
+	'method'      => 'GET',
+	'path'        => '/sites/%s/tags',
+	'path_labels' => array(
+		'$site'     => '(int|string) Site ID or domain'
+	),
+	'query_parameters' => array(
+		'number'   => '(int=100) The number of tags to return. Limit: 1000.',
+		'offset'   => '(int=0) 0-indexed offset.',
+		'page'     => '(int) Return the Nth 1-indexed page of tags. Takes precedence over the <code>offset</code> parameter.',
+		'search'   => '(string) Limit response to include only tags whose names or slugs match the provided search query.',
+		'order'    => array(
+			'ASC'  => 'Return tags in ascending order.',
+			'DESC' => 'Return tags in descending order.',
+		),
+		'order_by' => array(
+			'name'  => 'Order by the name of each tag.',
+			'count' => 'Order by the number of posts in each tag.',
+		),
+	),
+	'response_format' => array(
+		'found'    => '(int) The number of tags returned.',
+		'tags'     => '(array) Array of tag objects.',
+	),
+	'example_request'  => 'https://public-api.wordpress.com/rest/v1/sites/en.blog.wordpress.com/tags/?number=5'
+) );
+
 class WPCOM_JSON_API_Get_Taxonomies_Endpoint extends WPCOM_JSON_API_Endpoint {
 	// /sites/%s/tags       -> $blog_id
 	// /sites/%s/categories -> $blog_id
@@ -30,7 +90,7 @@ class WPCOM_JSON_API_Get_Taxonomies_Endpoint extends WPCOM_JSON_API_Endpoint {
 			if ( $args['page'] < 1 ) {
 				$args['page'] = 1;
 			}
-		
+
 			$args['offset'] = ( $args['page'] - 1 ) * $args['number'];
 			unset( $args['page'] );
 		}
diff --git a/plugins/jetpack/json-endpoints/class.wpcom-json-api-get-taxonomy-endpoint.php b/plugins/jetpack/json-endpoints/class.wpcom-json-api-get-taxonomy-endpoint.php
index c97089b4..728fe463 100644
--- a/plugins/jetpack/json-endpoints/class.wpcom-json-api-get-taxonomy-endpoint.php
+++ b/plugins/jetpack/json-endpoints/class.wpcom-json-api-get-taxonomy-endpoint.php
@@ -1,4 +1,35 @@
 <?php
+
+new WPCOM_JSON_API_Get_Taxonomy_Endpoint( array(
+	'description' => 'Get information about a single category.',
+	'group'       => 'taxonomy',
+	'stat'        => 'categories:1',
+
+	'method'      => 'GET',
+	'path'        => '/sites/%s/categories/slug:%s',
+	'path_labels' => array(
+		'$site'     => '(int|string) Site ID or domain',
+		'$category' => '(string) The category slug'
+	),
+
+	'example_request'  => 'https://public-api.wordpress.com/rest/v1/sites/en.blog.wordpress.com/categories/slug:community'
+) );
+
+new WPCOM_JSON_API_Get_Taxonomy_Endpoint( array(
+	'description' => 'Get information about a single tag.',
+	'group'       => 'taxonomy',
+	'stat'        => 'tags:1',
+
+	'method'      => 'GET',
+	'path'        => '/sites/%s/tags/slug:%s',
+	'path_labels' => array(
+		'$site' => '(int|string) Site ID or domain',
+		'$tag'  => '(string) The tag slug'
+	),
+
+	'example_request'  => 'https://public-api.wordpress.com/rest/v1/sites/en.blog.wordpress.com/tags/slug:wordpresscom'
+) );
+
 class WPCOM_JSON_API_Get_Taxonomy_Endpoint extends WPCOM_JSON_API_Taxonomy_Endpoint {
 	// /sites/%s/tags/slug:%s       -> $blog_id, $tag_id
 	// /sites/%s/categories/slug:%s -> $blog_id, $tag_id
diff --git a/plugins/jetpack/json-endpoints/class.wpcom-json-api-get-term-endpoint.php b/plugins/jetpack/json-endpoints/class.wpcom-json-api-get-term-endpoint.php
index 989a1459..6546af74 100644
--- a/plugins/jetpack/json-endpoints/class.wpcom-json-api-get-term-endpoint.php
+++ b/plugins/jetpack/json-endpoints/class.wpcom-json-api-get-term-endpoint.php
@@ -1,5 +1,27 @@
 <?php
 
+new WPCOM_JSON_API_Get_Term_Endpoint( array(
+	'description' => 'Get information about a single term.',
+	'group'       => 'taxonomy',
+	'stat'        => 'terms:1',
+	'method'      => 'GET',
+	'path'        => '/sites/%s/taxonomies/%s/terms/slug:%s',
+	'path_labels' => array(
+		'$site'     => '(int|string) Site ID or domain',
+		'$taxonomy' => '(string) Taxonomy',
+		'$slug'     => '(string) Term slug',
+	),
+	'response_format' => array(
+		'ID'          => '(int) The term ID.',
+		'name'        => '(string) The name of the term.',
+		'slug'        => '(string) The slug of the term.',
+		'description' => '(string) The description of the term.',
+		'post_count'  => '(int) The number of posts using this term.',
+		'parent'      => '(int) The parent ID for the term, if hierarchical.',
+	),
+	'example_request'  => 'https://public-api.wordpress.com/rest/v1/sites/en.blog.wordpress.com/taxonomies/post_tag/terms/slug:wordpresscom'
+) );
+
 class WPCOM_JSON_API_Get_Term_Endpoint extends WPCOM_JSON_API_Endpoint {
 	// /sites/%s/taxonomies/%s/terms/slug:%s -> $blog_id, $taxonomy, $slug
 	function callback( $path = '', $blog_id = 0, $taxonomy = 'category', $slug = 0 ) {
diff --git a/plugins/jetpack/json-endpoints/class.wpcom-json-api-list-comments-endpoint.php b/plugins/jetpack/json-endpoints/class.wpcom-json-api-list-comments-endpoint.php
index cdb0d466..b2a4938e 100644
--- a/plugins/jetpack/json-endpoints/class.wpcom-json-api-list-comments-endpoint.php
+++ b/plugins/jetpack/json-endpoints/class.wpcom-json-api-list-comments-endpoint.php
@@ -57,6 +57,35 @@ class WPCOM_JSON_API_List_Comments_Walker extends Walker {
 	}
 }
 
+new WPCOM_JSON_API_List_Comments_Endpoint( array(
+	'description' => 'Get a list of recent comments.',
+	'group'       => 'comments',
+	'stat'        => 'comments',
+
+	'method'      => 'GET',
+	'path'        => '/sites/%s/comments/',
+	'path_labels' => array(
+		'$site' => '(int|string) Site ID or domain',
+	),
+
+	'example_request' => 'https://public-api.wordpress.com/rest/v1/sites/en.blog.wordpress.com/comments/?number=2'
+) );
+
+new WPCOM_JSON_API_List_Comments_Endpoint( array(
+	'description' => 'Get a list of recent comments on a post.',
+	'group'       => 'comments',
+	'stat'        => 'posts:1:replies',
+
+	'method'      => 'GET',
+	'path'        => '/sites/%s/posts/%d/replies/',
+	'path_labels' => array(
+		'$site'    => '(int|string) Site ID or domain',
+		'$post_ID' => '(int) The post ID',
+	),
+
+	'example_request' => 'https://public-api.wordpress.com/rest/v1/sites/en.blog.wordpress.com/posts/7/replies/?number=2'
+) );
+
 // @todo permissions
 class WPCOM_JSON_API_List_Comments_Endpoint extends WPCOM_JSON_API_Comment_Endpoint {
 	public $response_format = array(
diff --git a/plugins/jetpack/json-endpoints/class.wpcom-json-api-list-embeds-endpoint.php b/plugins/jetpack/json-endpoints/class.wpcom-json-api-list-embeds-endpoint.php
index 35efd1d3..6f2ce126 100644
--- a/plugins/jetpack/json-endpoints/class.wpcom-json-api-list-embeds-endpoint.php
+++ b/plugins/jetpack/json-endpoints/class.wpcom-json-api-list-embeds-endpoint.php
@@ -1,4 +1,25 @@
 <?php
+
+new WPCOM_JSON_API_List_Embeds_Endpoint( array(
+	'description' => "Get a list of embeds available on a site. Note: The current user must have publishing access.",
+	'group'       => 'sites',
+	'stat'        => 'embeds',
+	'method'      => 'GET',
+	'path'        => '/sites/%s/embeds',
+	'path_labels' => array(
+		'$site'    => '(int|string) Site ID or domain',
+	),
+	'response_format' => array(
+		'embeds' => '(array) A list of supported embeds by their regex pattern.',
+	),
+	'example_request' => 'https://public-api.wordpress.com/rest/v1/sites/82974409/embeds',
+	'example_request_data' => array(
+		'headers' => array(
+			'authorization' => 'Bearer YOUR_API_TOKEN'
+		),
+	)
+) );
+
 class WPCOM_JSON_API_List_Embeds_Endpoint extends WPCOM_JSON_API_Endpoint {
 	// /sites/%s/embeds -> $blog_id
 	function callback( $path = '', $blog_id = 0 ) {
@@ -14,11 +35,11 @@ class WPCOM_JSON_API_List_Embeds_Endpoint extends WPCOM_JSON_API_Endpoint {
 
 		// list em
 		$output = array( 'embeds' => array() );
-	
+
 		if ( ! function_exists( '_wp_oembed_get_object' ) ) {
 			require_once( ABSPATH . WPINC . '/class-oembed.php' );
 		}
-				
+
 		global $wp_embed;
 		$oembed = _wp_oembed_get_object();
 
diff --git a/plugins/jetpack/json-endpoints/class.wpcom-json-api-list-invites-endpoint.php b/plugins/jetpack/json-endpoints/class.wpcom-json-api-list-invites-endpoint.php
index 1df7cfc8..3fbed890 100644
--- a/plugins/jetpack/json-endpoints/class.wpcom-json-api-list-invites-endpoint.php
+++ b/plugins/jetpack/json-endpoints/class.wpcom-json-api-list-invites-endpoint.php
@@ -1,4 +1,38 @@
 <?php
+
+new WPCOM_JSON_API_List_Invites_Endpoint( array(
+	'description' => 'List the invites of a site.',
+	'group'       => '__do_not_document',
+	'stat'        => 'invites:list',
+
+	'method'      => 'GET',
+	'path'        => '/sites/%s/invites',
+	'path_labels' => array(
+		'$site' => '(int|string) Site ID or domain',
+	),
+
+	'query_parameters' => array(
+		'number'   => '(int=25) Limit the total number of invites to be returned.',
+		'offset'   => '(int=0) The first n invites to be skipped in the returned array.',
+		'status'   => array(
+			'pending' => 'Return only pending invites.',
+			'all'     => 'Return all invites, pending and accepted, that have not been deleted.',
+		)
+	),
+
+	'response_format' => array(
+		'found'   => '(int) The total number of invites found that match the request (ignoring limits and offsets).',
+		'invites' => '(array) Array of invites.',
+	),
+
+	'example_request'      => 'https://public-api.wordpress.com/rest/v1/sites/82974409/invites',
+	'example_request_data' => array(
+		'headers' => array(
+			'authorization' => 'Bearer YOUR_API_TOKEN'
+		),
+	),
+) );
+
 class WPCOM_JSON_API_List_Invites_Endpoint extends WPCOM_JSON_API_Endpoint {
 	var $blog_id;
 	var $is_wpcom;
diff --git a/plugins/jetpack/json-endpoints/class.wpcom-json-api-list-media-endpoint.php b/plugins/jetpack/json-endpoints/class.wpcom-json-api-list-media-endpoint.php
index 74f8443f..95d11c58 100644
--- a/plugins/jetpack/json-endpoints/class.wpcom-json-api-list-media-endpoint.php
+++ b/plugins/jetpack/json-endpoints/class.wpcom-json-api-list-media-endpoint.php
@@ -1,5 +1,39 @@
 <?php
 
+new WPCOM_JSON_API_List_Media_Endpoint( array(
+	'description' => 'Get a list of items in the media library.',
+	'group'       => 'media',
+	'stat'        => 'media',
+
+	'method'      => 'GET',
+	'path'        => '/sites/%s/media/',
+	'deprecated'  => true,
+	'new_version' => '1.1',
+	'max_version' => '1',
+	'path_labels' => array(
+		'$site' => '(int|string) Site ID or domain',
+	),
+
+	'query_parameters' => array(
+		'number'    => '(int=20) The number of media items to return. Limit: 100.',
+		'offset'    => '(int=0) 0-indexed offset.',
+		'parent_id' => '(int) Default is showing all items. The post where the media item is attached. 0 shows unattached media items.',
+		'mime_type' => "(string) Default is empty. Filter by mime type (e.g., 'image/jpeg', 'application/pdf'). Partial searches also work (e.g. passing 'image' will search for all image files).",
+	),
+
+	'response_format' => array(
+		'media' => '(array) Array of media',
+		'found' => '(int) The number of total results found'
+	),
+
+	'example_request'      => 'https://public-api.wordpress.com/rest/v1/sites/82974409/media/?number=2',
+	'example_request_data' =>  array(
+		'headers' => array(
+			'authorization' => 'Bearer YOUR_API_TOKEN'
+		)
+	)
+) );
+
 class WPCOM_JSON_API_List_Media_Endpoint extends WPCOM_JSON_API_Endpoint {
 
 	function callback( $path = '', $blog_id = 0 ) {
diff --git a/plugins/jetpack/json-endpoints/class.wpcom-json-api-list-media-v1-1-endpoint.php b/plugins/jetpack/json-endpoints/class.wpcom-json-api-list-media-v1-1-endpoint.php
index fb910908..712909d9 100644
--- a/plugins/jetpack/json-endpoints/class.wpcom-json-api-list-media-v1-1-endpoint.php
+++ b/plugins/jetpack/json-endpoints/class.wpcom-json-api-list-media-v1-1-endpoint.php
@@ -1,5 +1,52 @@
 <?php
 
+new WPCOM_JSON_API_List_Media_v1_1_Endpoint( array(
+	'description' => 'Get a list of items in the media library.',
+	'group'       => 'media',
+	'stat'        => 'media',
+	'min_version' => '1.1',
+	'max_version' => '1.1',
+	'method'      => 'GET',
+	'path'        => '/sites/%s/media/',
+	'path_labels' => array(
+		'$site' => '(int|string) Site ID or domain',
+	),
+
+	'query_parameters' => array(
+		'number'    => '(int=20) The number of media items to return. Limit: 100.',
+		'offset'    => '(int=0) 0-indexed offset.',
+		'page'     => '(int) Return the Nth 1-indexed page of posts. Takes precedence over the <code>offset</code> parameter.',
+		'page_handle' => '(string) A page handle, returned from a previous API call as a <code>meta.next_page</code> property. This is the most efficient way to fetch the next page of results.',
+		'order'    => array(
+			'DESC' => 'Return files in descending order. For dates, that means newest to oldest.',
+			'ASC'  => 'Return files in ascending order. For dates, that means oldest to newest.',
+		),
+		'order_by' => array(
+			'date'          => 'Order by the uploaded time of each file.',
+			'title'         => "Order lexicographically by file titles.",
+			'ID'            => 'Order by media ID.',
+		),
+		'search'    => '(string) Search query.',
+		'post_ID'   => '(int) Default is showing all items. The post where the media item is attached. 0 shows unattached media items.',
+		'mime_type' => "(string) Default is empty. Filter by mime type (e.g., 'image/jpeg', 'application/pdf'). Partial searches also work (e.g. passing 'image' will search for all image files).",
+		'after'     => '(ISO 8601 datetime) Return media items uploaded after the specified datetime.',
+		'before'    => '(ISO 8601 datetime) Return media items uploaded before the specified datetime.',
+	),
+
+	'response_format' => array(
+		'media' => '(array) Array of media objects',
+		'found' => '(int) The number of total results found',
+		'meta'  => '(object) Meta data',
+	),
+
+	'example_request'      => 'https://public-api.wordpress.com/rest/v1.1/sites/82974409/media',
+	'example_request_data' =>  array(
+		'headers' => array(
+			'authorization' => 'Bearer YOUR_API_TOKEN'
+		)
+	)
+) );
+
 class WPCOM_JSON_API_List_Media_v1_1_Endpoint extends WPCOM_JSON_API_Endpoint {
 
 	public $date_range = array();
diff --git a/plugins/jetpack/json-endpoints/class.wpcom-json-api-list-media-v1-2-endpoint.php b/plugins/jetpack/json-endpoints/class.wpcom-json-api-list-media-v1-2-endpoint.php
index 702129e6..3b20fa08 100644
--- a/plugins/jetpack/json-endpoints/class.wpcom-json-api-list-media-v1-2-endpoint.php
+++ b/plugins/jetpack/json-endpoints/class.wpcom-json-api-list-media-v1-2-endpoint.php
@@ -2,6 +2,53 @@
 
 jetpack_require_lib( 'class.media' );
 
+new WPCOM_JSON_API_List_Media_v1_2_Endpoint( array(
+	'description' => 'Get a list of items in the media library.',
+	'group'       => 'media',
+	'stat'        => 'media',
+	'min_version' => '1.2',
+	'max_version' => '1.2',
+	'method'      => 'GET',
+	'path'        => '/sites/%s/media/',
+	'path_labels' => array(
+		'$site' => '(int|string) Site ID or domain',
+	),
+
+	'query_parameters' => array(
+		'number'    => '(int=20) The number of media items to return. Limit: 100.',
+		'offset'    => '(int=0) 0-indexed offset.',
+		'page'     => '(int) Return the Nth 1-indexed page of posts. Takes precedence over the <code>offset</code> parameter.',
+		'page_handle' => '(string) A page handle, returned from a previous API call as a <code>meta.next_page</code> property. This is the most efficient way to fetch the next page of results.',
+		'order'    => array(
+			'DESC' => 'Return files in descending order. For dates, that means newest to oldest.',
+			'ASC'  => 'Return files in ascending order. For dates, that means oldest to newest.',
+		),
+		'order_by' => array(
+			'date'          => 'Order by the uploaded time of each file.',
+			'title'         => "Order lexicographically by file titles.",
+			'ID'            => 'Order by media ID.',
+		),
+		'search'    => '(string) Search query.',
+		'post_ID'   => '(int) Default is showing all items. The post where the media item is attached. 0 shows unattached media items.',
+		'mime_type' => "(string) Default is empty. Filter by mime type (e.g., 'image/jpeg', 'application/pdf'). Partial searches also work (e.g. passing 'image' will search for all image files).",
+		'after'     => '(ISO 8601 datetime) Return media items uploaded after the specified datetime.',
+		'before'    => '(ISO 8601 datetime) Return media items uploaded before the specified datetime.',
+	),
+
+	'response_format' => array(
+		'media' => '(array) Array of media objects',
+		'found' => '(int) The number of total results found',
+		'meta'  => '(object) Meta data',
+	),
+
+	'example_request'      => 'https://public-api.wordpress.com/rest/v1.2/sites/82974409/media',
+	'example_request_data' =>  array(
+		'headers' => array(
+			'authorization' => 'Bearer YOUR_API_TOKEN'
+		)
+	)
+) );
+
 class WPCOM_JSON_API_List_Media_v1_2_Endpoint extends WPCOM_JSON_API_List_Media_v1_1_Endpoint {
 	function callback( $path = '', $blog_id = 0 ) {
 		$response = parent::callback( $path, $blog_id );
diff --git a/plugins/jetpack/json-endpoints/class.wpcom-json-api-list-post-type-taxonomies-endpoint.php b/plugins/jetpack/json-endpoints/class.wpcom-json-api-list-post-type-taxonomies-endpoint.php
index 73218abd..69d5bf47 100644
--- a/plugins/jetpack/json-endpoints/class.wpcom-json-api-list-post-type-taxonomies-endpoint.php
+++ b/plugins/jetpack/json-endpoints/class.wpcom-json-api-list-post-type-taxonomies-endpoint.php
@@ -1,5 +1,22 @@
 <?php
 
+new WPCOM_JSON_API_List_Post_Type_Taxonomies_Endpoint( array (
+	'description' => 'Get a list of taxonomies associated with a post type.',
+	'group'       => 'taxonomy',
+	'stat'        => 'sites:X:post-types:X:taxonomies',
+	'method'      => 'GET',
+	'path'        => '/sites/%s/post-types/%s/taxonomies',
+	'path_labels' => array(
+		'$site'      => '(int|string) Site ID or domain',
+		'$post_type' => '(string) Post type',
+	),
+	'response_format' => array(
+		'found'      => '(int) The number of taxonomies found',
+		'taxonomies' => '(array:taxonomy) A list of available taxonomies',
+	),
+	'example_request' => 'https://public-api.wordpress.com/rest/v1.1/sites/33534099/post-types/post/taxonomies'
+) );
+
 class WPCOM_JSON_API_List_Post_Type_Taxonomies_Endpoint extends WPCOM_JSON_API_Endpoint {
 	static $taxonomy_keys_to_include = array(
 		'name'         => 'name',
diff --git a/plugins/jetpack/json-endpoints/class.wpcom-json-api-list-post-types-endpoint.php b/plugins/jetpack/json-endpoints/class.wpcom-json-api-list-post-types-endpoint.php
index e2cf4623..d6cbefa8 100644
--- a/plugins/jetpack/json-endpoints/class.wpcom-json-api-list-post-types-endpoint.php
+++ b/plugins/jetpack/json-endpoints/class.wpcom-json-api-list-post-types-endpoint.php
@@ -1,5 +1,27 @@
 <?php
 
+new WPCOM_JSON_API_List_Post_Types_Endpoint( array (
+	'description' => 'Get a list of post types available for a site.',
+	'group'       => 'sites',
+	'stat'        => 'sites:X:post-types',
+
+	'method'      => 'GET',
+	'path'        => '/sites/%s/post-types',
+	'path_labels' => array(
+		'$site' => '(int|string) Site ID or domain',
+	),
+
+	'query_parameters' => array(
+		'api_queryable' => '(bool) If true, only queryable post types are returned',
+	),
+
+	'response_format' => array(
+		'found'      => '(int) The number of post types found',
+		'post_types' => '(array) A list of available post types',
+	),
+	'example_request' => 'https://public-api.wordpress.com/rest/v1.1/sites/33534099/post-types'
+) );
+
 class WPCOM_JSON_API_List_Post_Types_Endpoint extends WPCOM_JSON_API_Endpoint {
 	static $post_type_keys_to_include = array(
 		'name'         => 'name',
@@ -71,12 +93,12 @@ class WPCOM_JSON_API_List_Post_Types_Endpoint extends WPCOM_JSON_API_Endpoint {
 			'post_types' => $formatted_post_type_objects
 		);
 	}
-	
+
 	function post_type_supports_tags( $post_type ) {
 		if ( in_array( 'post_tag', get_object_taxonomies( $post_type ) ) ) {
 			return true;
 		}
-		
+
 		// the featured content module adds post_tag support
 		// to the post types that are registered for it
 		// however it does so in a way that isn't available
@@ -85,7 +107,7 @@ class WPCOM_JSON_API_List_Post_Types_Endpoint extends WPCOM_JSON_API_Endpoint {
 		if ( ! $featured_content || empty( $featured_content[0] ) || empty( $featured_content[0]['post_types'] ) ) {
 			return false;
 		}
-		
+
 		return in_array( $post_type, $featured_content[0]['post_types'] );
 	}
 }
diff --git a/plugins/jetpack/json-endpoints/class.wpcom-json-api-list-posts-endpoint.php b/plugins/jetpack/json-endpoints/class.wpcom-json-api-list-posts-endpoint.php
index db82ae9b..726aaea4 100644
--- a/plugins/jetpack/json-endpoints/class.wpcom-json-api-list-posts-endpoint.php
+++ b/plugins/jetpack/json-endpoints/class.wpcom-json-api-list-posts-endpoint.php
@@ -1,5 +1,64 @@
 <?php
 
+new WPCOM_JSON_API_List_Posts_Endpoint( array(
+	'description' => 'Get a list of matching posts.',
+	'new_version' => '1.1',
+	'max_version' => '1',
+	'group'       => 'posts',
+	'stat'        => 'posts',
+
+	'method'      => 'GET',
+	'path'        => '/sites/%s/posts/',
+	'path_labels' => array(
+		'$site' => '(int|string) Site ID or domain',
+	),
+
+	'query_parameters' => array(
+		'number'   => '(int=20) The number of posts to return. Limit: 100.',
+		'offset'   => '(int=0) 0-indexed offset.',
+		'page'     => '(int) Return the Nth 1-indexed page of posts. Takes precedence over the <code>offset</code> parameter.',
+		'order'    => array(
+			'DESC' => 'Return posts in descending order. For dates, that means newest to oldest.',
+			'ASC'  => 'Return posts in ascending order. For dates, that means oldest to newest.',
+		),
+		'order_by' => array(
+			'date'          => 'Order by the created time of each post.',
+			'modified'      => 'Order by the modified time of each post.',
+			'title'         => "Order lexicographically by the posts' titles.",
+			'comment_count' => 'Order by the number of comments for each post.',
+			'ID'            => 'Order by post ID.',
+		),
+		'after'    => '(ISO 8601 datetime) Return posts dated on or after the specified datetime.',
+		'before'   => '(ISO 8601 datetime) Return posts dated on or before the specified datetime.',
+		'tag'      => '(string) Specify the tag name or slug.',
+		'category' => '(string) Specify the category name or slug.',
+		'term'     => '(object:string) Specify comma-separated term slugs to search within, indexed by taxonomy slug.',
+		'type'     => "(string) Specify the post type. Defaults to 'post', use 'any' to query for both posts and pages. Post types besides post and page need to be whitelisted using the <code>rest_api_allowed_post_types</code> filter.",
+		'parent_id' => '(int) Returns only posts which are children of the specified post. Applies only to hierarchical post types.',
+		'exclude'  => '(array:int|int) Excludes the specified post ID(s) from the response',
+		'exclude_tree' => '(int) Excludes the specified post and all of its descendants from the response. Applies only to hierarchical post types.',
+		'status'   => array(
+			'publish' => 'Return only published posts.',
+			'private' => 'Return only private posts.',
+			'draft'   => 'Return only draft posts.',
+			'pending' => 'Return only posts pending editorial approval.',
+			'future'  => 'Return only posts scheduled for future publishing.',
+			'trash'   => 'Return only posts in the trash.',
+			'any'     => 'Return all posts regardless of status.',
+		),
+		'sticky'    => array(
+			'false'   => 'Post is not marked as sticky.',
+			'true'    => 'Stick the post to the front page.',
+		),
+		'author'   => "(int) Author's user ID",
+		'search'   => '(string) Search query',
+		'meta_key'   => '(string) Metadata key that the post should contain',
+		'meta_value'   => '(string) Metadata value that the post should contain. Will only be applied if a `meta_key` is also given',
+	),
+
+	'example_request' => 'https://public-api.wordpress.com/rest/v1/sites/en.blog.wordpress.com/posts/?number=5'
+) );
+
 class WPCOM_JSON_API_List_Posts_Endpoint extends WPCOM_JSON_API_Post_Endpoint {
 	public $date_range = array();
 
diff --git a/plugins/jetpack/json-endpoints/class.wpcom-json-api-list-posts-v1-1-endpoint.php b/plugins/jetpack/json-endpoints/class.wpcom-json-api-list-posts-v1-1-endpoint.php
index c50ac926..529df405 100644
--- a/plugins/jetpack/json-endpoints/class.wpcom-json-api-list-posts-v1-1-endpoint.php
+++ b/plugins/jetpack/json-endpoints/class.wpcom-json-api-list-posts-v1-1-endpoint.php
@@ -1,5 +1,61 @@
 <?php
 
+new WPCOM_JSON_API_List_Posts_v1_1_Endpoint( array(
+	'description' => 'Get a list of matching posts.',
+	'min_version' => '1.1',
+	'max_version' => '1.1',
+
+	'group'       => 'posts',
+	'stat'        => 'posts',
+
+	'method'      => 'GET',
+	'path'        => '/sites/%s/posts/',
+	'path_labels' => array(
+		'$site' => '(int|string) Site ID or domain',
+	),
+
+	'query_parameters' => array(
+		'number'   => '(int=20) The number of posts to return. Limit: 100.',
+		'offset'   => '(int=0) 0-indexed offset.',
+		'page'     => '(int) Return the Nth 1-indexed page of posts. Takes precedence over the <code>offset</code> parameter.',
+		'page_handle' => '(string) A page handle, returned from a previous API call as a <code>meta.next_page</code> property. This is the most efficient way to fetch the next page of results.',
+		'order'    => array(
+			'DESC' => 'Return posts in descending order. For dates, that means newest to oldest.',
+			'ASC'  => 'Return posts in ascending order. For dates, that means oldest to newest.',
+		),
+		'order_by' => array(
+			'date'          => 'Order by the created time of each post.',
+			'modified'      => 'Order by the modified time of each post.',
+			'title'         => "Order lexicographically by the posts' titles.",
+			'comment_count' => 'Order by the number of comments for each post.',
+			'ID'            => 'Order by post ID.',
+		),
+		'after'    => '(ISO 8601 datetime) Return posts dated after the specified datetime.',
+		'before'   => '(ISO 8601 datetime) Return posts dated before the specified datetime.',
+		'modified_after'    => '(ISO 8601 datetime) Return posts modified after the specified datetime.',
+		'modified_before'   => '(ISO 8601 datetime) Return posts modified before the specified datetime.',
+		'tag'      => '(string) Specify the tag name or slug.',
+		'category' => '(string) Specify the category name or slug.',
+		'term'     => '(object:string) Specify comma-separated term slugs to search within, indexed by taxonomy slug.',
+		'type'     => "(string) Specify the post type. Defaults to 'post', use 'any' to query for both posts and pages. Post types besides post and page need to be whitelisted using the <code>rest_api_allowed_post_types</code> filter.",
+		'parent_id' => '(int) Returns only posts which are children of the specified post. Applies only to hierarchical post types.',
+		'exclude'  => '(array:int|int) Excludes the specified post ID(s) from the response',
+		'exclude_tree' => '(int) Excludes the specified post and all of its descendants from the response. Applies only to hierarchical post types.',
+		'status'   => '(string) Comma-separated list of statuses for which to query, including any of: "publish", "private", "draft", "pending", "future", and "trash", or simply "any". Defaults to "publish"',
+		'sticky'    => array(
+			'include'   => 'Sticky posts are not excluded from the list.',
+			'exclude'   => 'Sticky posts are excluded from the list.',
+			'require'   => 'Only include sticky posts',
+		),
+		'author'   => "(int) Author's user ID",
+		'search'   => '(string) Search query',
+		'meta_key'   => '(string) Metadata key that the post should contain',
+		'meta_value'   => '(string) Metadata value that the post should contain. Will only be applied if a `meta_key` is also given',
+	),
+
+	'example_request' => 'https://public-api.wordpress.com/rest/v1.1/sites/en.blog.wordpress.com/posts/?number=2'
+) );
+
 class WPCOM_JSON_API_List_Posts_v1_1_Endpoint extends WPCOM_JSON_API_Post_v1_1_Endpoint {
 	public $date_range = array();
 	public $modified_range = array();
diff --git a/plugins/jetpack/json-endpoints/class.wpcom-json-api-list-posts-v1-2-endpoint.php b/plugins/jetpack/json-endpoints/class.wpcom-json-api-list-posts-v1-2-endpoint.php
index 664fd45f..3aa61bb5 100644
--- a/plugins/jetpack/json-endpoints/class.wpcom-json-api-list-posts-v1-2-endpoint.php
+++ b/plugins/jetpack/json-endpoints/class.wpcom-json-api-list-posts-v1-2-endpoint.php
@@ -1,10 +1,61 @@
 <?php
-/*
- * WARNING: This file is distributed verbatim in Jetpack.
- * There should be nothing WordPress.com specific in this file.
- *
- * @hide-in-jetpack
- */
+
+new WPCOM_JSON_API_List_Posts_v1_2_Endpoint( array(
+	'description' => 'Get a list of matching posts.',
+	'min_version' => '1.2',
+	'max_version' => '1.2',
+
+	'group'       => 'posts',
+	'stat'        => 'posts',
+
+	'method'      => 'GET',
+	'path'        => '/sites/%s/posts/',
+	'path_labels' => array(
+		'$site' => '(int|string) Site ID or domain',
+	),
+
+	'query_parameters' => array(
+		'number'   => '(int=20) The number of posts to return. Limit: 100.',
+		'offset'   => '(int=0) 0-indexed offset.',
+		'page'     => '(int) Return the Nth 1-indexed page of posts. Takes precedence over the <code>offset</code> parameter.',
+		'page_handle' => '(string) A page handle, returned from a previous API call as a <code>meta.next_page</code> property. This is the most efficient way to fetch the next page of results.',
+		'order'    => array(
+			'DESC' => 'Return posts in descending order. For dates, that means newest to oldest.',
+			'ASC'  => 'Return posts in ascending order. For dates, that means oldest to newest.',
+		),
+		'order_by' => array(
+			'date'          => 'Order by the created time of each post.',
+			'modified'      => 'Order by the modified time of each post.',
+			'title'         => "Order lexicographically by the posts' titles.",
+			'comment_count' => 'Order by the number of comments for each post.',
+			'ID'            => 'Order by post ID.',
+		),
+		'after'    => '(ISO 8601 datetime) Return posts dated after the specified datetime.',
+		'before'   => '(ISO 8601 datetime) Return posts dated before the specified datetime.',
+		'modified_after'    => '(ISO 8601 datetime) Return posts modified after the specified datetime.',
+		'modified_before'   => '(ISO 8601 datetime) Return posts modified before the specified datetime.',
+		'tag'      => '(string) Specify the tag name or slug.',
+		'category' => '(string) Specify the category name or slug.',
+		'term'     => '(object:string) Specify comma-separated term slugs to search within, indexed by taxonomy slug.',
+		'type'     => "(string) Specify the post type. Defaults to 'post', use 'any' to query for both posts and pages. Post types besides post and page need to be whitelisted using the <code>rest_api_allowed_post_types</code> filter.",
+		'exclude_private_types' => '(bool=false) Use this flag together with `type=any` to get only publicly accessible posts.',
+		'parent_id' => '(int) Returns only posts which are children of the specified post. Applies only to hierarchical post types.',
+		'exclude'  => '(array:int|int) Excludes the specified post ID(s) from the response',
+		'exclude_tree' => '(int) Excludes the specified post and all of its descendants from the response. Applies only to hierarchical post types.',
+		'status'   => '(string) Comma-separated list of statuses for which to query, including any of: "publish", "private", "draft", "pending", "future", and "trash", or simply "any". Defaults to "publish"',
+		'sticky'    => array(
+			'include'   => 'Sticky posts are not excluded from the list.',
+			'exclude'   => 'Sticky posts are excluded from the list.',
+			'require'   => 'Only include sticky posts',
+		),
+		'author'   => "(int) Author's user ID",
+		'search'   => '(string) Search query',
+		'meta_key'   => '(string) Metadata key that the post should contain',
+		'meta_value'   => '(string) Metadata value that the post should contain. Will only be applied if a `meta_key` is also given',
+	),
+
+	'example_request' => 'https://public-api.wordpress.com/rest/v1.2/sites/en.blog.wordpress.com/posts/?number=2'
+) );
 
 class WPCOM_JSON_API_List_Posts_v1_2_Endpoint extends WPCOM_JSON_API_List_Posts_v1_1_Endpoint {
 	// /sites/%s/posts/ -> $blog_id
diff --git a/plugins/jetpack/json-endpoints/class.wpcom-json-api-list-roles-endpoint.php b/plugins/jetpack/json-endpoints/class.wpcom-json-api-list-roles-endpoint.php
index ec142eb8..028aabd7 100644
--- a/plugins/jetpack/json-endpoints/class.wpcom-json-api-list-roles-endpoint.php
+++ b/plugins/jetpack/json-endpoints/class.wpcom-json-api-list-roles-endpoint.php
@@ -1,4 +1,31 @@
 <?php
+
+new WPCOM_JSON_API_List_Roles_Endpoint( array(
+	'description' => 'List the user roles of a site.',
+	'group'       => '__do_not_document',
+	'stat'        => 'roles:list',
+
+	'method'      => 'GET',
+	'path'        => '/sites/%s/roles',
+	'path_labels' => array(
+		'$site' => '(int|string) Site ID or domain',
+	),
+
+	'query_parameters' => array(
+	),
+
+	'response_format' => array(
+		'roles'  => '(array:role) Array of role objects.',
+	),
+
+	'example_request'      => 'https://public-api.wordpress.com/rest/v1/sites/82974409/roles',
+	'example_request_data' => array(
+		'headers' => array(
+			'authorization' => 'Bearer YOUR_API_TOKEN'
+		),
+	)
+) );
+
 class WPCOM_JSON_API_List_Roles_Endpoint extends WPCOM_JSON_API_Endpoint {
 
 	var $response_format = array(
diff --git a/plugins/jetpack/json-endpoints/class.wpcom-json-api-list-shortcodes-endpoint.php b/plugins/jetpack/json-endpoints/class.wpcom-json-api-list-shortcodes-endpoint.php
index 9b2fc1aa..ee21bd33 100644
--- a/plugins/jetpack/json-endpoints/class.wpcom-json-api-list-shortcodes-endpoint.php
+++ b/plugins/jetpack/json-endpoints/class.wpcom-json-api-list-shortcodes-endpoint.php
@@ -1,4 +1,25 @@
 <?php
+
+new WPCOM_JSON_API_List_Shortcodes_Endpoint( array(
+	'description' => "Get a list of shortcodes available on a site. Note: The current user must have publishing access.",
+	'group'       => 'sites',
+	'stat'        => 'shortcodes',
+	'method'      => 'GET',
+	'path'        => '/sites/%s/shortcodes',
+	'path_labels' => array(
+		'$site'    => '(int|string) Site ID or domain',
+	),
+	'response_format' => array(
+		'shortcodes' => '(array) A list of supported shortcodes by their handle.',
+	),
+	'example_request' => 'https://public-api.wordpress.com/rest/v1/sites/82974409/shortcodes',
+	'example_request_data' => array(
+		'headers' => array(
+			'authorization' => 'Bearer YOUR_API_TOKEN'
+		),
+	)
+) );
+
 class WPCOM_JSON_API_List_Shortcodes_Endpoint extends WPCOM_JSON_API_Endpoint {
 	// /sites/%s/shortcodes -> $blog_id
 	function callback( $path = '', $blog_id = 0 ) {
@@ -19,7 +40,7 @@ class WPCOM_JSON_API_List_Shortcodes_Endpoint extends WPCOM_JSON_API_Endpoint {
 		foreach ( $shortcode_tags as $tag => $class ) {
 			if ( '__return_false' == $class )
 				continue;
-			$output['shortcodes'][] = $tag; 
+			$output['shortcodes'][] = $tag;
 		}
 
 		return $output;
diff --git a/plugins/jetpack/json-endpoints/class.wpcom-json-api-list-terms-endpoint.php b/plugins/jetpack/json-endpoints/class.wpcom-json-api-list-terms-endpoint.php
index 5ffc432a..83edcfc9 100644
--- a/plugins/jetpack/json-endpoints/class.wpcom-json-api-list-terms-endpoint.php
+++ b/plugins/jetpack/json-endpoints/class.wpcom-json-api-list-terms-endpoint.php
@@ -1,5 +1,36 @@
 <?php
 
+new WPCOM_JSON_API_List_Terms_Endpoint( array(
+	'description' => 'Get a list of a site\'s terms by taxonomy.',
+	'group'       => 'taxonomy',
+	'stat'        => 'terms',
+	'method'      => 'GET',
+	'path'        => '/sites/%s/taxonomies/%s/terms',
+	'path_labels' => array(
+		'$site'     => '(int|string) Site ID or domain',
+		'$taxonomy' => '(string) Taxonomy',
+	),
+	'query_parameters' => array(
+		'number'   => '(int=100) The number of terms to return. Limit: 1000.',
+		'offset'   => '(int=0) 0-indexed offset.',
+		'page'     => '(int) Return the Nth 1-indexed page of terms. Takes precedence over the <code>offset</code> parameter.',
+		'search'   => '(string) Limit response to include only terms whose names or slugs match the provided search query.',
+		'order'    => array(
+			'ASC'  => 'Return terms in ascending order.',
+			'DESC' => 'Return terms in descending order.',
+		),
+		'order_by' => array(
+			'name'  => 'Order by the name of each tag.',
+			'count' => 'Order by the number of posts in each tag.',
+		),
+	),
+	'response_format' => array(
+		'found' => '(int) The number of terms returned.',
+		'terms' => '(array) Array of tag objects.',
+	),
+	'example_request'  => 'https://public-api.wordpress.com/rest/v1/sites/en.blog.wordpress.com/taxonomies/post_tags/terms?number=5'
+) );
+
 class WPCOM_JSON_API_List_Terms_Endpoint extends WPCOM_JSON_API_Endpoint {
 	// /sites/%s/taxonomies/%s/terms -> $blog_id, $taxonomy
 	function callback( $path = '', $blog_id = 0, $taxonomy = 'category' ) {
diff --git a/plugins/jetpack/json-endpoints/class.wpcom-json-api-list-users-endpoint.php b/plugins/jetpack/json-endpoints/class.wpcom-json-api-list-users-endpoint.php
index 3b1257a3..489223b7 100644
--- a/plugins/jetpack/json-endpoints/class.wpcom-json-api-list-users-endpoint.php
+++ b/plugins/jetpack/json-endpoints/class.wpcom-json-api-list-users-endpoint.php
@@ -1,4 +1,76 @@
 <?php
+
+new WPCOM_JSON_API_List_Users_Endpoint( array(
+	'description' => 'List the users of a site.',
+	'group'       => 'users',
+	'stat'        => 'users:list',
+
+	'method'      => 'GET',
+	'path'        => '/sites/%s/users',
+	'path_labels' => array(
+		'$site' => '(int|string) Site ID or domain',
+	),
+
+	'query_parameters' => array(
+		'number'   => '(int=20) Limit the total number of authors returned.',
+		'offset'   => '(int=0) The first n authors to be skipped in the returned array.',
+		'order'    => array(
+			'DESC' => 'Return authors in descending order.',
+			'ASC'  => 'Return authors in ascending order.',
+		),
+		'order_by' => array(
+			'ID'            => 'Order by ID (default).',
+			'login'         => 'Order by username.',
+			'nicename'      => "Order by nicename.",
+			'email'         => 'Order by author email address.',
+			'url'           => 'Order by author URL.',
+			'registered'    => 'Order by registered date.',
+			'display_name'  => 'Order by display name.',
+			'post_count'    => 'Order by number of posts published.',
+		),
+		'authors_only'      => '(bool) Set to true to fetch authors only',
+		'type'              => "(string) Specify the post type to query authors for. Only works when combined with the `authors_only` flag. Defaults to 'post'. Post types besides post and page need to be whitelisted using the <code>rest_api_allowed_post_types</code> filter.",
+		'search'            => '(string) Find matching users.',
+		'search_columns'    => "(array) Specify which columns to check for matching users. Can be any of 'ID', 'user_login', 'user_email', 'user_url', 'user_nicename', and 'display_name'. Only works when combined with `search` parameter.",
+		'role'              => '(string) Specify a specific user role to fetch.'
+	),
+
+	'response_format' => array(
+		'found'    => '(int) The total number of authors found that match the request (ignoring limits and offsets).',
+		'authors'  => '(array:author) Array of author objects.',
+	),
+
+	'example_response' => '{
+		"found": 1,
+		"users": [
+			{
+				"ID": 78972699,
+				"login": "apiexamples",
+				"email": "justin+apiexamples@a8c.com",
+				"name": "apiexamples",
+				"first_name": "",
+				"last_name": "",
+				"nice_name": "apiexamples",
+				"URL": "http://apiexamples.wordpress.com",
+				"avatar_URL": "https://1.gravatar.com/avatar/a2afb7b6c0e23e5d363d8612fb1bd5ad?s=96&d=identicon&r=G",
+				"profile_URL": "https://en.gravatar.com/apiexamples",
+				"site_ID": 82974409,
+				"roles": [
+					"administrator"
+				],
+				"is_super_admin": false
+			}
+		]
+	}',
+
+	'example_request'      => 'https://public-api.wordpress.com/rest/v1/sites/82974409/users',
+	'example_request_data' => array(
+		'headers' => array(
+			'authorization' => 'Bearer YOUR_API_TOKEN'
+		),
+	)
+) );
+
 class WPCOM_JSON_API_List_Users_Endpoint extends WPCOM_JSON_API_Endpoint {
 
 	var $response_format = array(
diff --git a/plugins/jetpack/json-endpoints/class.wpcom-json-api-menus-v1-1-endpoint.php b/plugins/jetpack/json-endpoints/class.wpcom-json-api-menus-v1-1-endpoint.php
index 066d8ef4..be02c6c1 100644
--- a/plugins/jetpack/json-endpoints/class.wpcom-json-api-menus-v1-1-endpoint.php
+++ b/plugins/jetpack/json-endpoints/class.wpcom-json-api-menus-v1-1-endpoint.php
@@ -467,6 +467,30 @@ class WPCOM_JSON_API_Menus_Complexify extends WPCOM_JSON_API_Menus_Translator {
 
 }
 
+new WPCOM_JSON_API_Menus_New_Menu_Endpoint( array (
+	'method' => 'POST',
+	'description' => 'Create a new navigation menu.',
+	'group' => 'menus',
+	'stat' => 'menus:new-menu',
+	'path' => '/sites/%s/menus/new',
+	'path_labels' => array(
+		'$site' => '(int|string) Site ID or domain',
+	),
+	'request_format'  => array(
+		'name' => '(string) Name of menu',
+	),
+	'response_format' => array(
+		'id' => '(int) Newly created menu ID',
+	),
+	'example_request' => 'https://public-api.wordpress.com/rest/v1.1/sites/82974409/menus/new',
+	'example_request_data' => array(
+		'headers' => array( 'authorization' => 'Bearer YOUR_API_TOKEN' ),
+		'body' => array(
+			'name' => 'Menu 1'
+		)
+	),
+) );
+
 class WPCOM_JSON_API_Menus_New_Menu_Endpoint extends WPCOM_JSON_API_Menus_Abstract_Endpoint {
 	function callback( $path = '', $site = 0 ) {
 		$site_id = $this->switch_to_blog_and_validate_user( $this->api->get_blog_id( $site ) );
@@ -487,6 +511,36 @@ class WPCOM_JSON_API_Menus_New_Menu_Endpoint extends WPCOM_JSON_API_Menus_Abstra
 	}
 }
 
+new WPCOM_JSON_API_Menus_Update_Menu_Endpoint( array (
+	'method' => 'POST',
+	'description' => 'Update a navigation menu.',
+	'group' => 'menus',
+	'stat' => 'menus:update-menu',
+	'path' => '/sites/%s/menus/%d',
+	'path_labels' => array(
+		'$site' => '(int|string) Site ID or domain',
+		'$menu_id' => '(int) Menu ID',
+	),
+	'request_format'  => array(
+		'name'  => '(string) Name of menu',
+		'items' => '(array) A list of menu item objects.
+			<br/><br/>
+			Item objects contain fields relating to that item, e.g. id, type, content_id,
+			but they can also contain other items objects - this nesting represents parents
+			and child items in the item tree.'
+	),
+	'response_format' => array(
+		'menu' => '(object) Updated menu object',
+	),
+	'example_request' => 'https://public-api.wordpress.com/rest/v1.1/sites/82974409/menus/510604099',
+	'example_request_data' => array(
+		'headers' => array( 'authorization' => 'Bearer YOUR_API_TOKEN' ),
+		'body' => array(
+			'name' => 'Test Menu'
+		),
+	),
+) );
+
 class WPCOM_JSON_API_Menus_Update_Menu_Endpoint extends WPCOM_JSON_API_Menus_Abstract_Endpoint {
 	function callback( $path = '', $site = 0, $menu_id = 0 ) {
 		$site_id = $this->switch_to_blog_and_validate_user( $this->api->get_blog_id( $site ) );
@@ -598,6 +652,31 @@ class WPCOM_JSON_API_Menus_Update_Menu_Endpoint extends WPCOM_JSON_API_Menus_Abs
 	}
 }
 
+new WPCOM_JSON_API_Menus_List_Menus_Endpoint( array (
+	'method'=> 'GET',
+	'description' => 'Get a list of all navigation menus.',
+	'group' => 'menus',
+	'stat' => 'menus:list-menu',
+	'path' => '/sites/%s/menus',
+	'path_labels' => array(
+		'$site' => '(int|string) Site ID or domain',
+	),
+	'response_format' => array(
+		'menus' => '(array) A list of menu objects.<br/><br/>
+			A menu object contains a name, items, locations, etc.
+			Check the example response for the full structure.
+			<br/><br/>
+			Item objects contain fields relating to that item, e.g. id, type, content_id,
+			but they can also contain other items objects - this nesting represents parents
+			and child items in the item tree.',
+		'locations' => '(array) Locations where menus can be placed. List of objects, one per location.'
+	),
+	'example_request' => 'https://public-api.wordpress.com/rest/v1.1/sites/82974409/menus',
+	'example_request_data' => array(
+		'headers' => array( 'authorization' => 'Bearer YOUR_API_TOKEN' ),
+	),
+) );
+
 class WPCOM_JSON_API_Menus_List_Menus_Endpoint extends WPCOM_JSON_API_Menus_Abstract_Endpoint {
 	function callback( $path = '', $site = 0 ) {
 		$site_id = $this->switch_to_blog_and_validate_user( $this->api->get_blog_id( $site ) );
@@ -630,6 +709,31 @@ class WPCOM_JSON_API_Menus_List_Menus_Endpoint extends WPCOM_JSON_API_Menus_Abst
 	}
 }
 
+new WPCOM_JSON_API_Menus_Get_Menu_Endpoint( array (
+	'method'=> 'GET',
+	'description' => 'Get a single navigation menu.',
+	'group' => 'menus',
+	'stat' => 'menus:get-menu',
+	'path' => '/sites/%s/menus/%d',
+	'path_labels' => array(
+		'$site' => '(int|string) Site ID or domain',
+		'$menu_id' => '(int) Menu ID',
+	),
+	'response_format' => array(
+		'menu' => '(object) A menu object.<br/><br/>
+			A menu object contains a name, items, locations, etc.
+			Check the example response for the full structure.
+			<br/><br/>
+			Item objects contain fields relating to that item, e.g. id, type, content_id,
+			but they can also contain other items objects - this nesting represents parents
+			and child items in the item tree.'
+	),
+	'example_request' => 'https://public-api.wordpress.com/rest/v1.1/sites/82974409/menus/510604099',
+	'example_request_data' => array(
+		'headers' => array( 'authorization' => 'Bearer YOUR_API_TOKEN' ),
+	),
+) );
+
 class WPCOM_JSON_API_Menus_Get_Menu_Endpoint extends WPCOM_JSON_API_Menus_Abstract_Endpoint {
 	function callback( $path = '', $site = 0, $menu_id = 0 ) {
 		$site_id = $this->switch_to_blog_and_validate_user( $this->api->get_blog_id( $site ) );
@@ -660,6 +764,25 @@ class WPCOM_JSON_API_Menus_Get_Menu_Endpoint extends WPCOM_JSON_API_Menus_Abstra
 	}
 }
 
+new WPCOM_JSON_API_Menus_Delete_Menu_Endpoint( array (
+	'method' => 'POST',
+	'description' => 'Delete a navigation menu',
+	'group' => 'menus',
+	'stat' => 'menus:delete-menu',
+	'path' => '/sites/%s/menus/%d/delete',
+	'path_labels' => array(
+		'$site' => '(int|string) Site ID or domain',
+		'$menu_id' => '(int) Menu ID',
+	),
+	'response_format' => array(
+		'deleted' => '(bool) Has the menu been deleted?',
+	),
+	'example_request' => 'https://public-api.wordpress.com/rest/v1.1/sites/82974409/menus/$menu_id/delete',
+	'example_request_data' => array(
+		'headers' => array( 'authorization' => 'Bearer YOUR_API_TOKEN' ),
+	),
+) );
+
 class WPCOM_JSON_API_Menus_Delete_Menu_Endpoint extends WPCOM_JSON_API_Menus_Abstract_Endpoint {
 	function callback( $path = '', $site = 0, $menu_id = 0 ) {
 		$site_id = $this->switch_to_blog_and_validate_user( $this->api->get_blog_id( $site ) );
diff --git a/plugins/jetpack/json-endpoints/class.wpcom-json-api-post-endpoint.php b/plugins/jetpack/json-endpoints/class.wpcom-json-api-post-endpoint.php
index 14472ab9..09d3f50c 100644
--- a/plugins/jetpack/json-endpoints/class.wpcom-json-api-post-endpoint.php
+++ b/plugins/jetpack/json-endpoints/class.wpcom-json-api-post-endpoint.php
@@ -46,8 +46,8 @@ abstract class WPCOM_JSON_API_Post_Endpoint extends WPCOM_JSON_API_Endpoint {
 		'publicize_URLs' => '(array:URL) Array of Twitter and Facebook URLs published by this post.',
 		'tags'           => '(object:tag) Hash of tags (keyed by tag name) applied to the post.',
 		'categories'     => '(object:category) Hash of categories (keyed by category name) applied to the post.',
-		'attachments'	 => '(object:attachment) Hash of post attachments (keyed by attachment ID).',
-		'metadata'	     => '(array) Array of post metadata keys and values. All unprotected meta keys are available by default for read requests. Both unprotected and protected meta keys are available for authenticated requests with access. Protected meta keys can be made available with the <code>rest_api_allowed_public_metadata</code> filter.',
+		'attachments'    => '(object:attachment) Hash of post attachments (keyed by attachment ID).',
+		'metadata'       => '(array) Array of post metadata keys and values. All unprotected meta keys are available by default for read requests. Both unprotected and protected meta keys are available for authenticated requests with access. Protected meta keys can be made available with the <code>rest_api_allowed_public_metadata</code> filter.',
 		'meta'           => '(object) API result meta data',
 		'current_user_can' => '(object) List of permissions. Note, deprecated in favor of `capabilities`',
 		'capabilities'   => '(object) List of post-specific permissions for the user; publish_post, edit_post, delete_post',
@@ -588,7 +588,7 @@ abstract class WPCOM_JSON_API_Post_Endpoint extends WPCOM_JSON_API_Endpoint {
 	 *
 	 * @param $attachment attachment row
 	 *
-	 * @return (object)
+	 * @return object
 	 */
 	function get_attachment( $attachment ) {
 		$metadata = wp_get_attachment_metadata( $attachment->ID );
diff --git a/plugins/jetpack/json-endpoints/class.wpcom-json-api-post-v1-1-endpoint.php b/plugins/jetpack/json-endpoints/class.wpcom-json-api-post-v1-1-endpoint.php
index 3df7bff8..418cfb16 100644
--- a/plugins/jetpack/json-endpoints/class.wpcom-json-api-post-v1-1-endpoint.php
+++ b/plugins/jetpack/json-endpoints/class.wpcom-json-api-post-v1-1-endpoint.php
@@ -4,7 +4,7 @@ abstract class WPCOM_JSON_API_Post_v1_1_Endpoint extends WPCOM_JSON_API_Endpoint
 	public $post_object_format = array(
 		// explicitly document and cast all output
 		'ID'                => '(int) The post ID.',
-		'site_ID'		    => '(int) The site ID.',
+		'site_ID'           => '(int) The site ID.',
 		'author'            => '(object>author) The author of the post.',
 		'date'              => "(ISO 8601 datetime) The post's creation time.",
 		'modified'          => "(ISO 8601 datetime) The post's most recent update time.",
@@ -46,9 +46,9 @@ abstract class WPCOM_JSON_API_Post_v1_1_Endpoint extends WPCOM_JSON_API_Endpoint
 		'terms'             => '(object) Hash of taxonomy names mapping to a hash of terms keyed by term name.',
 		'tags'              => '(object:tag) Hash of tags (keyed by tag name) applied to the post.',
 		'categories'        => '(object:category) Hash of categories (keyed by category name) applied to the post.',
-		'attachments'	    => '(object:attachment) Hash of post attachments (keyed by attachment ID). Returns the most recent 20 attachments. Use the `/sites/$site/media` endpoint to query the attachments beyond the default of 20 that are returned here.',
+		'attachments'       => '(object:attachment) Hash of post attachments (keyed by attachment ID). Returns the most recent 20 attachments. Use the `/sites/$site/media` endpoint to query the attachments beyond the default of 20 that are returned here.',
 		'attachment_count'  => '(int) The total number of attachments for this post. Use the `/sites/$site/media` endpoint to query the attachments beyond the default of 20 that are returned here.',
-		'metadata'	        => '(array) Array of post metadata keys and values. All unprotected meta keys are available by default for read requests. Both unprotected and protected meta keys are available for authenticated requests with access. Protected meta keys can be made available with the <code>rest_api_allowed_public_metadata</code> filter.',
+		'metadata'          => '(array) Array of post metadata keys and values. All unprotected meta keys are available by default for read requests. Both unprotected and protected meta keys are available for authenticated requests with access. Protected meta keys can be made available with the <code>rest_api_allowed_public_metadata</code> filter.',
 		'meta'              => '(object) API result meta data',
 		'capabilities'      => '(object) List of post-specific permissions for the user; publish_post, edit_post, delete_post',
 		'revisions'         => '(array) List of post revision IDs. Only available for posts retrieved with context=edit.',
@@ -103,7 +103,7 @@ abstract class WPCOM_JSON_API_Post_v1_1_Endpoint extends WPCOM_JSON_API_Endpoint
 
 		if ( is_wp_error( $post ) ) {
 			return $post;
-		} 
+		}
 
 		$GLOBALS['post'] = $post;
 
diff --git a/plugins/jetpack/json-endpoints/class.wpcom-json-api-render-embed-endpoint.php b/plugins/jetpack/json-endpoints/class.wpcom-json-api-render-embed-endpoint.php
index 30c90e46..5320978c 100644
--- a/plugins/jetpack/json-endpoints/class.wpcom-json-api-render-embed-endpoint.php
+++ b/plugins/jetpack/json-endpoints/class.wpcom-json-api-render-embed-endpoint.php
@@ -1,4 +1,29 @@
 <?php
+
+new WPCOM_JSON_API_Render_Embed_Endpoint( array(
+	'description' => "Get a rendered embed for a site. Note: The current user must have publishing access.",
+	'group'       => 'sites',
+	'stat'        => 'embeds:render',
+	'method'      => 'GET',
+	'path'        => '/sites/%s/embeds/render',
+	'path_labels' => array(
+		'$site'    => '(int|string) Site ID or domain',
+	),
+	'query_parameters' => array(
+		'embed_url'     => '(string) The query-string encoded embed URL to render. Required. Only accepts one at a time.',
+	),
+	'response_format' => array(
+		'embed_url' => '(string) The embed_url that was passed in for rendering.',
+		'result'    => '(html) The rendered HTML result of the embed.',
+	),
+	'example_request' => 'https://public-api.wordpress.com/rest/v1/sites/apiexamples.wordpress.com/embeds/render?embed_url=https%3A%2F%2Fwww.youtube.com%2Fwatch%3Fv%3DSQEQr7c0-dw',
+	'example_request_data' => array(
+		'headers' => array(
+			'authorization' => 'Bearer YOUR_API_TOKEN'
+		),
+	)
+) );
+
 class WPCOM_JSON_API_Render_Embed_Endpoint extends WPCOM_JSON_API_Render_Endpoint {
 	// /sites/%s/embeds/render -> $blog_id
 	function callback( $path = '', $blog_id = 0 ) {
diff --git a/plugins/jetpack/json-endpoints/class.wpcom-json-api-render-embed-reversal-endpoint.php b/plugins/jetpack/json-endpoints/class.wpcom-json-api-render-embed-reversal-endpoint.php
index 04dd694a..32af88da 100644
--- a/plugins/jetpack/json-endpoints/class.wpcom-json-api-render-embed-reversal-endpoint.php
+++ b/plugins/jetpack/json-endpoints/class.wpcom-json-api-render-embed-reversal-endpoint.php
@@ -1,4 +1,38 @@
 <?php
+
+new WPCOM_JSON_API_Render_Embed_Reversal_Endpoint( array(
+	'description' => "Determines if the given embed code can be reversed into a single line embed or a shortcode, and if so returns the embed or shortcode. Note: The current user must have publishing access.",
+	//'group'       => 'sites',
+	'group'       => '__do_not_document',
+	'stat'        => 'embeds:reversal',
+	'method'      => 'POST',
+	'path'        => '/sites/%s/embeds/reversal',
+	'path_labels' => array(
+		'$site'    => '(int|string) Site ID or domain',
+	),
+	'request_format' => array(
+		'maybe_embed' => '(string) The embed code to reverse. Required. Only accepts one at a time.',
+	),
+	'response_format' => array(
+		'maybe_embed' => '(string) The original embed code that was passed in for rendering.',
+		'reversal_type' => '(string) The type of reversal. Either an embed or a shortcode.',
+		'render_result' => '(html) The rendered HTML result of the embed or shortcode.',
+		'result' => '(string) The reversed content. Either a single line embed or a shortcode.',
+		'scripts'   => '(array) An array of JavaScript files needed to render the embed or shortcode. Returned in the format of <code>{ "script-slug" : { "src": "http://example.com/file.js", "extra" : "" } }</code> where extra contains any neccessary extra JS for initializing the source file and src contains the script to load. Omitted if no scripts are neccessary.',
+		'styles'    => '(array) An array of CSS files needed to render the embed or shortcode. Returned in the format of <code>{ "style-slug" : { "src": "http://example.com/file.css", "media" : "all" } }</code>. Omitted if no styles are neccessary.',
+	),
+	'example_request'      => 'https://public-api.wordpress.com/rest/v1/sites/82974409/shortcode-reversals/render/',
+	'example_request_data' => array(
+		'headers' => array(
+			'authorization' => 'Bearer YOUR_API_TOKEN'
+		),
+
+		'body' => array(
+			'maybe_embed' => '<iframe width="480" height="302" src="http://www.ustream.tv/embed/recorded/26370522/highlight/299667?v=3&amp;wmode=direct" scrolling="no" frameborder="0"></iframe>',
+		)
+	),
+) );
+
 class WPCOM_JSON_API_Render_Embed_Reversal_Endpoint extends WPCOM_JSON_API_Render_Endpoint {
 	// /sites/%s/embeds/reversal -> $blog_id
 	function callback( $path = '', $blog_id = 0 ) {
diff --git a/plugins/jetpack/json-endpoints/class.wpcom-json-api-render-shortcode-endpoint.php b/plugins/jetpack/json-endpoints/class.wpcom-json-api-render-shortcode-endpoint.php
index 8b52cfde..395fc7ac 100644
--- a/plugins/jetpack/json-endpoints/class.wpcom-json-api-render-shortcode-endpoint.php
+++ b/plugins/jetpack/json-endpoints/class.wpcom-json-api-render-shortcode-endpoint.php
@@ -1,4 +1,31 @@
 <?php
+
+new WPCOM_JSON_API_Render_Shortcode_Endpoint( array(
+	'description' => "Get a rendered shortcode for a site. Note: The current user must have publishing access.",
+	'group'       => 'sites',
+	'stat'        => 'shortcodes:render',
+	'method'      => 'GET',
+	'path'        => '/sites/%s/shortcodes/render',
+	'path_labels' => array(
+		'$site'    => '(int|string) Site ID or domain',
+	),
+	'query_parameters' => array(
+		'shortcode'     => '(string) The query-string encoded shortcode string to render. Required. Only accepts one at a time.',
+	),
+	'response_format' => array(
+		'shortcode' => '(string) The shortcode that was passed in for rendering.',
+		'result'    => '(html) The rendered HTML result of the shortcode.',
+		'scripts'   => '(array) An array of JavaScript files needed to render the shortcode. Returned in the format of <code>{ "script-slug" : { "src": "http://example.com/file.js", "extra" : "" } }</code> where extra contains any neccessary extra JS for initializing the source file and src contains the script to load. Omitted if no scripts are neccessary.',
+		'styles'    => '(array) An array of CSS files needed to render the shortcode. Returned in the format of <code>{ "style-slug" : { "src": "http://example.com/file.css", "media" : "all" } }</code>. Omitted if no styles are neccessary.',
+	),
+	'example_request' => 'https://public-api.wordpress.com/rest/v1/sites/82974409/shortcodes/render?shortcode=%5Bgallery%20ids%3D%22729%2C732%2C731%2C720%22%5D',
+	'example_request_data' => array(
+		'headers' => array(
+			'authorization' => 'Bearer YOUR_API_TOKEN'
+		),
+	)
+) );
+
 class WPCOM_JSON_API_Render_Shortcode_Endpoint extends WPCOM_JSON_API_Render_Endpoint {
 	// /sites/%s/shortcodes/render -> $blog_id
 	function callback( $path = '', $blog_id = 0 ) {
diff --git a/plugins/jetpack/json-endpoints/class.wpcom-json-api-sharing-buttons-endpoint.php b/plugins/jetpack/json-endpoints/class.wpcom-json-api-sharing-buttons-endpoint.php
index ff3ada51..53150df6 100644
--- a/plugins/jetpack/json-endpoints/class.wpcom-json-api-sharing-buttons-endpoint.php
+++ b/plugins/jetpack/json-endpoints/class.wpcom-json-api-sharing-buttons-endpoint.php
@@ -156,6 +156,53 @@ abstract class WPCOM_JSON_API_Sharing_Button_Endpoint extends WPCOM_JSON_API_End
 
 }
 
+new WPCOM_JSON_API_Get_Sharing_Buttons_Endpoint( array(
+	'description' => 'Get a list of a site\'s sharing buttons.',
+	'group'       => 'sharing',
+	'stat'        => 'sharing-buttons',
+	'method'      => 'GET',
+	'path'        => '/sites/%s/sharing-buttons/',
+	'path_labels' => array(
+		'$site' => '(int|string) Site ID or domain',
+	),
+	'query_parameters' => array(
+		'enabled_only' => '(bool) If true, only enabled sharing buttons are included in the response',
+		'visibility'   => '(string) The type of enabled sharing buttons to filter by, either "visible" or "hidden"',
+	),
+	'response_format' => array(
+		'found'           => '(int) The total number of sharing buttons found that match the request.',
+		'sharing_buttons' => '(array:object) Array of sharing button objects',
+	),
+	'example_request'      => 'https://public-api.wordpress.com/rest/v1/sites/30434183/sharing-buttons/',
+	'example_request_data' => array(
+		'headers' => array( 'authorization' => 'Bearer YOUR_API_TOKEN' ),
+	),
+	'example_response' => '
+{
+    "found": 2,
+    "sharing_buttons": [
+        {
+            "ID": "twitter",
+            "name": "Twitter",
+            "shortname": "twitter",
+            "custom": false,
+            "enabled": true,
+            "visibility": "visible",
+            "genericon": "\\f202"
+        },
+        {
+            "ID": "facebook",
+            "name": "Facebook",
+            "shortname": "facebook",
+            "custom": false,
+            "enabled": true,
+            "visibility": "visible",
+            "genericon": "\\f203"
+        }
+    ]
+}'
+) );
+
 class WPCOM_JSON_API_Get_Sharing_Buttons_Endpoint extends WPCOM_JSON_API_Sharing_Button_Endpoint {
 
 	// GET /sites/%s/sharing-buttons -> $blog_id
@@ -213,6 +260,42 @@ class WPCOM_JSON_API_Get_Sharing_Buttons_Endpoint extends WPCOM_JSON_API_Sharing
 	}
 }
 
+new WPCOM_JSON_API_Get_Sharing_Button_Endpoint( array(
+	'description' => 'Get information about a single sharing button.',
+	'group'       => '__do_not_document',
+	'stat'        => 'sharing-buttons:1',
+	'method'      => 'GET',
+	'path'        => '/sites/%s/sharing-buttons/%s',
+	'path_labels' => array(
+		'$site'      => '(int|string) Site ID or domain',
+		'$button_id' => '(string) The button ID',
+	),
+	'response_format' => array(
+		'ID'           => '(int) Sharing button ID',
+		'name'         => '(string) Sharing button name, used as a label on the button itself',
+		'shortname'    => '(string) A generated short name for the sharing button',
+		'URL'          => '(string) The URL pattern defined for a custom sharing button',
+		'icon'         => '(string) URL to the 16x16 icon defined for a custom sharing button',
+		'genericon'    => '(string) Icon character in Genericons icon set',
+		'custom'       => '(bool) Is the button a user-created custom sharing button?',
+		'enabled'      => '(bool) Is the button currently enabled for the site?',
+		'visibility'   => '(string) If enabled, the current visibility of the sharing button, either "visible" or "hidden"',
+	),
+	'example_request' => 'https://public-api.wordpress.com/rest/v1/sites/30434183/sharing-buttons/facebook',
+	'example_request_data' => array(
+		'headers' => array( 'authorization' => 'Bearer YOUR_API_TOKEN' ),
+	),
+	'example_response' => '{
+	"ID": "facebook",
+	"name": "Facebook",
+	"shortname": "facebook",
+	"custom": false,
+	"enabled": true,
+	"visibility": "visible",
+	"genericon": "\\f203"
+}'
+) );
+
 class WPCOM_JSON_API_Get_Sharing_Button_Endpoint extends WPCOM_JSON_API_Sharing_Button_Endpoint {
 
 	// GET /sites/%s/sharing-buttons/%s -> $blog_id, $button_id
@@ -239,6 +322,52 @@ class WPCOM_JSON_API_Get_Sharing_Button_Endpoint extends WPCOM_JSON_API_Sharing_
 
 }
 
+new WPCOM_JSON_API_Update_Sharing_Buttons_Endpoint( array(
+	'description' => 'Edit all sharing buttons for a site.',
+	'group'       => 'sharing',
+	'stat'        => 'sharing-buttons:X:POST',
+	'method'      => 'POST',
+	'path'        => '/sites/%s/sharing-buttons',
+	'path_labels' => array(
+		'$site'      => '(int|string) Site ID or domain',
+	),
+	'request_format' => array(
+		'sharing_buttons' => '(array:sharing_button) An array of sharing button objects',
+	),
+	'response_format' => array(
+		'success' => '(bool) Confirmation that all sharing buttons were updated as specified',
+		'updated' => '(array) An array of updated sharing buttons',
+	),
+	'example_request' => 'https://public-api.wordpress.com/rest/v1/sites/30434183/sharing-buttons',
+	'example_request_data' => array(
+		'headers' => array(
+			'authorization' => 'Bearer YOUR_API_TOKEN',
+		),
+		'body' => array(
+			'sharing_buttons' => array(
+				array(
+					'ID'         => 'facebook',
+					'visibility' => 'hidden',
+				)
+			)
+		)
+	),
+	'example_response' => '{
+	"success": true,
+	"updated": [
+		{
+			"ID": "facebook",
+			"name": "Facebook",
+			"shortname": "facebook",
+			"custom": false,
+			"enabled": true,
+			"visibility": "hidden",
+			"genericon": "\\f204"
+		}
+	]
+}'
+) );
+
 class WPCOM_JSON_API_Update_Sharing_Buttons_Endpoint extends WPCOM_JSON_API_Sharing_Button_Endpoint {
 
 	// POST /sites/%s/sharing-buttons -> $blog_id
@@ -312,6 +441,106 @@ class WPCOM_JSON_API_Update_Sharing_Buttons_Endpoint extends WPCOM_JSON_API_Shar
 
 }
 
+new WPCOM_JSON_API_Update_Sharing_Button_Endpoint( array(
+	'description' => 'Create a new custom sharing button.',
+	'group'       => '__do_not_document',
+	'stat'        => 'sharing-buttons:new',
+	'method'      => 'POST',
+	'path'        => '/sites/%s/sharing-buttons/new',
+	'path_labels' => array(
+		'$site' => '(int|string) Site ID or domain',
+	),
+	'request_format' => array(
+		'name'       => '(string) The name for your custom sharing button, used as a label on the button itself',
+		'URL'        => '(string) The URL to use for share links, including optional placeholders (%post_id%, %post_title%, %post_slug%, %post_url%, %post_full_url%, %post_excerpt%, %post_tags%, %home_url%)',
+		'icon'       => '(string) The full URL to a 16x16 icon to display on the sharing button',
+		'enabled'    => '(bool) Is the button currently enabled for the site?',
+		'visibility' => '(string) If enabled, the visibility of the sharing button, either "visible" (default) or "hidden"',
+	),
+	'response_format' => array(
+		'ID'           => '(string) Sharing button ID',
+		'name'         => '(string) Sharing button name, used as a label on the button itself',
+		'shortname'    => '(string) A generated short name for the sharing button',
+		'URL'          => '(string) The URL pattern defined for a custom sharing button',
+		'icon'         => '(string) URL to the 16x16 icon defined for a custom sharing button',
+		'genericon'    => '(string) Icon character in Genericons icon set',
+		'custom'       => '(bool) Is the button a user-created custom sharing button?',
+		'enabled'      => '(bool) Is the button currently enabled for the site?',
+		'visibility'   => '(string) If enabled, the current visibility of the sharing button, either "visible" or "hidden"',
+	),
+	'example_request' => 'https://public-api.wordpress.com/rest/v1/sites/30434183/sharing-buttons/new/',
+	'example_request_data' => array(
+		'headers' => array(
+			'authorization' => 'Bearer YOUR_API_TOKEN'
+		),
+		'body' => array(
+			'name'       => 'Custom',
+			'URL'        => 'https://www.wordpress.com/%post_name%',
+			'icon'       => 'https://en.wordpress.com/i/stats-icon.gif',
+			'enabled'    => true,
+			'visibility' => 'visible'
+		)
+	),
+	'example_response' => '{
+	"ID": "custom-123456789",
+	"name": "Custom",
+	"shortname": "custom",
+	"url": "https://www.wordpress.com/%post_name%",
+	"icon": "https://en.wordpress.com/i/stats-icon.gif",
+	"custom": true,
+	"enabled": true,
+	"visibility": "visible"
+}'
+) );
+
+new WPCOM_JSON_API_Update_Sharing_Button_Endpoint( array(
+	'description' => 'Edit a sharing button.',
+	'group'       => '__do_not_document',
+	'stat'        => 'sharing-buttons:1:POST',
+	'method'      => 'POST',
+	'path'        => '/sites/%s/sharing-buttons/%s',
+	'path_labels' => array(
+		'$site'      => '(int|string) Site ID or domain',
+		'$button_id' => '(string) The button ID',
+	),
+	'request_format' => array(
+		'name'       => '(string) Only if a custom sharing button, a new name used as a label on the button itself',
+		'URL'        => '(string) Only if a custom sharing button, the URL to use for share links, including optional placeholders (%post_title%, %post_url%, %post_full_url%, %post_excerpt%, %post_tags%)',
+		'icon'       => '(string) Only if a custom sharing button, the full URL to a 16x16 icon to display on the sharing button',
+		'enabled'    => '(bool) Is the button currently enabled for the site?',
+		'visibility' => '(string) If enabled, the visibility of the sharing button, either "visible" (default) or "hidden"',
+	),
+	'response_format' => array(
+		'ID'           => '(string) Sharing button ID',
+		'name'         => '(string) Sharing button name, used as a label on the button itself',
+		'shortname'    => '(string) A generated short name for the sharing button',
+		'URL'          => '(string) The URL pattern defined for a custom sharing button',
+		'icon'         => '(string) URL to the 16x16 icon defined for a custom sharing button',
+		'genericon'    => '(string) Icon character in Genericons icon set',
+		'custom'       => '(bool) Is the button a user-created custom sharing button?',
+		'enabled'      => '(bool) Is the button currently enabled for the site?',
+		'visibility'   => '(string) If enabled, the current visibility of the sharing button, either "visible" or "hidden"',
+	),
+	'example_request' => 'https://public-api.wordpress.com/rest/v1/sites/30434183/sharing-buttons/custom-123456789/',
+	'example_request_data' => array(
+		'headers' => array(
+			'authorization' => 'Bearer YOUR_API_TOKEN'
+		),
+		'body' => array(
+			'enabled' => false,
+		)
+	),
+	'example_response' => '{
+	"ID": "custom-123456789",
+	"name": "Custom",
+	"shortname": "custom",
+	"custom": true,
+	"enabled": false,
+	"icon": "https://en.wordpress.com/i/stats-icon.gif",
+	"url": "https://www.wordpress.com/%post_name%"
+}'
+) );
+
 class WPCOM_JSON_API_Update_Sharing_Button_Endpoint extends WPCOM_JSON_API_Sharing_Button_Endpoint {
 
 	// POST /sites/%s/sharing-buttons/new -> $blog_id
@@ -354,6 +583,30 @@ class WPCOM_JSON_API_Update_Sharing_Button_Endpoint extends WPCOM_JSON_API_Shari
 
 }
 
+new WPCOM_JSON_API_Delete_Sharing_Button_Endpoint( array(
+	'description' => 'Delete a custom sharing button.',
+	'group'		  => '__do_not_document',
+	'stat'		  => 'sharing-buttons:1:delete',
+	'method'	  => 'POST',
+	'path'        => '/sites/%s/sharing-buttons/%s/delete',
+	'path_labels' => array(
+		'$site'      => '(int|string) Site ID or domain',
+		'$button_id' => '(string) The button ID',
+	),
+	'response_format' => array(
+		'ID'      => '(int) The ID of the deleted sharing button',
+		'success' => '(bool) Confirmation that the sharing button has been removed'
+	),
+	'example_request' => 'https://public-api.wordpress.com/rest/v1/sites/30434183/sharing-buttons/custom-123456789/delete',
+	'example_request_data' => array(
+		'headers' => array( 'authorization' => 'Bearer YOUR_API_TOKEN' ),
+	),
+	'example_response' => '{
+	"ID": "custom-123456789",
+	"success": "true"
+}'
+) );
+
 class WPCOM_JSON_API_Delete_Sharing_Button_Endpoint extends WPCOM_JSON_API_Sharing_Button_Endpoint {
 
 	// POST /sites/%s/sharing-buttons/%s/delete -> $blog_id, $button_id
diff --git a/plugins/jetpack/json-endpoints/class.wpcom-json-api-site-settings-endpoint.php b/plugins/jetpack/json-endpoints/class.wpcom-json-api-site-settings-endpoint.php
index afeb0781..2ff3264c 100644
--- a/plugins/jetpack/json-endpoints/class.wpcom-json-api-site-settings-endpoint.php
+++ b/plugins/jetpack/json-endpoints/class.wpcom-json-api-site-settings-endpoint.php
@@ -1,12 +1,121 @@
 <?php
 
+new WPCOM_JSON_API_Site_Settings_Endpoint( array(
+	'description' => 'Get detailed settings information about a site.',
+	'group'       => '__do_not_document',
+	'stat'        => 'sites:X',
+	'max_version'   => '1.1',
+	'new_version' => '1.2',
+	'method'      => 'GET',
+	'path'        => '/sites/%s/settings',
+	'path_labels' => array(
+		'$site' => '(int|string) Site ID or domain',
+	),
+
+	'query_parameters' => array(
+		'context' => false,
+	),
+
+	'response_format' => WPCOM_JSON_API_Site_Settings_Endpoint::$site_format,
+
+	'example_request' => 'https://public-api.wordpress.com/rest/v1/sites/en.blog.wordpress.com/settings',
+) );
+
+new WPCOM_JSON_API_Site_Settings_Endpoint( array(
+	'description' => 'Update settings for a site.',
+	'group'       => '__do_not_document',
+	'stat'        => 'sites:X',
+	'max_version' => '1.1',
+	'new_version' => '1.2',
+	'method'      => 'POST',
+	'path'        => '/sites/%s/settings',
+	'path_labels' => array(
+		'$site' => '(int|string) Site ID or domain',
+	),
+
+	'request_format'  => array(
+		'blogname'                     => '(string) Blog name',
+		'blogdescription'              => '(string) Blog description',
+		'default_pingback_flag'        => '(bool) Notify blogs linked from article?',
+		'default_ping_status'          => '(bool) Allow link notifications from other blogs?',
+		'default_comment_status'       => '(bool) Allow comments on new articles?',
+		'blog_public'                  => '(string) Site visibility; -1: private, 0: discourage search engines, 1: allow search engines',
+		'jetpack_sync_non_public_post_stati' => '(bool) allow sync of post and pages with non-public posts stati',
+		'jetpack_relatedposts_enabled' => '(bool) Enable related posts?',
+		'jetpack_relatedposts_show_headline' => '(bool) Show headline in related posts?',
+		'jetpack_relatedposts_show_thumbnails' => '(bool) Show thumbnails in related posts?',
+		'jetpack_protect_whitelist'    => '(array) List of IP addresses to whitelist',
+		'infinite_scroll'              => '(bool) Support infinite scroll of posts?',
+		'default_category'             => '(int) Default post category',
+		'default_post_format'          => '(string) Default post format',
+		'require_name_email'           => '(bool) Require comment authors to fill out name and email?',
+		'comment_registration'         => '(bool) Require users to be registered and logged in to comment?',
+		'close_comments_for_old_posts' => '(bool) Automatically close comments on old posts?',
+		'close_comments_days_old'      => '(int) Age at which to close comments',
+		'thread_comments'              => '(bool) Enable threaded comments?',
+		'thread_comments_depth'        => '(int) Depth to thread comments',
+		'page_comments'                => '(bool) Break comments into pages?',
+		'comments_per_page'            => '(int) Number of comments to display per page',
+		'default_comments_page'        => '(string) newest|oldest Which page of comments to display first',
+		'comment_order'                => '(string) asc|desc Order to display comments within page',
+		'comments_notify'              => '(bool) Email me when someone comments?',
+		'moderation_notify'            => '(bool) Email me when a comment is helf for moderation?',
+		'social_notifications_like'    => '(bool) Email me when someone likes my post?',
+		'social_notifications_reblog'  => '(bool) Email me when someone reblogs my post?',
+		'social_notifications_subscribe' => '(bool) Email me when someone follows my blog?',
+		'comment_moderation'           => '(bool) Moderate comments for manual approval?',
+		'comment_whitelist'            => '(bool) Moderate comments unless author has a previously-approved comment?',
+		'comment_max_links'            => '(int) Moderate comments that contain X or more links',
+		'moderation_keys'              => '(string) Words or phrases that trigger comment moderation, one per line',
+		'blacklist_keys'               => '(string) Words or phrases that mark comment spam, one per line',
+		'lang_id'                      => '(int) ID for language blog is written in',
+		'wga'                          => '(array) Google Analytics Settings',
+		'disabled_likes'               => '(bool) Are likes globally disabled (they can still be turned on per post)?',
+		'disabled_reblogs'             => '(bool) Are reblogs disabled on posts?',
+		'jetpack_comment_likes_enabled' => '(bool) Are comment likes enabled for all comments?',
+		'sharing_button_style'         => '(string) Style to use for sharing buttons (icon-text, icon, text, or official)',
+		'sharing_label'                => '(string) Label to use for sharing buttons, e.g. "Share this:"',
+		'sharing_show'                 => '(string|array:string) Post type or array of types where sharing buttons are to be displayed',
+		'sharing_open_links'           => '(string) Link target for sharing buttons (same or new)',
+		'twitter_via'                  => '(string) Twitter username to include in tweets when people share using the Twitter button',
+		'jetpack-twitter-cards-site-tag' => '(string) The Twitter username of the owner of the site\'s domain.',
+		'eventbrite_api_token'         => '(int) The Keyring token ID for an Eventbrite token to associate with the site',
+		'holidaysnow'                  => '(bool) Enable snowfall on frontend of site?',
+		'timezone_string'              => '(string) PHP-compatible timezone string like \'UTC-5\'',
+		'gmt_offset'                   => '(int) Site offset from UTC in hours',
+		'date_format'                  => '(string) PHP Date-compatible date format',
+		'time_format'                  => '(string) PHP Date-compatible time format',
+		'start_of_week'                => '(int) Starting day of week (0 = Sunday, 6 = Saturday)',
+		'jetpack_testimonial'          => '(bool) Whether testimonial custom post type is enabled for the site',
+		'jetpack_testimonial_posts_per_page' => '(int) Number of testimonials to show per page',
+		'jetpack_portfolio'            => '(bool) Whether portfolio custom post type is enabled for the site',
+		'jetpack_portfolio_posts_per_page' => '(int) Number of portfolio projects to show per page',
+		Jetpack_SEO_Utils::FRONT_PAGE_META_OPTION => '(string) The seo meta description for the site.',
+		Jetpack_SEO_Titles::TITLE_FORMATS_OPTION => '(array) SEO meta title formats. Allowed keys: front_page, posts, pages, groups, archives',
+		'verification_services_codes'  => '(array) Website verification codes. Allowed keys: google, pinterest, bing, yandex',
+		'markdown_supported'            => '(bool) Whether markdown is supported for this site',
+		'wpcom_publish_posts_with_markdown' => '(bool) Whether markdown is enabled for posts',
+		'wpcom_publish_comments_with_markdown' => '(bool) Whether markdown is enabled for comments',
+		'amp_is_enabled'   => '(bool) Whether AMP is enabled for this site',
+		'site_icon'                    => '(int) Media attachment ID to use as site icon. Set to zero or an otherwise empty value to clear',
+		'api_cache'                    => '(bool) Turn on/off the Jetpack JSON API cache',
+		'posts_per_page'               => '(int) Number of posts to show on blog pages',
+	),
+
+	'response_format' => array(
+		'updated' => '(array)'
+	),
+
+	'example_request' => 'https://public-api.wordpress.com/rest/v1/sites/en.blog.wordpress.com/settings',
+) );
+
 class WPCOM_JSON_API_Site_Settings_Endpoint extends WPCOM_JSON_API_Endpoint {
 
 	public static $site_format = array(
- 		'ID'                => '(int) Site ID',
- 		'name'              => '(string) Title of site',
- 		'description'       => '(string) Tagline or description of site',
- 		'URL'               => '(string) Full URL to the site',
+		'ID'                => '(int) Site ID',
+		'name'              => '(string) Title of site',
+		'description'       => '(string) Tagline or description of site',
+		'URL'               => '(string) Full URL to the site',
 		'lang'              => '(string) Primary language code of the site',
 		'locale_variant'    => '(string) Locale variant code for the site, if set',
 		'settings'          => '(array) An array of options/settings for the blog. Only viewable by users with post editing rights to the site.',
@@ -53,7 +162,7 @@ class WPCOM_JSON_API_Site_Settings_Endpoint extends WPCOM_JSON_API_Endpoint {
 	/**
 	 * Determines whether jetpack_relatedposts is supported
 	 *
-	 * @return (bool)
+	 * @return bool
 	 */
 	public function jetpack_relatedposts_supported() {
 		$wpcom_related_posts_theme_blacklist = array(
@@ -68,7 +177,7 @@ class WPCOM_JSON_API_Site_Settings_Endpoint extends WPCOM_JSON_API_Endpoint {
 	/**
 	 * Returns category details
 	 *
-	 * @return (array)
+	 * @return array
 	 */
 	public function get_category_details( $category ) {
 		return array(
@@ -81,9 +190,9 @@ class WPCOM_JSON_API_Site_Settings_Endpoint extends WPCOM_JSON_API_Endpoint {
 	 * Returns an option value as the result of the callable being applied to
 	 * it if a value is set, otherwise null.
 	 *
-	 * @param (string) $option_name Option name
-	 * @param (callable) $cast_callable Callable to invoke on option value
-	 * @return (int|null) Numeric option value or null
+	 * @param string $option_name Option name
+	 * @param callable $cast_callable Callable to invoke on option value
+	 * @return int|null Numeric option value or null
 	 */
 	protected function get_cast_option_value_or_null( $option_name, $cast_callable ) {
 		$option_value = get_option( $option_name, null );
@@ -97,7 +206,7 @@ class WPCOM_JSON_API_Site_Settings_Endpoint extends WPCOM_JSON_API_Endpoint {
 	/**
 	 * Collects the necessary information to return for a get settings response.
 	 *
-	 * @return (array)
+	 * @return array
 	 */
 	public function get_settings_response() {
 
@@ -214,9 +323,7 @@ class WPCOM_JSON_API_Site_Settings_Endpoint extends WPCOM_JSON_API_Endpoint {
 					'lang_id'                 => defined( 'IS_WPCOM' ) && IS_WPCOM
 						? get_lang_id_by_code( wpcom_l10n_get_blog_locale_variant( $blog_id, true ) )
 						: get_option( 'lang_id' ),
-					'wga'                     => defined( 'IS_WPCOM' ) && IS_WPCOM
-						? get_option( 'wga' )
-						: $this->get_google_analytics(),
+					'wga'                     => $this->get_google_analytics(),
 					'disabled_likes'          => (bool) get_option( 'disabled_likes' ),
 					'disabled_reblogs'        => (bool) get_option( 'disabled_reblogs' ),
 					'jetpack_comment_likes_enabled' => (bool) get_option( 'jetpack_comment_likes_enabled', false ),
@@ -303,7 +410,7 @@ class WPCOM_JSON_API_Site_Settings_Endpoint extends WPCOM_JSON_API_Endpoint {
 	/**
 	 * Updates site settings for authorized users
 	 *
-	 * @return (array)
+	 * @return array
 	 */
 	public function update_settings() {
 		// $this->input() retrieves posted arguments whitelisted and casted to the $request_format
diff --git a/plugins/jetpack/json-endpoints/class.wpcom-json-api-site-settings-v1-2-endpoint.php b/plugins/jetpack/json-endpoints/class.wpcom-json-api-site-settings-v1-2-endpoint.php
index 872512b6..3cf42c43 100644
--- a/plugins/jetpack/json-endpoints/class.wpcom-json-api-site-settings-v1-2-endpoint.php
+++ b/plugins/jetpack/json-endpoints/class.wpcom-json-api-site-settings-v1-2-endpoint.php
@@ -1,5 +1,111 @@
 <?php
 
+new WPCOM_JSON_API_Site_Settings_V1_2_Endpoint( array(
+	'description' => 'Get detailed settings information about a site.',
+	'group'       => '__do_not_document',
+	'stat'        => 'sites:X',
+	'min_version'   => '1.2',
+	'method'      => 'GET',
+	'path'        => '/sites/%s/settings',
+	'path_labels' => array(
+		'$site' => '(int|string) Site ID or domain',
+	),
+
+	'query_parameters' => array(
+		'context' => false,
+	),
+
+	'response_format' => WPCOM_JSON_API_Site_Settings_Endpoint::$site_format,
+
+	'example_request' => 'https://public-api.wordpress.com/rest/v1.2/sites/en.blog.wordpress.com/settings?pretty=1',
+) );
+
+new WPCOM_JSON_API_Site_Settings_V1_2_Endpoint( array(
+	'description' => 'Update settings for a site.',
+	'group'       => '__do_not_document',
+	'stat'        => 'sites:X',
+	'min_version'   => '1.2',
+	'method'      => 'POST',
+	'path'        => '/sites/%s/settings',
+	'path_labels' => array(
+		'$site' => '(int|string) Site ID or domain',
+	),
+
+	'request_format'  => array(
+		'blogname'                             => '(string) Blog name',
+		'blogdescription'                      => '(string) Blog description',
+		'default_pingback_flag'                => '(bool) Notify blogs linked from article?',
+		'default_ping_status'                  => '(bool) Allow link notifications from other blogs?',
+		'default_comment_status'               => '(bool) Allow comments on new articles?',
+		'blog_public'                          => '(string) Site visibility; -1: private, 0: discourage search engines, 1: allow search engines',
+		'jetpack_sync_non_public_post_stati'   => '(bool) allow sync of post and pages with non-public posts stati',
+		'jetpack_relatedposts_enabled'         => '(bool) Enable related posts?',
+		'jetpack_relatedposts_show_headline'   => '(bool) Show headline in related posts?',
+		'jetpack_relatedposts_show_thumbnails' => '(bool) Show thumbnails in related posts?',
+		'jetpack_protect_whitelist'            => '(array) List of IP addresses to whitelist',
+		'infinite_scroll'                      => '(bool) Support infinite scroll of posts?',
+		'default_category'                     => '(int) Default post category',
+		'default_post_format'                  => '(string) Default post format',
+		'require_name_email'                   => '(bool) Require comment authors to fill out name and email?',
+		'comment_registration'                 => '(bool) Require users to be registered and logged in to comment?',
+		'close_comments_for_old_posts'         => '(bool) Automatically close comments on old posts?',
+		'close_comments_days_old'              => '(int) Age at which to close comments',
+		'thread_comments'                      => '(bool) Enable threaded comments?',
+		'thread_comments_depth'                => '(int) Depth to thread comments',
+		'page_comments'                        => '(bool) Break comments into pages?',
+		'comments_per_page'                    => '(int) Number of comments to display per page',
+		'default_comments_page'                => '(string) newest|oldest Which page of comments to display first',
+		'comment_order'                        => '(string) asc|desc Order to display comments within page',
+		'comments_notify'                      => '(bool) Email me when someone comments?',
+		'moderation_notify'                    => '(bool) Email me when a comment is helf for moderation?',
+		'social_notifications_like'            => '(bool) Email me when someone likes my post?',
+		'social_notifications_reblog'          => '(bool) Email me when someone reblogs my post?',
+		'social_notifications_subscribe'       => '(bool) Email me when someone follows my blog?',
+		'comment_moderation'                   => '(bool) Moderate comments for manual approval?',
+		'comment_whitelist'                    => '(bool) Moderate comments unless author has a previously-approved comment?',
+		'comment_max_links'                    => '(int) Moderate comments that contain X or more links',
+		'moderation_keys'                      => '(string) Words or phrases that trigger comment moderation, one per line',
+		'blacklist_keys'                       => '(string) Words or phrases that mark comment spam, one per line',
+		'lang_id'                              => '(int) ID for language blog is written in',
+		'locale'                               => '(string) locale code for language blog is written in',
+		'wga'                                  => '(array) Google Analytics Settings',
+		'disabled_likes'                       => '(bool) Are likes globally disabled (they can still be turned on per post)?',
+		'disabled_reblogs'                     => '(bool) Are reblogs disabled on posts?',
+		'jetpack_comment_likes_enabled'        => '(bool) Are comment likes enabled for all comments?',
+		'sharing_button_style'                 => '(string) Style to use for sharing buttons (icon-text, icon, text, or official)',
+		'sharing_label'                        => '(string) Label to use for sharing buttons, e.g. "Share this:"',
+		'sharing_show'                         => '(string|array:string) Post type or array of types where sharing buttons are to be displayed',
+		'sharing_open_links'                   => '(string) Link target for sharing buttons (same or new)',
+		'twitter_via'                          => '(string) Twitter username to include in tweets when people share using the Twitter button',
+		'jetpack-twitter-cards-site-tag'       => '(string) The Twitter username of the owner of the site\'s domain.',
+		'eventbrite_api_token'                 => '(int) The Keyring token ID for an Eventbrite token to associate with the site',
+		'holidaysnow'                          => '(bool) Enable snowfall on front end of site?',
+		'timezone_string'                      => '(string) PHP-compatible timezone string like \'UTC-5\'',
+		'gmt_offset'                           => '(int) Site offset from UTC in hours',
+		'date_format'                          => '(string) PHP Date-compatible date format',
+		'time_format'                          => '(string) PHP Date-compatible time format',
+		'start_of_week'                        => '(int) Starting day of week (0 = Sunday, 6 = Saturday)',
+		'jetpack_testimonial'                  => '(bool) Whether testimonial custom post type is enabled for the site',
+		'jetpack_testimonial_posts_per_page'   => '(int) Number of testimonials to show per page',
+		'jetpack_portfolio'                    => '(bool) Whether portfolio custom post type is enabled for the site',
+		'jetpack_portfolio_posts_per_page'     => '(int) Number of portfolio projects to show per page',
+		Jetpack_SEO_Utils::FRONT_PAGE_META_OPTION => '(string) The SEO meta description for the site.',
+		Jetpack_SEO_Titles::TITLE_FORMATS_OPTION  => '(array) SEO meta title formats. Allowed keys: front_page, posts, pages, groups, archives',
+		'verification_services_codes'          => '(array) Website verification codes. Allowed keys: google, pinterest, bing, yandex',
+		'amp_is_enabled'                       => '(bool) Whether AMP is enabled for this site',
+		'podcasting_archive'                   => '(string) The post category, if any, used for publishing podcasts',
+		'site_icon'                            => '(int) Media attachment ID to use as site icon. Set to zero or an otherwise empty value to clear',
+		'api_cache'                            => '(bool) Turn on/off the Jetpack JSON API cache',
+		'posts_per_page'                       => '(int) Number of posts to show on blog pages',
+	),
+
+	'response_format' => array(
+		'updated' => '(array)'
+	),
+
+	'example_request' => 'https://public-api.wordpress.com/rest/v1/sites/en.blog.wordpress.com/settings?pretty=1',
+) );
+
 class WPCOM_JSON_API_Site_Settings_V1_2_Endpoint extends WPCOM_JSON_API_Site_Settings_Endpoint {
 
 	public static $site_format = array(
diff --git a/plugins/jetpack/json-endpoints/class.wpcom-json-api-site-user-endpoint.php b/plugins/jetpack/json-endpoints/class.wpcom-json-api-site-user-endpoint.php
index 57de701c..b20fa6c2 100644
--- a/plugins/jetpack/json-endpoints/class.wpcom-json-api-site-user-endpoint.php
+++ b/plugins/jetpack/json-endpoints/class.wpcom-json-api-site-user-endpoint.php
@@ -1,4 +1,102 @@
 <?php
+
+new WPCOM_JSON_API_Site_User_Endpoint( array(
+	'description' => 'Get details of a user of a site by ID.',
+	'group'       => '__do_not_document', //'users'
+	'stat'        => 'sites:1:user',
+	'method'      => 'GET',
+	'path'        => '/sites/%s/users/%d',
+	'path_labels' => array(
+		'$site'    => '(int|string) Site ID or domain',
+		'$user_id' => '(int) User ID',
+	),
+	'response_format' => WPCOM_JSON_API_Site_User_Endpoint::$user_format,
+	'example_request'      => 'https://public-api.wordpress.com/rest/v1/sites/30434183/user/23',
+	'example_request_data' => array(
+		'headers' => array(
+			'authorization' => 'Bearer YOUR_API_TOKEN'
+		),
+	),
+	'example_response'     => '{
+		"ID": 18342963,
+		"login": "binarysmash",
+		"email": false,
+		"name": "binarysmash",
+		"URL": "http:\/\/binarysmash.wordpress.com",
+		"avatar_URL": "http:\/\/0.gravatar.com\/avatar\/a178ebb1731d432338e6bb0158720fcc?s=96&d=identicon&r=G",
+		"profile_URL": "http:\/\/en.gravatar.com\/binarysmash",
+		"roles": [ "administrator" ]
+	}'
+) );
+
+new WPCOM_JSON_API_Site_User_Endpoint( array(
+	'description' => 'Get details of a user of a site by login.',
+	'group'       => 'users',
+	'stat'        => 'sites:1:user',
+	'method'      => 'GET',
+	'path'        => '/sites/%s/users/login:%s',
+	'path_labels' => array(
+		'$site'    => '(int|string) The site ID or domain.',
+		'$user_id' => '(string) The user\'s login.',
+	),
+	'response_format' => WPCOM_JSON_API_Site_User_Endpoint::$user_format,
+	'example_request'      => 'https://public-api.wordpress.com/rest/v1/sites/30434183/user/login:binarysmash',
+	'example_request_data' => array(
+		'headers' => array(
+			'authorization' => 'Bearer YOUR_API_TOKEN'
+		),
+	),
+	'example_response'     => '{
+		"ID": 18342963,
+		"login": "binarysmash",
+		"email": false,
+		"name": "binarysmash",
+		"URL": "http:\/\/binarysmash.wordpress.com",
+		"avatar_URL": "http:\/\/0.gravatar.com\/avatar\/a178ebb1731d432338e6bb0158720fcc?s=96&d=identicon&r=G",
+		"profile_URL": "http:\/\/en.gravatar.com\/binarysmash",
+		"roles": [ "administrator" ]
+	}'
+) );
+
+new WPCOM_JSON_API_Site_User_Endpoint( array(
+	'description' => 'Update details of a user of a site.',
+	'group'       => 'users',
+	'stat'        => 'sites:1:user',
+	'method'      => 'POST',
+	'path'        => '/sites/%s/users/%d',
+	'path_labels' => array(
+		'$site'    => '(int|string) The site ID or domain.',
+		'$user_id' => '(int) The user\'s ID.',
+	),
+	'request_format'  => WPCOM_JSON_API_Site_User_Endpoint::$user_format,
+	'response_format' => WPCOM_JSON_API_Site_User_Endpoint::$user_format,
+	'example_request'      => 'https://public-api.wordpress.com/rest/v1/sites/30434183/user/23',
+	'example_request_data' => array(
+		'headers' => array(
+			'authorization' => 'Bearer YOUR_API_TOKEN'
+		),
+		'body' => array(
+			'roles' => array(
+				array(
+					'administrator',
+				)
+			),
+			'first_name' => 'Rocco',
+			'last_name' => 'Tripaldi',
+		)
+	),
+	'example_response'     => '{
+		"ID": 18342963,
+		"login": "binarysmash",
+		"email": false,
+		"name": "binarysmash",
+		"URL": "http:\/\/binarysmash.wordpress.com",
+		"avatar_URL": "http:\/\/0.gravatar.com\/avatar\/a178ebb1731d432338e6bb0158720fcc?s=96&d=identicon&r=G",
+		"profile_URL": "http:\/\/en.gravatar.com\/binarysmash",
+		"roles": [ "administrator" ]
+	}'
+) );
+
 class WPCOM_JSON_API_Site_User_Endpoint extends WPCOM_JSON_API_Endpoint {
 
 	public static $user_format = array(
@@ -63,7 +161,7 @@ class WPCOM_JSON_API_Site_User_Endpoint extends WPCOM_JSON_API_Endpoint {
 	/**
 	 * Updates user data
 	 *
-	 * @return (array)
+	 * @return array
 	 */
 	public function update_user( $user_id, $blog_id ) {
 		$input = $this->input();
diff --git a/plugins/jetpack/json-endpoints/class.wpcom-json-api-update-comment-endpoint.php b/plugins/jetpack/json-endpoints/class.wpcom-json-api-update-comment-endpoint.php
index 79632dd3..7cef4302 100644
--- a/plugins/jetpack/json-endpoints/class.wpcom-json-api-update-comment-endpoint.php
+++ b/plugins/jetpack/json-endpoints/class.wpcom-json-api-update-comment-endpoint.php
@@ -1,4 +1,128 @@
 <?php
+
+new WPCOM_JSON_API_Update_Comment_Endpoint( array(
+	'description' => 'Create a comment on a post.',
+	'group'       => 'comments',
+	'stat'        => 'posts:1:replies:new',
+
+	'method'      => 'POST',
+	'path'        => '/sites/%s/posts/%d/replies/new',
+	'path_labels' => array(
+		'$site'    => '(int|string) Site ID or domain',
+		'$post_ID' => '(int) The post ID'
+	),
+
+	'request_format' => array(
+		// explicitly document all input
+		'content'   => '(HTML) The comment text.',
+//		@todo Should we open this up to unauthenticated requests too?
+//		'author'    => '(author object) The author of the comment.',
+	),
+
+	'pass_wpcom_user_details' => true,
+
+	'example_request'      => 'https://public-api.wordpress.com/rest/v1/sites/82974409/posts/843/replies/new/',
+	'example_request_data' =>  array(
+		'headers' => array(
+			'authorization' => 'Bearer YOUR_API_TOKEN'
+		),
+		'body' => array(
+			'content' => 'Your reply is very interesting. This is a reply.'
+		)
+	)
+) );
+
+new WPCOM_JSON_API_Update_Comment_Endpoint( array(
+	'description' => 'Create a comment as a reply to another comment.',
+	'group'       => 'comments',
+	'stat'        => 'comments:1:replies:new',
+
+	'method'      => 'POST',
+	'path'        => '/sites/%s/comments/%d/replies/new',
+	'path_labels' => array(
+		'$site'       => '(int|string) Site ID or domain',
+		'$comment_ID' => '(int) The comment ID'
+	),
+
+	'request_format' => array(
+		'content'   => '(HTML) The comment text.',
+//		@todo Should we open this up to unauthenticated requests too?
+//		'author'    => '(author object) The author of the comment.',
+	),
+
+	'pass_wpcom_user_details' => true,
+
+	'example_request'      => 'https://public-api.wordpress.com/rest/v1/sites/82974409/comments/29/replies/new',
+	'example_request_data' => array(
+		'headers' => array(
+			'authorization' => 'Bearer YOUR_API_TOKEN'
+		),
+		'body' => array(
+			'content' => 'This reply is very interesting. This is editing a comment reply via the API.',
+		)
+	)
+) );
+
+new WPCOM_JSON_API_Update_Comment_Endpoint( array(
+	'description' => 'Edit a comment.',
+	'group'       => 'comments',
+	'stat'        => 'comments:1:POST',
+
+	'method'      => 'POST',
+	'path'        => '/sites/%s/comments/%d',
+	'path_labels' => array(
+		'$site'       => '(int|string) Site ID or domain',
+		'$comment_ID' => '(int) The comment ID'
+	),
+
+	'request_format' => array(
+		'author'       => "(string) The comment author's name.",
+		'author_email' => "(string) The comment author's email.",
+		'author_url'   => "(string) The comment author's URL.",
+		'content'      => '(HTML) The comment text.',
+		'date'         => "(ISO 8601 datetime) The comment's creation time.",
+		'status'       => array(
+			'approved'   => 'Approve the comment.',
+			'unapproved' => 'Remove the comment from public view and send it to the moderation queue.',
+			'spam'       => 'Mark the comment as spam.',
+			'unspam'     => 'Unmark the comment as spam. Will attempt to set it to the previous status.',
+			'trash'      => 'Send a comment to the trash if trashing is enabled (see constant: EMPTY_TRASH_DAYS).',
+			'untrash'    => 'Untrash a comment. Only works when the comment is in the trash.',
+		),
+	),
+
+	'example_request'      => 'https://public-api.wordpress.com/rest/v1/sites/82974409/comments/29',
+	'example_request_data' => array(
+		'headers' => array(
+			'authorization' => 'Bearer YOUR_API_TOKEN'
+		),
+		'body' => array(
+			'content' => 'This reply is now edited via the API.',
+			'status'  => 'approved',
+		)
+	)
+) );
+
+new WPCOM_JSON_API_Update_Comment_Endpoint( array(
+	'description' => 'Delete a comment.',
+	'group'       => 'comments',
+	'stat'        => 'comments:1:delete',
+
+	'method'      => 'POST',
+	'path'        => '/sites/%s/comments/%d/delete',
+	'path_labels' => array(
+		'$site'       => '(int|string) Site ID or domain',
+		'$comment_ID' => '(int) The comment ID'
+	),
+
+	'example_request'      => 'https://public-api.wordpress.com/rest/v1/sites/82974409/comments/$comment_ID/delete',
+	'example_request_data' => array(
+		'headers' => array(
+			'authorization' => 'Bearer YOUR_API_TOKEN'
+		)
+	)
+) );
+
 class WPCOM_JSON_API_Update_Comment_Endpoint extends WPCOM_JSON_API_Comment_Endpoint {
 	function __construct( $args ) {
 		parent::__construct( $args );
@@ -67,7 +191,7 @@ class WPCOM_JSON_API_Update_Comment_Endpoint extends WPCOM_JSON_API_Comment_Endp
 			return new WP_Error( 'unauthorized', 'User cannot create comments', 403 );
 		}
 
-		if ( !comments_open( $post->ID ) ) {
+		if ( ! ( comments_open( $post->ID ) || current_user_can( 'moderate_comments' ) ) ) {
 			return new WP_Error( 'unauthorized', 'Comments on this post are closed', 403 );
 		}
 
diff --git a/plugins/jetpack/json-endpoints/class.wpcom-json-api-update-customcss.php b/plugins/jetpack/json-endpoints/class.wpcom-json-api-update-customcss.php
index 954de00b..c67ac3e4 100644
--- a/plugins/jetpack/json-endpoints/class.wpcom-json-api-update-customcss.php
+++ b/plugins/jetpack/json-endpoints/class.wpcom-json-api-update-customcss.php
@@ -5,6 +5,42 @@
  * https://public-api.wordpress.com/rest/v1.1/sites/$site/customcss/
  */
 
+new WPCOM_JSON_API_Update_CustomCss_Endpoint( array (
+	'description'      => 'Set custom-css data for a site.',
+	'group'            => '__do_not_document',
+	'stat'             => 'customcss:1:update',
+	'method'           => 'POST',
+	'min_version'      => '1.1',
+	'path'             => '/sites/%s/customcss',
+	'path_labels'      => array(
+		'$site' => '(string) Site ID or domain.',
+	),
+	'request_format'  => array(
+		'css' => '(string) Optional. The raw CSS.',
+		'preprocessor' => '(string) Optional. The name of the preprocessor if any.',
+		'add_to_existing' => '(bool) Optional. False to skip the existing styles.',
+	),
+	'response_format'  => array(
+		'css' => '(string) The raw CSS.',
+		'preprocessor' => '(string) The name of the preprocessor if any.',
+		'add_to_existing' => '(bool) False to skip the existing styles.',
+	),
+	'example_request'  => 'https://public-api.wordpress.com/rest/v1.1/sites/12345678/customcss',
+	'example_request_data' => array(
+		'headers' => array( 'authorization' => 'Bearer YOUR_API_TOKEN' ),
+		'body' => array(
+			'css' => '.stie-title { color: #fff; }',
+			'preprocessor' => 'sass'
+		),
+	),
+	'example_response' => '
+	{
+		"css": ".site-title { color: #fff; }",
+		"preprocessor": "sass",
+		"add_to_existing": "true"
+	}'
+) );
+
 class WPCOM_JSON_API_Update_CustomCss_Endpoint extends WPCOM_JSON_API_Endpoint {
 	/**
 	 * API callback.
diff --git a/plugins/jetpack/json-endpoints/class.wpcom-json-api-update-invites-endpoint.php b/plugins/jetpack/json-endpoints/class.wpcom-json-api-update-invites-endpoint.php
index 689cef88..6048cdf3 100644
--- a/plugins/jetpack/json-endpoints/class.wpcom-json-api-update-invites-endpoint.php
+++ b/plugins/jetpack/json-endpoints/class.wpcom-json-api-update-invites-endpoint.php
@@ -1,4 +1,48 @@
 <?php
+
+new WPCOM_JSON_API_Update_Invites_Endpoint( array(
+	'description' => 'Delete an invite for a user to join a site.',
+	'group'       => '__do_not_document',
+	'stat'        => 'invites:1:delete',
+	'method'      => 'POST',
+	'path'        => '/sites/%s/invites/%s/delete',
+	'path_labels' => array(
+		'$site'      => '(int|string) Site ID or domain',
+		'$invite_id' => '(string) The ID of the invite'
+	),
+	'response_format' => array(
+		'invite_key' => '(string) Identifier for the deleted invite',
+		'deleted' => '(bool) Was the invitation removed?'
+	),
+
+	'example_request' => 'https://public-api.wordpress.com/rest/v1/sites/30434183/invites/123523562/delete',
+
+	'example_request_data' => array(
+		'headers' => array( 'authorization' => 'Bearer YOUR_API_TOKEN' ),
+	),
+) );
+
+new WPCOM_JSON_API_Update_Invites_Endpoint( array(
+	'description' => 'Resend invitation for a user to join a site.',
+	'group'       => '__do_not_document',
+	'stat'        => 'invites:1',
+	'method'      => 'POST',
+	'path'        => '/sites/%s/invites/%s/resend',
+	'path_labels' => array(
+		'$site'      => '(int|string) Site ID or domain',
+		'$invite_id' => '(string) The ID of the invite'
+	),
+	'response_format' => array(
+		'result' => '(bool) Was the invitation resent?'
+	),
+
+	'example_request' => 'https://public-api.wordpress.com/rest/v1/sites/30434183/invites/123523562',
+
+	'example_request_data' => array(
+		'headers' => array( 'authorization' => 'Bearer YOUR_API_TOKEN' ),
+	),
+) );
+
 class WPCOM_JSON_API_Update_Invites_Endpoint extends WPCOM_JSON_API_Endpoint {
 	public $blog_id;
 	public $invite_id;
diff --git a/plugins/jetpack/json-endpoints/class.wpcom-json-api-update-media-endpoint.php b/plugins/jetpack/json-endpoints/class.wpcom-json-api-update-media-endpoint.php
index 00e170ea..f751a6ae 100644
--- a/plugins/jetpack/json-endpoints/class.wpcom-json-api-update-media-endpoint.php
+++ b/plugins/jetpack/json-endpoints/class.wpcom-json-api-update-media-endpoint.php
@@ -1,5 +1,45 @@
 <?php
 
+new WPCOM_JSON_API_Update_Media_Endpoint( array(
+	'description' => 'Edit basic information about a media item.',
+	'group'       => 'media',
+	'stat'        => 'media:1:POST',
+	'method'      => 'POST',
+	'path'        => '/sites/%s/media/%d',
+	'deprecated'  => true,
+	'new_version' => '1.1',
+	'path_labels' => array(
+		'$site'    => '(int|string) Site ID or domain',
+		'$media_ID' => '(int) The ID of the media item',
+	),
+
+	'request_format' => array(
+		'title'       => '(string) The file name.',
+		'caption'     => '(string) File caption.',
+		'description' => '(HTML) Description of the file.',
+	),
+
+	'response_format' => array(
+		'id'          => '(int) The ID of the media item',
+		'date'        =>  '(ISO 8601 datetime) The date the media was uploaded',
+		'parent'      => '(int) ID of the post this media is attached to',
+		'link'        => '(string) URL to the file',
+		'title'       => '(string) File name',
+		'caption'     => '(string) User provided caption of the file',
+		'description' => '(string) Description of the file',
+		'metadata'    => '(array) Array of metadata about the file, such as Exif data or sizes',
+	),
+	'example_request'      => 'https://public-api.wordpress.com/rest/v1.1/sites/82974409/media/446',
+	'example_request_data' =>  array(
+		'headers' => array(
+			'authorization' => 'Bearer YOUR_API_TOKEN'
+		),
+		'body' => array(
+			'title' => 'Updated Title'
+		)
+	)
+) );
+
 class WPCOM_JSON_API_Update_Media_Endpoint extends WPCOM_JSON_API_Endpoint {
 	function callback( $path = '', $blog_id = 0, $media_id = 0 ) {
 		$blog_id = $this->api->switch_to_blog_and_validate_user( $this->api->get_blog_id( $blog_id ) );
diff --git a/plugins/jetpack/json-endpoints/class.wpcom-json-api-update-media-v1-1-endpoint.php b/plugins/jetpack/json-endpoints/class.wpcom-json-api-update-media-v1-1-endpoint.php
index c4a34caf..1284cdcb 100644
--- a/plugins/jetpack/json-endpoints/class.wpcom-json-api-update-media-v1-1-endpoint.php
+++ b/plugins/jetpack/json-endpoints/class.wpcom-json-api-update-media-v1-1-endpoint.php
@@ -1,5 +1,62 @@
 <?php
 
+new WPCOM_JSON_API_Update_Media_v1_1_Endpoint( array(
+	'description' => 'Edit basic information about a media item.',
+	'group'       => 'media',
+	'stat'        => 'media:1:POST',
+	'min_version' => '1.1',
+	'max_version' => '1.1',
+	'method'      => 'POST',
+	'path'        => '/sites/%s/media/%d',
+	'path_labels' => array(
+		'$site'    => '(int|string) Site ID or domain',
+		'$media_ID' => '(int) The ID of the media item',
+	),
+
+	'request_format' => array(
+		'parent_id'   => '(int) ID of the post this media is attached to',
+		'title'       => '(string) The file name.',
+		'caption'     => '(string) File caption.',
+		'description' => '(HTML) Description of the file.',
+		'alt'         => "(string) Alternative text for image files.",
+		'artist'      => "(string) Audio Only. Artist metadata for the audio track.",
+		'album'       => "(string) Audio Only. Album metadata for the audio track.",
+	),
+
+	'response_format' => array(
+		'ID'               => '(int) The ID of the media item',
+		'date'             => '(ISO 8601 datetime) The date the media was uploaded',
+		'post_ID'          => '(int) ID of the post this media is attached to',
+		'author_ID'        => '(int) ID of the user who uploaded the media',
+		'URL'              => '(string) URL to the file',
+		'guid'             => '(string) Unique identifier',
+		'file'			   => '(string) File name',
+		'extension'        => '(string) File extension',
+		'mime_type'        => '(string) File mime type',
+		'title'            => '(string) File name',
+		'caption'          => '(string) User provided caption of the file',
+		'description'      => '(string) Description of the file',
+		'alt'              => '(string)  Alternative text for image files.',
+		'thumbnails'       => '(object) Media item thumbnail URL options',
+		'height'           => '(int) (Image & video only) Height of the media item',
+		'width'            => '(int) (Image & video only) Width of the media item',
+		'length'           => '(int) (Video & audio only) Duration of the media item, in seconds',
+		'exif'             => '(array) (Image & audio only) Exif (meta) information about the media item',
+		'videopress_guid'  => '(string) (Video only) VideoPress GUID of the video when uploaded on a blog with VideoPress',
+		'videopress_processing_done'  => '(bool) (Video only) If the video is uploaded on a blog with VideoPress, this will return the status of processing on the video.'
+	),
+
+	'example_request'      => 'https://public-api.wordpress.com/rest/v1.1/sites/82974409/media/446',
+	'example_request_data' =>  array(
+		'headers' => array(
+			'authorization' => 'Bearer YOUR_API_TOKEN'
+		),
+		'body' => array(
+			'title' => 'Updated Title'
+		)
+	)
+) );
+
 class WPCOM_JSON_API_Update_Media_v1_1_Endpoint extends WPCOM_JSON_API_Endpoint {
 	function callback( $path = '', $blog_id = 0, $media_id = 0 ) {
 		$blog_id = $this->api->switch_to_blog_and_validate_user( $this->api->get_blog_id( $blog_id ) );
@@ -45,7 +102,7 @@ class WPCOM_JSON_API_Update_Media_v1_1_Endpoint extends WPCOM_JSON_API_Endpoint
 		if ( 0 === strpos( $item->mime_type, 'audio/' ) ) {
 			$changed = false;
 			$id3data = wp_get_attachment_metadata( $media_id );
-		
+
 			if ( ! is_array( $id3data ) ) {
 				$changed = true;
 				$id3data = array();
@@ -55,7 +112,7 @@ class WPCOM_JSON_API_Update_Media_v1_1_Endpoint extends WPCOM_JSON_API_Endpoint
 				'artist' => __( 'Artist', 'jetpack' ),
 				'album' => __( 'Album', 'jetpack' )
 			);
-		
+
 			foreach ( $id3_keys as $key => $label ) {
 				if ( isset( $input[ $key ] ) ) {
 					$changed = true;
diff --git a/plugins/jetpack/json-endpoints/class.wpcom-json-api-update-post-endpoint.php b/plugins/jetpack/json-endpoints/class.wpcom-json-api-update-post-endpoint.php
index 4231f296..bbcdd34e 100644
--- a/plugins/jetpack/json-endpoints/class.wpcom-json-api-update-post-endpoint.php
+++ b/plugins/jetpack/json-endpoints/class.wpcom-json-api-update-post-endpoint.php
@@ -1,4 +1,183 @@
 <?php
+
+new WPCOM_JSON_API_Update_Post_Endpoint( array(
+	'description' => 'Create a post.',
+	'group'       => 'posts',
+	'stat'        => 'posts:new',
+	'new_version' => '1.2',
+	'max_version' => '1',
+	'method'      => 'POST',
+	'path'        => '/sites/%s/posts/new',
+	'path_labels' => array(
+		'$site' => '(int|string) Site ID or domain',
+	),
+
+	'request_format' => array(
+		// explicitly document all input
+		'date'      => "(ISO 8601 datetime) The post's creation time.",
+		'title'     => '(HTML) The post title.',
+		'content'   => '(HTML) The post content.',
+		'excerpt'   => '(HTML) An optional post excerpt.',
+		'slug'      => '(string) The name (slug) for the post, used in URLs.',
+		'author'    => '(string) The username or ID for the user to assign the post to.',
+		'publicize' => '(array|bool) True or false if the post be publicized to external services. An array of services if we only want to publicize to a select few. Defaults to true.',
+		'publicize_message' => '(string) Custom message to be publicized to external services.',
+		'status'    => array(
+			'publish' => 'Publish the post.',
+			'private' => 'Privately publish the post.',
+			'draft'   => 'Save the post as a draft.',
+			'pending' => 'Mark the post as pending editorial approval.',
+			'auto-draft' => 'Save a placeholder for a newly created post, with no content.',
+		),
+		'sticky'    => array(
+			'false'   => 'Post is not marked as sticky.',
+			'true'    => 'Stick the post to the front page.',
+		),
+		'password'  => '(string) The plaintext password protecting the post, or, more likely, the empty string if the post is not password protected.',
+		'parent'    => "(int) The post ID of the new post's parent.",
+		'type'      => "(string) The post type. Defaults to 'post'. Post types besides post and page need to be whitelisted using the <code>rest_api_allowed_post_types</code> filter.",
+		'categories' => "(array|string) Comma-separated list or array of categories (name or id)",
+		'tags'       => "(array|string) Comma-separated list or array of tags (name or id)",
+		'format'     => array_merge( array( 'default' => 'Use default post format' ), get_post_format_strings() ),
+		'featured_image' => "(string) The post ID of an existing attachment to set as the featured image. Pass an empty string to delete the existing image.",
+		'media'      => "(media) An array of files to attach to the post. To upload media, the entire request should be multipart/form-data encoded. Multiple media items will be displayed in a gallery. Accepts  jpg, jpeg, png, gif, pdf, doc, ppt, odt, pptx, docx, pps, ppsx, xls, xlsx, key. Audio and Video may also be available. See <code>allowed_file_types</code> in the options response of the site endpoint. <br /><br /><strong>Example</strong>:<br />" .
+		 				"<code>curl \<br />--form 'title=Image' \<br />--form 'media[]=@/path/to/file.jpg' \<br />-H 'Authorization: BEARER your-token' \<br />'https://public-api.wordpress.com/rest/v1/sites/123/posts/new'</code>",
+		'media_urls' => "(array) An array of URLs for images to attach to a post. Sideloads the media in for a post.",
+		'metadata'      => "(array) Array of metadata objects containing the following properties: `key` (metadata key), `id` (meta ID), `previous_value` (if set, the action will only occur for the provided previous value), `value` (the new value to set the meta to), `operation` (the operation to perform: `update` or `add`; defaults to `update`). All unprotected meta keys are available by default for read requests. Both unprotected and protected meta keys are avaiable for authenticated requests with proper capabilities. Protected meta keys can be made available with the <code>rest_api_allowed_public_metadata</code> filter.",
+		'comments_open' => "(bool) Should the post be open to comments? Defaults to the blog's preference.",
+		'pings_open'    => "(bool) Should the post be open to comments? Defaults to the blog's preference.",
+		'likes_enabled' => "(bool) Should the post be open to likes? Defaults to the blog's preference.",
+		'sharing_enabled' => "(bool) Should sharing buttons show on this post? Defaults to true.",
+		'menu_order'    => "(int) (Pages Only) the order pages should appear in. Use 0 to maintain alphabetical order.",
+	),
+
+	'example_request'      => 'https://public-api.wordpress.com/rest/v1/sites/82974409/posts/new/',
+
+	'example_request_data' => array(
+		'headers' => array(
+			'authorization' => 'Bearer YOUR_API_TOKEN'
+		),
+
+		'body' => array(
+			'title'      => 'Hello World',
+			'content'    => 'Hello. I am a test post. I was created by the API',
+			'tags'       => 'tests',
+			'categories' => 'API'
+		)
+	)
+) );
+
+new WPCOM_JSON_API_Update_Post_Endpoint( array(
+	'description' => 'Edit a post.',
+	'group'       => 'posts',
+	'stat'        => 'posts:1:POST',
+	'new_version' => '1.2',
+	'max_version' => '1',
+	'method'      => 'POST',
+	'path'        => '/sites/%s/posts/%d',
+	'path_labels' => array(
+		'$site'    => '(int|string) Site ID or domain',
+		'$post_ID' => '(int) The post ID',
+	),
+
+	'request_format' => array(
+		'date'      => "(ISO 8601 datetime) The post's creation time.",
+		'title'     => '(HTML) The post title.',
+		'content'   => '(HTML) The post content.',
+		'excerpt'   => '(HTML) An optional post excerpt.',
+		'slug'      => '(string) The name (slug) for the post, used in URLs.',
+		'author'    => '(string) The username or ID for the user to assign the post to.',
+		'publicize' => '(array|bool) True or false if the post be publicized to external services. An array of services if we only want to publicize to a select few. Defaults to true.',
+		'publicize_message' => '(string) Custom message to be publicized to external services.',
+		'status'    => array(
+			'publish' => 'Publish the post.',
+			'private' => 'Privately publish the post.',
+			'draft'   => 'Save the post as a draft.',
+			'pending' => 'Mark the post as pending editorial approval.',
+			'trash'   => 'Set the post as trashed.',
+		),
+		'sticky'    => array(
+			'false'   => 'Post is not marked as sticky.',
+			'true'    => 'Stick the post to the front page.',
+		),
+		'password'   => '(string) The plaintext password protecting the post, or, more likely, the empty string if the post is not password protected.',
+		'parent'     => "(int) The post ID of the new post's parent.",
+		'categories' => "(array|string) Comma-separated list or array of categories (name or id)",
+		'tags'       => "(array|string) Comma-separated list or array of tags (name or id)",
+		'format'     => array_merge( array( 'default' => 'Use default post format' ), get_post_format_strings() ),
+		'comments_open' => '(bool) Should the post be open to comments?',
+		'pings_open'    => '(bool) Should the post be open to comments?',
+		'likes_enabled' => "(bool) Should the post be open to likes?",
+		'menu_order'    => "(int) (Pages Only) the order pages should appear in. Use 0 to maintain alphabetical order.",
+		'sharing_enabled' => "(bool) Should sharing buttons show on this post?",
+		'featured_image' => "(string) The post ID of an existing attachment to set as the featured image. Pass an empty string to delete the existing image.",
+		'media'      => "(media) An array of files to attach to the post. To upload media, the entire request should be multipart/form-data encoded. Multiple media items will be displayed in a gallery. Accepts  jpg, jpeg, png, gif, pdf, doc, ppt, odt, pptx, docx, pps, ppsx, xls, xlsx, key. Audio and Video may also be available. See <code>allowed_file_types</code> in the options resposne of the site endpoint. <br /><br /><strong>Example</strong>:<br />" .
+		 				"<code>curl \<br />--form 'title=Image' \<br />--form 'media[]=@/path/to/file.jpg' \<br />-H 'Authorization: BEARER your-token' \<br />'https://public-api.wordpress.com/rest/v1/sites/123/posts/new'</code>",
+		'media_urls' => "(array) An array of URLs for images to attach to a post. Sideloads the media in for a post.",
+		'metadata'      => "(array) Array of metadata objects containing the following properties: `key` (metadata key), `id` (meta ID), `previous_value` (if set, the action will only occur for the provided previous value), `value` (the new value to set the meta to), `operation` (the operation to perform: `update` or `add`; defaults to `update`). All unprotected meta keys are available by default for read requests. Both unprotected and protected meta keys are available for authenticated requests with proper capabilities. Protected meta keys can be made available with the <code>rest_api_allowed_public_metadata</code> filter.",
+	),
+
+	'example_request'      => 'https://public-api.wordpress.com/rest/v1/sites/82974409/posts/881',
+
+	'example_request_data' => array(
+		'headers' => array(
+			'authorization' => 'Bearer YOUR_API_TOKEN'
+		),
+
+		'body' => array(
+			'title'      => 'Hello World (Again)',
+			'content'    => 'Hello. I am an edited post. I was edited by the API',
+			'tags'       => 'tests',
+			'categories' => 'API'
+		)
+	)
+) );
+
+new WPCOM_JSON_API_Update_Post_Endpoint( array(
+	'description' => 'Delete a post. Note: If the trash is enabled, this request will send the post to the trash. A second request will permanently delete the post.',
+	'group'       => 'posts',
+	'stat'        => 'posts:1:delete',
+	'new_version' => '1.1',
+	'max_version' => '1',
+	'method'      => 'POST',
+	'path'        => '/sites/%s/posts/%d/delete',
+	'path_labels' => array(
+		'$site'    => '(int|string) Site ID or domain',
+		'$post_ID' => '(int) The post ID',
+	),
+
+	'example_request'      => 'https://public-api.wordpress.com/rest/v1/sites/82974409/posts/$post_ID/delete/',
+
+	'example_request_data' => array(
+		'headers' => array(
+			'authorization' => 'Bearer YOUR_API_TOKEN'
+		)
+	)
+) );
+
+new WPCOM_JSON_API_Update_Post_Endpoint( array(
+	'description' => 'Restore a post or page from the trash to its previous status.',
+	'group'       => 'posts',
+	'stat'        => 'posts:1:restore',
+
+	'method'      => 'POST',
+	'new_version' => '1.1',
+	'max_version' => '1',
+	'path'        => '/sites/%s/posts/%d/restore',
+	'path_labels' => array(
+		'$site'    => '(int|string) Site ID or domain',
+		'$post_ID' => '(int) The post ID',
+	),
+
+	'example_request'      => 'https://public-api.wordpress.com/rest/v1/sites/82974409/posts/$post_ID/restore/',
+
+	'example_request_data' => array(
+		'headers' => array(
+			'authorization' => 'Bearer YOUR_API_TOKEN'
+		)
+	)
+) );
+
 class WPCOM_JSON_API_Update_Post_Endpoint extends WPCOM_JSON_API_Post_Endpoint {
 	function __construct( $args ) {
 		parent::__construct( $args );
diff --git a/plugins/jetpack/json-endpoints/class.wpcom-json-api-update-post-v1-1-endpoint.php b/plugins/jetpack/json-endpoints/class.wpcom-json-api-update-post-v1-1-endpoint.php
index e74ec352..72c04a8e 100644
--- a/plugins/jetpack/json-endpoints/class.wpcom-json-api-update-post-v1-1-endpoint.php
+++ b/plugins/jetpack/json-endpoints/class.wpcom-json-api-update-post-v1-1-endpoint.php
@@ -1,4 +1,190 @@
 <?php
+
+new WPCOM_JSON_API_Update_Post_v1_1_Endpoint( array(
+	'description' => 'Create a post.',
+	'group'       => 'posts',
+	'stat'        => 'posts:new',
+	'new_version' => '1.2',
+	'min_version' => '1.1',
+	'max_version' => '1.1',
+	'method'      => 'POST',
+	'path'        => '/sites/%s/posts/new',
+	'path_labels' => array(
+		'$site' => '(int|string) Site ID or domain',
+	),
+
+	'request_format' => array(
+		// explicitly document all input
+		'date'      => "(ISO 8601 datetime) The post's creation time.",
+		'title'     => '(HTML) The post title.',
+		'content'   => '(HTML) The post content.',
+		'excerpt'   => '(HTML) An optional post excerpt.',
+		'slug'      => '(string) The name (slug) for the post, used in URLs.',
+		'author'    => '(string) The username or ID for the user to assign the post to.',
+		'publicize' => '(array|bool) True or false if the post be publicized to external services. An array of services if we only want to publicize to a select few. Defaults to true.',
+		'publicize_message' => '(string) Custom message to be publicized to external services.',
+		'status'    => array(
+			'publish' => 'Publish the post.',
+			'private' => 'Privately publish the post.',
+			'draft'   => 'Save the post as a draft.',
+			'pending' => 'Mark the post as pending editorial approval.',
+			'future'  => 'Schedule the post (alias for publish; you must also set a future date).',
+			'auto-draft' => 'Save a placeholder for a newly created post, with no content.',
+		),
+		'sticky'    => array(
+			'false'   => 'Post is not marked as sticky.',
+			'true'    => 'Stick the post to the front page.',
+		),
+		'password'  => '(string) The plaintext password protecting the post, or, more likely, the empty string if the post is not password protected.',
+		'parent'    => "(int) The post ID of the new post's parent.",
+		'type'      => "(string) The post type. Defaults to 'post'. Post types besides post and page need to be whitelisted using the <code>rest_api_allowed_post_types</code> filter.",
+		'terms'      => '(object) Mapping of taxonomy to comma-separated list or array of terms (name or id)',
+		'categories' => "(array|string) Comma-separated list or array of categories (name or id)",
+		'tags'       => "(array|string) Comma-separated list or array of tags (name or id)",
+		'format'     => array_merge( array( 'default' => 'Use default post format' ), get_post_format_strings() ),
+		'featured_image' => "(string) The post ID of an existing attachment to set as the featured image. Pass an empty string to delete the existing image.",
+		'media'      => "(media) An array of files to attach to the post. To upload media, the entire request should be multipart/form-data encoded. Multiple media items will be displayed in a gallery. Accepts  jpg, jpeg, png, gif, pdf, doc, ppt, odt, pptx, docx, pps, ppsx, xls, xlsx, key. Audio and Video may also be available. See <code>allowed_file_types</code> in the options response of the site endpoint. Errors produced by media uploads, if any, will be in `media_errors` in the response. <br /><br /><strong>Example</strong>:<br />" .
+		 				"<code>curl \<br />--form 'title=Image Post' \<br />--form 'media[0]=@/path/to/file.jpg' \<br />--form 'media_attrs[0][caption]=My Great Photo' \<br />-H 'Authorization: BEARER your-token' \<br />'https://public-api.wordpress.com/rest/v1/sites/123/posts/new'</code>",
+		'media_urls' => "(array) An array of URLs for images to attach to a post. Sideloads the media in for a post. Errors produced by media sideloading, if any, will be in `media_errors` in the response.",
+		'media_attrs' => "(array) An array of attributes (`title`, `description` and `caption`) are supported to assign to the media uploaded via the `media` or `media_urls` properties. You must use a numeric index for the keys of `media_attrs` which follow the same sequence as `media` and `media_urls`. <br /><br /><strong>Example</strong>:<br />" .
+		                 "<code>curl \<br />--form 'title=Gallery Post' \<br />--form 'media[]=@/path/to/file1.jpg' \<br />--form 'media_urls[]=http://exapmple.com/file2.jpg' \<br /> \<br />--form 'media_attrs[0][caption]=This will be the caption for file1.jpg' \<br />--form 'media_attrs[1][title]=This will be the title for file2.jpg' \<br />-H 'Authorization: BEARER your-token' \<br />'https://public-api.wordpress.com/rest/v1/sites/123/posts/new'</code>",
+		'metadata'      => "(array) Array of metadata objects containing the following properties: `key` (metadata key), `id` (meta ID), `previous_value` (if set, the action will only occur for the provided previous value), `value` (the new value to set the meta to), `operation` (the operation to perform: `update` or `add`; defaults to `update`). All unprotected meta keys are available by default for read requests. Both unprotected and protected meta keys are avaiable for authenticated requests with proper capabilities. Protected meta keys can be made available with the <code>rest_api_allowed_public_metadata</code> filter.",
+		'discussion'    => '(object) A hash containing one or more of the following boolean values, which default to the blog\'s discussion preferences: `comments_open`, `pings_open`',
+		'likes_enabled' => "(bool) Should the post be open to likes? Defaults to the blog's preference.",
+		'sharing_enabled' => "(bool) Should sharing buttons show on this post? Defaults to true.",
+		'menu_order'    => "(int) (Pages Only) the order pages should appear in. Use 0 to maintain alphabetical order.",
+		'page_template' => '(string) (Pages Only) The page template this page should use.',
+	),
+
+	'example_request'      => 'https://public-api.wordpress.com/rest/v1.1/sites/82974409/posts/new/',
+
+	'example_request_data' => array(
+		'headers' => array(
+			'authorization' => 'Bearer YOUR_API_TOKEN'
+		),
+
+		'body' => array(
+			'title'      => 'Hello World',
+			'content'    => 'Hello. I am a test post. I was created by the API',
+			'tags'       => 'tests',
+			'categories' => 'API'
+		)
+	)
+) );
+
+new WPCOM_JSON_API_Update_Post_v1_1_Endpoint( array(
+	'description' => 'Edit a post.',
+	'group'       => 'posts',
+	'stat'        => 'posts:1:POST',
+	'new_version' => '1.2',
+	'min_version' => '1.1',
+	'max_version' => '1.1',
+	'method'      => 'POST',
+	'path'        => '/sites/%s/posts/%d',
+	'path_labels' => array(
+		'$site'    => '(int|string) Site ID or domain',
+		'$post_ID' => '(int) The post ID',
+	),
+
+	'request_format' => array(
+		'date'      => "(ISO 8601 datetime) The post's creation time.",
+		'title'     => '(HTML) The post title.',
+		'content'   => '(HTML) The post content.',
+		'excerpt'   => '(HTML) An optional post excerpt.',
+		'slug'      => '(string) The name (slug) for the post, used in URLs.',
+		'author'    => '(string) The username or ID for the user to assign the post to.',
+		'publicize' => '(array|bool) True or false if the post be publicized to external services. An array of services if we only want to publicize to a select few. Defaults to true.',
+		'publicize_message' => '(string) Custom message to be publicized to external services.',
+		'status'    => array(
+			'publish' => 'Publish the post.',
+			'private' => 'Privately publish the post.',
+			'draft'   => 'Save the post as a draft.',
+			'future'  => 'Schedule the post (alias for publish; you must also set a future date).',
+			'pending' => 'Mark the post as pending editorial approval.',
+			'trash'   => 'Set the post as trashed.',
+		),
+		'sticky'    => array(
+			'false'   => 'Post is not marked as sticky.',
+			'true'    => 'Stick the post to the front page.',
+		),
+		'password'   => '(string) The plaintext password protecting the post, or, more likely, the empty string if the post is not password protected.',
+		'parent'     => "(int) The post ID of the new post's parent.",
+		'terms'      => '(object) Mapping of taxonomy to comma-separated list or array of terms (name or id)',
+		'categories' => "(array|string) Comma-separated list or array of categories (name or id)",
+		'tags'       => "(array|string) Comma-separated list or array of tags (name or id)",
+		'format'     => array_merge( array( 'default' => 'Use default post format' ), get_post_format_strings() ),
+		'discussion' => '(object) A hash containing one or more of the following boolean values, which default to the blog\'s discussion preferences: `comments_open`, `pings_open`',
+		'likes_enabled' => "(bool) Should the post be open to likes?",
+		'menu_order'    => "(int) (Pages only) the order pages should appear in. Use 0 to maintain alphabetical order.",
+		'page_template' => '(string) (Pages Only) The page template this page should use.',
+		'sharing_enabled' => "(bool) Should sharing buttons show on this post?",
+		'featured_image' => "(string) The post ID of an existing attachment to set as the featured image. Pass an empty string to delete the existing image.",
+		'media'      => "(media) An array of files to attach to the post. To upload media, the entire request should be multipart/form-data encoded. Multiple media items will be displayed in a gallery. Accepts  jpg, jpeg, png, gif, pdf, doc, ppt, odt, pptx, docx, pps, ppsx, xls, xlsx, key. Audio and Video may also be available. See <code>allowed_file_types</code> in the options resposne of the site endpoint. <br /><br /><strong>Example</strong>:<br />" .
+		 				"<code>curl \<br />--form 'title=Image' \<br />--form 'media[]=@/path/to/file.jpg' \<br />-H 'Authorization: BEARER your-token' \<br />'https://public-api.wordpress.com/rest/v1/sites/123/posts/new'</code>",
+		'media_urls' => "(array) An array of URLs for images to attach to a post. Sideloads the media in for a post.",
+		'metadata'      => "(array) Array of metadata objects containing the following properties: `key` (metadata key), `id` (meta ID), `previous_value` (if set, the action will only occur for the provided previous value), `value` (the new value to set the meta to), `operation` (the operation to perform: `update` or `add`; defaults to `update`). All unprotected meta keys are available by default for read requests. Both unprotected and protected meta keys are available for authenticated requests with proper capabilities. Protected meta keys can be made available with the <code>rest_api_allowed_public_metadata</code> filter.",
+	),
+
+	'example_request'      => 'https://public-api.wordpress.com/rest/v1.1/sites/82974409/posts/881',
+
+	'example_request_data' => array(
+		'headers' => array(
+			'authorization' => 'Bearer YOUR_API_TOKEN'
+		),
+
+		'body' => array(
+			'title'      => 'Hello World (Again)',
+			'content'    => 'Hello. I am an edited post. I was edited by the API',
+			'tags'       => 'tests',
+			'categories' => 'API'
+		)
+	)
+) );
+
+new WPCOM_JSON_API_Update_Post_v1_1_Endpoint( array(
+	'description' => 'Delete a post. Note: If the trash is enabled, this request will send the post to the trash. A second request will permanently delete the post.',
+	'group'       => 'posts',
+	'stat'        => 'posts:1:delete',
+	'min_version' => '1.1',
+	'max_version' => '1.1',
+	'method'      => 'POST',
+	'path'        => '/sites/%s/posts/%d/delete',
+	'path_labels' => array(
+		'$site'    => '(int|string) Site ID or domain',
+		'$post_ID' => '(int) The post ID',
+	),
+
+	'example_request'      => 'https://public-api.wordpress.com/rest/v1.1/sites/82974409/posts/$post_ID/delete/',
+
+	'example_request_data' => array(
+		'headers' => array(
+			'authorization' => 'Bearer YOUR_API_TOKEN'
+		)
+	)
+) );
+
+new WPCOM_JSON_API_Update_Post_v1_1_Endpoint( array(
+	'description' => 'Restore a post or page from the trash to its previous status.',
+	'group'       => 'posts',
+	'stat'        => 'posts:1:restore',
+	'min_version' => '1.1',
+	'max_version' => '1.1',
+	'method'      => 'POST',
+	'path'        => '/sites/%s/posts/%d/restore',
+	'path_labels' => array(
+		'$site'    => '(int|string) Site ID or domain',
+		'$post_ID' => '(int) The post ID',
+	),
+
+	'example_request'      => 'https://public-api.wordpress.com/rest/v1.1/sites/82974409/posts/$post_ID/restore/',
+
+	'example_request_data' => array(
+		'headers' => array(
+			'authorization' => 'Bearer YOUR_API_TOKEN'
+		)
+	)
+) );
+
 class WPCOM_JSON_API_Update_Post_v1_1_Endpoint extends WPCOM_JSON_API_Post_v1_1_Endpoint {
 	function __construct( $args ) {
 		parent::__construct( $args );
diff --git a/plugins/jetpack/json-endpoints/class.wpcom-json-api-update-post-v1-2-endpoint.php b/plugins/jetpack/json-endpoints/class.wpcom-json-api-update-post-v1-2-endpoint.php
index 339d06c5..e33d3dc3 100644
--- a/plugins/jetpack/json-endpoints/class.wpcom-json-api-update-post-v1-2-endpoint.php
+++ b/plugins/jetpack/json-endpoints/class.wpcom-json-api-update-post-v1-2-endpoint.php
@@ -1,4 +1,150 @@
 <?php
+
+new WPCOM_JSON_API_Update_Post_v1_2_Endpoint( array(
+	'description' => 'Create a post.',
+	'group'       => 'posts',
+	'stat'        => 'posts:new',
+	'min_version' => '1.2',
+	'max_version' => '1.2',
+	'method'      => 'POST',
+	'path'        => '/sites/%s/posts/new',
+	'path_labels' => array(
+		'$site' => '(int|string) Site ID or domain',
+	),
+
+	'request_format' => array(
+		// explicitly document all input
+		'date'      => "(ISO 8601 datetime) The post's creation time.",
+		'title'     => '(HTML) The post title.',
+		'content'   => '(HTML) The post content.',
+		'excerpt'   => '(HTML) An optional post excerpt.',
+		'slug'      => '(string) The name (slug) for the post, used in URLs.',
+		'author'    => '(string) The username or ID for the user to assign the post to.',
+		'publicize' => '(array|bool) True or false if the post be publicized to external services. An array of services if we only want to publicize to a select few. Defaults to true.',
+		'publicize_message' => '(string) Custom message to be publicized to external services.',
+		'status'    => array(
+			'publish' => 'Publish the post.',
+			'private' => 'Privately publish the post.',
+			'draft'   => 'Save the post as a draft.',
+			'pending' => 'Mark the post as pending editorial approval.',
+			'future'  => 'Schedule the post (alias for publish; you must also set a future date).',
+			'auto-draft' => 'Save a placeholder for a newly created post, with no content.',
+		),
+		'sticky'    => array(
+			'false'   => 'Post is not marked as sticky.',
+			'true'    => 'Stick the post to the front page.',
+		),
+		'password'  => '(string) The plaintext password protecting the post, or, more likely, the empty string if the post is not password protected.',
+		'parent'    => "(int) The post ID of the new post's parent.",
+		'type'      => "(string) The post type. Defaults to 'post'. Post types besides post and page need to be whitelisted using the <code>rest_api_allowed_post_types</code> filter.",
+		'terms'      => '(object) Mapping of taxonomy to comma-separated list or array of term names',
+		'categories' => "(array|string) Comma-separated list or array of category names",
+		'tags'       => "(array|string) Comma-separated list or array of tag names",
+		'terms_by_id'      => '(object) Mapping of taxonomy to comma-separated list or array of term IDs',
+		'categories_by_id' => "(array|string) Comma-separated list or array of category IDs",
+		'tags_by_id'       => "(array|string) Comma-separated list or array of tag IDs",
+		'format'     => array_merge( array( 'default' => 'Use default post format' ), get_post_format_strings() ),
+		'featured_image' => "(string) The post ID of an existing attachment to set as the featured image. Pass an empty string to delete the existing image.",
+		'media'      => "(media) An array of files to attach to the post. To upload media, the entire request should be multipart/form-data encoded. Multiple media items will be displayed in a gallery. Accepts  jpg, jpeg, png, gif, pdf, doc, ppt, odt, pptx, docx, pps, ppsx, xls, xlsx, key. Audio and Video may also be available. See <code>allowed_file_types</code> in the options response of the site endpoint. Errors produced by media uploads, if any, will be in `media_errors` in the response. <br /><br /><strong>Example</strong>:<br />" .
+		 				"<code>curl \<br />--form 'title=Image Post' \<br />--form 'media[0]=@/path/to/file.jpg' \<br />--form 'media_attrs[0][caption]=My Great Photo' \<br />-H 'Authorization: BEARER your-token' \<br />'https://public-api.wordpress.com/rest/v1/sites/123/posts/new'</code>",
+		'media_urls' => "(array) An array of URLs for images to attach to a post. Sideloads the media in for a post. Errors produced by media sideloading, if any, will be in `media_errors` in the response.",
+		'media_attrs' => "(array) An array of attributes (`title`, `description` and `caption`) are supported to assign to the media uploaded via the `media` or `media_urls` properties. You must use a numeric index for the keys of `media_attrs` which follow the same sequence as `media` and `media_urls`. <br /><br /><strong>Example</strong>:<br />" .
+		                 "<code>curl \<br />--form 'title=Gallery Post' \<br />--form 'media[]=@/path/to/file1.jpg' \<br />--form 'media_urls[]=http://exapmple.com/file2.jpg' \<br /> \<br />--form 'media_attrs[0][caption]=This will be the caption for file1.jpg' \<br />--form 'media_attrs[1][title]=This will be the title for file2.jpg' \<br />-H 'Authorization: BEARER your-token' \<br />'https://public-api.wordpress.com/rest/v1/sites/123/posts/new'</code>",
+		'metadata'      => "(array) Array of metadata objects containing the following properties: `key` (metadata key), `id` (meta ID), `previous_value` (if set, the action will only occur for the provided previous value), `value` (the new value to set the meta to), `operation` (the operation to perform: `update` or `add`; defaults to `update`). All unprotected meta keys are available by default for read requests. Both unprotected and protected meta keys are avaiable for authenticated requests with proper capabilities. Protected meta keys can be made available with the <code>rest_api_allowed_public_metadata</code> filter.",
+		'discussion'    => '(object) A hash containing one or more of the following boolean values, which default to the blog\'s discussion preferences: `comments_open`, `pings_open`',
+		'likes_enabled' => "(bool) Should the post be open to likes? Defaults to the blog's preference.",
+		'sharing_enabled' => "(bool) Should sharing buttons show on this post? Defaults to true.",
+		'menu_order'    => "(int) (Pages Only) the order pages should appear in. Use 0 to maintain alphabetical order.",
+		'page_template' => '(string) (Pages Only) The page template this page should use.',
+	),
+
+	'example_request'      => 'https://public-api.wordpress.com/rest/v1.2/sites/82974409/posts/new/',
+
+	'example_request_data' => array(
+		'headers' => array(
+			'authorization' => 'Bearer YOUR_API_TOKEN'
+		),
+
+		'body' => array(
+			'title'      => 'Hello World',
+			'content'    => 'Hello. I am a test post. I was created by the API',
+			'tags'       => 'tests',
+			'categories' => 'API'
+		)
+	)
+) );
+
+new WPCOM_JSON_API_Update_Post_v1_2_Endpoint( array(
+	'description' => 'Edit a post.',
+	'group'       => 'posts',
+	'stat'        => 'posts:1:POST',
+	'min_version' => '1.2',
+	'max_version' => '1.2',
+	'method'      => 'POST',
+	'path'        => '/sites/%s/posts/%d',
+	'path_labels' => array(
+		'$site'    => '(int|string) Site ID or domain',
+		'$post_ID' => '(int) The post ID',
+	),
+
+	'request_format' => array(
+		'date'      => "(ISO 8601 datetime) The post's creation time.",
+		'title'     => '(HTML) The post title.',
+		'content'   => '(HTML) The post content.',
+		'excerpt'   => '(HTML) An optional post excerpt.',
+		'slug'      => '(string) The name (slug) for the post, used in URLs.',
+		'author'    => '(string) The username or ID for the user to assign the post to.',
+		'publicize' => '(array|bool) True or false if the post be publicized to external services. An array of services if we only want to publicize to a select few. Defaults to true.',
+		'publicize_message' => '(string) Custom message to be publicized to external services.',
+		'status'    => array(
+			'publish' => 'Publish the post.',
+			'private' => 'Privately publish the post.',
+			'draft'   => 'Save the post as a draft.',
+			'future'  => 'Schedule the post (alias for publish; you must also set a future date).',
+			'pending' => 'Mark the post as pending editorial approval.',
+			'trash'   => 'Set the post as trashed.',
+		),
+		'sticky'    => array(
+			'false'   => 'Post is not marked as sticky.',
+			'true'    => 'Stick the post to the front page.',
+		),
+		'password'   => '(string) The plaintext password protecting the post, or, more likely, the empty string if the post is not password protected.',
+		'parent'     => "(int) The post ID of the new post's parent.",
+		'terms'      => '(object) Mapping of taxonomy to comma-separated list or array of term names',
+		'terms_by_id' => '(object) Mapping of taxonomy to comma-separated list or array of term IDs',
+		'categories' => "(array|string) Comma-separated list or array of category names",
+		'categories_by_id' => "(array|string) Comma-separated list or array of category IDs",
+		'tags'       => "(array|string) Comma-separated list or array of tag names",
+		'tags_by_id'       => "(array|string) Comma-separated list or array of tag IDs",
+		'format'     => array_merge( array( 'default' => 'Use default post format' ), get_post_format_strings() ),
+		'discussion' => '(object) A hash containing one or more of the following boolean values, which default to the blog\'s discussion preferences: `comments_open`, `pings_open`',
+		'likes_enabled' => "(bool) Should the post be open to likes?",
+		'menu_order'    => "(int) (Pages only) the order pages should appear in. Use 0 to maintain alphabetical order.",
+		'page_template' => '(string) (Pages Only) The page template this page should use.',
+		'sharing_enabled' => "(bool) Should sharing buttons show on this post?",
+		'featured_image' => "(string) The post ID of an existing attachment to set as the featured image. Pass an empty string to delete the existing image.",
+		'media'      => "(media) An array of files to attach to the post. To upload media, the entire request should be multipart/form-data encoded. Multiple media items will be displayed in a gallery. Accepts  jpg, jpeg, png, gif, pdf, doc, ppt, odt, pptx, docx, pps, ppsx, xls, xlsx, key. Audio and Video may also be available. See <code>allowed_file_types</code> in the options resposne of the site endpoint. <br /><br /><strong>Example</strong>:<br />" .
+		 				"<code>curl \<br />--form 'title=Image' \<br />--form 'media[]=@/path/to/file.jpg' \<br />-H 'Authorization: BEARER your-token' \<br />'https://public-api.wordpress.com/rest/v1/sites/123/posts/new'</code>",
+		'media_urls' => "(array) An array of URLs for images to attach to a post. Sideloads the media in for a post.",
+		'metadata'      => "(array) Array of metadata objects containing the following properties: `key` (metadata key), `id` (meta ID), `previous_value` (if set, the action will only occur for the provided previous value), `value` (the new value to set the meta to), `operation` (the operation to perform: `update` or `add`; defaults to `update`). All unprotected meta keys are available by default for read requests. Both unprotected and protected meta keys are available for authenticated requests with proper capabilities. Protected meta keys can be made available with the <code>rest_api_allowed_public_metadata</code> filter.",
+	),
+
+	'example_request'      => 'https://public-api.wordpress.com/rest/v1.2/sites/82974409/posts/881',
+
+	'example_request_data' => array(
+		'headers' => array(
+			'authorization' => 'Bearer YOUR_API_TOKEN'
+		),
+
+		'body' => array(
+			'title'      => 'Hello World (Again)',
+			'content'    => 'Hello. I am an edited post. I was edited by the API',
+			'tags'       => 'tests',
+			'categories' => 'API'
+		)
+	)
+) );
+
 class WPCOM_JSON_API_Update_Post_v1_2_Endpoint extends WPCOM_JSON_API_Update_Post_v1_1_Endpoint {
 
 	// /sites/%s/posts/new       -> $blog_id
diff --git a/plugins/jetpack/json-endpoints/class.wpcom-json-api-update-site-homepage-endpoint.php b/plugins/jetpack/json-endpoints/class.wpcom-json-api-update-site-homepage-endpoint.php
index 96191fdc..fa8c4cf8 100644
--- a/plugins/jetpack/json-endpoints/class.wpcom-json-api-update-site-homepage-endpoint.php
+++ b/plugins/jetpack/json-endpoints/class.wpcom-json-api-update-site-homepage-endpoint.php
@@ -1,5 +1,37 @@
 <?php
 
+new WPCOM_JSON_API_Update_Site_Homepage_Endpoint( array (
+	'description'      => 'Set site homepage settings',
+	'group'            => '__do_not_document',
+	'stat'             => 'sites:1:homepage',
+	'method'           => 'POST',
+	'min_version'      => '1.1',
+	'path'             => '/sites/%s/homepage',
+	'path_labels'      => array(
+		'$site' => '(string) Site ID or domain.',
+	),
+	'request_format'  => array(
+		'is_page_on_front' => '(bool) True if we will use a page as the homepage; false to use a blog page as the homepage.',
+		'page_on_front_id' => '(int) Optional. The ID of the page to use as the homepage if is_page_on_front is true.',
+		'page_for_posts_id' => '(int) Optional. The ID of the page to use as the blog page if is_page_on_front is true.',
+	),
+	'response_format'  => array(
+		'is_page_on_front' => '(bool) True if we will use a page as the homepage; false to use a blog page as the homepage.',
+		'page_on_front_id' => '(int) The ID of the page to use as the homepage if is_page_on_front is true.',
+		'page_for_posts_id' => '(int) The ID of the page to use as the blog page if is_page_on_front is true.',
+	),
+	'example_request'  => 'https://public-api.wordpress.com/rest/v1.1/sites/82974409/homepage',
+	'example_request_data' => array(
+		'headers' => array( 'authorization' => 'Bearer YOUR_API_TOKEN' ),
+		'body' => array(
+			'is_page_on_front' => true,
+			'page_on_front_id' => 1,
+			'page_for_posts_id' => 0,
+		),
+	),
+	'example_response' => '{"is_page_on_front":true,"page_on_front_id":1,"page_for_posts_id":0}'
+) );
+
 class WPCOM_JSON_API_Update_Site_Homepage_Endpoint extends WPCOM_JSON_API_Endpoint {
 
 	function callback( $path = '', $site_id = 0 ) {
diff --git a/plugins/jetpack/json-endpoints/class.wpcom-json-api-update-site-logo-endpoint.php b/plugins/jetpack/json-endpoints/class.wpcom-json-api-update-site-logo-endpoint.php
index 89fa9121..2ccca0a9 100644
--- a/plugins/jetpack/json-endpoints/class.wpcom-json-api-update-site-logo-endpoint.php
+++ b/plugins/jetpack/json-endpoints/class.wpcom-json-api-update-site-logo-endpoint.php
@@ -1,5 +1,54 @@
 <?php
 
+new WPCOM_JSON_API_Update_Site_Logo_Endpoint( array (
+	'description'      => 'Set site logo settings',
+	'group'            => '__do_not_document',
+	'stat'             => 'sites:1:logo',
+	'method'           => 'POST',
+	'min_version'      => '1.1',
+	'path'             => '/sites/%s/logo',
+	'path_labels'      => array(
+		'$site' => '(string) Site ID or domain.',
+	),
+	'request_format'  => array(
+		'id' => '(int) The ID of the logo post',
+		'url' => '(string) The URL of the logo post',
+	),
+	'response_format'  => array(
+		'id' => '(int) The ID of the logo post',
+		'url' => '(string) The URL of the logo post',
+	),
+	'example_request'  => 'https://public-api.wordpress.com/rest/v1.1/sites/82974409/logo',
+	'example_request_data' => array(
+		'headers' => array( 'authorization' => 'Bearer YOUR_API_TOKEN' ),
+		'body' => array(
+			'id' => 12345,
+			'url' => 'https://s.w.org/about/images/logos/codeispoetry-rgb.png',
+		),
+	),
+	'example_response' => '
+	{
+		"id": 12345,
+		"url": "https:\/\/s.w.org\/about\/images\/logos\/codeispoetry-rgb.png"
+	}'
+) );
+
+new WPCOM_JSON_API_Update_Site_Logo_Endpoint( array (
+	'description'      => 'Delete site logo settings',
+	'group'            => '__do_not_document',
+	'stat'             => 'sites:1:logo:delete',
+	'method'           => 'POST',
+	'min_version'      => '1.1',
+	'path'             => '/sites/%s/logo/delete',
+	'path_labels'      => array(
+		'$site' => '(string) Site ID or domain.',
+	),
+	'example_request'  => 'https://public-api.wordpress.com/rest/v1.1/sites/82974409/logo/delete',
+	'example_request_data' => array(
+		'headers' => array( 'authorization' => 'Bearer YOUR_API_TOKEN' ),
+	),
+) );
+
 class WPCOM_JSON_API_Update_Site_Logo_Endpoint extends WPCOM_JSON_API_Endpoint {
 	function callback( $path = '', $site_id = 0 ) {
 		// Switch to the given blog.
diff --git a/plugins/jetpack/json-endpoints/class.wpcom-json-api-update-taxonomy-endpoint.php b/plugins/jetpack/json-endpoints/class.wpcom-json-api-update-taxonomy-endpoint.php
index 979330b2..5cab5b3f 100644
--- a/plugins/jetpack/json-endpoints/class.wpcom-json-api-update-taxonomy-endpoint.php
+++ b/plugins/jetpack/json-endpoints/class.wpcom-json-api-update-taxonomy-endpoint.php
@@ -1,5 +1,165 @@
 <?php
 
+new WPCOM_JSON_API_Update_Taxonomy_Endpoint( array(
+	'description' => 'Create a new category.',
+	'group'       => 'taxonomy',
+	'stat'        => 'categories:new',
+
+	'method'      => 'POST',
+	'path'        => '/sites/%s/categories/new',
+	'path_labels' => array(
+		'$site' => '(int|string) Site ID or domain',
+	),
+
+	'request_format' => array(
+		'name'        => '(string) Name of the category',
+		'description' => '(string) A description of the category',
+		'parent'      => '(int) ID of the parent category',
+	),
+
+	'example_request'      => 'https://public-api.wordpress.com/rest/v1/sites/82974409/categories/new/',
+	'example_request_data' => array(
+		'headers' => array(
+			'authorization' => 'Bearer YOUR_API_TOKEN'
+		),
+		'body' => array(
+			'name' => 'Puppies',
+		)
+	)
+) );
+
+new WPCOM_JSON_API_Update_Taxonomy_Endpoint( array(
+	'description' => 'Create a new tag.',
+	'group'       => 'taxonomy',
+	'stat'        => 'tags:new',
+
+	'method'      => 'POST',
+	'path'        => '/sites/%s/tags/new',
+	'path_labels' => array(
+		'$site' => '(int|string) Site ID or domain',
+	),
+
+	'request_format' => array(
+		'name'        => '(string) Name of the tag',
+		'description' => '(string) A description of the tag',
+	),
+
+	'example_request'      => 'https://public-api.wordpress.com/rest/v1/sites/82974409/tags/new/',
+	'example_request_data' => array(
+		'headers' => array(
+			'authorization' => 'Bearer YOUR_API_TOKEN'
+		),
+		'body' => array(
+			'name' => 'Kitties'
+		)
+	)
+) );
+
+new WPCOM_JSON_API_Update_Taxonomy_Endpoint( array(
+	'description' => 'Edit a tag.',
+	'group'       => 'taxonomy',
+	'stat'        => 'tags:1:POST',
+
+	'method'      => 'POST',
+	'path'        => '/sites/%s/tags/slug:%s',
+	'path_labels' => array(
+		'$site' => '(int|string) Site ID or domain',
+		'$tag'  => '(string) The tag slug',
+	),
+
+	'request_format' => array(
+		'name'        => '(string) Name of the tag',
+		'description' => '(string) A description of the tag',
+	),
+
+	'example_request'      => 'https://public-api.wordpress.com/rest/v1/sites/82974409/tags/slug:testing-tag',
+	'example_request_data' => array(
+		'headers' => array(
+			'authorization' => 'Bearer YOUR_API_TOKEN'
+		),
+		'body' => array(
+			'description' => 'Kitties are awesome!'
+		)
+	)
+) );
+
+new WPCOM_JSON_API_Update_Taxonomy_Endpoint( array(
+	'description' => 'Edit a category.',
+	'group'       => 'taxonomy',
+	'stat'        => 'categories:1:POST',
+
+	'method'      => 'POST',
+	'path'        => '/sites/%s/categories/slug:%s',
+	'path_labels' => array(
+		'$site'     => '(int|string) Site ID or domain',
+		'$category' => '(string) The category slug',
+	),
+
+	'request_format' => array(
+		'name'        => '(string) Name of the category',
+		'description' => '(string) A description of the category',
+		'parent'      => '(int) ID of the parent category',
+	),
+
+	'example_request'      => 'https://public-api.wordpress.com/rest/v1/sites/82974409/categories/slug:testing-category',
+	'example_request_data' => array(
+		'headers' => array(
+			'authorization' => 'Bearer YOUR_API_TOKEN'
+		),
+		'body' => array(
+			'description' => 'Puppies are great!'
+		)
+	)
+) );
+
+new WPCOM_JSON_API_Update_Taxonomy_Endpoint( array(
+	'description' => 'Delete a category.',
+	'group'       => 'taxonomy',
+	'stat'        => 'categories:1:delete',
+
+	'method'      => 'POST',
+	'path'        => '/sites/%s/categories/slug:%s/delete',
+	'path_labels' => array(
+		'$site'     => '(int|string) Site ID or domain',
+		'$category' => '(string) The category slug',
+	),
+	'response_format' => array(
+		'slug'    => '(string) The slug of the deleted category',
+		'success' => '(bool) Was the operation successful?',
+	),
+
+	'example_request'      => 'https://public-api.wordpress.com/rest/v1/sites/82974409/categories/slug:$category/delete',
+	'example_request_data' => array(
+		'headers' => array(
+			'authorization' => 'Bearer YOUR_API_TOKEN'
+		),
+	)
+) );
+
+new WPCOM_JSON_API_Update_Taxonomy_Endpoint( array(
+	'description' => 'Delete a tag.',
+	'group'       => 'taxonomy',
+	'stat'        => 'tags:1:delete',
+
+	'method'      => 'POST',
+	'path'        => '/sites/%s/tags/slug:%s/delete',
+	'path_labels' => array(
+		'$site' => '(int|string) Site ID or domain',
+		'$tag'  => '(string) The tag slug',
+	),
+	'response_format' => array(
+		'slug'    => '(string) The slug of the deleted tag',
+		'success' => '(bool) Was the operation successful?',
+	),
+
+	'example_request'      => 'https://public-api.wordpress.com/rest/v1/sites/82974409/tags/slug:$tag/delete',
+	'example_request_data' => array(
+		'headers' => array(
+			'authorization' => 'Bearer YOUR_API_TOKEN'
+		),
+	)
+) );
+
 class WPCOM_JSON_API_Update_Taxonomy_Endpoint extends WPCOM_JSON_API_Taxonomy_Endpoint {
 	// /sites/%s/tags|categories/new    -> $blog_id
 	// /sites/%s/tags|categories/slug:%s -> $blog_id, $taxonomy_id
diff --git a/plugins/jetpack/json-endpoints/class.wpcom-json-api-update-term-endpoint.php b/plugins/jetpack/json-endpoints/class.wpcom-json-api-update-term-endpoint.php
index f0dea3ac..710ffa6b 100644
--- a/plugins/jetpack/json-endpoints/class.wpcom-json-api-update-term-endpoint.php
+++ b/plugins/jetpack/json-endpoints/class.wpcom-json-api-update-term-endpoint.php
@@ -1,5 +1,81 @@
 <?php
 
+new WPCOM_JSON_API_Update_Term_Endpoint( array(
+	'description' => 'Create a new term.',
+	'group'       => 'taxonomy',
+	'stat'        => 'terms:new',
+	'method'      => 'POST',
+	'path'        => '/sites/%s/taxonomies/%s/terms/new',
+	'path_labels' => array(
+		'$site'     => '(int|string) Site ID or domain',
+		'$taxonomy' => '(string) Taxonomy',
+	),
+	'request_format' => array(
+		'name'        => '(string) Name of the term',
+		'description' => '(string) A description of the term',
+		'parent'      => '(int) The parent ID for the term, if hierarchical',
+	),
+	'example_request'      => 'https://public-api.wordpress.com/rest/v1/sites/82974409/taxonomies/post_tag/terms/new',
+	'example_request_data' => array(
+		'headers' => array(
+			'authorization' => 'Bearer YOUR_API_TOKEN'
+		),
+		'body' => array(
+			'name' => 'Ribs & Chicken'
+		)
+	)
+) );
+
+new WPCOM_JSON_API_Update_Term_Endpoint( array(
+	'description' => 'Edit a term.',
+	'group'       => 'taxonomy',
+	'stat'        => 'terms:1:POST',
+	'method'      => 'POST',
+	'path'        => '/sites/%s/taxonomies/%s/terms/slug:%s',
+	'path_labels' => array(
+		'$site'     => '(int|string) Site ID or domain',
+		'$taxonomy' => '(string) Taxonomy',
+		'$slug'     => '(string) The term slug',
+	),
+	'request_format' => array(
+		'name'        => '(string) Name of the term',
+		'description' => '(string) A description of the term',
+		'parent'      => '(int) The parent ID for the term, if hierarchical',
+	),
+	'example_request'      => 'https://public-api.wordpress.com/rest/v1/sites/82974409/taxonomies/post_tag/terms/slug:testing-term',
+	'example_request_data' => array(
+		'headers' => array(
+			'authorization' => 'Bearer YOUR_API_TOKEN'
+		),
+		'body' => array(
+			'description' => 'The most delicious'
+		)
+	)
+) );
+
+new WPCOM_JSON_API_Update_Term_Endpoint( array(
+	'description' => 'Delete a term.',
+	'group'       => 'taxonomy',
+	'stat'        => 'terms:1:delete',
+	'method'      => 'POST',
+	'path'        => '/sites/%s/taxonomies/%s/terms/slug:%s/delete',
+	'path_labels' => array(
+		'$site'     => '(int|string) Site ID or domain',
+		'$taxonomy' => '(string) Taxonomy',
+		'$slug'     => '(string) The term slug',
+	),
+	'response_format' => array(
+		'slug'    => '(string) The slug of the deleted term',
+		'success' => '(bool) Whether the operation was successful',
+	),
+	'example_request'      => 'https://public-api.wordpress.com/rest/v1/sites/82974409/taxonomies/post_tag/terms/slug:$term/delete',
+	'example_request_data' => array(
+		'headers' => array(
+			'authorization' => 'Bearer YOUR_API_TOKEN'
+		),
+	)
+) );
+
 class WPCOM_JSON_API_Update_Term_Endpoint extends WPCOM_JSON_API_Taxonomy_Endpoint {
 	// /sites/%s/taxonomies/%s/terms/new            -> $blog_id, $taxonomy
 	// /sites/%s/taxonomies/%s/terms/slug:%s        -> $blog_id, $taxonomy, $slug
diff --git a/plugins/jetpack/json-endpoints/class.wpcom-json-api-update-user-endpoint.php b/plugins/jetpack/json-endpoints/class.wpcom-json-api-update-user-endpoint.php
index e08e8810..ef5cb2d8 100644
--- a/plugins/jetpack/json-endpoints/class.wpcom-json-api-update-user-endpoint.php
+++ b/plugins/jetpack/json-endpoints/class.wpcom-json-api-update-user-endpoint.php
@@ -1,4 +1,38 @@
 <?php
+
+new WPCOM_JSON_API_Update_User_Endpoint( array(
+	'description' => 'Deletes or removes a user of a site.',
+	'group'       => 'users',
+	'stat'        => 'users:delete',
+
+	'method'      => 'POST',
+	'path'        => '/sites/%s/users/%d/delete',
+	'path_labels' => array(
+		'$site'       => '(int|string) The site ID or domain.',
+		'$user_ID'    => '(int) The user\'s ID'
+	),
+
+	'request_format' => array(
+		'reassign' => '(int) An optional id of a user to reassign posts to.',
+	),
+
+	'response_format' => array(
+		'success' => '(bool) Was the deletion of user successful?',
+	),
+
+	'example_request'      => 'https://public-api.wordpress.com/rest/v1/sites/82974409/users/1/delete',
+	'example_request_data' => array(
+		'headers' => array(
+			'authorization' => 'Bearer YOUR_API_TOKEN'
+		),
+	),
+
+	'example_response' => '
+	{
+		"success": true
+	}'
+) );
+
 class WPCOM_JSON_API_Update_User_Endpoint extends WPCOM_JSON_API_Endpoint {
 
 	function callback( $path = '', $blog_id = 0, $user_id = 0 ) {
diff --git a/plugins/jetpack/json-endpoints/class.wpcom-json-api-upload-media-endpoint.php b/plugins/jetpack/json-endpoints/class.wpcom-json-api-upload-media-endpoint.php
index fda2d279..a47b5d0c 100644
--- a/plugins/jetpack/json-endpoints/class.wpcom-json-api-upload-media-endpoint.php
+++ b/plugins/jetpack/json-endpoints/class.wpcom-json-api-upload-media-endpoint.php
@@ -1,5 +1,40 @@
 <?php
 
+new WPCOM_JSON_API_Upload_Media_Endpoint( array(
+	'description' => 'Upload a new media item.',
+	'group'       => 'media',
+	'stat'        => 'media:new',
+	'method'      => 'POST',
+	'path'        => '/sites/%s/media/new',
+	'deprecated'  => true,
+	'new_version' => '1.1',
+	'max_version' => '1',
+	'path_labels' => array(
+		'$site' => '(int|string) Site ID or domain',
+	),
+
+	'request_format' => array(
+		'media'      => "(media) An array of media to attach to the post. To upload media, the entire request should be multipart/form-data encoded. Accepts images (image/gif, image/jpeg, image/png) only at this time.<br /><br /><strong>Example</strong>:<br />" .
+		                "<code>curl \<br />--form 'media[]=@/path/to/file.jpg' \<br />-H 'Authorization: BEARER your-token' \<br />'https://public-api.wordpress.com/rest/v1/sites/123/media/new'</code>",
+		'media_urls' => "(array) An array of URLs to upload to the post."
+	),
+
+	'example_request'      => 'https://public-api.wordpress.com/rest/v1/sites/82974409/media/new/',
+
+	'response_format' => array(
+		'media' => '(array) Array of uploaded media',
+		'errors' => '(array) Array of error messages of uploading media failures'
+	),
+	'example_request_data' =>  array(
+		'headers' => array(
+			'authorization' => 'Bearer YOUR_API_TOKEN'
+		),
+		'body' => array(
+			'media_urls' => "https://s.w.org/about/images/logos/codeispoetry-rgb.png"
+		)
+	)
+) );
+
 class WPCOM_JSON_API_Upload_Media_Endpoint extends WPCOM_JSON_API_Endpoint {
 	function callback( $path = '', $blog_id = 0 ) {
 		$blog_id = $this->api->switch_to_blog_and_validate_user( $this->api->get_blog_id( $blog_id ) );
diff --git a/plugins/jetpack/json-endpoints/class.wpcom-json-api-upload-media-v1-1-endpoint.php b/plugins/jetpack/json-endpoints/class.wpcom-json-api-upload-media-v1-1-endpoint.php
index f635f451..7aea6949 100644
--- a/plugins/jetpack/json-endpoints/class.wpcom-json-api-upload-media-v1-1-endpoint.php
+++ b/plugins/jetpack/json-endpoints/class.wpcom-json-api-upload-media-v1-1-endpoint.php
@@ -1,4 +1,43 @@
 <?php
+
+new WPCOM_JSON_API_Upload_Media_v1_1_Endpoint( array(
+	'description' => 'Upload a new piece of media.',
+	'allow_cross_origin_request' => true,
+	'allow_upload_token_auth' => true,
+	'group'       => 'media',
+	'stat'        => 'media:new',
+	'min_version' => '1.1',
+	'max_version' => '1.1',
+	'method'      => 'POST',
+	'path'        => '/sites/%s/media/new',
+	'path_labels' => array(
+		'$site' => '(int|string) Site ID or domain',
+	),
+
+	'request_format' => array(
+		'media'      => "(media) An array of media to attach to the post. To upload media, the entire request should be multipart/form-data encoded. Accepts  jpg, jpeg, png, gif, pdf, doc, ppt, odt, pptx, docx, pps, ppsx, xls, xlsx, key. Audio and Video may also be available. See <code>allowed_file_types</code> in the options response of the site endpoint.<br /><br /><strong>Example</strong>:<br />" .
+		                "<code>curl \<br />--form 'media[]=@/path/to/file.jpg' \<br />-H 'Authorization: BEARER your-token' \<br />'https://public-api.wordpress.com/rest/v1/sites/123/media/new'</code>",
+		'media_urls' => "(array) An array of URLs to upload to the post. Errors produced by media uploads, if any, will be in `media_errors` in the response.",
+		'attrs' => "(array) An array of attributes (`title`, `description`, `caption` `alt` for images, `artist` for audio, `album` for audio, and `parent_id`) are supported to assign to the media uploaded via the `media` or `media_urls` properties. You must use a numeric index for the keys of `attrs` which follows the same sequence as `media` and `media_urls`. <br /><br /><strong>Example</strong>:<br />" .
+		                 "<code>curl \<br />--form 'media[]=@/path/to/file1.jpg' \<br />--form 'media_urls[]=http://example.com/file2.jpg' \<br /> \<br />--form 'attrs[0][caption]=This will be the caption for file1.jpg' \<br />--form 'attrs[1][title]=This will be the title for file2.jpg' \<br />-H 'Authorization: BEARER your-token' \<br />'https://public-api.wordpress.com/rest/v1/sites/123/posts/new'</code>",
+	),
+
+	'response_format' => array(
+		'media' => '(array) Array of uploaded media objects',
+		'errors' => '(array) Array of error messages of uploading media failures',
+	),
+
+	'example_request' => 'https://public-api.wordpress.com/rest/v1.1/sites/82974409/media/new',
+	'example_request_data' =>  array(
+		'headers' => array(
+			'authorization' => 'Bearer YOUR_API_TOKEN',
+		),
+		'body' => array(
+			'media_urls' => 'https://s.w.org/about/images/logos/codeispoetry-rgb.png',
+		),
+	)
+) );
+
 class WPCOM_JSON_API_Upload_Media_v1_1_Endpoint extends WPCOM_JSON_API_Endpoint {
 
 	/**
@@ -67,17 +106,17 @@ class WPCOM_JSON_API_Upload_Media_v1_1_Endpoint extends WPCOM_JSON_API_Endpoint
 			}
 		}
 
-        // Normal WPCOM upload processing
-        if ( count( $other_media_files ) > 0 || count( $media_urls ) > 0 ) {
-	        $create_media = $this->handle_media_creation_v1_1( $other_media_files, $media_urls, $media_attrs );
-	        $media_ids = $create_media['media_ids'];
-	        $errors = $create_media['errors'];
-
-	        $media_items = array();
-	        foreach ( $media_ids as $media_id ) {
-		        $media_items[] = $this->get_media_item_v1_1( $media_id );
-	        }
-        }
+		// Normal WPCOM upload processing
+		if ( count( $other_media_files ) > 0 || count( $media_urls ) > 0 ) {
+			$create_media = $this->handle_media_creation_v1_1( $other_media_files, $media_urls, $media_attrs );
+			$media_ids = $create_media['media_ids'];
+			$errors = $create_media['errors'];
+
+			$media_items = array();
+			foreach ( $media_ids as $media_id ) {
+				$media_items[] = $this->get_media_item_v1_1( $media_id );
+			}
+		}
 
 		if ( count( $media_items ) <= 0 ) {
 			return $this->api->output_early( 400, array( 'errors' => $errors ) );
diff --git a/plugins/jetpack/json-endpoints/jetpack/class.jetpack-json-api-cron-endpoint.php b/plugins/jetpack/json-endpoints/jetpack/class.jetpack-json-api-cron-endpoint.php
index 87fd7c89..f50c38c0 100644
--- a/plugins/jetpack/json-endpoints/jetpack/class.jetpack-json-api-cron-endpoint.php
+++ b/plugins/jetpack/json-endpoints/jetpack/class.jetpack-json-api-cron-endpoint.php
@@ -5,7 +5,7 @@ class Jetpack_JSON_API_Cron_Endpoint extends Jetpack_JSON_API_Endpoint {
 	protected $needed_capabilities = 'manage_options';
 
 	protected function validate_call( $_blog_id, $capability, $check_manage_active = true ) {
-		parent::validate_call( $_blog_id, $capability, false );
+		return parent::validate_call( $_blog_id, $capability, false );
 	}
 
 	protected function result() {
diff --git a/plugins/jetpack/json-endpoints/jetpack/class.jetpack-json-api-sync-endpoint.php b/plugins/jetpack/json-endpoints/jetpack/class.jetpack-json-api-sync-endpoint.php
index 3db8086a..ef5831e8 100644
--- a/plugins/jetpack/json-endpoints/jetpack/class.jetpack-json-api-sync-endpoint.php
+++ b/plugins/jetpack/json-endpoints/jetpack/class.jetpack-json-api-sync-endpoint.php
@@ -5,7 +5,7 @@ class Jetpack_JSON_API_Sync_Endpoint extends Jetpack_JSON_API_Endpoint {
 	protected $needed_capabilities = 'manage_options';
 
 	protected function validate_call( $_blog_id, $capability, $check_manage_active = true ) {
-		parent::validate_call( $_blog_id, $capability, false );
+		return parent::validate_call( $_blog_id, $capability, false );
 	}
 
 	protected function result() {