games/mix: implement Knuth's specification for comments

[plan9front.git] / sys / man / 4 / import

diff --git a/sys/man/4/import b/sys/man/4/import
old mode 100755 (executable)
new mode 100644 (file)
index d8026c7..88be814
--- a/sys/man/4/import
+++ b/sys/man/4/import
@@ -25,6 +25,11 @@ import \- import a name space from a remote system
 ]
 ]
 .SH DESCRIPTION
+This tool is deprecated and has been replaced by
+.I rimport
+(see
+.IR rcpu (1)).
+.PP
 .I Import
 allows an arbitrary
 .I file
@@ -68,11 +73,24 @@ is a directory.
 Skip the authentication protocol.
 This is useful for connecting to foreign systems like Inferno.
 .TP
+.B -z
+Bypass the initial protocol request for which remote tree to serve.
+This is necessary when the remote 
+.IR exportfs (4) 
+is running with the 
+.B -r 
+or 
+.B -S 
+options which pre-select a file tree to serve. The exception is if both sides are
+operating in the
+.B -B
+backwards mode.
+.TP
 .B -B
 Run in ``backwards'' mode, described below.
 .TP
 .B -E \fIenc
-Push an authentication protocol on its network connection.
+Push an encryption protocol on its network connection.
 The supported protocols are
 .B clear
 (the default, no protocol)
@@ -82,9 +100,9 @@ There are plans to make
 .B tls
 available.
 .TP
-.B -e '\fIenc auth\fR'
-Specify the encryption and authentication algorithms to use for
-encrypting the wire traffic
+.B -e '\fIenc hash\fR'
+Specify the encryption and hash algorithms to use for
+encrypting and authenticating the wire traffic
 (see
 .IR ssl (3)).
 The defaults are
@@ -99,17 +117,17 @@ to select a key to authenticate to the remote side
 (see
 .IR auth (2)).
 .TP
-.B -o -O
-These equivalent flags run
-.I import
-in a pre-9P2000 compatibility mode to import from ancient servers.
-.TP
 .B -p
 Push the
 .IR aan (8)
 filter onto the connection to protect against
 temporary network outages.
 .TP
+.B -n
+Specify announce string for
+.IR aan (8)
+filter when run in ``backwards'' mode.
+.TP
 .B -s \fIname
 Post the connection's mountable file descriptor as
 .BI /srv/ name\fR.
@@ -191,6 +209,7 @@ to restart
 .SH SOURCE
 .B /sys/src/cmd/import.c
 .SH SEE ALSO
+.IR rcpu (1),
 .IR bind (1),
 .IR ssl (3),
 .IR exportfs (4),