From 21ef286eef859bf30cd12b63b393b18cb89b6898 Mon Sep 17 00:00:00 2001
From: Drew Jaynes <info@drewapicture.com>
Date: Sun, 26 Jun 2016 18:06:27 +0000
Subject: [PATCH] Docs: Further improve the note of caution within the DocBlock
 description for `query_posts()`.

See #32246.

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


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

diff --git a/wp-includes/query.php b/wp-includes/query.php
index 35662468f0..38a6928d64 100644
--- a/wp-includes/query.php
+++ b/wp-includes/query.php
@@ -79,9 +79,11 @@ function set_query_var( $var, $value ) {
 /**
  * Sets up The Loop with query parameters.
  *
- * Important: This will completely override the current WordPress Loop and can easily
- * produce unexpected results. In most cases, the better option is to instead modify
- * specific properties of the loop using the {@see 'pre_get_posts'} action.
+ * Note: This function will completely override the main query and isn't intended for use
+ * by plugins or themes. Its overly-simplistic approach to modifying the main query can be
+ * problematic and should be avoided wherever possible. In most cases, there are better,
+ * more performant options for modifying the main query such as via the {@see 'pre_get_posts'}
+ * action within WP_Query.
  *
  * This must not be used within the WordPress Loop.
  *
diff --git a/wp-includes/version.php b/wp-includes/version.php
index ae2f072a3c..e0deaf5183 100644
--- a/wp-includes/version.php
+++ b/wp-includes/version.php
@@ -4,7 +4,7 @@
  *
  * @global string $wp_version
  */
-$wp_version = '4.6-alpha-37877';
+$wp_version = '4.6-alpha-37878';
 
 /**
  * Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema.