From 31f150080aa6975de2c271d7241320dfcf1c1ce7 Mon Sep 17 00:00:00 2001 From: Drew Jaynes Date: Sun, 10 Jul 2016 00:56:28 +0000 Subject: [PATCH] Docs: Standardize references to "meta box" or "meta boxes" as two distinct words throughout core documentation per the core spelling guide. See #32246. Built from https://develop.svn.wordpress.org/trunk@38029 git-svn-id: http://core.svn.wordpress.org/trunk@37970 1a063a9b-81f0-0310-95a4-ce76da25c4cd --- wp-admin/edit-form-advanced.php | 2 +- wp-admin/includes/deprecated.php | 2 +- wp-admin/includes/media.php | 2 +- wp-admin/includes/nav-menu.php | 12 ++++++------ wp-admin/includes/post.php | 2 +- wp-includes/general-template.php | 2 +- wp-includes/taxonomy.php | 4 ++-- wp-includes/version.php | 2 +- 8 files changed, 14 insertions(+), 14 deletions(-) diff --git a/wp-admin/edit-form-advanced.php b/wp-admin/edit-form-advanced.php index b710f6b7e6..bd229b90c9 100644 --- a/wp-admin/edit-form-advanced.php +++ b/wp-admin/edit-form-advanced.php @@ -219,7 +219,7 @@ $publish_callback_args = null; if ( post_type_supports($post_type, 'revisions') && 'auto-draft' != $post->post_status ) { $revisions = wp_get_post_revisions( $post_ID ); - // We should aim to show the revisions metabox only when there are revisions. + // We should aim to show the revisions meta box only when there are revisions. if ( count( $revisions ) > 1 ) { reset( $revisions ); // Reset pointer for key() $publish_callback_args = array( 'revisions_count' => count( $revisions ), 'revision_id' => key( $revisions ) ); diff --git a/wp-admin/includes/deprecated.php b/wp-admin/includes/deprecated.php index 7753004a60..2bf25d3336 100644 --- a/wp-admin/includes/deprecated.php +++ b/wp-admin/includes/deprecated.php @@ -1117,7 +1117,7 @@ function wp_create_thumbnail( $file, $max_side, $deprecated = '' ) { } /** - * This was once used to display a metabox for the nav menu theme locations. + * This was once used to display a meta box for the nav menu theme locations. * * Deprecated in favor of a 'Manage Locations' tab added to nav menus management screen. * diff --git a/wp-admin/includes/media.php b/wp-admin/includes/media.php index a865e1558c..8b95181c54 100644 --- a/wp-admin/includes/media.php +++ b/wp-admin/includes/media.php @@ -2818,7 +2818,7 @@ function edit_form_image_editor( $post ) { } /** - * Displays non-editable attachment metadata in the publish metabox + * Displays non-editable attachment metadata in the publish meta box. * * @since 3.5.0 */ diff --git a/wp-admin/includes/nav-menu.php b/wp-admin/includes/nav-menu.php index ab83baa9bc..cb5b3b2b8e 100644 --- a/wp-admin/includes/nav-menu.php +++ b/wp-admin/includes/nav-menu.php @@ -123,7 +123,7 @@ function _wp_ajax_menu_quick_search( $request = array() ) { } /** - * Register nav menu metaboxes and advanced menu items + * Register nav menu meta boxes and advanced menu items. * * @since 3.0.0 **/ @@ -178,7 +178,7 @@ function wp_initial_nav_menu_meta_boxes() { } /** - * Creates metaboxes for any post type menu item. + * Creates meta boxes for any post type menu item.. * * @since 3.0.0 */ @@ -212,7 +212,7 @@ function wp_nav_menu_post_type_meta_boxes() { } /** - * Creates metaboxes for any taxonomy menu item. + * Creates meta boxes for any taxonomy menu item. * * @since 3.0.0 */ @@ -252,7 +252,7 @@ function wp_nav_menu_disabled_check( $nav_menu_selected_id ) { } /** - * Displays a metabox for the custom links menu item. + * Displays a meta box for the custom links menu item. * * @since 3.0.0 * @@ -289,7 +289,7 @@ function wp_nav_menu_item_link_meta_box() { } /** - * Displays a metabox for a post type menu item. + * Displays a meta box for a post type menu item. * * @since 3.0.0 * @@ -568,7 +568,7 @@ function wp_nav_menu_item_post_type_meta_box( $object, $post_type ) { } /** - * Displays a metabox for a taxonomy menu item. + * Displays a meta box for a taxonomy menu item. * * @since 3.0.0 * diff --git a/wp-admin/includes/post.php b/wp-admin/includes/post.php index cd1074827f..1d397ea0c6 100644 --- a/wp-admin/includes/post.php +++ b/wp-admin/includes/post.php @@ -1166,7 +1166,7 @@ function wp_edit_attachments_query( $q = false ) { } /** - * Returns the list of classes to be used by a metabox + * Returns the list of classes to be used by a meta box. * * @since 2.5.0 * diff --git a/wp-includes/general-template.php b/wp-includes/general-template.php index 4f2be9fb3f..bf0614bd22 100644 --- a/wp-includes/general-template.php +++ b/wp-includes/general-template.php @@ -2947,7 +2947,7 @@ function wp_default_editor() { * _WP_Editors should not be used directly. See https://core.trac.wordpress.org/ticket/17144. * * NOTE: Once initialized the TinyMCE editor cannot be safely moved in the DOM. For that reason - * running wp_editor() inside of a metabox is not a good idea unless only Quicktags is used. + * running wp_editor() inside of a meta box is not a good idea unless only Quicktags is used. * On the post edit screen several actions can be used to include additional editors * containing TinyMCE: 'edit_page_form', 'edit_form_advanced' and 'dbx_post_sidebar'. * See https://core.trac.wordpress.org/ticket/19173 for more information. diff --git a/wp-includes/taxonomy.php b/wp-includes/taxonomy.php index 9999d211b7..d5d8a344b5 100644 --- a/wp-includes/taxonomy.php +++ b/wp-includes/taxonomy.php @@ -475,7 +475,7 @@ function register_taxonomy( $taxonomy, $object_type, $args = array() ) { $wp_taxonomies[ $taxonomy ] = (object) $args; - // register callback handling for metabox + // Register callback handling for meta box. add_filter( 'wp_ajax_add-' . $taxonomy, '_wp_ajax_add_hierarchical_term' ); /** @@ -528,7 +528,7 @@ function unregister_taxonomy( $taxonomy ) { remove_permastruct( $taxonomy ); } - // Unregister callback handling for metabox. + // Unregister callback handling for meta box. remove_filter( 'wp_ajax_add-' . $taxonomy, '_wp_ajax_add_hierarchical_term' ); // Remove the taxonomy. diff --git a/wp-includes/version.php b/wp-includes/version.php index 04c3f282c9..8a3784d087 100644 --- a/wp-includes/version.php +++ b/wp-includes/version.php @@ -4,7 +4,7 @@ * * @global string $wp_version */ -$wp_version = '4.6-beta2-38028'; +$wp_version = '4.6-beta2-38029'; /** * Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema.