? typo_1.patch ? sites/all/modules ? sites/default/settings.php Index: install.php =================================================================== RCS file: /cvs/drupal/drupal/install.php,v retrieving revision 1.86 diff -u -p -r1.86 install.php --- install.php 6 Nov 2007 09:00:30 -0000 1.86 +++ install.php 10 Nov 2007 18:32:21 -0000 @@ -371,7 +371,7 @@ function _install_settings_form_validate // Verify the table prefix if (!empty($db_prefix) && is_string($db_prefix) && !preg_match('/^[A-Za-z0-9_.]+$/', $db_prefix)) { - form_set_error('db_prefix', st('The database table prefix you have entered, %db_prefix, is invalid. The table prefix can only contain alphanumeric characters, underscores or dots.', array('%db_prefix' => $db_prefix)), 'error'); + form_set_error('db_prefix', st('The database table prefix you have entered, %db_prefix, is invalid. The table prefix can only contain alphanumeric characters, periods, or underscores.', array('%db_prefix' => $db_prefix)), 'error'); } if (!empty($db_port) && !is_numeric($db_port)) { Index: modules/menu/menu.admin.inc =================================================================== RCS file: /cvs/drupal/drupal/modules/menu/menu.admin.inc,v retrieving revision 1.5 diff -u -p -r1.5 menu.admin.inc --- modules/menu/menu.admin.inc 9 Nov 2007 22:14:40 -0000 1.5 +++ modules/menu/menu.admin.inc 10 Nov 2007 18:32:21 -0000 @@ -317,7 +317,7 @@ function menu_edit_menu(&$form_state, $t '#type' => 'textfield', '#title' => t('Menu name'), '#maxsize' => MENU_MAX_MENU_NAME_LENGTH_UI, - '#description' => t('The machine-readable name of this menu. This text will be used for constructing the URL of the menu overview page for this menu. This name may consist of only of lowercase letters, numbers, and hyphens, and must be unique.'), + '#description' => t('The machine-readable name of this menu. This text will be used for constructing the URL of the menu overview page for this menu. This name must contain only lowercase letters, numbers, and hyphens, and must be unique.'), '#required' => TRUE, ); $form['#insert'] = TRUE; Index: modules/node/content_types.inc =================================================================== RCS file: /cvs/drupal/drupal/modules/node/content_types.inc,v retrieving revision 1.43 diff -u -p -r1.43 content_types.inc --- modules/node/content_types.inc 12 Oct 2007 14:10:18 -0000 1.43 +++ modules/node/content_types.inc 10 Nov 2007 18:32:21 -0000 @@ -73,7 +73,7 @@ function node_type_form(&$form_state, $t '#title' => t('Name'), '#type' => 'textfield', '#default_value' => $type->name, - '#description' => t('The human-readable name of this content type. This text will be displayed as part of the list on the create content page. It is recommended that this name begins with a capital letter and consists only of letters, numbers, and spaces. This name must be unique to this content type.'), + '#description' => t('The human-readable name of this content type. This text will be displayed as part of the list on the create content page. This name must begin with a capital letter and contain only letters, numbers, and spaces. This name must be unique.'), '#required' => TRUE, ); @@ -84,7 +84,7 @@ function node_type_form(&$form_state, $t '#default_value' => $type->type, '#maxlength' => 32, '#required' => TRUE, - '#description' => t('The machine-readable name of this content type. This text will be used for constructing the URL of the create content page for this content type. This name may consist of only of lowercase letters, numbers, and underscores. Hyphens are not allowed. Underscores will be converted into hyphens when constructing the URL of the create content page. This name must be unique to this content type.'), + '#description' => t('The machine-readable name of this content type. This text will be used for constructing the URL of the create content page for this content type. This name must contain only lowercase letters, numbers, and underscores. Underscores will be converted into hyphens when constructing the URL of the create content page. This name must be unique.'), ); } else { @@ -232,7 +232,7 @@ function node_type_form_validate($form, form_set_error('type', t('The machine-readable name %type is already taken.', array('%type' => $type->type))); } if (!preg_match('!^[a-z0-9_]+$!', $type->type)) { - form_set_error('type', t('The machine-readable name can only consist of lowercase letters, underscores, and numbers.')); + form_set_error('type', t('The machine-readable name must contain only lowercase letters, numbers, and underscores.')); } // The type cannot be just the character '0', since elsewhere we check it using empty(). if ($type->type === '0') {