From 4815bfc2a083d4ad3f99716591df1dc829afef5e Mon Sep 17 00:00:00 2001
From: Drew Jaynes <info@drewapicture.com>
Date: Mon, 9 Mar 2015 07:04:27 +0000
Subject: [PATCH] Update hook docs for the `editable_slug` filter as it is
 evaluated in more than just a term slug context, it is also leveraged for use
 with post URIs.

See #31569.

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


git-svn-id: http://core.svn.wordpress.org/trunk@31669 1a063a9b-81f0-0310-95a4-ce76da25c4cd
---
 wp-admin/edit-tag-form.php | 8 ++++++--
 wp-includes/version.php    | 2 +-
 2 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/wp-admin/edit-tag-form.php b/wp-admin/edit-tag-form.php
index 0b00ded844..419ddf942e 100644
--- a/wp-admin/edit-tag-form.php
+++ b/wp-admin/edit-tag-form.php
@@ -91,11 +91,15 @@ do_action( "{$taxonomy}_term_edit_form_tag" );
 			<th scope="row"><label for="slug"><?php _e( 'Slug' ); ?></label></th>
 			<?php
 			/**
-			 * Filter the editable term slug.
+			 * Filter the editable slug.
+			 *
+			 * Note: This is a multi-use hook in that it is leveraged both for editable
+			 * post URIs and term slugs.
 			 *
 			 * @since 2.6.0
 			 *
-			 * @param string $tag_slug The current term slug.
+			 * @param string $slug The editable slug. Will be either a term slug or post URI depending
+			 *                     upon the context in which it is evaluated.
 			 */
 			$slug = isset( $tag->slug ) ? apply_filters( 'editable_slug', $tag->slug ) : '';
 			?>
diff --git a/wp-includes/version.php b/wp-includes/version.php
index d77777d50f..f15af0b04b 100644
--- a/wp-includes/version.php
+++ b/wp-includes/version.php
@@ -4,7 +4,7 @@
  *
  * @global string $wp_version
  */
-$wp_version = '4.2-alpha-31687';
+$wp_version = '4.2-alpha-31688';
 
 /**
  * Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema.