' . t('On UNIX, Linux and Mac OS X, the file /etc/syslog.conf defines this routing configuration. Messages can be flagged with the codes LOG_LOCAL0 through LOG_LOCAL7. For information on syslog facilities, severity levels, and how to set up syslog.conf, see the syslog.conf manual page.', array('@syslog_conf' => url('http://www.rt.com/man/syslog.5.html'))) . '
' . t('On Microsoft Windows messages are always sent to the Event Log using the code LOG_USER.') . '
' . t('For more information, see the online handbook and and PHP\'s openlog and syslog functions.', array('@syslog' => 'http://drupal.org/handbook/modules/syslog', '@php_openlog' => url('http://www.php.net/manual/function.openlog.php'), '@php_syslog' => url('http://www.php.net/manual/function.syslog.php'))) . '
'; + $output .= '' . t('For more information, see the online handbook and PHP\'s openlog and syslog functions.', array('@syslog' => 'http://drupal.org/handbook/modules/syslog', '@php_openlog' => url('http://www.php.net/manual/function.openlog.php'), '@php_syslog' => url('http://www.php.net/manual/function.syslog.php'))) . '
'; return $output; } Index: modules/field/modules/field_sql_storage/field_sql_storage.module =================================================================== RCS file: /cvs/drupal/drupal/modules/field/modules/field_sql_storage/field_sql_storage.module,v retrieving revision 1.22 diff -u -r1.22 field_sql_storage.module --- modules/field/modules/field_sql_storage/field_sql_storage.module 10 Sep 2009 22:31:58 -0000 1.22 +++ modules/field/modules/field_sql_storage/field_sql_storage.module 26 Sep 2009 04:29:51 -0000 @@ -12,7 +12,7 @@ function field_sql_storage_help($path, $arg) { switch ($path) { case 'admin/help#field_sql_storage': - $output = '' . t('The Field SQL Storage module stores Field API data in the database. It is the default field storage module, but other field storage modules may be available in the contributions repository.') . '
'; + $output = '' . t('The Field SQL Storage module stores Field API data in the database. It is the default field storage module, but other field storage modules may be available in the contributions repository.') . '
'; return $output; } } Index: modules/menu/menu.module =================================================================== RCS file: /cvs/drupal/drupal/modules/menu/menu.module,v retrieving revision 1.204 diff -u -r1.204 menu.module --- modules/menu/menu.module 18 Sep 2009 00:04:22 -0000 1.204 +++ modules/menu/menu.module 26 Sep 2009 04:29:51 -0000 @@ -18,7 +18,7 @@ function menu_help($path, $arg) { switch ($path) { case 'admin/help#menu': - $output = '' . t("The menu module provides an interface to control and customize Drupal's powerful menu system. Menus are a hierarchical collection of links used to navigate a website. Each menu is rendered in a block that may be positioned and displayed using Drupal's flexible block system. Five menus are provided by Drupal and are always present: Navigation, Management, User menu, Main menu, and Secondary menu. The Management menu contains links for administration and content creation, while the Navigation menu is the default location for site navigation links created by newly enabled modules. Both of these are often displayed in either the left or right sidebar. Most Drupal themes also provide support for the Main links and Secondary links, by displaying them in either the header or footer of each page. The Main menu is the default source for the Main links and the User menu is the default source for the Secondary links. By default, the User menu has links to take the current user to their account or allow them to log out, while the Main menu and Secondary menu contain no menu links but may be configured to contain custom menu items specific to your site. You may create an unlimited number of additional menus, each of which will automatically have an associated block.") . '
'; + $output = '' . t("The menu module provides an interface to control and customize Drupal's powerful menu system. Menus are a hierarchical collection of links used to navigate a website. Each menu is rendered in a block that may be positioned and displayed using Drupal's flexible block system. Five menus are provided by Drupal and are always present: Navigation, Management, User menu, Main menu, and Secondary menu. The Management menu contains links for administration and content creation, while the Navigation menu is the default location for site navigation links created by newly enabled modules. Both of these are often displayed in either the left or right sidebar. Most Drupal themes also provide support for the Main links and Secondary links, by displaying them in either the header or footer of each page. The Main menu is the default source for the Main links and the User menu is the default source for the Secondary links. By default, the User menu has links to take the current user to their account or allow them to log out, while the Main menu and Secondary menu contain no menu links but may be configured to contain custom menu items specific to your site. You may create an unlimited number of additional menus, each of which will automatically have an associated block.") . '
'; $output .= '' . t('The menus page displays all menus currently available on your site. Select a menu from this list to add or edit a menu link, or to rearrange links within the menu. Create new menus using the add menu page (the block containing a new menu must also be enabled on the blocks administration page).', array('@menu' => url('admin/structure/menu'), '@add-menu' => url('admin/structure/menu/add'), '@blocks' => url('admin/structure/block'))) . '
'; $output .= '' . t('For more information, see the online handbook entry for Menu module.', array('@menu' => 'http://drupal.org/handbook/modules/menu/')) . '
'; return $output; Index: modules/system/system.install =================================================================== RCS file: /cvs/drupal/drupal/modules/system/system.install,v retrieving revision 1.389 diff -u -r1.389 system.install --- modules/system/system.install 20 Sep 2009 17:56:24 -0000 1.389 +++ modules/system/system.install 26 Sep 2009 04:29:56 -0000 @@ -311,7 +311,7 @@ 'title' => $t('HTTP request status'), 'value' => $t('Fails'), 'severity' => REQUIREMENT_ERROR, - 'description' => $t('Your system or network configuration does not allow Drupal to access web pages, resulting in reduced functionality. This could be due to your webserver configuration or PHP settings, and should be resolved in order to download information about available updates, fetch aggregator feeds, sign in via OpenID, or use other network-dependent services. If you are certain that Drupal can access web pages but you are still seeing this message, you may add$conf[\'drupal_http_request_fails\'] = FALSE; to the bottom of your settings.php file.'),
+ 'description' => $t('Your system or network configuration does not allow Drupal to access web pages, resulting in reduced functionality. This could be due to your webserver configuration or PHP settings, and should be resolved in order to download information about available updates, fetch aggregator feeds, sign in via OpenID, or use other network-dependent services. If you are certain that Drupal can access web pages but you are still seeing this message, you may add $conf[\'drupal_http_request_fails\'] = FALSE; to the bottom of your settings.php file.'),
);
}
}
Index: modules/system/system.admin.inc
===================================================================
RCS file: /cvs/drupal/drupal/modules/system/system.admin.inc,v
retrieving revision 1.206
diff -u -r1.206 system.admin.inc
--- modules/system/system.admin.inc 21 Sep 2009 07:59:18 -0000 1.206
+++ modules/system/system.admin.inc 26 Sep 2009 04:29:52 -0000
@@ -1420,7 +1420,7 @@
$form['bandwidth_optimization'] = array(
'#type' => 'fieldset',
'#title' => t('Bandwidth optimization'),
- '#description' => t('External resources can be optimized automatically, which can reduce both the size and number of requests made to your website.') . $disabled_message,
+ '#description' => t('External resources can be optimized automatically, which can reduce both the size and number of requests made to your website.') . $disabled_message,
);
// Do not allow Drupal to gzip pages if the server alredy does that.
Index: modules/user/user.module
===================================================================
RCS file: /cvs/drupal/drupal/modules/user/user.module,v
retrieving revision 1.1053
diff -u -r1.1053 user.module
--- modules/user/user.module 25 Sep 2009 15:14:18 -0000 1.1053
+++ modules/user/user.module 26 Sep 2009 04:30:03 -0000
@@ -2605,7 +2605,7 @@
case 'admin/people/create':
return '' . t("This web page allows administrators to register new users. Users' e-mail addresses and usernames must be unique.") . '
'; case 'admin/config/people/permissions': - return '' . t('Permissions let you control what users can do and see on your site. You can define a specific set of permissions for each role. (See the Roles page to create a role). Two important roles to consider are Authenticated Users and Administrators. Any permissions granted to the Authenticated Users role will be given to any user who can log into your site. You can make any role the Administrator role for the site, meaning this will be granted all new permissions automatically. You can do this on the User Settings page. You should be careful to ensure that only trusted users are given this access and level of control of your site.', array('@role' => url('admin/config/people/roles'), '@settings' => url('admin/config/people/accounts'))) . '
'; + return '' . t('Permissions let you control what users can do and see on your site. You can define a specific set of permissions for each role. (See the Roles page to create a role). Two important roles to consider are Authenticated Users and Administrators. Any permissions granted to the Authenticated Users role will be given to any user who can log into your site. You can make any role the Administrator role for the site, meaning this will be granted all new permissions automatically. You can do this on the User Settings page. You should be careful to ensure that only trusted users are given this access and level of control of your site.', array('@role' => url('admin/config/people/roles'), '@settings' => url('admin/config/people/accounts'))) . '
'; case 'admin/config/people/roles': return t('Roles allow you to fine tune the security and administration of Drupal. A role defines a group of users that have certain privileges as defined in user permissions. Examples of roles include: anonymous user, authenticated user, moderator, administrator and so on. In this area you will define the role names of the various roles. To delete a role choose "edit".
By default, Drupal comes with two user roles: