From b3faafc6321f69ffc665c8eb6ce5ccbac80eca8b Mon Sep 17 00:00:00 2001
From: John Blackbourn <johnbillion@git.wordpress.org>
Date: Sun, 28 Aug 2016 23:57:49 +0000
Subject: [PATCH] Themes: Correct the list of possible values for the dynamic
 portion of the `{$type}_template_hierarchy` and `{$type}_template` filters.

See #14310

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


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

diff --git a/wp-includes/template.php b/wp-includes/template.php
index 998ba3a50f..8873ea0e3b 100644
--- a/wp-includes/template.php
+++ b/wp-includes/template.php
@@ -32,7 +32,7 @@ function get_query_template( $type, $templates = array() ) {
 	 * The last element in the array should always be the fallback template for this query type.
 	 *
 	 * Possible values for `$type` include: 'index', '404', 'archive', 'author', 'category', 'tag', 'taxonomy', 'date',
-	 * 'embed', home', 'front_page', 'page', 'paged', 'search', 'single', 'singular', and 'attachment'.
+	 * 'embed', home', 'frontpage', 'page', 'paged', 'search', 'single', 'singular', and 'attachment'.
 	 *
 	 * @since 4.7.0
 	 *
@@ -50,7 +50,7 @@ function get_query_template( $type, $templates = array() ) {
 	 * This hook also applies to various types of files loaded as part of the Template Hierarchy.
 	 *
 	 * Possible values for `$type` include: 'index', '404', 'archive', 'author', 'category', 'tag', 'taxonomy', 'date',
-	 * 'embed', home', 'front_page', 'page', 'paged', 'search', 'single', 'singular', and 'attachment'.
+	 * 'embed', home', 'frontpage', 'page', 'paged', 'search', 'single', 'singular', and 'attachment'.
 	 *
 	 * @since 1.5.0
 	 *
diff --git a/wp-includes/version.php b/wp-includes/version.php
index da5d2a2b65..8e5c8b6676 100644
--- a/wp-includes/version.php
+++ b/wp-includes/version.php
@@ -4,7 +4,7 @@
  *
  * @global string $wp_version
  */
-$wp_version = '4.7-alpha-38427';
+$wp_version = '4.7-alpha-38428';
 
 /**
  * Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema.