Index: modules/drupal/drupal.admin.inc
===================================================================
RCS file: /cvs/drupal/drupal/modules/drupal/drupal.admin.inc,v
retrieving revision 1.1
diff -u -p -r1.1 drupal.admin.inc
--- modules/drupal/drupal.admin.inc	21 Aug 2007 08:15:59 -0000	1.1
+++ modules/drupal/drupal.admin.inc	2 Sep 2007 05:57:18 -0000
@@ -13,18 +13,15 @@
  * @see system_settings_form().
  */
 function drupal_sites_registry_settings() {
-  // Check if all required fields are present
-  if ((variable_get('site_name', 'Drupal') == 'Drupal') || (variable_get('site_name', 'Drupal') == '')) {
-    form_set_error('drupal_directory', t('You must set the name of your site on the <a href="@url">administer &raquo; settings &raquo; site information</a> page.', array('@url' => url('admin/settings/site-information'))));
+  // Check if all required fields are set correctly
+  if ((variable_get('site_name', 'Drupal') == 'Drupal')) {
+    form_set_error('site_name', t('"Drupal" may not be used as your site name. You must change your site name on the <a href="@url">site information settings page</a>.', array('@url' => url('admin/settings/site-information')))); 
   }
-  else if (variable_get('site_mail', ini_get('sendmail_from')) == '') {
-    form_set_error('drupal_directory', t('You must set an e-mail address for your site on the <a href="@url">site information settings page</a>.', array('@url' => url('admin/settings/site-information'))));
+  if (variable_get('site_slogan', '') == '') {
+    form_set_error('site_slogan', t('You must set your site slogan on the <a href="@url">site information settings page</a>.', array('@url' => url('admin/settings/site-information'))));
   }
-  else if (variable_get('site_slogan', '') == '') {
-    form_set_error('drupal_directory', t('You must set your site slogan on the <a href="@url">site information settings page</a>.', array('@url' => url('admin/settings/site-information'))));
-  }
-  else if (variable_get('site_mission', '') == '') {
-    form_set_error('drupal_directory', t('You must set your site mission on the <a href="@url">site information settings page</a>.' , array('@url' => url('admin/settings/site-information'))));
+  if (variable_get('site_mission', '') == '') {
+    form_set_error('site_mission', t('You must set your site mission on the <a href="@url">site information settings page</a>.' , array('@url' => url('admin/settings/site-information'))));
   }
 
   $options = array('1' => t('Enabled'), '0' => t('Disabled'));