Consolidate catsh history documentation

4 files changed, 29 insertions, 99 deletions

diff --git a/bin/catsh/Makefile b/bin/catsh/Makefile
index b3dd4779..092d8be6 100644
--- a/bin/catsh/Makefile
+++ b/bin/catsh/Makefile
@@ -89,6 +89,3 @@ shell:
 
 unshell:
 	sed -i sed '\;^$(PREFIX)/bin/catsh$$;d' /etc/shells
-
-README: catsh.7
-	mandoc catsh.7 | col -bx > README
diff --git a/bin/catsh/README b/bin/catsh/README
deleted file mode 100644
index ccd41938..00000000
--- a/bin/catsh/README
+++ /dev/null
@@ -1,28 +0,0 @@
-CATSH(7)               Miscellaneous Information Manual               CATSH(7)
-
-NAME
-     catsh – a shell
-
-DESCRIPTION
-     catsh is a shell derived from FreeBSD sh(1), which is in turn derived
-     from Almquist shell.  It includes editline(3) from NetBSD.
-
-   Differences from sh(1)
-     •   ENV defaults to ‘${XDG_CONFIG_HOME:-${HOME}/.config}/catsh/env.sh’.
-
-     •   PS0 is printed before each prompt, allowing multi-line prompts.
-
-     •   Right-aligned prompts can be set with RPS1 and RPS2.
-
-     •   PSlit can be used to embed terminal escape sequences in prompts, as
-         in NetBSD sh(1).
-
-     •   HOME is shortened to ‘~’ in prompt expansion.
-
-     •   fc -s =new allows prefixing commands with new.
-
-HISTORY
-     sh(1) sources were imported from FreeBSD 12.0.  editline(3) sources were
-     imported from NetBSD 8.0.
-
-Causal Agency                  January 14, 2019                  Causal Agency
diff --git a/bin/catsh/catsh.1 b/bin/catsh/catsh.1
index ab5c608e..e013a452 100644
--- a/bin/catsh/catsh.1
+++ b/bin/catsh/catsh.1
@@ -32,7 +32,7 @@
 .\"	from: @(#)sh.1	8.6 (Berkeley) 5/4/95
 .\" $FreeBSD: releng/12.0/bin/sh/sh.1 336483 2018-07-19 13:09:29Z 0mp $
 .
-.Dd January 10, 2019
+.Dd June 24, 2019
 .Dt CATSH 1
 .Os
 .
@@ -3205,10 +3205,34 @@ license after the Bourne shell from
 .Pp
 The
 .Nm
-utility is based on
-.Xr sh 1
-from
-.Fx 12.0 .
+sources were imported from
+.Fx 12.0
+.Xr sh 1 .
+Bundled
+.Xr editline 3
+sources were imported from
+.Nx 8.0 .
+.
+.Ss Differences from sh
+.Bl -bullet -compact
+.It
+.Va ENV
+has a default value.
+.It
+Further prompt customization with
+.Va PS0 ,
+.Va RPS1 ,
+.Va RPS2 ,
+.Va PSlit .
+.It
+.Va HOME
+is shortened to
+.Sq ~
+in prompt expansion.
+.It
+.Ic fc Fl s Ar = Ns Ar new
+prefixes commands.
+.El
 .
 .Sh AUTHORS
 .An -nosplit
diff --git a/bin/catsh/catsh.7 b/bin/catsh/catsh.7
deleted file mode 100644
index e41544fd..00000000
--- a/bin/catsh/catsh.7
+++ /dev/null
@@ -1,63 +0,0 @@
-.Dd January 14, 2019
-.Dt CATSH 7
-.Os "Causal Agency"
-.
-.Sh NAME
-.Nm catsh
-.Nd a shell
-.
-.Sh DESCRIPTION
-.Nm
-is a shell derived from
-.Fx
-.Xr sh 1 ,
-which is in turn derived from Almquist shell.
-It includes
-.Xr editline 3
-from
-.Nx .
-.
-.Ss Differences from Xr sh 1
-.Bl -bullet
-.It
-.Va ENV
-defaults to
-.Ql ${XDG_CONFIG_HOME:-${HOME}/.config}/catsh/env.sh .
-.
-.It
-.Va PS0
-is printed before each prompt,
-allowing multi-line prompts.
-.
-.It
-Right-aligned prompts can be set with
-.Va RPS1
-and
-.Va RPS2 .
-.
-.It
-.Va PSlit
-can be used to embed terminal escape sequences in prompts,
-as in
-.Nx
-.Xr sh 1 .
-.
-.It
-.Va HOME
-is shortened to
-.Sq ~
-in prompt expansion.
-.
-.It
-.Ic fc Fl s Ar = Ns Ar new
-allows prefixing commands with
-.Ar new .
-.El
-.
-.Sh HISTORY
-.Xr sh 1
-sources were imported from
-.Fx 12.0 .
-.Xr editline 3
-sources were imported from
-.Nx 8.0 .