3 files changed, 4 insertions, 31 deletions
diff --git a/usr.bin/calendar/calendars/calendar.history b/usr.bin/calendar/calendars/calendar.history
index d1b3e66647ee..e4e248c31f3e 100644
--- a/usr.bin/calendar/calendars/calendar.history
+++ b/usr.bin/calendar/calendars/calendar.history
@@ -48,7 +48,7 @@
 01/31	Explorer I launched, 1958.  Van Allen Belt discovered
 01/31	Irving Langmuir, 1881, invented tungsten filament lamp
 02/01	First TV soap: Secret Storm, 1954
-02/01	Forces led by Khomeini take over Iran, 1979
+02/01	Forces lead by Khomeini take over Iran, 1979
 02/04	Cybernet inaugurated, 1969
 02/04	Patricia Hearst kidnaped by Symbionese Liberation Army, 1974
 02/07	Fellowship leaves Lorien (LOTR)
@@ -115,6 +115,7 @@
 04/07	Albert Hofmann synthesizes LSD in Switzerland, 1943
 04/07	Alewives run, Cape Cod
 04/09	Lee surrenders to Grant at Appomattox Courthouse, 1865
+04/12	Columbia launched, 1981
 04/12	Confederate troops fire first shots of Civil War at Ft Sumter, 1861
 04/12	Space Shuttle Columbia launched, 1981
 04/12	Yuri Gagarin becomes the first man in space, 1961
@@ -463,7 +464,7 @@
 12/01	Martin Luther King Jr., leads black boycott of Montgomery buses, 1955
 12/01	Rosa Parks refuses to move to back of the bus (Montgomery, AL), 1953
 12/03	First neon light display, Paris, 1910
-12/03	First successful human heart transplant led by Dr. Barnard, 1967
+12/03	First successful human heart transplant lead by Dr. Barnard, 1967
 12/03	The Montreux Casino burns down during a Frank Zappa concert, 1971
 12/04	Washington takes leave of his officers at Fraunce's Tavern, NYC, 1783
 12/05	Death of Smaug (LOTR)
diff --git a/usr.bin/chpass/chpass.1 b/usr.bin/chpass/chpass.1
index 1b9f8b1282dd..b36ddbba10e6 100644
--- a/usr.bin/chpass/chpass.1
+++ b/usr.bin/chpass/chpass.1
@@ -47,19 +47,8 @@
 .Nm chpass
 .Op Fl a Ar list
 .Op Fl p Ar encpass
-.Op Fl e Ar expiretime
 .Op Fl s Ar newshell
 .Op user
-.Pp
-.Nm chpass
-.Op Fl oly
-.Op Fl a Ar list
-.Op Fl p Ar encpass
-.Op Fl e Ar expiretime
-.Op Fl s Ar newshell
-.Op Fl d Ar domain
-.Op Fl h Ar host
-.Op user
 .Sh DESCRIPTION
 The
 .Nm
@@ -88,9 +77,6 @@ The super-user is allowed to directly supply an encrypted password field,
 in the format used by
 .Xr crypt 3 ,
 as an argument.
-.It Fl e Ar expiretime
-Change the account expire time. This option is used to set the expire time
-from a script as if it was done in the interactive editor.
 .It Fl s Ar newshell
 Attempt to change the user's shell to
 .Ar newshell .
diff --git a/usr.bin/mklocale/mklocale.1 b/usr.bin/mklocale/mklocale.1
index 58f337fdcd34..f1b3d3950e63 100644
--- a/usr.bin/mklocale/mklocale.1
+++ b/usr.bin/mklocale/mklocale.1
@@ -43,14 +43,8 @@
 .Nd make LC_CTYPE locale files
 .Sh SYNOPSIS
 .Nm mklocale
-.Op Fl d
 .Ar "< src-file"
 .Ar "> language/LC_CTYPE"
-.Nm mklocale
-.Op Fl d
-.Fl o
-.Ar language/LC_CTYPE
-.Ar src-file
 .Sh DESCRIPTION
 The
 .Nm mklocale
@@ -68,14 +62,6 @@ It consists of a series of lines which start with a keyword and have
 associated data following.  C style comments are used
 to place comments in the file.
 .Pp
-Following options are available:
-.Bl -tag -width indent
-.It Fl d
-Turns on debuging messages.
-.It Fl o
-Specify output file.
-.El
-.Pp
 Besides the keywords which will be listed below,
 the following are valid tokens in
 .Ar src-file :
@@ -256,7 +242,7 @@ Defines runes which are special characters, printable and graphic.
 Defines runes which are phonograms, printable and graphic.
 .El
 .Sh SEE ALSO
-.Xr colldef 1 ,
+.Xr mklocale 1 ,
 .Xr mbrune 3 ,
 .Xr rune 3 ,
 .Xr setlocale 3 ,