From c5a8c3aa860604494c51228370042448f16c75f1 Mon Sep 17 00:00:00 2001 From: Drew Jaynes Date: Tue, 10 Nov 2015 06:58:25 +0000 Subject: [PATCH] Permalinks: Rename the "Default" permalink structure to "None" as permalinks have been enabled by default (where supported) since 4.2. Updates help tabs and contextual text to match. Props johnbillion, DrewAPicture. Fixes #34509. Built from https://develop.svn.wordpress.org/trunk@35599 git-svn-id: http://core.svn.wordpress.org/trunk@35563 1a063a9b-81f0-0310-95a4-ce76da25c4cd --- wp-admin/options-permalink.php | 14 +++++++------- wp-includes/version.php | 2 +- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/wp-admin/options-permalink.php b/wp-admin/options-permalink.php index 98a871d241..bcebb2c4c5 100644 --- a/wp-admin/options-permalink.php +++ b/wp-admin/options-permalink.php @@ -19,15 +19,15 @@ get_current_screen()->add_help_tab( array( 'id' => 'overview', 'title' => __('Overview'), 'content' => '

' . __('Permalinks are the permanent URLs to your individual pages and blog posts, as well as your category and tag archives. A permalink is the web address used to link to your content. The URL to each post should be permanent, and never change — hence the name permalink.') . '

' . - '

' . __('This screen allows you to choose your default permalink structure. You can choose from common settings or create custom URL structures.') . '

' . + '

' . __( 'This screen allows you to choose your permalink structure. You can choose from common settings or create custom URL structures.' ) . '

' . '

' . __('You must click the Save Changes button at the bottom of the screen for new settings to take effect.') . '

', ) ); get_current_screen()->add_help_tab( array( - 'id' => 'common-settings', - 'title' => __('Common Settings'), - 'content' => '

' . __('Many people choose to use “pretty permalinks,” URLs that contain useful information such as the post title rather than generic post ID numbers. You can choose from any of the permalink formats under Common Settings, or can craft your own if you select Custom Structure.') . '

' . - '

' . __('If you pick an option other than Default, your general URL path with structure tags, terms surrounded by %, will also appear in the custom structure field and your path can be further modified there.') . '

' . + 'id' => 'permalink-settings', + 'title' => __('Permalink Settings'), + 'content' => '

' . __( 'Permalinks can contain useful information, such as the post date, title, or other elements. You can choose from any of the suggested permalink formats, or you can craft your own if you select Custom Structure.' ) . '

' . + '

' . __( 'If you pick an option other than None, your general URL path with structure tags (terms surrounded by %) will also appear in the custom structure field and your path can be further modified there.' ) . '

' . '

' . __('When you assign multiple categories or tags to a post, only one can show up in the permalink: the lowest numbered category. This applies if your custom structure includes %category% or %tag%.') . '

' . '

' . __('You must click the Save Changes button at the bottom of the screen for new settings to take effect.') . '

', ) ); @@ -167,7 +167,7 @@ if ( ! is_multisite() ) {
-

URLs which have question marks and lots of numbers in them; however, WordPress offers you the ability to create a custom URL structure for your permalinks and archives. This can improve the aesthetics, usability, and forward-compatibility of your links. A number of tags are available, and here are some examples to get you started.'); ?>

+

number of tags are available, and here are some examples to get you started.' ); ?>

- + diff --git a/wp-includes/version.php b/wp-includes/version.php index 70534a7497..2158192eb8 100644 --- a/wp-includes/version.php +++ b/wp-includes/version.php @@ -4,7 +4,7 @@ * * @global string $wp_version */ -$wp_version = '4.4-beta3-35598'; +$wp_version = '4.4-beta3-35599'; /** * Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema.
/?p=123