Index: /trunk/src/org/openstreetmap/josm/actions/search/SearchAction.java
===================================================================
--- /trunk/src/org/openstreetmap/josm/actions/search/SearchAction.java	(revision 4498)
+++ /trunk/src/org/openstreetmap/josm/actions/search/SearchAction.java	(revision 4499)
@@ -202,12 +202,12 @@
         DescriptionTextBuilder descriptionText = new DescriptionTextBuilder();
         descriptionText.append("<html><style>li.header{font-size:110%; list-style-type:none; margin-top:5px;}</style><ul>");
-        descriptionText.appendItem(tr("<b>Baker Street</b> - ''Baker'' and ''Street'' in any key or name."));
-        descriptionText.appendItem(tr("<b>\"Baker Street\"</b> - ''Baker Street'' in any key or name."));
-        descriptionText.appendItem(tr("<b>name:Bak</b> - ''Bak'' anywhere in the name."));
-        descriptionText.appendItem(tr("<b>type=route</b> - key ''type'' with value exactly ''route''.") + "</li>");
-        descriptionText.appendItem(tr("<b>type=*</b> - key ''type'' with any value. Try also <b>*=value</b>, <b>type=</b>, <b>*=*</b>, <b>*=</b>") + "</li>");
-        descriptionText.appendItem(tr("<b>-name:Bak</b> - not ''Bak'' in the name."));
-        descriptionText.appendItem(tr("<b>oneway?</b> - oneway=yes, true, 1 or on"));
-        descriptionText.appendItem(tr("<b>foot:</b> - key=foot set to any value."));
+        descriptionText.appendItem(tr("<b>Baker Street</b> - ''Baker'' and ''Street'' in any key."));
+        descriptionText.appendItem(tr("<b>\"Baker Street\"</b> - ''Baker Street'' in any key."));
+        descriptionText.appendItem(tr("<b>key:Bak</b> - ''Bak'' anywhere in the key ''key''."));
+        descriptionText.appendItem(tr("<b>-key:Bak</b> - ''Bak'' nowhere in the key ''key''."));
+        descriptionText.appendItem(tr("<b>key=value</b> - key ''key'' with value exactly ''value''.") + "</li>");
+        descriptionText.appendItem(tr("<b>key=*</b> - key ''key'' with any value. Try also <b>*=value</b>, <b>key=</b>, <b>*=*</b>, <b>*=</b>.") + "</li>");
+        descriptionText.appendItem(tr("<b>key:</b> - key ''key'' set to any value."));
+        descriptionText.appendItem(tr("<b>key?</b> - key ''key'' with the value ''yes'', ''true'', ''1'' or ''on''."));
         descriptionText.appendItemHeader(tr("Special targets"));
         /* I18n: don't translate the bold text keyword */ descriptionText.appendItem(tr("<b>type:</b>... - objects with corresponding type (<b>node</b>, <b>way</b>, <b>relation</b>)"));
@@ -216,5 +216,5 @@
         /* I18n: don't translate the bold text keyword */ descriptionText.appendItem(tr("<b>id:</b>... - objects with given ID (0 for new objects)"));
         /* I18n: don't translate the bold text keyword */ descriptionText.appendItem(tr("<b>version:</b>... - objects with given version (0 objects without an assigned version)"));
-        /* I18n: don't translate the bold text keyword */ descriptionText.appendItem(tr("<b>changeset:</b>... - objects with given changeset id (0 objects without assigned changeset)"));
+        /* I18n: don't translate the bold text keyword */ descriptionText.appendItem(tr("<b>changeset:</b>... - objects with given changeset ID (0 objects without an assigned changeset)"));
         /* I18n: don't translate the bold text keyword */ descriptionText.appendItem(tr("<b>nodes:</b>... - objects with given number of nodes (<b>nodes:</b>count, <b>nodes:</b>min-max, <b>nodes:</b>min- or <b>nodes:</b>-max)"));
         /* I18n: don't translate the bold text keyword */ descriptionText.appendItem(tr("<b>tags:</b>... - objects with given number of tags (<b>tags:</b>count, <b>tags:</b>min-max, <b>tags:</b>min- or <b>tags:</b>-max)"));
