diff --git a/readme.html b/readme.html index f0309df1e9..e38b5c6b49 100644 --- a/readme.html +++ b/readme.html @@ -47,7 +47,7 @@
WordPress can import from a number of systems. First you need to get WordPress installed and working as described above, before using our import tools.
+WordPress can import from a number of systems. First you need to get WordPress installed and working as described above, before using our import tools.
' . __( 'You can upload and insert media (images, audio, documents, etc.) by clicking the Add Media button. You can select from the images and files already uploaded to the Media Library, or upload new media to add to your page or post. To create an image gallery, select the images to add and click the “Create a new gallery” button.' ) . '
'; - $inserting_media .= '' . __( 'You can also embed media from many popular websites including Twitter, YouTube, Flickr and others by pasting the media URL on its own line into the content of your post/page. Learn more about embeds.' ) . '
'; + $inserting_media .= '' . __( 'You can also embed media from many popular websites including Twitter, YouTube, Flickr and others by pasting the media URL on its own line into the content of your post/page. Learn more about embeds.' ) . '
'; get_current_screen()->add_help_tab( array( @@ -377,7 +377,7 @@ if ( 'post' === $post_type ) { ''; if ( current_theme_supports( 'post-formats' ) && post_type_supports( 'post', 'post-formats' ) ) { - $publish_box .= '' . __( 'This screen allows you to configure a network as ha '
' . __( 'Once you add this code and refresh your browser, multisite should be enabled. This screen, now in the Network Admin navigation menu, will keep an archive of the added code. You can toggle between Network Admin and Site Admin by clicking on the Network Admin or an individual site name under the My Sites dropdown in the Toolbar.' ) . '
' . '' . __( 'The choice of subdirectory sites is disabled if this setup is more than a month old because of permalink problems with “/blog/” from the main site. This disabling will be addressed in a future version.' ) . '
' . '' . __( 'For more information:' ) . '
' . - '' . __( 'Documentation on Creating a Network' ) . '
' . + '' . __( 'Documentation on Creating a Network' ) . '
' . '' . __( 'Documentation on the Network Screen' ) . '
'; get_current_screen()->add_help_tab( @@ -78,7 +78,7 @@ get_current_screen()->add_help_tab( get_current_screen()->set_help_sidebar( '' . __( 'For more information:' ) . '
' . - '' . __( 'Documentation on Creating a Network' ) . '
' . + '' . __( 'Documentation on Creating a Network' ) . '
' . '' . __( 'Documentation on the Network Screen' ) . '
' . '' . __( 'Support forums' ) . '
' ); diff --git a/wp-admin/network/index.php b/wp-admin/network/index.php index b51fc4e560..96f4f682c7 100644 --- a/wp-admin/network/index.php +++ b/wp-admin/network/index.php @@ -53,7 +53,7 @@ get_current_screen()->add_help_tab( get_current_screen()->set_help_sidebar( '' . __( 'For more information:' ) . '
' . - '' . __( 'Documentation on the Network Admin' ) . '
' . + '' . __( 'Documentation on the Network Admin' ) . '
' . '' . __( 'Support forums' ) . '
' ); diff --git a/wp-admin/options-general.php b/wp-admin/options-general.php index 28aa16cb9a..b522997f90 100644 --- a/wp-admin/options-general.php +++ b/wp-admin/options-general.php @@ -32,8 +32,8 @@ if ( ! is_multisite() ) { '' . sprintf(
/* translators: %s: Documentation URL. */
__( 'Though the terms refer to two different concepts, in practice, they can be the same address or different. For example, you can have the core WordPress installation files in the root directory (https://example.com), in which case the two URLs would be the same. Or the WordPress files can be in a subdirectory (https://example.com/wordpress). In that case, the WordPress URL and the site URL would be different.' ),
- __( 'https://wordpress.org/documentation/article/giving-wordpress-its-own-directory/' )
- ) . '
' . sprintf( /* translators: 1: http://, 2: https:// */ __( 'Both WordPress URL and site URL can start with either %1$s or %2$s. A URL starting with %2$s requires an SSL certificate, so be sure that you have one before changing to %2$s. With %2$s, a padlock will appear next to the address in the browser address bar. Both %2$s and the padlock signal that your site meets some basic security requirements, which can build trust with your visitors and with search engines.' ), @@ -235,7 +235,7 @@ if ( ! is_multisite() ) { printf( /* translators: %s: Documentation URL. */ __( 'Enter the same address here unless you want your site home page to be different from your WordPress installation directory.' ), - __( 'https://wordpress.org/documentation/article/giving-wordpress-its-own-directory/' ) + __( 'https://developer.wordpress.org/advanced-administration/server/wordpress-in-directory/' ) ); ?>
diff --git a/wp-admin/options-permalink.php b/wp-admin/options-permalink.php index 46da9be8f3..a22cdb0c92 100644 --- a/wp-admin/options-permalink.php +++ b/wp-admin/options-permalink.php @@ -61,7 +61,7 @@ $help_sidebar_content = '' . __( 'For more information:' ) . '' . __( 'Documentation on Using Permalinks' ) . '
'; if ( $is_nginx ) { - $help_sidebar_content .= '' . __( 'Documentation on Nginx configuration.' ) . '
'; + $help_sidebar_content .= '' . __( 'Documentation on Nginx configuration.' ) . '
'; } $help_sidebar_content .= '' . __( 'Support forums' ) . '
'; @@ -465,7 +465,7 @@ printf( /* translators: 1: web.config, 2: Documentation URL, 3: Ctrl + A, 4: ⌘ + A, 5: Element code. */ __( 'Error: Your %1$s file is not writable, so updating it automatically was not possible. This is the URL rewrite rule you should have in your %1$s file. Click in the field and press %3$s (or %4$s on Mac) to select all. Then insert this rule inside of the %5$s element in %1$s file.' ), 'web.config',
- __( 'https://wordpress.org/documentation/article/changing-file-permissions/' ),
+ __( 'https://developer.wordpress.org/advanced-administration/server/file-permissions/' ),
'Ctrl + A',
'⌘ + A',
'/<configuration>/<system.webServer>/<rewrite>/<rules>'
@@ -497,7 +497,7 @@ printf(
printf(
/* translators: 1: Documentation URL, 2: web.config, 3: Ctrl + A, 4: ⌘ + A */
__( 'Error: The root directory of your site is not writable, so creating a file automatically was not possible. This is the URL rewrite rule you should have in your %2$s file. Create a new file called %2$s in the root directory of your site. Click in the field and press %3$s (or %4$s on Mac) to select all. Then insert this code into the %2$s file.' ),
- __( 'https://wordpress.org/documentation/article/changing-file-permissions/' ),
+ __( 'https://developer.wordpress.org/advanced-administration/server/file-permissions/' ),
'web.config',
'Ctrl + A',
'⌘ + A'
@@ -533,7 +533,7 @@ printf(
/* translators: 1: .htaccess, 2: Documentation URL, 3: Ctrl + A, 4: ⌘ + A */
__( 'Error: Your %1$s file is not writable, so updating it automatically was not possible. These are the mod_rewrite rules you should have in your %1$s file. Click in the field and press %3$s (or %4$s on Mac) to select all.' ),
'.htaccess',
- __( 'https://wordpress.org/documentation/article/changing-file-permissions/' ),
+ __( 'https://developer.wordpress.org/advanced-administration/server/file-permissions/' ),
'Ctrl + A',
'⌘ + A'
);
diff --git a/wp-admin/options-writing.php b/wp-admin/options-writing.php
index b65f19ebf9..21adf262f8 100644
--- a/wp-admin/options-writing.php
+++ b/wp-admin/options-writing.php
@@ -225,7 +225,7 @@ if ( apply_filters( 'enable_update_services_configuration', true ) ) {
printf(
/* translators: %s: Documentation URL. */
__( 'When you publish a new post, WordPress automatically notifies the following site update services. For more about this, see the Update Services documentation article. Separate multiple service URLs with line breaks.' ),
- __( 'https://wordpress.org/documentation/article/update-services/' )
+ __( 'https://developer.wordpress.org/advanced-administration/wordpress/update-services/' )
);
?>
@@ -239,7 +239,7 @@ if ( apply_filters( 'enable_update_services_configuration', true ) ) {
printf(
/* translators: 1: Documentation URL, 2: URL to Reading Settings screen. */
__( 'WordPress is not notifying any Update Services because of your site’s visibility settings.' ),
- __( 'https://wordpress.org/documentation/article/update-services/' ),
+ __( 'https://developer.wordpress.org/advanced-administration/wordpress/update-services/' ),
'options-reading.php'
);
?>
diff --git a/wp-admin/plugin-editor.php b/wp-admin/plugin-editor.php
index da57d95e74..cd743baa37 100644
--- a/wp-admin/plugin-editor.php
+++ b/wp-admin/plugin-editor.php
@@ -323,7 +323,7 @@ endif;
printf(
/* translators: %s: Documentation URL. */
__( 'You need to make this file writable before you can save your changes. See Changing File Permissions for more information.' ),
- __( 'https://wordpress.org/documentation/article/changing-file-permissions/' )
+ __( 'https://developer.wordpress.org/advanced-administration/server/file-permissions/' )
);
?>
diff --git a/wp-admin/setup-config.php b/wp-admin/setup-config.php
index 5fd805e41a..4f0833805c 100644
--- a/wp-admin/setup-config.php
+++ b/wp-admin/setup-config.php
@@ -197,7 +197,7 @@ switch ( $step ) {
printf(
/* translators: 1: Documentation URL, 2: wp-config.php */
__( 'Need more help? Read the support article on %2$s.' ),
- __( 'https://wordpress.org/documentation/article/editing-wp-config-php/' ),
+ __( 'https://developer.wordpress.org/advanced-administration/wordpress/wp-config/' ),
'wp-config.php'
);
?>
@@ -484,7 +484,7 @@ if ( ! /iPad|iPod|iPhone/.test( navigator.userAgent ) ) {
/* translators: 1: wp-config.php, 2: Documentation URL. */
__( 'You need to make the file %1$s writable before you can save your changes. See Changing File Permissions for more information.' ),
'wp-config.php',
- __( 'https://wordpress.org/documentation/article/changing-file-permissions/' )
+ __( 'https://developer.wordpress.org/advanced-administration/server/file-permissions/' )
);
} else {
$error_message = sprintf(
diff --git a/wp-admin/theme-editor.php b/wp-admin/theme-editor.php
index 868df4b65c..dfbe69abb6 100644
--- a/wp-admin/theme-editor.php
+++ b/wp-admin/theme-editor.php
@@ -51,7 +51,7 @@ get_current_screen()->set_help_sidebar(
'' . __( 'For more information:' ) . '
' . '' . __( 'Documentation on Theme Development' ) . '
' . '' . __( 'Documentation on Editing Themes' ) . '
' . - '' . __( 'Documentation on Editing Files' ) . '
' . + '' . __( 'Documentation on Editing Files' ) . '
' . '' . __( 'Documentation on Template Tags' ) . '
' . '' . __( 'Support forums' ) . '
' ); @@ -356,7 +356,7 @@ else : printf( /* translators: %s: Documentation URL. */ __( 'You need to make this file writable before you can save your changes. See Changing File Permissions for more information.' ), - __( 'https://wordpress.org/documentation/article/changing-file-permissions/' ) + __( 'https://developer.wordpress.org/advanced-administration/server/file-permissions/' ) ); ?> diff --git a/wp-admin/update-core.php b/wp-admin/update-core.php index 80fbd530b2..3e48bae0da 100644 --- a/wp-admin/update-core.php +++ b/wp-admin/update-core.php @@ -258,7 +258,7 @@ function core_upgrade_preamble() { $message = sprintf( /* translators: 1: Documentation on WordPress backups, 2: Documentation on updating WordPress. */ __( 'Important: Before updating, please back up your database and files. For help with updates, visit the Updating WordPress documentation page.' ), - __( 'https://wordpress.org/documentation/article/wordpress-backups/' ), + __( 'https://developer.wordpress.org/advanced-administration/security/backup/' ), __( 'https://wordpress.org/documentation/article/updating-wordpress/' ) ); wp_admin_notice( @@ -1045,7 +1045,7 @@ if ( current_user_can( 'update_themes' ) || current_user_can( 'update_plugins' ) ) ); - $help_sidebar_rollback = '' . __( 'Common Errors' ) . '
'; + $help_sidebar_rollback = '' . __( 'Common Errors' ) . '
'; } get_current_screen()->set_help_sidebar( diff --git a/wp-includes/version.php b/wp-includes/version.php index 735b1c6f6a..7d48a69ee6 100644 --- a/wp-includes/version.php +++ b/wp-includes/version.php @@ -16,7 +16,7 @@ * * @global string $wp_version */ -$wp_version = '6.6-alpha-57792'; +$wp_version = '6.6-alpha-57793'; /** * Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema.