20100205-1101

10 files changed, 30 insertions, 26 deletions

diff --git a/man/1/bind b/man/1/bind
index 2b4c470c..4ef46a55 100644
--- a/man/1/bind
+++ b/man/1/bind
@@ -89,13 +89,14 @@ it is assumed to be a network address for a machine acting
 as a file server.
 This argument should then conform to the conventions
 described in
-.IR sys-dial (2).
+.IR dial (2).
 Otherwise
 .I source
 should be the name of a file that when opened gives a connection
-to a file server, something serving the Styx protocol
+to a file server, something serving the 9P protocol
 described in
-.IR intro (5).
+.IR intro (5),
+formerly called `Styx'.
 The optional
 .I spec
 argument to
@@ -262,7 +263,7 @@ Note the caveats on that page.
 For
 .I mount
 only,
-the file server serves the original version of the Styx protocol, and
+the file server serves the 1995 version of Inferno's Styx protocol, and
 .I mount
 inserts a process that translates to the current version.
 .SH SOURCE
@@ -273,10 +274,10 @@ inserts a process that translates to the current version.
 .B /appl/cmd/unmount.b
 .SH SEE ALSO
 .IR sh (1),
+.IR dial (2),
 .IR keyring-auth (2),
 .IR security-auth (2),
 .IR sys-intro (2),
 .IR sys-bind (2),
-.IR sys-dial (2),
 .IR intro (3),
 .IR getauthinfo (8)
diff --git a/man/1/cpu b/man/1/cpu
index 3f6f0226..fe13c09c 100644
--- a/man/1/cpu
+++ b/man/1/cpu
@@ -49,7 +49,7 @@ is not used after authentication.
 .SH SOURCE
 .B /appl/cmd/cpu.b
 .SH SEE ALSO
-.IR sys-dial (2),
+.IR dial (2),
 .IR keyring-auth (2),
 .IR security-auth (2)
 .SH BUGS
diff --git a/man/1/grid-register b/man/1/grid-register
index 8eeca460..947875d7 100644
--- a/man/1/grid-register
+++ b/man/1/grid-register
@@ -11,12 +11,12 @@ grid: register \- registers a resource with a known
 
 .SH DESCRIPTION
 .I Register
-takes a program which serves a Styx (see
-.IR intro (5))
-namespace on
-.I stdin
-and registers it with a known 
-.IR registry (4).
+takes a program that serves a namespace using the 9P protocol on its standard input
+and registers it with a known
+.IR registery (4).
+(See
+.IR intro (5)
+for a description of the protocol.)
 It then marshals the service by listening for incoming connections and exporting the namespace across them.
 .I Register
 prints out various status messages to
diff --git a/man/1/grid-session b/man/1/grid-session
index 472809d3..19ca4c4f 100644
--- a/man/1/grid-session
+++ b/man/1/grid-session
@@ -17,9 +17,11 @@ Once started,
 .IR session
 presents a heirarchical view of currently registered resources (such as
 .IR grid-ns (1))
-which export a Styx (see
-.IR intro (5))
-namespace. The top level displays the type of resource e.g. 
+that serve name spaces using 9P.
+(See
+.IR intro (5)
+for a description of the protocol.)
+The top level displays the type of resource, for instance
 .BR 'CPU resource' , 
 whilst the second level shows the name of each individual resource. Descending futher down the tree will reveal the attributes of the selected resource. To mount a resource and see the namespace it exports, click mouse button 3 on the resource name. The view will switch to a split pane view displaying the resource namespace with directories listed on the left and all files in the current directory displayed on the right.
 .PP
diff --git a/man/1/listen b/man/1/listen
index 4234ad49..42dc1bac 100644
--- a/man/1/listen
+++ b/man/1/listen
@@ -59,7 +59,7 @@ waits for an incoming network connection on
 (as accepted by
 .B announce
 in
-.IR sys-dial (2))
+.IR dial (2))
 and then invokes
 .IR sh (1)
 to run the associated
@@ -97,7 +97,7 @@ with the shell variable
 .B net
 set to the name of the corresponding network directory
 (see
-.IR sys-dial (2)),
+.IR dial (2)),
 before listening for incoming calls.
 This can be used to change, or find out the characteristics
 of an announced port (for instance to find out
@@ -231,7 +231,7 @@ attach message seen by the command that
 has been started by
 .IR styxlisten .
 .SH "SEE ALSO"
-.IR svc (8),
-.IR sys-dial (2),
+.IR dial (2),
+.IR ssl (3),
 .IR auth (6),
-.IR ssl (3)
+.IR svc (8)
diff --git a/man/1/ls b/man/1/ls
index 1a7d548a..2b6cc4d1 100644
--- a/man/1/ls
+++ b/man/1/ls
@@ -61,7 +61,7 @@ to the file's owner, members of the file's group and anybody else
 respectively.
 .IP 2.
 The device type (this is the `#' device letter for local devices
-or `M' for files mounted over a Styx connection).
+or `M' for files mounted over a 9P connection).
 .IP 3.
 The device instance number (this distinguishes between
 separately mounted instances of the same device).
diff --git a/man/1/ns b/man/1/ns
index e4a19d31..5095b0cb 100644
--- a/man/1/ns
+++ b/man/1/ns
@@ -27,7 +27,7 @@ mount or bind, the original name of the file is shown.
 .PP
 Mounts of file services on a network show the network address as
 given to
-.IR sys-dial (2)
+.IR dial (2)
 instead of the name of the data file for the connection; the
 .B -r
 option causes
@@ -40,4 +40,3 @@ to show the raw file name instead.
 .IR prog (3),
 .IR namespace (4),
 .IR namespace (6)
-
diff --git a/man/1/secstore b/man/1/secstore
index bab02a1e..c59a711c 100644
--- a/man/1/secstore
+++ b/man/1/secstore
@@ -98,7 +98,7 @@ as the extra authentication code if the server demands it.
 Connect to the server at the given network
 .IR address ,
 as defined by
-.IR sys-dial (2),
+.IR dial (2),
 and translated by
 .IR cs (8).
 The default is
diff --git a/man/1/sh-file2chan b/man/1/sh-file2chan
index d9a57304..27115a8e 100644
--- a/man/1/sh-file2chan
+++ b/man/1/sh-file2chan
@@ -235,7 +235,9 @@ memory-based file called
 .EE
 It is, however, very limited, as binary data stored in the file
 will be corrupted, and the size of the file is limited to the amount
-of data that can be transmitted in a single Styx message (8192 bytes).
+of data that can be transmitted in a single write
+(see
+.IR sys-read (2)).
 .PP
 The following code implements a single-threaded logfile
 which can support multiple concurrent writers:
diff --git a/man/1/telnet b/man/1/telnet
index 10cdfe22..b840b070 100644
--- a/man/1/telnet
+++ b/man/1/telnet
@@ -9,7 +9,7 @@ telnet \- make a remote telnet connection
 uses the Telnet protocol to talk to a remote
 .IR machine ,
 addressed using any form acceptable to
-.IR sys-dial (2):
+.IR dial (2):
 .IB net ! host ! port
 in general.
 The default