From bf36b458bb8fffd708f469b79ded95592455b492 Mon Sep 17 00:00:00 2001
From: Sergey Biryukov <sergeybiryukov.ru@gmail.com>
Date: Wed, 16 Sep 2015 16:47:25 +0000
Subject: [PATCH] Docs: Update the DocBlock for `wp_page_menu()` to include
 `'before'`, `'after'`, and `'walker'` arguments added in [34200].

Align the `$defaults` array and include the default value for `'show_home'`.

Props stevegrunwell.
Fixes #11095.
Built from https://develop.svn.wordpress.org/trunk@34243


git-svn-id: http://core.svn.wordpress.org/trunk@34207 1a063a9b-81f0-0310-95a4-ce76da25c4cd
---
 wp-includes/post-template.php | 21 +++++++++++++--------
 wp-includes/version.php       |  2 +-
 2 files changed, 14 insertions(+), 9 deletions(-)

diff --git a/wp-includes/post-template.php b/wp-includes/post-template.php
index 3f8beab86b..b296464836 100644
--- a/wp-includes/post-template.php
+++ b/wp-includes/post-template.php
@@ -1187,6 +1187,7 @@ function wp_list_pages( $args = '' ) {
  * arguments.
  *
  * @since 2.7.0
+ * @since 4.4.0 Added `$before`, `$after`, and `$walker` arguments.
  *
  * @param array|string $args {
  *     Optional. Arguments to generate a page menu. See wp_list_pages() for additional arguments.
@@ -1196,23 +1197,27 @@ function wp_list_pages( $args = '' ) {
  *     @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          $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 string          $before      The HTML or text to prepend to the menu. Default is '<ul>'.
+ *     @type string          $after       The HTML or text to append to the menu. Default is '</ul>'.
+ *     @type Walker          $walker      Walker instance to use for listing pages. Default empty (Walker_Page).
  * }
  * @return string|void HTML menu
  */
 function wp_page_menu( $args = array() ) {
 	$defaults = array(
 		'sort_column' => 'menu_order, post_title',
-		'menu_class' => 'menu',
-		'echo' => true,
+		'menu_class'  => 'menu',
+		'echo'        => true,
+		'show_home'   => false,
 		'link_before' => '',
-		'link_after' => '',
-		'before' => '<ul>',
-		'after' => '</ul>',
-		'walker' => ''
+		'link_after'  => '',
+		'before'      => '<ul>',
+		'after'       => '</ul>',
+		'walker'      => '',
 	);
 	$args = wp_parse_args( $args, $defaults );
 
diff --git a/wp-includes/version.php b/wp-includes/version.php
index 384fc887c5..04d63c4a7b 100644
--- a/wp-includes/version.php
+++ b/wp-includes/version.php
@@ -4,7 +4,7 @@
  *
  * @global string $wp_version
  */
-$wp_version = '4.4-alpha-34242';
+$wp_version = '4.4-alpha-34243';
 
 /**
  * Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema.