shop annotation refinement

Give alternate shop type names for most of the shop types that didn't
already have such.  "General store" is the last remaining exception.
Only matters for automatically generated annotations for #overview.

src/shknam.c

@@ -193,7 +193,7 @@ static const char *const shkhealthfoods[] = {
  * have to lower some or all of the probability fields in old entries to
  * free up some percentage for the new type.
  *
- * The placement type field is not yet used but will be in the near future.
+ * The placement type field is not yet used but might be someday.
  *
  * The iprobs array in each entry defines the probabilities for various kinds
  * of objects to be present in the given shop type.  You can associate with
@@ -202,6 +202,9 @@ static const char *const shkhealthfoods[] = {
  * In the latter case, prepend it with a unary minus so the code can know
  * (by testing the sign) whether to use mkobj() or mksobj().
  * shtypes[] is externally referenced from mkroom.c, mon.c and shk.c. 
+ *
+ * The second, usually shorter, store type name is used in automatically
+ * generated annotations for #overview.  If Null, the first name gets used.
  */
 const struct shclass shtypes[] = {
     { "general store", NULL,
@@ -259,7 +262,7 @@ const struct shclass shtypes[] = {
         { 0, 0 },
         { 0, 0 } },
       shkweapons },
-    { "delicatessen", NULL,
+    { "delicatessen", "food shop",
       FOOD_CLASS,
       5,
       D_SHOP,
@@ -270,7 +273,7 @@ const struct shclass shtypes[] = {
         { 3, -ICE_BOX },
         { 0, 0 } },
       shkfoods },
-    { "jewelers", NULL,
+    { "jewelers", "ring shop",
       RING_CLASS,
       3,
       D_SHOP,
@@ -290,7 +293,7 @@ const struct shclass shtypes[] = {
         { 5, -ELVEN_CLOAK },
         { 0, 0 } },
       shkwands },
-    { "hardware store", NULL,
+    { "hardware store", "tool shop",
       TOOL_CLASS,
       3,
       D_SHOP,
@@ -312,7 +315,7 @@ const struct shclass shtypes[] = {
         { 0, 0 },
         { 0, 0 } },
       shkbooks },
-    { "health food store", NULL,
+    { "health food store", "vegetarian food shop",
       FOOD_CLASS,
       2,
       D_SHOP,