* [9front] mainly just spelling and typos
@ 2021-11-01 20:49 Stuart Morrow
2021-11-01 20:55 ` [9front] " Stuart Morrow
2021-11-01 21:54 ` [9front] " qwx
0 siblings, 2 replies; 8+ messages in thread
From: Stuart Morrow @ 2021-11-01 20:49 UTC (permalink / raw)
To: 9front
Most are self-explanatory, but:
1. nusb(4) is reverted to match what's in plan9.ini(8) (and I add a hyphen)
2. in ps(1), try expanding
(old) $resource Waiting for more of a critical $resource
(new) $resource Waiting for more of a critical resource
when $resource is, say, "memory".
Diskparts(8) erroneously claims sd[C-H] for IDE controllers; no
diff is attached because I wouldn't know what to replace it with.
Why should the manual single out IDE controllers in the current year?
diff 87a823332f9eaa4ff1e72f8524f6e59d1cc4f407 uncommitted
--- a/sys/src/cmd/ascii.c
+++ b/sys/src/cmd/ascii.c
@@ -57,7 +57,7 @@
int ncol;
int text=1;
int strip=0;
-Biobuf bin;
+Biobuf bout;
void
main(int argc, char **argv)
@@ -64,7 +64,7 @@
{
int i;
- Binit(&bin, 1, OWRITE);
+ Binit(&bout, 1, OWRITE);
ARGBEGIN{
case '8':
nchars=256; break;
@@ -95,7 +95,7 @@
for(i=0;i<nchars;i++){
put(i);
if((i&7)==7)
- Bprint(&bin, "|\n");
+ Bprint(&bout, "|\n");
}
}else{
if(text==1)
@@ -106,7 +106,7 @@
else
putnum(*argv++);
}
- Bputc(&bin, '\n');
+ Bputc(&bout, '\n');
exits(0);
}
void
@@ -118,9 +118,9 @@
void
put(int i)
{
- Bputc(&bin, '|');
+ Bputc(&bout, '|');
putn(i, ncol);
- Bprint(&bin, " %s", str[i]);
+ Bprint(&bout, " %s", str[i]);
}
char dig[]="0123456789abcdefghijklmnopqrstuvwxyz";
void
@@ -129,7 +129,7 @@
if(ndig==0)
return;
putn(n/base, ndig-1);
- Bputc(&bin, dig[n%base]);
+ Bputc(&bout, dig[n%base]);
}
void
puttext(char *s)
@@ -137,9 +137,9 @@
int n;
n=btoi(s)&0377;
if(strip)
- Bputc(&bin, n);
+ Bputc(&bout, n);
else
- Bprint(&bin, "%s\n", str[n]);
+ Bprint(&bout, "%s\n", str[n]);
}
void
putnum(char *s)
@@ -146,7 +146,7 @@
{
while(*s){
putn(*s++&0377, ncol);
- Bputc(&bin, '\n');
+ Bputc(&bout, '\n');
}
}
int
--- a/sys/src/cmd/ls.c
+++ b/sys/src/cmd/ls.c
@@ -45,7 +45,7 @@
int mwidth; /* max width of muid */
int lwidth; /* max width of length */
int gwidth; /* max width of groupid */
-Biobuf bin;
+Biobuf bout;
void
main(int argc, char *argv[])
@@ -52,7 +52,7 @@
{
int i;
- Binit(&bin, 1, OWRITE);
+ Binit(&bout, 1, OWRITE);
ARGBEGIN{
case 'F': Fflag++; break;
case 'd': dflag++; break;
@@ -153,7 +153,7 @@
format(dirbuf[i].d, dirbuf[i].d->name);
}
ndir = 0;
- Bflush(&bin);
+ Bflush(&bout);
}
void
@@ -211,23 +211,23 @@
int i;
if(sflag)
- Bprint(&bin, "%*llud ",
+ Bprint(&bout, "%*llud ",
swidth, (db->length+1023)/1024);
if(mflag){
- Bprint(&bin, "[%q] ", db->muid);
+ Bprint(&bout, "[%q] ", db->muid);
for(i=2+strlen(db->muid); i<mwidth; i++)
- Bprint(&bin, " ");
+ Bprint(&bout, " ");
}
if(qflag)
- Bprint(&bin, "(%.16llux %*lud %.2ux) ",
+ Bprint(&bout, "(%.16llux %*lud %.2ux) ",
db->qid.path,
qwidth, db->qid.vers,
db->qid.type);
if(Tflag)
- Bprint(&bin, "%c ", (db->mode&DMTMP)? 't': '-');
+ Bprint(&bout, "%c ", (db->mode&DMTMP)? 't': '-');
if(lflag)
- Bprint(&bin, "%M %C %*ud %*q %*q %*llud %s ",
+ Bprint(&bout, "%M %C %*ud %*q %*q %*llud %s ",
db->mode, db->type,
vwidth, db->dev,
-uwidth, db->uid,
@@ -234,7 +234,7 @@
-gwidth, db->gid,
lwidth, db->length,
asciitime(uflag? db->atime: db->mtime));
- Bprint(&bin, Qflag? "%s%s\n": "%q%s\n", name, fileflag(db));
+ Bprint(&bout, Qflag? "%s%s\n": "%q%s\n", name, fileflag(db));
}
void
diff 35a8152ebc0edc2a6cc6b1e37a08ff8e31033703 uncommitted
--- a//rc/bin/dosmnt
+++ b//rc/bin/dosmnt
@@ -6,7 +6,7 @@
exit usage
}
-x=(`{ls /dev/sd??/dos* >[2]/dev/null |uniq})
+x=(`{ls /dev/sd?*/dos* >[2]/dev/null |uniq})
if(test $#x -lt $1){
echo 'not that many dos disks' >[1=2]
exit usage
--- a//sys/man/4/nusb
+++ b//sys/man/4/nusb
@@ -117,7 +117,7 @@
is the device class, subclass, protocol indentifier
formatted as 6 digit hexadecimal.
.I Usbd
-assigns a stable device identifier based on the
+assigns a stable device-unique name based on the
device descriptor for
.IR hname .
This information is read by
@@ -169,7 +169,7 @@
.BR /dev )
that includes one directory per storage device, named
.BI sdU N [. M ]
-in correspondence with the USB device identifier
+in correspondence with the USB device-unique name
and the storage unit number (or LUN). The LUN is omited
for single lun devices.
.PP
--- a/sys/man/1/grep
+++ b/sys/man/1/grep
@@ -111,7 +111,7 @@
.I grep
with
.B -n
-(plus aditional flags, if provided)
+(plus additional flags, if provided)
and forces tagging of output lines by file name. If no files
are listed, it recursively searches the current directory for
all files matching
--- a/sys/man/1/ps
+++ b/sys/man/1/ps
@@ -80,8 +80,7 @@
performing the named system call.
.TP
.BI no " resource
-waiting for more of a critical
-.IR resource .
+waiting for more of a critical resource.
.PD
.PP
The
@@ -109,8 +108,8 @@
to print the arguments for the process. Newlines in arguments will
be translated to spaces for display.
.PP
.I Pstree
-prints the processes as a tree in a two colum layout where
-the first colum being the process id and second column
+prints the processes as a tree in a two-column layout where
+the first column being the process id and second column
the program name and arguments indented and prefixed with
line drawing runes to reflect the nesting in the hierarchy.
.SH FILES
--- a/sys/man/2/graphics
+++ b/sys/man/2/graphics
@@ -469,7 +469,7 @@
.BR screen ,
a pointer to the
.B Image
-defining the window (or the overall display, if no window system is
running); and
+defining the window (or the overall display, if no window system is
running), and
.BR _screen ,
a pointer to the
.B Screen
--- a/sys/man/3/audio
+++ b/sys/man/3/audio
@@ -36,7 +36,7 @@
.B buffered
followed by the number of bytes currently queued for output. The
numbers are decimal and right-padded with spaces to fit.
-After this fixed header, the contents of the file is driver specific.
+After this fixed header, the content of the file is driver-specific.
.PP
.B Volume
is the control file associated with the audio port. Each source has
--- a/sys/man/4/cifs
+++ b/sys/man/4/cifs
@@ -34,7 +34,7 @@
.SH DESCRIPTION
.I Cifs
translates between Microsoft's file-sharing protocol
-(a.k.a. CIFS or SMB) and 9P, allowing Plan9 clients to mount file systems
+(a.k.a. CIFS or SMB) and 9P, allowing Plan 9 clients to mount file systems
(shares or trees in MS terminology) published by such servers.
.PP
The root of the mounted directory contains one subdirectory per share,
@@ -204,7 +204,7 @@
.B -a
option can be used to force
.I cifs
-to use one of the less secure authentication mechnisms.
+to use one of the less secure authentication mechanisms.
.LP
Windows 7 has dropped support for RAP, which is used to generate
the synthetic files offered by
--- a/sys/man/4/tftpfs
+++ b/sys/man/4/tftpfs
@@ -24,7 +24,7 @@
network bootstrap (see
.IR dhcpd (8)).
As the protocol has no way of distinguishing files from
-directories, the final path segment needs to conain a dot
+directories, the final path segment needs to contain a dot
(.) character to be recognized as a file. To access files that
have no dot in the filename, a trailing dot has to be added
and will be stripped before it is passed to the server.
--- a/sys/man/6/style
+++ b/sys/man/6/style
@@ -18,7 +18,7 @@
.IP •
no tabs expanded to spaces.
.IP •
-surround a binary operator (particular a low precedence one) with spaces;
+surround a binary operator (particularly a low precedence one) with spaces;
don't try to write the most compact code possible
but rather the most readable.
.IP •
--- a/sys/man/8/ipserv
+++ b/sys/man/8/ipserv
@@ -169,7 +169,7 @@
.PP
.I Socksd
is a SOCKS4 and SOCKS5
-proxy server allowing non Plan9 machines to access the
+proxy server allowing non-Plan 9 machines to access the
outside network.
The net to use for outgoing calls can be specified
with the
--- a/sys/man/8/plan9.ini
+++ b/sys/man/8/plan9.ini
@@ -514,7 +514,7 @@
from the top of physical memory.
.SS AUDIO
.SS \fLaudio\fIX\fL=\fIvalue\fP
-This defines a sound interface. PCI based audio devices such as
+This defines a sound interface. PCI-based audio devices such as
Intel HD audio or AC97 are autodetected and do not require any settings.
.PP
Known types are
@@ -778,7 +778,7 @@
This variable is automatically generated by the boot loader (see
.IR 9boot (8))
by doing a BIOS E820 memory scan while still in realmode and
-passed to the kernel. The format is a unordered list of
+passed to the kernel. The format is an unordered list of
decimal region
.I type
and hexadecimal 64-bit
diff 35a8152ebc0edc2a6cc6b1e37a08ff8e31033703 uncommitted
--- a//sys/man/4/bzfs
+++ b//sys/man/4/bzfs
@@ -26,7 +26,7 @@
The
.B -m
option sets the mountpoint
-.I mptp
+.I mtpt
(default /root).
If the
.B -s
--- a/sys/src/cmd/disk/prep/edisk.c
+++ b/sys/src/cmd/disk/prep/edisk.c
@@ -142,7 +142,7 @@
{UU(0x6A82CB45,0x1DD2,0x11B2,0x99A6,0x080020736631ULL),
"solarisboot", "Solaris Boot"},
{UU(0x6A85CF4D,0x1DD2,0x11B2,0x99A6,0x080020736631ULL),
"solarisroot", "Solaris Root"},
{UU(0x6A87C46F,0x1DD2,0x11B2,0x99A6,0x080020736631ULL),
"solarisswap", "Solaris Swap"},
-{UU(0x6A8B642B,0x1DD2,0x11B2,0x99A6,0x080020736631ULL),
"solarisbakup", "Solaris Backup"},
+{UU(0x6A8B642B,0x1DD2,0x11B2,0x99A6,0x080020736631ULL),
"solarisbackup", "Solaris Backup"},
{UU(0x6A898CC3,0x1DD2,0x11B2,0x99A6,0x080020736631ULL), "solarisusr",
"Solaris /usr"},
{UU(0x6A8EF2E9,0x1DD2,0x11B2,0x99A6,0x080020736631ULL), "solarisvar",
"Solaris /var"},
{UU(0x6A90BA39,0x1DD2,0x11B2,0x99A6,0x080020736631ULL),
"solarishome", "Solaris /home"},
diff 7879a3a9a614bdde9f7a22246536980ec27289fc uncommitted
--- a//sys/man/8/prep
+++ b//sys/man/8/prep
@@ -83,7 +83,7 @@
.B 0x39
are Plan 9 partitions.
EFI systems use GUID partition table (GPT) format where partition types
-are identied by a 128-bit long identifiers. The randomly
+are identified by a 128-bit long identifiers. The randomly
generated GUID
.B C91818F9-8025-47AF-89D2-F030D7000C2C
is used to identify the Plan 9 partition type in this scheme.
@@ -158,7 +158,9 @@
worm filesystem.
.TP
.B fs
-A kfs file system.
+An
+.IR hjfs (4)
+file system.
.TP
.B fscfg
A one-sector partition used to store an
diff 7879a3a9a614bdde9f7a22246536980ec27289fc uncommitted
--- a/sys/lib/dist/ndb/local
+++ b/sys/lib/dist/ndb/local
@@ -27,7 +27,7 @@
ns=M.ROOT-SERVERS.NET
#
-# because the public demands the name localsource
+# because the public demands the name localhost
#
ip=127.0.0.1 sys=localhost dom=localhost
^ permalink raw reply [flat|nested] 8+ messages in thread
* [9front] Re: mainly just spelling and typos
2021-11-01 20:49 [9front] mainly just spelling and typos Stuart Morrow
@ 2021-11-01 20:55 ` Stuart Morrow
2021-11-01 22:03 ` qwx
2021-11-01 22:24 ` Stanley Lieber
2021-11-01 21:54 ` [9front] " qwx
1 sibling, 2 replies; 8+ messages in thread
From: Stuart Morrow @ 2021-11-01 20:55 UTC (permalink / raw)
To: 9front
Some that have nothing to do with /dist/plan9front.
The fqa ones are self-explanatory, the wiki one is
so that fshalt will hit all cwfs's, which couldn't hurt.
--- migrating-cwfs.md
+++ /mnt/acme/4/body
@@ -114,7 +114,7 @@
## Bring up new FS
cpu% bind -a '#S' /dev
- cpu% cwfs64x -n newcwfs -f /dev/sdD0/fscache -C -c
+ cpu% cwfs64x -n cwfsnew -f /dev/sdD0/fscache -C -c
config: service cwfs
config: config /dev/sdD0/fscache
config: filsys main c(/dev/sdD0/fscache)(/dev/sdD0/fsworm)
@@ -130,8 +130,8 @@
You can now mount the new filesystem:
- cpu% mount /srv/newcwfs /n/newroot
- cpu% mount /srv/newcwfs /n/newdump dump
+ cpu% mount /srv/cwfsnew /n/newroot
+ cpu% mount /srv/cwfsnew /n/newdump dump
cpu%
## Copy 9fat and nvram
--- fqa.ms
+++ /mnt/acme/4/body
@@ -277,7 +277,7 @@
.ihtml a
.ihtml a <a href="fqa1.html#1.11.1.2">
-1.11.1.2 - Mercurial repository
+1.11.1.2 - Git repository
.ihtml a
.ihtml h1 <h1>
--- fqa1.ms
+++ /mnt/acme/10/body
@@ -1391,7 +1391,7 @@
.ihtml ul <ul>
.IP
.ihtml a <a href="http://git.9front.org/plan9front/plan9front">
-https://code.9front.org/hg/plan9front (official)
+https://git.9front.org/plan9front/plan9front (official)
.ihtml a
.LP
.ihtml ul
--- fqa3.ms
+++ /mnt/acme/11/body
@@ -2783,7 +2783,7 @@
Multiboot can be used to start the 9front kernel directly, skipping
the bootloader step:
.P1
--qemu -kernel 9pc -initrd plan9.ini
+qemu -kernel 9pc -initrd plan9.ini
.P2
.html - <a name="3.3.1.4" />
^ permalink raw reply [flat|nested] 8+ messages in thread
* Re: [9front] mainly just spelling and typos
2021-11-01 20:49 [9front] mainly just spelling and typos Stuart Morrow
2021-11-01 20:55 ` [9front] " Stuart Morrow
@ 2021-11-01 21:54 ` qwx
2021-11-02 20:15 ` Stuart Morrow
1 sibling, 1 reply; 8+ messages in thread
From: qwx @ 2021-11-01 21:54 UTC (permalink / raw)
To: 9front
> Most are self-explanatory, but:
> 1. nusb(4) is reverted to match what's in plan9.ini(8) (and I add a hyphen)
> 2. in ps(1), try expanding
> (old) Waiting for more of a critical
> (new) Waiting for more of a critical resource
> when is, say, "memory".
>
> Diskparts(8) erroneously claims sd[C-H] for IDE controllers; no
> diff is attached because I wouldn't know what to replace it with.
> Why should the manual single out IDE controllers in the current year?
Hi,
Thanks for the patches. Comments:
- The ascii and ls patches are pointless pikeshedding
- dosmnt: I don't think that this is necessary, and afaict it could
conflict with USB dos filesystems already mounted on /shr
- nusb(4): `device identifier' is what is used for USB in general,
I think it can be left alone
- ps(1): I don't understand the point of the first part, it looked
just fine to me
Everything else is fine imho, others may disagree with that or my
own comments.
Cheers,
qwx
^ permalink raw reply [flat|nested] 8+ messages in thread
* Re: [9front] Re: mainly just spelling and typos
2021-11-01 20:55 ` [9front] " Stuart Morrow
@ 2021-11-01 22:03 ` qwx
2021-11-01 22:24 ` Stanley Lieber
1 sibling, 0 replies; 8+ messages in thread
From: qwx @ 2021-11-01 22:03 UTC (permalink / raw)
To: 9front
On Mon Nov 1 22:00:47 +0100 2021, morrow.stuart@gmail.com wrote:
> Some that have nothing to do with /dist/plan9front.
> The fqa ones are self-explanatory, the wiki one is
> so that fshalt will hit all cwfs's, which couldn't hurt.
You're missing a space character in your wiki patch, so
it can't apply cleanly, otherwise it's all fine by me.
Thanks!
qwx
^ permalink raw reply [flat|nested] 8+ messages in thread
* Re: [9front] Re: mainly just spelling and typos
2021-11-01 20:55 ` [9front] " Stuart Morrow
2021-11-01 22:03 ` qwx
@ 2021-11-01 22:24 ` Stanley Lieber
1 sibling, 0 replies; 8+ messages in thread
From: Stanley Lieber @ 2021-11-01 22:24 UTC (permalink / raw)
To: 9front
On November 1, 2021 8:55:12 PM UTC, Stuart Morrow <morrow.stuart@gmail.com> wrote:
>Some that have nothing to do with /dist/plan9front.
>The fqa ones are self-explanatory, the wiki one is
>so that fshalt will hit all cwfs's, which couldn't hurt.
>
>
>--- migrating-cwfs.md
>+++ /mnt/acme/4/body
>@@ -114,7 +114,7 @@
> ## Bring up new FS
>
> cpu% bind -a '#S' /dev
>- cpu% cwfs64x -n newcwfs -f /dev/sdD0/fscache -C -c
>+ cpu% cwfs64x -n cwfsnew -f /dev/sdD0/fscache -C -c
> config: service cwfs
> config: config /dev/sdD0/fscache
> config: filsys main c(/dev/sdD0/fscache)(/dev/sdD0/fsworm)
>@@ -130,8 +130,8 @@
>
> You can now mount the new filesystem:
>
>- cpu% mount /srv/newcwfs /n/newroot
>- cpu% mount /srv/newcwfs /n/newdump dump
>+ cpu% mount /srv/cwfsnew /n/newroot
>+ cpu% mount /srv/cwfsnew /n/newdump dump
> cpu%
>
> ## Copy 9fat and nvram
>
>
>--- fqa.ms
>+++ /mnt/acme/4/body
>@@ -277,7 +277,7 @@
> .ihtml a
>
> .ihtml a <a href="fqa1.html#1.11.1.2">
>-1.11.1.2 - Mercurial repository
>+1.11.1.2 - Git repository
> .ihtml a
>
> .ihtml h1 <h1>
>--- fqa1.ms
>+++ /mnt/acme/10/body
>@@ -1391,7 +1391,7 @@
> .ihtml ul <ul>
> .IP
> .ihtml a <a href="http://git.9front.org/plan9front/plan9front">
>-https://code.9front.org/hg/plan9front (official)
>+https://git.9front.org/plan9front/plan9front (official)
> .ihtml a
> .LP
> .ihtml ul
>--- fqa3.ms
>+++ /mnt/acme/11/body
>@@ -2783,7 +2783,7 @@
>
> Multiboot can be used to start the 9front kernel directly, skipping
>the bootloader step:
> .P1
>--qemu -kernel 9pc -initrd plan9.ini
>+qemu -kernel 9pc -initrd plan9.ini
> .P2
>
> .html - <a name="3.3.1.4" />
>
applied to fqa, thanks.
sl
^ permalink raw reply [flat|nested] 8+ messages in thread
* Re: [9front] mainly just spelling and typos
2021-11-01 21:54 ` [9front] " qwx
@ 2021-11-02 20:15 ` Stuart Morrow
2021-11-02 20:39 ` qwx
2021-11-03 22:03 ` qwx
0 siblings, 2 replies; 8+ messages in thread
From: Stuart Morrow @ 2021-11-02 20:15 UTC (permalink / raw)
To: 9front
On 01/11/2021, qwx@sciops.net <qwx@sciops.net> wrote:
> - ps(1): I don't understand the point of the first part, it looked
> just fine to me
"No memory: waiting for more of a critical memory" reads right to you?
(I don't actually know what forms "no [resource]" can take - but I
can't see why this (made-up) example wouldn't still be
representative.)
^ permalink raw reply [flat|nested] 8+ messages in thread
* Re: [9front] mainly just spelling and typos
2021-11-02 20:15 ` Stuart Morrow
@ 2021-11-02 20:39 ` qwx
2021-11-03 22:03 ` qwx
1 sibling, 0 replies; 8+ messages in thread
From: qwx @ 2021-11-02 20:39 UTC (permalink / raw)
To: 9front
On Tue Nov 2 21:28:43 +0100 2021, morrow.stuart@gmail.com wrote:
> On 01/11/2021, qwx@sciops.net <qwx@sciops.net> wrote:
> > - ps(1): I don't understand the point of the first part, it looked
> > just fine to me
>
> "No memory: waiting for more of a critical memory" reads right to you?
> (I don't actually know what forms "no [resource]" can take - but I
> can't see why this (made-up) example wouldn't still be
> representative.)
Please correct me if I'm wrong, but the purpose of this line is to
convey what a process state of this type would indicate and it seems
clear to me as is. imho this is a non-issue.
Thanks,
qwx
^ permalink raw reply [flat|nested] 8+ messages in thread
* Re: [9front] mainly just spelling and typos
2021-11-02 20:15 ` Stuart Morrow
2021-11-02 20:39 ` qwx
@ 2021-11-03 22:03 ` qwx
1 sibling, 0 replies; 8+ messages in thread
From: qwx @ 2021-11-03 22:03 UTC (permalink / raw)
To: 9front
Hello,
Pushed part of the patches according to my previous comments.
If there are any other comments or anyone doesn't agree with the
choices I made, I will happily discuss them.
Please don't inline the patches and add them as an attachment.
The patch in the original mail did not apply cleanly, some
lines were split, others were missing spaces.
Thanks again!
Cheers,
qwx
^ permalink raw reply [flat|nested] 8+ messages in thread
end of thread, other threads:[~2021-11-04 9:12 UTC | newest]
Thread overview: 8+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2021-11-01 20:49 [9front] mainly just spelling and typos Stuart Morrow
2021-11-01 20:55 ` [9front] " Stuart Morrow
2021-11-01 22:03 ` qwx
2021-11-01 22:24 ` Stanley Lieber
2021-11-01 21:54 ` [9front] " qwx
2021-11-02 20:15 ` Stuart Morrow
2021-11-02 20:39 ` qwx
2021-11-03 22:03 ` qwx
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).