From c55f447ad43835a8f024d4d99054bf0477fd9508 Mon Sep 17 00:00:00 2001
From: Drew Jaynes <info@drewapicture.com>
Date: Sun, 7 Feb 2016 02:46:25 +0000
Subject: [PATCH] Docs: Revert unintended changes in wp-includes/post.php,
 mistakenly included in [36497].

See #34988. See #33701.

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


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

diff --git a/wp-includes/post.php b/wp-includes/post.php
index a116b1e825..43361d413a 100644
--- a/wp-includes/post.php
+++ b/wp-includes/post.php
@@ -1188,9 +1188,9 @@ function register_post_type( $post_type, $args = array() ) {
 }
 
 /**
- * Un-registers a post type.
+ * Unregisters a post type.
  *
- * Can not be used to un-register built-in post types.
+ * Can not be used to unregister built-in post types.
  *
  * @since 4.5.0
  *
@@ -1200,7 +1200,7 @@ function register_post_type( $post_type, $args = array() ) {
  * @global array      $post_type_meta_caps    Used to remove meta capabilities.
  * @global array      $wp_post_types          List of post types.
  *
- * @param string $post_type Post type to un-register.
+ * @param string $post_type Post type to unregister.
  * @return bool|WP_Error True on success, WP_Error on failure.
  */
 function unregister_post_type( $post_type ) {
@@ -1210,7 +1210,7 @@ function unregister_post_type( $post_type ) {
 
 	$post_type_args = get_post_type_object( $post_type );
 
-	// Do not allow un-registering internal post types.
+	// Do not allow unregistering internal post types.
 	if ( $post_type_args->_builtin ) {
 		return new WP_Error( 'invalid_post_type', __( 'Unregistering a built-in post type is not allowed' ) );
 	}
diff --git a/wp-includes/version.php b/wp-includes/version.php
index cc64ffc49f..71f49e4df1 100644
--- a/wp-includes/version.php
+++ b/wp-includes/version.php
@@ -4,7 +4,7 @@
  *
  * @global string $wp_version
  */
-$wp_version = '4.5-alpha-36497';
+$wp_version = '4.5-alpha-36498';
 
 /**
  * Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema.