Merge ^/head r364051 through r364081.

usr.bin/calendar/calendars/calendar.history

@@ -408,7 +408,6 @@
 08/06	Caricom in Barbados
 08/06	Cy Young pitches first game, 1890
 08/07	Jack the Ripper makes his first kill, 1888
-08/08	Atomic bomb dropped on Nagasaki, 1945
 08/08	Montenegro declares war on Germany, 1914
 08/08	Richard Nixon resigns the US presidency, 1974
 08/08	The Great Train Robbery -- $7,368,000, 1963

usr.bin/calendar/calendars/de_DE.ISO8859-1/calendar.geschichte

@@ -104,7 +104,7 @@ LANG=de_DE.ISO8859-1
 10/01	Verkündigung der Urteile im Nürnberger Hauptkriegsverbrecherprozeß, 1946
 02/25	Auflösung der Landes Preußen durch den Kontrollrat, 1947
 08/06	Erster Atombombenabwurf auf Hiroshima, 1945
-08/08	Atombombenabwurf auf Nagasaki, 1945
+08/09	Atombombenabwurf auf Nagasaki, 1945
 04/19	Aufstand im Warschauer Ghetto, 1943
 12/07	Japan bombardiert Pearl Harbor, 1941
 

usr.bin/uname/uname.1

@@ -28,7 +28,7 @@
 .\"	@(#)uname.1	8.3 (Berkeley) 4/8/94
 .\" $FreeBSD$
 .\"
-.Dd June 27, 2019
+.Dd August 10, 2020
 .Dt UNAME 1
 .Os
 .Sh NAME
@@ -107,6 +107,9 @@ and
 flags are intended to be used for fine grain differentiation of incremental
 .Fx
 development and user visible changes.
+Note that when both of these two options are specified, regardless of their
+order, the kernel version would be printed first, followed by the user
+environment version.
 .Sh ENVIRONMENT
 An environment variable composed of the string
 .Ev UNAME_