From ec60115f2a948e300514fea862503c6b59bf10c7 Mon Sep 17 00:00:00 2001
From: Sergey Biryukov <sergeybiryukov.ru@gmail.com>
Date: Wed, 4 Nov 2020 02:30:09 +0000
Subject: [PATCH] Docs: Adjust documentation for some `WP_Post_Type`
 properties:

* Split the summary for `$template` per the documentation standards. The summary should be a single sentence.
* Change the type for `$template_lock` to `string|false`, to clarify that `true` is not supported.
* Fix typo in `$delete_with_user` description, adjust for better readability.

Follow-up to [49041], [49492].

See #46261.
Built from https://develop.svn.wordpress.org/trunk@49494


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

diff --git a/wp-includes/class-wp-post-type.php b/wp-includes/class-wp-post-type.php
index afe8eaeb46..38a47bc677 100644
--- a/wp-includes/class-wp-post-type.php
+++ b/wp-includes/class-wp-post-type.php
@@ -250,10 +250,12 @@ final class WP_Post_Type {
 	/**
 	 * Whether to delete posts of this type when deleting a user.
 	 *
-	 * If true, posts of this type belonging to the user will be moved to Trash when then user is deleted.
-	 * If false, posts of this type belonging to the user will *not* be trashed or deleted.
-	 * If not set (the default), posts are trashed if post_type_supports( 'author' ).
-	 * Otherwise posts are not trashed or deleted. Default null.
+	 * - If true, posts of this type belonging to the user will be moved to Trash when the user is deleted.
+	 * - If false, posts of this type belonging to the user will *not* be trashed or deleted.
+	 * - If not set (the default), posts are trashed if post type supports the 'author' feature.
+	 *   Otherwise posts are not trashed or deleted.
+	 *
+	 * Default null.
 	 *
 	 * @since 4.6.0
 	 * @var bool $delete_with_user
@@ -261,9 +263,9 @@ final class WP_Post_Type {
 	public $delete_with_user = null;
 
 	/**
-	 * Array of blocks to use as the default initial state for an editor
-	 * session. Each item should be an array containing block name and
-	 * optional attributes.
+	 * Array of blocks to use as the default initial state for an editor session.
+	 *
+	 * Each item should be an array containing block name and optional attributes.
 	 *
 	 * Default empty array.
 	 *
@@ -277,17 +279,17 @@ final class WP_Post_Type {
 	/**
 	 * Whether the block template should be locked if $template is set.
 	 *
-	 * If set to 'all', the user is unable to insert new blocks, move existing blocks
-	 * and delete blocks.
-	 * If set to 'insert', the user is able to move existing blocks but is unable to insert
-	 * new blocks and delete blocks.
+	 * - If set to 'all', the user is unable to insert new blocks, move existing blocks
+	 *   and delete blocks.
+	 * - If set to 'insert', the user is able to move existing blocks but is unable to insert
+	 *   new blocks and delete blocks.
 	 *
 	 * Default false.
 	 *
 	 * @link https://developer.wordpress.org/block-editor/developers/block-api/block-templates/
 	 *
 	 * @since 5.6.0
-	 * @var string|bool $template_lock
+	 * @var string|false $template_lock
 	 */
 	public $template_lock = false;
 
diff --git a/wp-includes/version.php b/wp-includes/version.php
index d797cae042..ec9b1c215c 100644
--- a/wp-includes/version.php
+++ b/wp-includes/version.php
@@ -13,7 +13,7 @@
  *
  * @global string $wp_version
  */
-$wp_version = '5.6-beta3-49493';
+$wp_version = '5.6-beta3-49494';
 
 /**
  * Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema.