diff --git a/wp-content/themes/twentyseventeen/functions.php b/wp-content/themes/twentyseventeen/functions.php index 79f76fc3c3..fe155f8f41 100644 --- a/wp-content/themes/twentyseventeen/functions.php +++ b/wp-content/themes/twentyseventeen/functions.php @@ -122,8 +122,8 @@ function twentyseventeen_setup() { 'posts' => array( 'home', - 'about-us', - 'contact-us', + 'about', + 'contact', 'blog', 'homepage-section', ), @@ -136,9 +136,9 @@ function twentyseventeen_setup() { 'theme_mods' => array( 'panel_1' => '{{homepage-section}}', - 'panel_2' => '{{about-us}}', + 'panel_2' => '{{about}}', 'panel_3' => '{{blog}}', - 'panel_4' => '{{contact-us}}', + 'panel_4' => '{{contact}}', ), 'nav_menus' => array( diff --git a/wp-includes/theme.php b/wp-includes/theme.php index c4ec5943f9..e237b62788 100644 --- a/wp-includes/theme.php +++ b/wp-includes/theme.php @@ -1852,17 +1852,22 @@ function get_theme_starter_content() { 'page_about' => array( 'type' => 'post_type', 'object' => 'page', - 'object_id' => '{{about-us}}', + 'object_id' => '{{about}}', ), 'page_blog' => array( 'type' => 'post_type', 'object' => 'page', 'object_id' => '{{blog}}', ), + 'page_news' => array( + 'type' => 'post_type', + 'object' => 'page', + 'object_id' => '{{news}}', + ), 'page_contact' => array( 'type' => 'post_type', 'object' => 'page', - 'object_id' => '{{contact-us}}', + 'object_id' => '{{contact}}', ), 'link_email' => array( @@ -1909,28 +1914,32 @@ function get_theme_starter_content() { 'posts' => array( 'home' => array( 'post_type' => 'page', - 'post_title' => _x( 'Homepage', 'Theme starter content' ), - 'post_content' => _x( 'Welcome home.', 'Theme starter content' ), + 'post_title' => _x( 'Home', 'Theme starter content' ), + 'post_content' => _x( 'Welcome to your site! This is your homepage, which is what most visitors will see when they come to your site for the first time.', 'Theme starter content' ), ), - 'about-us' => array( + 'about' => array( 'post_type' => 'page', - 'post_title' => _x( 'About Us', 'Theme starter content' ), - 'post_content' => _x( 'More than you ever wanted to know.', 'Theme starter content' ), + 'post_title' => _x( 'About', 'Theme starter content' ), + 'post_content' => _x( 'You might be an artist who would like to introduce yourself and your work here or maybe you’re a business with a mission to describe.', 'Theme starter content' ), ), - 'contact-us' => array( + 'contact' => array( 'post_type' => 'page', - 'post_title' => _x( 'Contact Us', 'Theme starter content' ), - 'post_content' => _x( 'Call us at 999-999-9999.', 'Theme starter content' ), + 'post_title' => _x( 'Contact', 'Theme starter content' ), + 'post_content' => _x( 'This is a page with some basic contact information, such as an address and phone number. You might also try a plugin to add a contact form.', 'Theme starter content' ), ), 'blog' => array( 'post_type' => 'page', 'post_title' => _x( 'Blog', 'Theme starter content' ), ), + 'news' => array( + 'post_type' => 'page', + 'post_title' => _x( 'News', 'Theme starter content' ), + ), 'homepage-section' => array( 'post_type' => 'page', 'post_title' => _x( 'A homepage section', 'Theme starter content' ), - 'post_content' => _x( 'This is an example of a homepage section, which are managed in theme options.', 'Theme starter content' ), + 'post_content' => _x( 'This is an example of a homepage section. Homepage sections can be any page other than the homepage itself, including the page that shows your latest blog posts.', 'Theme starter content' ), ), ), ); diff --git a/wp-includes/version.php b/wp-includes/version.php index 6704ba0e8d..2aae75c913 100644 --- a/wp-includes/version.php +++ b/wp-includes/version.php @@ -4,7 +4,7 @@ * * @global string $wp_version */ -$wp_version = '4.7-beta3-39259'; +$wp_version = '4.7-beta3-39260'; /** * Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema.