From 318f7458082210427e8ef0aa0607fcca5e178b50 Mon Sep 17 00:00:00 2001
From: Drew Jaynes <info@drewapicture.com>
Date: Wed, 25 May 2016 16:17:27 +0000
Subject: [PATCH] Docs: Correct DocBlock descriptions for the `$before`,
 `$after`, `$link_before`, and `$link_after` arguments for `wp_nav_menu()`.

* `$before` falls before the link markup starts
* `$after` falls after the link markup ends
* `$link_before` falls before the link text
* `$link_after` falls after the link text

Props wp_smith for the initial patch.

See #32246.

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


git-svn-id: http://core.svn.wordpress.org/trunk@37529 1a063a9b-81f0-0310-95a4-ce76da25c4cd
---
 wp-includes/nav-menu-template.php | 8 ++++----
 wp-includes/version.php           | 2 +-
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/wp-includes/nav-menu-template.php b/wp-includes/nav-menu-template.php
index aaba786f41..9f11165323 100644
--- a/wp-includes/nav-menu-template.php
+++ b/wp-includes/nav-menu-template.php
@@ -235,10 +235,10 @@ class Walker_Nav_Menu extends Walker {
  *     @type string        $container_id    The ID that is applied to the container. Default empty.
  *     @type callable|bool $fallback_cb     If the menu doesn't exists, a callback function will fire.
  *                                          Default is 'wp_page_menu'. Set to false for no fallback.
- *     @type string        $before          Text before the link text. Default empty.
- *     @type string        $after           Text after the link text. Default empty.
- *     @type string        $link_before     Text before the link. Default empty.
- *     @type string        $link_after      Text after the link. Default empty.
+ *     @type string        $before          Text before the link markup. Default empty.
+ *     @type string        $after           Text after the link markup. Default empty.
+ *     @type string        $link_before     Text before the link text. Default empty.
+ *     @type string        $link_after      Text after the link text. Default empty.
  *     @type bool          $echo            Whether to echo the menu or return it. Default true.
  *     @type int           $depth           How many levels of the hierarchy are to be included. 0 means all. Default 0.
  *     @type object        $walker          Instance of a custom walker class. Default empty.
diff --git a/wp-includes/version.php b/wp-includes/version.php
index bc90eec73e..daa5b37ea4 100644
--- a/wp-includes/version.php
+++ b/wp-includes/version.php
@@ -4,7 +4,7 @@
  *
  * @global string $wp_version
  */
-$wp_version = '4.6-alpha-37560';
+$wp_version = '4.6-alpha-37561';
 
 /**
  * Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema.