Merge 8.6

jan.nijtmans · jan.nijtmans · commit b4cc01c65814 · 2020-11-20T08:26:02.000Z
diff --git a/doc/DumpActiveMemory.3 b/doc/DumpActiveMemory.3
@@ -1,5 +1,5 @@
 '\"
-'\" Copyright (c) 1992-1999 Karl Lehenbauer and Mark Diekhans.
+'\" Copyright (c) 1992-1999 Karl Lehenbauer & Mark Diekhans.
 '\" Copyright (c) 2000 by Scriptics Corporation.
 '\" All rights reserved.
 '\"
diff --git a/doc/TCL_MEM_DEBUG.3 b/doc/TCL_MEM_DEBUG.3
@@ -1,5 +1,5 @@
 '\"
-'\" Copyright (c) 1992-1999 Karl Lehenbauer and Mark Diekhans.
+'\" Copyright (c) 1992-1999 Karl Lehenbauer & Mark Diekhans.
 '\" Copyright (c) 2000 by Scriptics Corporation.
 '\" All rights reserved.
 '\"
diff --git a/doc/memory.n b/doc/memory.n
@@ -1,5 +1,5 @@
 '\"
-'\" Copyright (c) 1992-1999 by Karl Lehenbauer and Mark Diekhans
+'\" Copyright (c) 1992-1999 by Karl Lehenbauer & Mark Diekhans
 '\" Copyright (c) 2000 by Scriptics Corporation.
 '\" All rights reserved.
 '\"
diff --git a/generic/tclClock.c b/generic/tclClock.c
@@ -5,7 +5,7 @@
  *	the time and date facilities of TclX, by Mark Diekhans and Karl
  *	Lehenbauer.
  *
- * Copyright 1991-1995 Karl Lehenbauer and Mark Diekhans.
+ * Copyright (c) 1991-1995 Karl Lehenbauer & Mark Diekhans.
  * Copyright (c) 1995 Sun Microsystems, Inc.
  * Copyright (c) 2004 by Kevin B. Kenny. All rights reserved.
  *
diff --git a/generic/tclDate.c b/generic/tclDate.c
@@ -76,7 +76,7 @@
  *	This file is generated from a yacc grammar defined in the file
  *	tclGetDate.y. It should not be edited directly.
  *
- * Copyright (c) 1992-1995 Karl Lehenbauer and Mark Diekhans.
+ * Copyright (c) 1992-1995 Karl Lehenbauer & Mark Diekhans.
  * Copyright (c) 1995-1997 Sun Microsystems, Inc.
  *
  * See the file "license.terms" for information on usage and redistribution of
diff --git a/generic/tclGetDate.y b/generic/tclGetDate.y
@@ -7,7 +7,7 @@
  *	only used when doing free-form date parsing, an ill-defined process
  *	anyway.
  *
- * Copyright (c) 1992-1995 Karl Lehenbauer and Mark Diekhans.
+ * Copyright (c) 1992-1995 Karl Lehenbauer & Mark Diekhans.
  * Copyright (c) 1995-1997 Sun Microsystems, Inc.
  *
  * See the file "license.terms" for information on usage and redistribution of
@@ -27,7 +27,7 @@
  *	This file is generated from a yacc grammar defined in the file
  *	tclGetDate.y. It should not be edited directly.
  *
- * Copyright (c) 1992-1995 Karl Lehenbauer and Mark Diekhans.
+ * Copyright (c) 1992-1995 Karl Lehenbauer & Mark Diekhans.
  * Copyright (c) 1995-1997 Sun Microsystems, Inc.
  *
  * See the file "license.terms" for information on usage and redistribution of

Original file line number	Diff line number	Diff line change
`@@ -5,7 +5,7 @@`
`5`	`5`	`* the time and date facilities of TclX, by Mark Diekhans and Karl`
`6`	`6`	`* Lehenbauer.`
`7`	`7`	`*`
`8`		`- * Copyright 1991-1995 Karl Lehenbauer and Mark Diekhans.`
	`8`	`+ * Copyright (c) 1991-1995 Karl Lehenbauer & Mark Diekhans.`
`9`	`9`	`* Copyright (c) 1995 Sun Microsystems, Inc.`
`10`	`10`	`* Copyright (c) 2004 by Kevin B. Kenny. All rights reserved.`
`11`	`11`	`*`
Original file line number	Diff line number	Diff line change
`@@ -76,7 +76,7 @@`
`76`	`76`	`* This file is generated from a yacc grammar defined in the file`
`77`	`77`	`* tclGetDate.y. It should not be edited directly.`
`78`	`78`	`*`
`79`		`- * Copyright (c) 1992-1995 Karl Lehenbauer and Mark Diekhans.`
	`79`	`+ * Copyright (c) 1992-1995 Karl Lehenbauer & Mark Diekhans.`
`80`	`80`	`* Copyright (c) 1995-1997 Sun Microsystems, Inc.`
`81`	`81`	`*`
`82`	`82`	`* See the file "license.terms" for information on usage and redistribution of`
Original file line number	Diff line number	Diff line change
`@@ -7,7 +7,7 @@`
`7`	`7`	`* only used when doing free-form date parsing, an ill-defined process`
`8`	`8`	`* anyway.`
`9`	`9`	`*`
`10`		`- * Copyright (c) 1992-1995 Karl Lehenbauer and Mark Diekhans.`
	`10`	`+ * Copyright (c) 1992-1995 Karl Lehenbauer & Mark Diekhans.`
`11`	`11`	`* Copyright (c) 1995-1997 Sun Microsystems, Inc.`
`12`	`12`	`*`
`13`	`13`	`* See the file "license.terms" for information on usage and redistribution of`
`@@ -27,7 +27,7 @@`
`27`	`27`	`* This file is generated from a yacc grammar defined in the file`
`28`	`28`	`* tclGetDate.y. It should not be edited directly.`
`29`	`29`	`*`
`30`		`- * Copyright (c) 1992-1995 Karl Lehenbauer and Mark Diekhans.`
	`30`	`+ * Copyright (c) 1992-1995 Karl Lehenbauer & Mark Diekhans.`
`31`	`31`	`* Copyright (c) 1995-1997 Sun Microsystems, Inc.`
`32`	`32`	`*`
`33`	`33`	`* See the file "license.terms" for information on usage and redistribution of`