20100205-1101

8 files changed, 39 insertions, 83 deletions

diff --git a/man/8/collabsrv b/man/8/collabsrv
index 0d425cab..b99e0365 100644
--- a/man/8/collabsrv
+++ b/man/8/collabsrv
@@ -29,7 +29,7 @@ The services are defined by the contents of directory
 (default:
 .BR /services/collab ).
 .I Collabsrv
-serves an authenticated Styx connection that exports the contents of
+serves an authenticated 9P connection that exports the contents of
 .IB dir /export
 (default:
 .BR /services/collab/export ).
@@ -57,10 +57,10 @@ all share that name space.
 The name space is determined by the service.
 .PP
 A client wishing to make use of the services must first
-.IR sys-dial (2)
+.IR dial (2)
 to connect to
 .IR collabsrv,
-and authenticate and mount the resulting Styx connection.
+and authenticate and mount the resulting 9P connection.
 It can do so using the
 .I mount
 command
@@ -141,7 +141,7 @@ but usually refer to files in
 Each
 .I collabsrv
 service is represented by a name space peculiar to that service.
-The interface to the service is therefore implemented by a service-specific Styx server
+The interface to the service is therefore implemented by a service-specific 9P server
 .RI ( disfile
 in the configuration file).
 Current services are described below.
diff --git a/man/8/cs b/man/8/cs
index 63f8e149..4f7e1b4e 100644
--- a/man/8/cs
+++ b/man/8/cs
@@ -31,7 +31,7 @@ answering requests by client processes
 to translate symbolic network and service names into
 instructions for connecting to the given service.
 It is normally accessed indirectly by calls to
-.IR sys-dial (2).
+.IR dial (2).
 .PP
 The network data is taken from the network database files,
 described in
@@ -76,7 +76,7 @@ or
 .B announce
 as required.
 (All this activity is normally encapsulated in a call to
-.IR sys-dial (2)).
+.IR dial (2).)
 .I Cs
 produces a translation for each network and for each network address on which a symbolic
 .I netaddr
@@ -243,6 +243,6 @@ map from symbolic service names to servers
 .br
 .B /appl/cmd/ndb/csquery.b
 .SH "SEE ALSO"
-.IR sys-dial (2),
+.IR dial (2),
 .IR ndb (6),
 .IR dns (8)
diff --git a/man/8/httpd b/man/8/httpd
index eca8bf25..d00cc31c 100644
--- a/man/8/httpd
+++ b/man/8/httpd
@@ -60,7 +60,7 @@ has the following options:
 Listen for calls on the given
 .IR address ,
 expressed using the syntax of
-.IR sys-dial (2).
+.IR dial (2).
 .TP
 .BI -c " cachesize"
 Set the size of the daemon's cache to
diff --git a/man/8/ping b/man/8/ping
index 441ff0f2..7991f1d0 100644
--- a/man/8/ping
+++ b/man/8/ping
@@ -17,7 +17,7 @@ ping \- probe the Internet
 sends ICMP echo requests to a network
 .I destination
 (which has the syntax accepted by
-.IR sys-dial (2)).
+.IR dial (2)).
 The target host, if up, should send a corresponding reply.
 By default, one line is printed for each reply,
 containing the sequence number (starting at 0) of the message it answers,
@@ -54,7 +54,7 @@ in bytes
 .SH SOURCE
 .B /appl/cmd/ip/ping.b
 .SH SEE ALSO
-.IR sys-dial (2),
+.IR dial (2),
 .IR ip (3)
 .SH DIAGNOSTICS
 .I Ping
diff --git a/man/8/rdbgsrv b/man/8/rdbgsrv
index 139cd4c5..c3d9d0ba 100644
--- a/man/8/rdbgsrv
+++ b/man/8/rdbgsrv
@@ -15,19 +15,13 @@ rdbgsrv \- remote debug server
 .I mountpoint
 .SH DESCRIPTION
 .I Rdbgsrv
-is intended for use with versions of
-.IR sboot (10.8)
-that do not use
-.IR styxmon (10.8),
-but serve Styx directly.
-.I Rdbgsrv
 interposes itself between
 .I dev
 (default:
 .BR /dev/eia0 )
 and
 .I mountpoint
-to convey Styx messages via the serial port to and from a Styx server program
+to convey 9P messages via the serial port to and from a 9P server program
 running on a board running native Inferno.
 The
 .B \-f
@@ -39,8 +33,8 @@ option sets the line speed; the default is 38400 baud.
 The
 .B \-d
 option selects debugging options by a bit mask:
-1, print trace of Styx message types;
-2, print actual Styx message contents.
+1, print trace of 9P message types;
+2, print actual 9P message contents.
 .PP
 The monitor program on the board must be started first.
 .I Rdbgsrv
@@ -49,63 +43,16 @@ writes the two byte message
 and keeps reading the device until it sees the reply
 .BR ok .
 It then attempts to mount the exported name space, and
-copies Styx messages to and from the device.
+copies 9P messages to and from the device.
 .PP
 Once
 .I rdbgsrv
-is running, several device files provided by the program
+is running, any device files provided by the program
 will be visible at
 .IR mountpoint .
-The files include flash partitions, a console file, and a file representing
-temporary storage in the device's memory:
-.TF sbootconsole
-.PD
-.TP
-.B sbootconsole
-Accepts
-.IR sboot (10.8)
-commands.
-When read, it returns output from recent commands.
-.TP
-.B tmp
-Temporary memory buffer that accepts data to be copied to the flash.
-.TP
-.BI F! partition
-Represents the flash partition with the name
-.IR partition .
-.PP
-The following example
-Inferno
-session on the host mounts the serial device on
-.BR /n/rdbg ,
-and sends commands by writing to
-.BR /n/rdbg/sbootconsole .
-.IP
-.EX
-% bind -b '#t' /dev           # ensure /dev/eia0 is visible
-% auxi/rdbgsrv /n/rdbg
-% ls /n/rdbg
-/n/rdbg/F!kern
-/n/rdbg/F!fs
-/n/rdbg/sbootconsole
-/n/rdbg/tmp
-% cp /os/sa1100/isword.p9.gz /n/rdbg/F!kern # copy kernel
-% cp /tmp/fs.tgz /n/rdbg/tmp  # copy compressed file system
-% echo c/u T! F!fs >/n/rdbg/sbootconsole
-% cat /n/rdbg/sbootconsole
-% echo P >/n/rdbg/sbootconsole
-% echo b F!kern >/n/rdbg/sbootconsole       # boot from F!kern
-.EE
-.PP
-Copying a file containing
-.I sboot
-commands to
-.B /n/rdbg/sbootconsole
-has the same effect as writing the individual commands to the console.
 .SH SOURCE
 .B /appl/auxi/rdbgsrv.b
 .SH SEE ALSO
-.IR sboot (10.8),
-.IR styxmon (10.8)
+.IR styxchat (8)
 .SH BUGS
 No error recovery is applied, let alone error correction.
diff --git a/man/8/styxchat b/man/8/styxchat
index 11fdb378..29a04dd8 100644
--- a/man/8/styxchat
+++ b/man/8/styxchat
@@ -1,6 +1,6 @@
 .TH STYXCHAT 8
 .SH NAME
-styxchat \- exchange Styx messages with a server or client
+styxchat \- exchange 9P (Styx) messages with a server or client
 .SH SYNOPSIS
 .B styxchat
 [
@@ -16,7 +16,8 @@ styxchat \- exchange Styx messages with a server or client
 ]
 .SH DESCRIPTION
 .I Styxchat
-exchanges messages with a Styx service.
+exchanges messages with a 9P service.
+(9P was previously called `Styx' when used by Inferno, hence the command's name.)
 See
 .IR intro (5)
 for the protocol definition.
@@ -27,9 +28,9 @@ It makes a connection to a given
 if the
 .B -s
 option is specified),
-then reads a textual representation of Styx T-messages from the standard
+then reads a textual representation of 9P T-messages from the standard
 input and writes them on the connection, with a copy on standard output,
-simultaneously reading Styx R-messages from the connection and printing a representation of them
+simultaneously reading 9P R-messages from the connection and printing a representation of them
 on standard output.
 Each message is represented by one line
 on the standard output in the form of a literal of either
@@ -58,7 +59,7 @@ The
 option causes
 .I destination
 to be interpreted as a network address, as accepted by
-.IR sys-dial (2)
+.IR dial (2)
 (or
 .I listen
 with
@@ -67,7 +68,7 @@ If
 .I destination
 is not provided,
 .B styxchat
-reads and writes Styx messages on its standard input,
+reads and writes 9P messages on its standard input,
 using
 .B /dev/cons
 where it would usually use its standard input and output.
@@ -192,10 +193,10 @@ option, allowing data display to be enabled later.
 .PP
 By default,
 .I styxchat
-sends a Styx client's T-messages and prints a server's R-messages.
+sends a 9P client's T-messages and prints a server's R-messages.
 The
 .B -s
-option causes it to present a server's view: it prints the T-messages from Styx clients, and sends R-messages
+option causes it to present a server's view: it prints the T-messages from 9P clients, and sends R-messages
 as it reads a textual representation of them from standard input:
 .IP
 .br
diff --git a/man/8/styxmon b/man/8/styxmon
index 48012736..60c194e6 100644
--- a/man/8/styxmon
+++ b/man/8/styxmon
@@ -1,6 +1,6 @@
 .TH STYXMON 8
 .SH NAME
-styxmon \- monitor a Styx conversation
+styxmon \- monitor a 9P (Styx) conversation
 .SH SYNOPSIS
 .B styxmon
 [
@@ -14,13 +14,13 @@ styxmon \- monitor a Styx conversation
 ]
 .SH DESCRIPTION
 .I Styxmon
-allows the monitoring of styx messages sent and received
+allows the monitoring of 9P messages sent and received
 by
 .IR cmd ,
-which should serve Styx through its standard input.
+which should serve 9P through its standard input.
 .I Styxmon
-in its turn serves Styx through its standard input,
-and writes information on the Styx messages that
+in its turn serves 9P through its standard input,
+and writes information on the 9P messages that
 it sees to the standard error.
 The
 .B -r
diff --git a/man/8/svc b/man/8/svc
index 38d00c55..ae8701d1 100644
--- a/man/8/svc
+++ b/man/8/svc
@@ -5,6 +5,9 @@ svc: auth, net, registry, rstyx, styx \- start Inferno network services
 .B svc/net
 .br
 .B svc/auth
+[
+.B -n
+]
 .br
 .B svc/registry
 .br
@@ -38,6 +41,11 @@ file service or remote execution.
 .I Auth
 must be run (only) on a host that is to act as an authentication server,
 providing signing and other authentication services to itself and the network.
+The
+.B -n
+flag tells it not to start
+.IR keyfs (4),
+perhaps because it has been started already.
 The files
 .BR /keydb/signerkey ,
 created by
@@ -85,7 +93,7 @@ putting it at the conventional location for the local registry,
 Initial (static) service descriptions are taken from
 .B /lib/ndb/registry
 if it exists.
-It then starts a listener to give other hosts access to the registry as a Styx
+It then starts a listener to give other hosts access to the registry as a 9P
 service at
 .BR tcp!*!registry ,
 normally port 6675.