From f7224ea6355400c9ff3fd7cbd39bdc9b652201a7 Mon Sep 17 00:00:00 2001
From: John Blackbourn <johnbillion@git.wordpress.org>
Date: Wed, 7 Feb 2018 22:13:30 +0000
Subject: [PATCH] Docs: Copy a helpful inline doc into the function header for
 visibility.

See #42505

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


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

diff --git a/wp-includes/post.php b/wp-includes/post.php
index b35930a7b7..ba59019870 100644
--- a/wp-includes/post.php
+++ b/wp-includes/post.php
@@ -4099,7 +4099,9 @@ function wp_set_post_tags( $post_id = 0, $tags = '', $append = false ) {
  *
  * @param int          $post_id  Optional. The Post ID. Does not default to the ID of the global $post.
  * @param string|array $tags     Optional. An array of terms to set for the post, or a string of terms
- *                               separated by commas. Default empty.
+ *                               separated by commas. Hierarchical taxonomies must always pass IDs rather
+ *                               than names so that children with the same names but different parents
+ *                               aren't confused. Default empty.
  * @param string       $taxonomy Optional. Taxonomy name. Default 'post_tag'.
  * @param bool         $append   Optional. If true, don't delete existing terms, just add on. If false,
  *                               replace the terms with the new terms. Default false.
diff --git a/wp-includes/version.php b/wp-includes/version.php
index a6b89e849b..f27b49f677 100644
--- a/wp-includes/version.php
+++ b/wp-includes/version.php
@@ -4,7 +4,7 @@
  *
  * @global string $wp_version
  */
-$wp_version = '5.0-alpha-42663';
+$wp_version = '5.0-alpha-42664';
 
 /**
  * Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema.