Merge branch 'master' into dtdocbook

cde/.gitignore

@@ -2284,8 +2284,8 @@ ylwrap
 .deps
 .objs
 .dirstamp
-autotools_config.h
-autotools_config.h.in
+cde_config.h
+cde_config.h.in
 lib/DtTerm/util/lineToData
 lib/csa/y.tab.c
 lib/csa/y.tab.h
@@ -2307,3 +2307,10 @@ programs/localized/util/MsgCat.c
 programs/fontaliases/linux/en_US.UTF-8/fonts.alias
 programs/fontaliases/linux/en_US.UTF-8/mk_fonts_alias
 programs/fontaliases/linux/en_US.UTF-8/test_fonts_alias
+
+# files that are modified by configure for version information
+copyright
+doc/common/help/HELPEnt.sgm
+include/Dt/Dt.h
+lib/tt/bin/ttauth/ttauth.man
+lib/tt/tooltalk.inc