20100205-1101

3 files changed, 21 insertions, 11 deletions

diff --git a/man/10/devattach b/man/10/devattach
index 48d48c8d..8d152f48 100644
--- a/man/10/devattach
+++ b/man/10/devattach
@@ -203,7 +203,7 @@ and consequently those values must remain valid until the last use of
 .BR up->genbuf .)
 If channel
 .I c
-corresponds to a file descriptor on which Styx is served,
+corresponds to a file descriptor on which 9P is served,
 .I devdir
 sets both the flag bit
 .B QTMOUNT
@@ -214,9 +214,7 @@ and the flag bit
 in
 .IB dp ->mode
 (see
-.I export
-in
-.IR sys-dial (2)
+.IR sys-export (2)
 and
 .I mount
 in
@@ -470,7 +468,7 @@ returned by
 .BR Qid.path ).
 If
 .I c
-is a communications channel connecting a Styx server to a current mount point,
+is a communications channel connecting a 9P server to a current mount point,
 the
 .B DMMOUNT
 bit is set in the resulting
diff --git a/man/10/odbc b/man/10/odbc
index fac39877..6367aca9 100644
--- a/man/10/odbc
+++ b/man/10/odbc
@@ -7,11 +7,13 @@ ODBC \- A Windows ODBC file server
 .B -d
 ] [
 .BI -p " port"
+] [
+.BI -u " user"
 ]
 .SH DESCRIPTION
 .I Odbc
 is a file server that runs under Windows and
-exports a Styx namespace
+exports a 9P namespace
 (see
 .IR intro (5)).
 An Inferno process that mounts the namespace
@@ -26,6 +28,15 @@ to print debugging information.
 The
 .B -p
 option gives the port number to listen on for connections. The default is 6700.
+.PP
+By default, the user
+.B inferno
+owns the files in the name space.
+The
+.B -u
+option makes
+.I user
+own the files instead.
 .SS Name space
 .I Odbc
 presents the following name space:
diff --git a/man/10/styx b/man/10/styx
index cbf9bdda..70f37a6a 100644
--- a/man/10/styx
+++ b/man/10/styx
@@ -40,7 +40,8 @@ uint sizeD2M(Dir *d)
 These
 routines convert messages in the machine-independent format of
 the Inferno file protocol,
-Styx (which is equivalent to the Plan 9 protocol 9P2000),
+described by
+.IR intro (5),
 to and from a more convenient form,
 an
 .B Fcall
@@ -129,7 +130,7 @@ void	PBIT64(uchar*, vlong)
 This structure is defined in
 .BR <styx.h> .
 See section 5
-for a full description of Styx messages and their encoding.
+for a full description of 9P messages and their encoding.
 For all message types, the
 .B type
 field of an
@@ -149,7 +150,7 @@ The other fields are used selectively by the message types
 given in comments.
 .PP
 .I ConvM2S
-takes a Styx message at
+takes a 9P message at
 .I ap
 of length
 .IR nap ,
@@ -197,7 +198,7 @@ are copied into the message.
 The constant
 .B IOHDRSZ
 is a suitable amount of buffer to reserve for storing
-the Styx header;
+the 9P header;
 the data portion of a
 .B Twrite
 or
@@ -295,7 +296,7 @@ which is a simple but effective test of validity.
 and
 .I buf
 should include the second two-byte (16-bit) length field that precedes the entry when
-formatted in a Styx message (see
+formatted in a 9P message (see
 .IR stat (5));
 in other words,
 .I nbuf