From 8f6188ae5303a20ed75b5a8c5022d6ce1f6017b4 Mon Sep 17 00:00:00 2001
From: Drew Jaynes <info@drewapicture.com>
Date: Mon, 24 Nov 2014 04:42:22 +0000
Subject: [PATCH] Ensure inline code is markdown-escaped as such, and that code
 snippets in descriptions are properly indented.

Affects DocBlocks for the following core elements:
* Two arguments in `_walk_bookmarks()`
* A code snippet in the class header for `WP_Roles`
* A code snippet in the class header for `WP_HTTP_Proxy`
* Inline code fixes in the summary and a parameter description for `WP_oEmbed::discover()`
* An argument description in `_WP_Editors::parse_settings()`
* Inline code fixes in the summary and a parameter description the `embed_oembed_discover` hook.

Props rarst.
See #30473.

Built from https://develop.svn.wordpress.org/trunk@30536


git-svn-id: http://core.svn.wordpress.org/trunk@30525 1a063a9b-81f0-0310-95a4-ce76da25c4cd
---
 wp-includes/bookmark-template.php |  4 ++--
 wp-includes/capabilities.php      | 14 ++++++--------
 wp-includes/class-http.php        |  9 ++++-----
 wp-includes/class-oembed.php      |  4 ++--
 wp-includes/class-wp-editor.php   |  2 +-
 wp-includes/class-wp-embed.php    |  4 ++--
 wp-includes/version.php           |  2 +-
 7 files changed, 18 insertions(+), 21 deletions(-)

diff --git a/wp-includes/bookmark-template.php b/wp-includes/bookmark-template.php
index a4561900b8..54ad5c998d 100644
--- a/wp-includes/bookmark-template.php
+++ b/wp-includes/bookmark-template.php
@@ -34,8 +34,8 @@
  *                                      or 0|false. Default 1|true.
  *     @type int|bool $show_name        Whether to show link name if available. Accepts 1|true or
  *                                      0|false. Default 0|false.
- *     @type string   $before           The HTML or text to prepend to each bookmark. Default '<li>'.
- *     @type string   $after            The HTML or text to append to each bookmark. Default '</li>'.
+ *     @type string   $before           The HTML or text to prepend to each bookmark. Default `<li>`.
+ *     @type string   $after            The HTML or text to append to each bookmark. Default `</li>`.
  *     @type string   $link_before      The HTML or text to prepend to each bookmark inside the anchor
  *                                      tags. Default empty.
  *     @type string   $link_after       The HTML or text to append to each bookmark inside the anchor
diff --git a/wp-includes/capabilities.php b/wp-includes/capabilities.php
index 3172cbfa9b..4e9353af21 100644
--- a/wp-includes/capabilities.php
+++ b/wp-includes/capabilities.php
@@ -13,14 +13,12 @@
  * the name in value of the 'name' key. The capabilities are stored as an array
  * in the value of the 'capability' key.
  *
- * <code>
- * array (
- *		'rolename' => array (
- *			'name' => 'rolename',
- *			'capabilities' => array()
- *		)
- * )
- * </code>
+ *     array (
+ *    		'rolename' => array (
+ *    			'name' => 'rolename',
+ *    			'capabilities' => array()
+ *    		)
+ *     )
  *
  * @since 2.0.0
  * @package WordPress
diff --git a/wp-includes/class-http.php b/wp-includes/class-http.php
index 79f586a810..32a227fd05 100644
--- a/wp-includes/class-http.php
+++ b/wp-includes/class-http.php
@@ -1660,11 +1660,10 @@ class WP_Http_Curl {
  * </ol>
  *
  * An example can be as seen below.
- * <code>
- * define('WP_PROXY_HOST', '192.168.84.101');
- * define('WP_PROXY_PORT', '8080');
- * define('WP_PROXY_BYPASS_HOSTS', 'localhost, www.example.com, *.wordpress.org');
- * </code>
+ *
+ *     define('WP_PROXY_HOST', '192.168.84.101');
+ *     define('WP_PROXY_PORT', '8080');
+ *     define('WP_PROXY_BYPASS_HOSTS', 'localhost, www.example.com, *.wordpress.org');
  *
  * @link https://core.trac.wordpress.org/ticket/4011 Proxy support ticket in WordPress.
  * @link https://core.trac.wordpress.org/ticket/14636 Allow wildcard domains in WP_PROXY_BYPASS_HOSTS
diff --git a/wp-includes/class-oembed.php b/wp-includes/class-oembed.php
index c70c76da5e..b6ecba9944 100644
--- a/wp-includes/class-oembed.php
+++ b/wp-includes/class-oembed.php
@@ -291,9 +291,9 @@ class WP_oEmbed {
 	}
 
 	/**
-	 * Attempts to find oEmbed provider discovery <link> tags at the given URL.
+	 * Attempts to discover link tags at the given URL for an oEmbed provider.
 	 *
-	 * @param string $url The URL that should be inspected for discovery <link> tags.
+	 * @param string $url The URL that should be inspected for discovery `<link>` tags.
 	 * @return bool|string False on failure, otherwise the oEmbed provider URL.
 	 */
 	public function discover( $url ) {
diff --git a/wp-includes/class-wp-editor.php b/wp-includes/class-wp-editor.php
index 52c7bd3738..460d39b6ac 100644
--- a/wp-includes/class-wp-editor.php
+++ b/wp-includes/class-wp-editor.php
@@ -48,7 +48,7 @@ final class _WP_Editors {
 	 *     @type string     $tabfocus_elements The previous and next element ID to move the focus to
 	 *                                         when pressing the Tab key in TinyMCE. Defualt ':prev,:next'.
 	 *     @type string     $editor_css        Intended for extra styles for both Visual and Text editors.
-	 *                                         Should include <style> tags, and can use "scoped". Default empty.
+	 *                                         Should include `<style>` tags, and can use "scoped". Default empty.
 	 *     @type string     $editor_class      Extra classes to add to the editor textarea elemen. Default empty.
 	 *     @type bool       $teeny             Whether to output the minimal editor config. Examples include
 	 *                                         Press This and the Comment editor. Default false.
diff --git a/wp-includes/class-wp-embed.php b/wp-includes/class-wp-embed.php
index 23a8289939..03e5e8a56c 100644
--- a/wp-includes/class-wp-embed.php
+++ b/wp-includes/class-wp-embed.php
@@ -223,13 +223,13 @@ class WP_Embed {
 			}
 
 			/**
-			 * Filter whether to inspect the given URL for discoverable <link> tags.
+			 * Filter whether to inspect the given URL for discoverable link tags.
 			 *
 			 * @since 2.9.0
 			 *
 			 * @see WP_oEmbed::discover()
 			 *
-			 * @param bool $enable Whether to enable <link> tag discovery. Default false.
+			 * @param bool $enable Whether to enable link tag discovery. Default false.
 			 */
 			$attr['discover'] = ( apply_filters( 'embed_oembed_discover', false ) && author_can( $post_ID, 'unfiltered_html' ) );
 
diff --git a/wp-includes/version.php b/wp-includes/version.php
index 6ec3785989..dd321ce901 100644
--- a/wp-includes/version.php
+++ b/wp-includes/version.php
@@ -4,7 +4,7 @@
  *
  * @global string $wp_version
  */
-$wp_version = '4.1-beta2-30535';
+$wp_version = '4.1-beta2-30536';
 
 /**
  * Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema.