Improve Info-streamline-headings defaults

* lisp/info.el (Info-streamline-headings): Improve defaults.  These
produce somewhat more consistent results on my system, and seems
slightly more in line with current GNU practices.  For example, gcc
uses the "Software development" heading instead of "Programming".

diff --git a/lisp/info.el b/lisp/info.el
index 8ea47d2dbefccca2a557547e7d72ac7ff15448a4..3fd8108132f371435752cbb368efc2cd67906f6c 100644 (file)
--- a/lisp/info.el
+++ b/lisp/info.el
@@ -1474,9 +1474,10 @@ is non-nil)."
 
 (defvar Info-streamline-headings
   '(("Emacs" . "Emacs")
-    ("Programming" . "Programming")
+    ("Software development\\|Programming" . "Software development")
     ("Libraries" . "Libraries")
-    ("World Wide Web\\|Net Utilities" . "Net Utilities"))
+    ("Network applications\\|World Wide Web\\|Net Utilities"
+     . "Network applications"))
   "List of elements (RE . NAME) to merge headings matching RE to NAME.")
 
 (defun Info-dir-remove-duplicates ()