From e770c77e9816e156c6df4a455e71b5f9fff79310 Mon Sep 17 00:00:00 2001
From: Danny Weldon <danny.weldon@gmail.com>
Date: Sun, 14 Jan 2018 00:18:23 +1000
Subject: [PATCH] More sh.1 fixes and additions

cd section was appending rksh93
Added histexpand and -H
Removed duplicate -D
Some options were indented too far
Some reordering of options
---
 src/cmd/ksh93/sh.1 | 55 ++++++++++++++++++++++++----------------------
 1 file changed, 29 insertions(+), 26 deletions(-)

diff --git a/src/cmd/ksh93/sh.1 b/src/cmd/ksh93/sh.1
index ef875294bf09..9d28fa1ac09c 100644
--- a/src/cmd/ksh93/sh.1
+++ b/src/cmd/ksh93/sh.1
@@ -6027,7 +6027,7 @@ The
 command may not be executed by
 .if \nZ=0 .B rsh\^.
 .if \nZ=1 .B rksh\^.
-.if \nZ=1 .B rksh93\^.
+.if \nZ=2 .B rksh93\^.
 .TP
 \f3command\fP \*(OK \f3\-pvxV\fP \*(CK \f2name\^\fP \*(OK \f2arg\^\fP .\|.\|. \*(CK
 Without the
@@ -7136,6 +7136,11 @@ If followed by a
 .B /
 only directories and sub-directories are matched.
 .TP 8
+.B \-H
+Enable \f3!\fP-style history expansion similar to
+.IR csh (1).
+.
+.TP 8
 .B \-K
 When no arguments are specified, it is used along with
 .B \-s
@@ -7202,10 +7207,6 @@ The following argument can be one of the following option names:
 Same as
 .BR \-a .
 .TP 8
-.B errexit
-Same as
-.BR \-e .
-.TP 8
 .B bgnice
 All background jobs are run at a lower priority.
 This is the default mode.
@@ -7219,6 +7220,10 @@ Puts you in an
 .I emacs
 style in-line editor for command entry.
 .TP 8
+.B errexit
+Same as
+.BR \-e .
+.TP 8
 .B globstar
 Same as
 .BR \-G .
@@ -7228,6 +7233,10 @@ Puts you in a
 .I gmacs
 style in-line editor for command entry.
 .TP 8
+.B histexpand
+Same as
+.BR \-H .
+.TP 8
 .B ignoreeof
 The shell will not exit on end-of-file.
 The command
@@ -7287,6 +7296,10 @@ of the pipeline have completed, and the return value
 will be the value of the last non-zero command
 to fail or zero if no command has failed.
 .TP 8
+.B privileged
+Same as
+.BR \-p .
+.TP 8
 .B showme
 When enabled, simple commands or pipelines preceded by a semicolon
 .RB ( ; )
@@ -7297,18 +7310,14 @@ Otherwise, the leading
 .B ;
 will be ignored.
 .TP 8
-.B privileged
+.B trackall
 Same as
-.BR \-p .
+.BR \-h .
 .TP 8
 .B verbose
 Same as
 .BR \-v .
 .TP 8
-.B trackall
-Same as
-.BR \-h .
-.TP 8
 .B vi
 Puts you in insert mode of a
 .I vi\^
@@ -8247,10 +8256,13 @@ when it is invoked:
 .PD 0
 .TP 8
 .B \-D
-Do not execute the script, but output the set of double quoted strings
-preceded by a
-.BR $ .
-These strings are needed for localization of the script to different locales.
+A list of all double quoted strings that are preceded by a
+.B $
+will be printed on standard output and the shell will exit.
+This set of strings will be subject to language translation
+when the locale is not C or POSIX.
+No commands will be executed.
+.PD
 .TP 8
 .B \-E
 Reads the file named by the
@@ -8258,7 +8270,7 @@ Reads the file named by the
 variable or by
 .B \s-1$HOME\s+1/\f3.\fPkshrc
 if not defined after the profiles.
-.TP 10
+.TP 8
 .BI \-c
 If the
 .B \-c
@@ -8294,7 +8306,7 @@ In this case \s-1TERM\s+1 is ignored (so that \f3kill 0\fP
 does not kill an interactive shell) and \s-1INTR\s+1 is caught and ignored
 (so that
 .B wait
-is ).
+is interruptible).
 In all cases, \s-1QUIT\s+1 is ignored by the shell.
 .TP
 .B \-r
@@ -8302,15 +8314,6 @@ If the
 .B \-r
 option is present, the shell is a restricted shell.
 .TP
-.B \-D
-A list of all double quoted strings that are preceded by a
-.B $
-will be printed on standard output and the shell will exit.
-This set of strings will be subject to language translation
-when the locale is not C or POSIX.
-No commands will be executed.
-.PD
-.TP
 .B \-P
 If
 .B \-P