6 files changed, 13 insertions, 10 deletions
diff --git a/includes/install.inc b/includes/install.inc
index 1c0608a63..6014fe7aa 100644
--- a/includes/install.inc
+++ b/includes/install.inc
@@ -4,6 +4,7 @@
 define('SCHEMA_UNINSTALLED', -1);
 define('SCHEMA_INSTALLED', 0);
 
+define('REQUIREMENT_INFO', -1);
 define('REQUIREMENT_OK', 0);
 define('REQUIREMENT_WARNING', 1);
 define('REQUIREMENT_ERROR', 2);
diff --git a/misc/watchdog-ok.png b/misc/watchdog-ok.png
new file mode 100644
index 000000000..62c9046a8
--- /dev/null
+++ b/misc/watchdog-ok.png
diff --git a/modules/system/admin.css b/modules/system/admin.css
index 8db5227ce..6a70b8cb6 100644
--- a/modules/system/admin.css
+++ b/modules/system/admin.css
@@ -58,3 +58,6 @@ table.system-status-report tr.error th {
 table.system-status-report tr.warning th {
   background-image: url('../../misc/watchdog-warning.png');
 }
+table.system-status-report tr.ok th {
+  background-image: url('../../misc/watchdog-ok.png');
+}
diff --git a/modules/system/system.css b/modules/system/system.css
index e64b15466..a11e33876 100644
--- a/modules/system/system.css
+++ b/modules/system/system.css
@@ -51,9 +51,6 @@ div.warning, tr.warning {
 div.ok, tr.ok {
   background: #dfd;
 }
-.ok {
-  color: green;
-}
 .item-list .icon {
   color: #555;
   float: right;
diff --git a/modules/system/system.install b/modules/system/system.install
index 8194241e5..972079d3e 100644
--- a/modules/system/system.install
+++ b/modules/system/system.install
@@ -19,18 +19,19 @@ function system_requirements($phase) {
     $requirements['drupal'] = array(
       'title' => $t('Drupal'),
       'value' => VERSION,
+      'severity' => REQUIREMENT_INFO
     );
   }
 
   // Test web server
+  $software = $_SERVER['SERVER_SOFTWARE'];
   $requirements['webserver'] = array(
     'title' => $t('Web server'),
+    'value' => $software
   );
   // Use server info string, if present.
-  if (isset($_SERVER['SERVER_SOFTWARE'])) {
-    $requirements['webserver']['value'] = $_SERVER['SERVER_SOFTWARE'];
-
-    list($server, $version) = split('[ /]', $_SERVER['SERVER_SOFTWARE']);
+  if ($software && preg_match('![0-9]!', $software)) {
+    list($server, $version) = split('[ /]', $software);
     switch ($server) {
       case 'Apache':
         if (version_compare($version, DRUPAL_MINIMUM_APACHE) < 0) {
@@ -46,8 +47,8 @@ function system_requirements($phase) {
     }
   }
   else {
-    $requirements['webserver']['value'] = $t('Unknown');
-    $requirements['webserver']['description'] = $t('Unable to determine your web server type. Drupal might not work properly.');
+    $requirements['webserver']['value'] = $software ? $software : $t('Unknown');
+    $requirements['webserver']['description'] = $t('Unable to determine your web server type and version. Drupal might not work properly.');
     $requirements['webserver']['severity'] = REQUIREMENT_WARNING;
   }
 
diff --git a/modules/system/system.module b/modules/system/system.module
index 29176036b..8ca5fb4de 100644
--- a/modules/system/system.module
+++ b/modules/system/system.module
@@ -46,7 +46,7 @@ function system_help($section) {
       return t('<p>Modules are plugins for Drupal that extend its core functionality. Here you can select which modules are enabled. Click on the name of the module in the navigation menu for their individual configuration pages. Once a module is enabled, new <a href="@permissions">permissions</a> might be made available. Modules can automatically be temporarily disabled to reduce server load when your site becomes extremely busy by enabling the throttle.module and checking throttle. The auto-throttle functionality must be enabled on the <a href="@throttle">throttle configuration page</a> after having enabled the throttle module.</p>
 <p>It is important that <a href="@update-php">update.php</a> is run every time a module is updated to a newer version.</p>', array('@permissions' => url('admin/user/access'), '@throttle' => url('admin/settings/throttle'), '@update-php' => $base_url .'/update.php'));
     case 'admin/logs/status':
-      return t('<p>Here you can find a short overview of your Drupal site\'s parameters as well as any problems detected with your installation. It is useful for example to copy/paste this information when you need support.</p>');
+      return t('<p>Here you can find a short overview of your Drupal site\'s parameters as well as any problems detected with your installation. It is useful to copy/paste this information when you need support.</p>');
   }
 }
 
@@ -1427,6 +1427,7 @@ function theme_status_report(&$requirements) {
       $class = $i % 2 == 0 ? 'even' : 'odd';
 
       $classes = array(
+        REQUIREMENT_INFO => 'info',
         REQUIREMENT_OK => 'ok',
         REQUIREMENT_WARNING => 'warning',
         REQUIREMENT_ERROR => 'error',