diff --git a/wp-includes/post-template.php b/wp-includes/post-template.php index c4050d9718..735bfad032 100644 --- a/wp-includes/post-template.php +++ b/wp-includes/post-template.php @@ -1131,18 +1131,17 @@ function wp_list_pages( $args = '' ) { * @since 2.7.0 * * @param array|string $args { - * Optional. Arguments to generate a page menu. {@see wp_list_pages()} - * for additional arguments. + * Optional. Arguments to generate a page menu. See wp_list_pages() for additional arguments. * - * @type string $sort_column How to short the list of pages. Accepts post column names. - * Default 'menu_order, post_title'. - * @type string $menu_class Class to use for the div ID containing the page list. Default 'menu'. - * @type bool $echo Whether to echo the list or return it. Accepts true (echo) or false (return). - * Default true. - * @type string $link_before The HTML or text to prepend to $show_home text. Default empty. - * @type string $link_after The HTML or text to append to $show_home text. Default empty. - * @type int|bool|string $show_home Whether to display the link to the home page. Can just enter the text - * you'd like shown for the home link. 1|true defaults to 'Home'. + * @type string $sort_column How to short the list of pages. Accepts post column names. + * Default 'menu_order, post_title'. + * @type string $menu_class Class to use for the div ID containing the page list. Default 'menu'. + * @type bool $echo Whether to echo the list or return it. Accepts true (echo) or false (return). + * Default true. + * @type string $link_before The HTML or text to prepend to $show_home text. Default empty. + * @type string $link_after The HTML or text to append to $show_home text. Default empty. + * @type int|bool|string $show_home Whether to display the link to the home page. Can just enter the text + * you'd like shown for the home link. 1|true defaults to 'Home'. * } * @return string html menu */ diff --git a/wp-includes/version.php b/wp-includes/version.php index 85d087ece2..615ae0cc36 100644 --- a/wp-includes/version.php +++ b/wp-includes/version.php @@ -4,7 +4,7 @@ * * @global string $wp_version */ -$wp_version = '4.2-alpha-31599'; +$wp_version = '4.2-alpha-31600'; /** * Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema.