Skip to content

Commit d41ec67

Browse files
JohnoKingMcDutchie
authored andcommitted
Fix some errors in the documentation and other minor issues (#42)
Somewhat notable changes in this commit: - The 'set +r' bugfix (re: 74b4162) is now documented in the changelog. - Missing options have been added to the synopsis section of the ksh man page. - The minor formatting fix from ksh-community/ksh#5 has been applied to the ksh man page. - A few fixes from att@5e747cfb have been applied to the ksh man page. - The man page fixes from att#353 have been applied, being: - An addition to document the behavior of 'set -H'. - A fix for the cd section appending rksh93. - A fix for some options being indented too far. - Removal of a duplicate section documenting '-D'. - Reordering the options for 'set' in alphabetical order. - A minor fix for the documentation of 'ksh -i'.
1 parent 43d9fba commit d41ec67

File tree

13 files changed

+54
-48
lines changed

13 files changed

+54
-48
lines changed

NEWS

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -45,8 +45,8 @@ Any uppercase BUG_* names are modernish shell bug IDs.
4545

4646
- A two decade old bug that caused 'whence -a' to base the path of
4747
tracked aliases on the user's current working directory has been
48-
fixed. Now the real path to the tracked aliases is shown when '-a'
49-
is passed to the whence command.
48+
fixed. Now the real path to tracked aliases is shown when '-a' is
49+
passed to the whence command.
5050

5151
2020-06-17:
5252

@@ -120,6 +120,9 @@ Any uppercase BUG_* names are modernish shell bug IDs.
120120
shell's hash table. This fix applies to the hash utility and when the
121121
PATH is reset manually.
122122

123+
- 'set +r' is no longer able to unset the restricted option. This change
124+
makes the behavior of 'set +r' identical to 'set +o restricted'.
125+
123126
2020-06-09:
124127

125128
- The 'unalias' builtin will now return a non-zero status if it tries

lib/package/INIT.README

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -165,7 +165,7 @@ All recorded changes follow.
165165
10-06-25 package.sh: "force admin ditto" => no ditto --update option
166166
10-06-22 C+probe: handle cc that require .[ci] input for version info
167167
10-06-21 ditto.sh: change default remote access to ssh (about time)
168-
10-06-12 regress.sh: DISGNOSTICS [ 1 | 0 | pattern ] and fix EXIT for all
168+
10-06-12 regress.sh: DIAGNOSTICS [ 1 | 0 | pattern ] and fix EXIT for all
169169
10-06-09 package.sh: add AT&T to usable nmake check
170170
10-06-06 iffe.sh,iffe.tst: add { api ver } ops
171171
10-04-22 package.sh: update "html binary|source" NAME/PASSWORD info

lib/package/INIT.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -127,7 +127,7 @@
127127
10-06-25 package.sh: "force admin ditto" => no ditto --update option
128128
10-06-22 C+probe: handle cc that require .[ci] input for version info
129129
10-06-21 ditto.sh: change default remote access to ssh (about time)
130-
10-06-12 regress.sh: DISGNOSTICS [ 1 | 0 | pattern ] and fix EXIT for all
130+
10-06-12 regress.sh: DIAGNOSTICS [ 1 | 0 | pattern ] and fix EXIT for all
131131
10-06-09 package.sh: add AT&T to usable nmake check
132132
10-06-06 iffe.sh,iffe.tst: add { api ver } ops
133133
10-04-22 package.sh: update "html binary|source" NAME/PASSWORD info

src/cmd/INIT/RELEASE

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -70,7 +70,7 @@
7070
10-06-25 package.sh: "force admin ditto" => no ditto --update option
7171
10-06-22 C+probe: handle cc that require .[ci] input for version info
7272
10-06-21 ditto.sh: change default remote access to ssh (about time)
73-
10-06-12 regress.sh: DISGNOSTICS [ 1 | 0 | pattern ] and fix EXIT for all
73+
10-06-12 regress.sh: DIAGNOSTICS [ 1 | 0 | pattern ] and fix EXIT for all
7474
10-06-09 package.sh: add AT&T to usable nmake check
7575
10-06-06 iffe.sh,iffe.tst: add { api ver } ops
7676
10-04-22 package.sh: update "html binary|source" NAME/PASSWORD info

src/cmd/builtin/pty.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ USAGE_LICENSE
3333
"[+?Input to \bpty\b will be written to the standard input of this "
3434
"command. The standard output and standard error from the command will "
3535
"be written to the standard output of \bpty\b.]"
36-
"[+?The \bpty\b commmand terminates when the command completes.]"
36+
"[+?The \bpty\b command terminates when the command completes.]"
3737
"[d:dialogue?Execute the dialogue on the standard input. A dialogue is a "
3838
"sequence of commands, one command per line. All \are\a patterns are "
3939
"extended regular expressions. The \are\a \b?1\b will print the subject "
@@ -58,7 +58,7 @@ USAGE_LICENSE
5858
"[r [\are\a]]?read a line from the master [and it should match "
5959
"re]]]"
6060
"[s \amilliseconds\a?sleep for \amilliseconds\a]"
61-
"[t \amilliseconds\a?set the master read timout to "
61+
"[t \amilliseconds\a?set the master read timeout to "
6262
"\amilliseconds\a; the default is \b1000\b]"
6363
"[u \are\a?read lines from the master until one matches \are\a]"
6464
"[v \alevel\a?set the verbose trace \alevel\a, more output for "

src/cmd/ksh93/COMPATIBILITY

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -128,7 +128,7 @@ omitted features that are completely upward compatible.
128128
The sequence escape control-v will display the shell version.
129129

130130
29. In ksh-88, DEBUG traps were executed. after each command. In ksh-93
131-
DEBUG traps are exeucted before each command.
131+
DEBUG traps are executed before each command.
132132

133133
30. In ksh-88, a redirection to a file name given by an empty string was
134134
ignored. In ksh-93, this is an error.

src/cmd/ksh93/RELEASE88

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -157,7 +157,7 @@ of ksh.
157157
8. Variable .sh.version is set to the version string for
158158
this shell.
159159
9. Variable .sh.name is set to the name of the variable
160-
that that was referenced or assigned to when executing a get
160+
that was referenced or assigned to when executing a get
161161
or set discipline function.
162162
10. Variable .sh.subscript is set to the subscript for the variable
163163
that was referenced or assign to when executing a get or

src/cmd/ksh93/bltins/enum.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -160,7 +160,7 @@ static void put_enum(Namval_t* np,const char *val,int flags,Namfun_t *fp)
160160
i++;
161161
}
162162
if(nv_isattr(np,NV_NOFREE))
163-
error(ERROR_exit(1), "%s: invalid value %s",nv_name(np),val);
163+
error(ERROR_exit(1), "%s: invalid value %s",nv_name(np),val);
164164
}
165165

166166
static char* get_enum(register Namval_t* np, Namfun_t *fp)

src/cmd/ksh93/bltins/typeset.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -561,7 +561,7 @@ static int setall(char **argv,register int flag,Dt_t *troot,struct tdata *tp
561561
if(troot == shp->fun_tree)
562562
{
563563
/*
564-
*functions can be exported or
564+
* functions can be exported or
565565
* traced but not set
566566
*/
567567
flag &= ~NV_ASSIGN;

src/cmd/ksh93/data/builtins.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -940,7 +940,7 @@ const char sh_opthash[] =
940940
"\n"
941941
"[+EXIT STATUS?]{"
942942
"[+0?Successful completion.]"
943-
"[+>0?An error occured.]"
943+
"[+>0?An error occurred.]"
944944
"}"
945945
"[+SEE ALSO?\bsh\b(1), \balias\b(1)]"
946946
;

0 commit comments

Comments
 (0)