master a83e4a9 1/2: Improve Info-streamline-headings defaults

[Stefan Kangas]

branch: master
commit a83e4a929b4637426597e1c34e525a2d7dbf15b0
Author: Stefan Kangas <stefan@marxist.se>
Commit: Stefan Kangas <stefan@marxist.se>

    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".
---
 lisp/info.el | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/lisp/info.el b/lisp/info.el
index 8ea47d2..3fd8108 100644
--- 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 ()