Pages:'. - * @type string $after HTML or text to append to each link. Default is '
'. - * @type string $link_before HTML or text to prepend to each link, inside the tag. + * @type string $before HTML or text to prepend to each link. Default is `Pages:`. + * @type string $after HTML or text to append to each link. Default is `
`. + * @type string $link_before HTML or text to prepend to each link, inside the `` tag. * Also prepended to the current item, which is not linked. Default empty. - * @type string $link_after HTML or text to append to each Pages link inside the tag. + * @type string $link_after HTML or text to append to each Pages link inside the `` tag. * Also appended to the current item, which is not linked. Default empty. * @type string $next_or_number Indicates whether page numbers should be used. Valid values are number * and next. Default is 'number'. @@ -1510,7 +1510,7 @@ function wp_get_attachment_link( $id = 0, $size = 'thumbnail', $permalink = fals } /** - * Wrap attachment in <> element before content.
+ * Wrap attachment in paragraph tag before content.
*
* @since 2.0.0
*
diff --git a/wp-includes/post.php b/wp-includes/post.php
index 39eb6a35e9..3b3d55fe19 100644
--- a/wp-includes/post.php
+++ b/wp-includes/post.php
@@ -372,8 +372,8 @@ function get_children( $args = '', $output = OBJECT ) {
* referenced.
*
* The returned array has 'main', 'extended', and 'more_text' keys. Main has the text before
- * the . The 'extended' key has the content after the
- * comment. The 'more_text' key has the custom "Read More" text.
+ * the ``. The 'extended' key has the content after the
+ * `` comment. The 'more_text' key has the custom "Read More" text.
*
* @since 1.0.0
*
@@ -1594,8 +1594,8 @@ function _post_type_meta_capabilities( $capabilities = null ) {
* - singular_name - name for one object of this post type. Default is Post/Page
* - add_new - Default is Add New for both hierarchical and non-hierarchical types.
* When internationalizing this string, please use a gettext context
- * {@see http://codex.wordpress.org/I18n_for_WordPress_Developers#Disambiguation_by_context}
- * matching your post type. Example: _x('Add New', 'product');.
+ * {@link http://codex.wordpress.org/I18n_for_WordPress_Developers#Disambiguation_by_context}
+ * matching your post type. Example: `_x( 'Add New', 'product' );`.
* - add_new_item - Default is Add New Post/Add New Page.
* - edit_item - Default is Edit Post/Edit Page.
* - new_item - Default is New Post/New Page.
@@ -1606,7 +1606,7 @@ function _post_type_meta_capabilities( $capabilities = null ) {
* - parent_item_colon - This string isn't used on non-hierarchical types. In hierarchical
* ones the default is 'Parent Page:'.
* - all_items - String for the submenu. Default is All Posts/All Pages.
- * - menu_name - Default is the same as name.
+ * - menu_name - Default is the same as `name`.
*
* Above, the first default value is for non-hierarchical post types (like posts)
* and the second one is for hierarchical post types (like pages).
diff --git a/wp-includes/rewrite.php b/wp-includes/rewrite.php
index d62b4db968..36b5683268 100644
--- a/wp-includes/rewrite.php
+++ b/wp-includes/rewrite.php
@@ -226,22 +226,20 @@ define( 'EP_ALL', EP_PERMALINK | EP_ATTACHMENT | EP_ROOT | EP_COMMENTS | EP_SEAR
* Adding an endpoint creates extra rewrite rules for each of the matching
* places specified by the provided bitmask. For example:
*
- *
- * add_rewrite_endpoint( 'json', EP_PERMALINK | EP_PAGES );
- *
+ * add_rewrite_endpoint( 'json', EP_PERMALINK | EP_PAGES );
*
* will add a new rewrite rule ending with "json(/(.*))?/?$" for every permastruct
* that describes a permalink (post) or page. This is rewritten to "json=$match"
* where $match is the part of the URL matched by the endpoint regex (e.g. "foo" in
- * "
- * $out = do_shortcode($content);
- *
+ * $out = do_shortcode( $content );
*
* @link http://codex.wordpress.org/Shortcode_API
*
@@ -52,38 +50,34 @@ $shortcode_tags = array();
*
* Simplest example of a shortcode tag using the API:
*
- *
- * // [footag foo="bar"]
- * function footag_func($atts) {
- * return "foo = {$atts[foo]}";
- * }
- * add_shortcode('footag', 'footag_func');
- *
+ * // [footag foo="bar"]
+ * function footag_func( $atts ) {
+ * return "foo = {
+ * $atts[foo]
+ * }";
+ * }
+ * add_shortcode( 'footag', 'footag_func' );
*
* Example with nice attribute defaults:
*
- *
- * // [bartag foo="bar"]
- * function bartag_func($atts) {
- * $args = shortcode_atts(array(
- * 'foo' => 'no foo',
- * 'baz' => 'default baz',
- * ), $atts);
+ * // [bartag foo="bar"]
+ * function bartag_func( $atts ) {
+ * $args = shortcode_atts( array(
+ * 'foo' => 'no foo',
+ * 'baz' => 'default baz',
+ * ), $atts );
*
- * return "foo = {$args['foo']}";
- * }
- * add_shortcode('bartag', 'bartag_func');
- *
+ * return "foo = {$args['foo']}";
+ * }
+ * add_shortcode( 'bartag', 'bartag_func' );
*
* Example with enclosed content:
*
- *
- * // [baztag]content[/baztag]
- * function baztag_func($atts, $content='') {
- * return "content = $content";
- * }
- * add_shortcode('baztag', 'baztag_func');
- *
+ * // [baztag]content[/baztag]
+ * function baztag_func( $atts, $content = '' ) {
+ * return "content = $content";
+ * }
+ * add_shortcode( 'baztag', 'baztag_func' );
*
* @since 2.5.0
*
diff --git a/wp-includes/version.php b/wp-includes/version.php
index 9f76f2420d..471e9e9fc9 100644
--- a/wp-includes/version.php
+++ b/wp-includes/version.php
@@ -4,7 +4,7 @@
*
* @global string $wp_version
*/
-$wp_version = '4.1-beta2-30544';
+$wp_version = '4.1-beta2-30545';
/**
* Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema.