Index: apachesolr.module
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/apachesolr/apachesolr.module,v
retrieving revision 1.1.2.12.2.136
diff -u -p -r1.1.2.12.2.136 apachesolr.module
--- apachesolr.module	30 Apr 2009 18:00:00 -0000	1.1.2.12.2.136
+++ apachesolr.module	6 May 2009 14:08:27 -0000
@@ -1061,6 +1061,38 @@ function apachesolr_index_key($field) {
 }
 
 /**
+ * Try to map a schema field name to a human-readable description.
+ */
+function apachesolr_field_name_map($field_name) {
+  static $map;
+
+  if (!isset($map)) {
+    $map = array(
+      'body' => t('Body text - the full, rendered content'),
+      'title' => t('Content title'),
+      'name' => t('Author name'),
+      'path_alias' => t('Path alias'),
+      'taxonomy_names' => t('All taxonomy term names'),
+      'tags_h1' => t('Body text inside H1 tags'),
+      'tags_h2_h3' => t('Body text inside H2 or H3 tags'),
+      'tags_h4_h5_h6' => t('Body text inside H4, H4, or H6 tags'),
+      'tags_inline' => t('Body text in inline tags like EM or STRONG'),
+      'tags_a' => t('Body text inside links (A tags)'),
+      'tid' => t('Taxonomy term IDs'),
+    );
+    foreach(taxonomy_get_vocabularies() as $vocab) {
+      $map['ts_vid_'. $vocab->vid .'_names'] = t('Taxonomy term names only from the %name vocabulary', array('%name' => $vocab->name));
+      $map['im_vid_'. $vocab->vid] = t('Taxonomy term IDs from the %name vocabulary', array('%name' => $vocab->name));
+    }
+    foreach (apachesolr_cck_fields() as $name => $field) {
+      $map[apachesolr_index_key($field)] = t('CCK @type field %label', array('@type' => $field['index_type'], '%name' => $field['label'])); 
+    }
+    drupal_alter('apachesolr_field_name_map', $map);
+  }
+  return isset($map[$field_name]) ? $map[$field_name] : $field_name;
+}
+
+/**
  * Invokes hook_apachesolr_cck_field_mappings to find out how to handle CCK fields.
  */
 function apachesolr_cck_fields() {
Index: apachesolr_search.admin.inc
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/apachesolr/apachesolr_search.admin.inc,v
retrieving revision 1.1.2.15
diff -u -p -r1.1.2.15 apachesolr_search.admin.inc
--- apachesolr_search.admin.inc	30 Apr 2009 18:00:00 -0000	1.1.2.15
+++ apachesolr_search.admin.inc	6 May 2009 14:08:27 -0000
@@ -55,51 +55,51 @@ function apachesolr_search_bias_form($fo
     '2:150.0' => '3',
     '2:100.0' => '2',
     '1:100.0' => '1',
-    '0:0' => t('Normal'),
+    '0:0' => t('Ignore'),
   );
 
   $weights = drupal_map_assoc(array('21.0', '13.0', '8.0', '5.0', '3.0', '2.0', '1.0', '0.8', '0.5', '0.3', '0.2', '0.1'));
-  $weights['0'] = t('Normal');
+  $weights['0'] = t('Ignore');
 
   $form['biasing'] = array(
     '#type' => 'fieldset',
     '#title' => t('Result biasing'),
     '#collapsible' => TRUE,
     '#collapsed' => FALSE,
-    '#description' => t('Give bias to certain properties when ordering the search results. Any value except <em>Normal</em> will increase the score of the given type in search results. Choose <em>Normal</em> to ignore any given property.'),
+    '#description' => t('Give bias to certain properties when ordering the search results. Any value except <em>Ignore</em> will increase the score of the given type in search results. Choose <em>Ignore</em> to ignore any given property.'),
   );
   $form['biasing']['apachesolr_search_sticky_boost'] = array(
     '#type' => 'select',
     '#options' => $weights,
-    '#title' => t("'Sticky at top of lists' weight"),
+    '#title' => t("Sticky at top of lists"),
     '#default_value' => $sticky_boost,
-    '#description' => t("Select additional weight to give to nodes that are set to be 'Sticky at top of lists'."),
+    '#description' => t("Select additional bias to give to nodes that are set to be 'Sticky at top of lists'."),
   );
   $form['biasing']['apachesolr_search_promote_boost'] = array(
     '#type' => 'select',
     '#options' => $weights,
-    '#title' => t("'Promoted to home page' weight"),
+    '#title' => t("Promoted to home page"),
     '#default_value' => $promote_boost,
-    '#description' => t("Select additional weight to give to nodes that are set to be 'Promoted to home page'."),
+    '#description' => t("Select additional bias to give to nodes that are set to be 'Promoted to home page'."),
   );
   $form['biasing']['apachesolr_search_date_boost'] = array(
     '#type' => 'select',
     '#options' => $options,
-    '#title' => t("'More recently created' bias"),
+    '#title' => t("More recently created"),
     '#default_value' => $date_settings,
     '#description' => t('This setting will change the result scoring so that nodes created more recently may appear before those with higher keyword matching.'),
   );
   $form['biasing']['apachesolr_search_comment_boost'] = array(
     '#type' => 'select',
     '#options' => $options,
-    '#title' => t("'More comments' bias"),
+    '#title' => t("More comments"),
     '#default_value' => $comment_settings,
     '#description' => t('This setting will change the result scoring so that nodes with more comments may appear before those with higher keyword matching.'),
   );
   $form['biasing']['apachesolr_search_changed_boost'] = array(
     '#type' => 'select',
     '#options' => $options,
-    '#title' => t("'More recent comments' bias"),
+    '#title' => t("More recent comments"),
     '#default_value' => $changed_settings,
     '#description' => t('This setting will change the result scoring so that nodes with the most recent comments (or most recent updates to the node itself) may appear before those with higher keyword matching.'),
   );
@@ -139,7 +139,7 @@ function apachesolr_search_settings_form
 
     $form['apachesolr_search_query_fields'] = array(
       '#type' => 'fieldset',
-      '#title' => t('Field weights'),
+      '#title' => t('Field biases'),
       '#collapsible' => TRUE,
       '#collapsed' => FALSE,
       '#tree' => TRUE,
@@ -150,7 +150,7 @@ function apachesolr_search_settings_form
         '#access' => $field->type == 'text',
         '#type' => 'select',
         '#options' => $weights,
-        '#title' => t('Weight for %field_name', array('%field_name' => $field_name)),
+        '#title' => apachesolr_field_name_map($field_name),
         '#default_value' => isset($qf[$field_name]) ? $qf[$field_name] : '0',
       );
     }
@@ -159,7 +159,7 @@ function apachesolr_search_settings_form
       $form['apachesolr_search_query_fields'][$field_name] = array(
         '#type' => 'select',
         '#options' => $weights,
-        '#title' => t('Weight for %field_name', array('%field_name' => $field_name)),
+        '#title' => apachesolr_field_name_map($field_name),
         '#default_value' => isset($qf[$field_name]) ? $qf[$field_name] : $defaults[$field_name],
       );
     }
@@ -178,18 +178,18 @@ function apachesolr_search_type_boost_fo
 
   $form['apachesolr_search_type_settings'] = array(
     '#type' => 'fieldset',
-    '#title' => t('Type weighting and exclusion'),
+    '#title' => t('Type biasing and exclusion'),
     '#collapsible' => TRUE,
     '#collapsed' => FALSE,
   );
   $form['apachesolr_search_type_settings']['apachesolr_search_type_boosts'] = array(
     '#type' => 'item',
-    '#description' => t("Specify here which node types should get a higher relevancy score in searches. Any value except <em>Normal</em> will increase the score of the given type in search results."),
+    '#description' => t("Specify here which node types should get a higher relevancy score in searches. Any value except <em>Ignore</em> will increase the score of the given type in search results."),
     '#tree' => TRUE,
   );
 
   $weights = drupal_map_assoc(array('21.0', '13.0', '8.0', '5.0', '3.0', '2.0', '1.0', '0.8', '0.5', '0.3', '0.2', '0.1'));
-  $weights['0'] = t('Normal');
+  $weights['0'] = t('Ignore');
 
   // Get the current boost values.
   $type_boosts = variable_get('apachesolr_search_type_boosts', array());
@@ -198,7 +198,7 @@ function apachesolr_search_type_boost_fo
   foreach ($names as $type => $name) {
     $form['apachesolr_search_type_settings']['apachesolr_search_type_boosts'][$type] = array(
       '#type' => 'select',
-      '#title' => t('Weight for %type type content', array('%type' => $name)),
+      '#title' => t('%type type content bias', array('%type' => $name)),
       '#options' => $weights,
       '#default_value' => isset($type_boosts[$type]) ? $type_boosts[$type] : 0,
     );
@@ -209,7 +209,7 @@ function apachesolr_search_type_boost_fo
     '#title' => t('Types to exclude from the search index'),
     '#options' => $names,
     '#default_value' => variable_get('apachesolr_search_excluded_types', array()),
-    '#description' => t("Specify here which node types should be totally excluded from the search index."),
+    '#description' => t("Specify here which node types should be totally excluded from the search index. Content excluded from the index will never appear in any search results."),
   );
 
   $form['#submit'][] = 'apachesolr_search_type_boost_form_submit';