merge

5 files changed, 103 insertions, 2 deletions

diff --git a/sys/man/1/sam b/sys/man/1/sam
index 1ecb55ede..f9e9afdac 100644
--- a/sys/man/1/sam
+++ b/sys/man/1/sam
@@ -496,11 +496,20 @@ Plan 9 command.
 Send the range to the standard input of the
 Plan 9 command.
 .TP
+.BI ^ " Plan 9-command
+Send the standard output of the Plan 9 command
+to the command window.
+.TP
 .BI | " Plan 9-command
 Send the range to the standard input, and replace it by
 the standard output, of the
 Plan 9 command.
 .TP
+.BI _ " Plan 9-command
+Send the range to the standard input, and send the
+standard output of the Plan 9 command to the command
+window.
+.TP
 .BI \*a! " Plan 9-command
 Run the
 Plan 9 command.
@@ -515,6 +524,8 @@ is used.
 In any of
 .BR < ,
 .BR > ,
+.BR ^ ,
+.BR _ ,
 .B |
 or
 .BR ! ,
diff --git a/sys/man/3/aoe b/sys/man/3/aoe
index d6ae374f3..71f3fb865 100644
--- a/sys/man/3/aoe
+++ b/sys/man/3/aoe
@@ -271,7 +271,7 @@ Unused.
 .\" .IR vblade (1),
 .IR sd (3),
 .IR sdaoe (3),
-.IR aoesrv (8),
+.IR vblade (8),
 .IR snoopy (8)
 .br
 .BR http://www.coraid.com/documents/AoEr10.txt
diff --git a/sys/man/3/sdaoe b/sys/man/3/sdaoe
index 62677497b..d0470fb4e 100644
--- a/sys/man/3/sdaoe
+++ b/sys/man/3/sdaoe
@@ -68,7 +68,7 @@ over Ethernet interfaces 0 and 1,
 .IP
 .EX
 aoeif=ether0 ether1
-aoedev=e!#æ/aoe/42.0
+aoedev=e!42.0
 .EE
 .SH SOURCE
 .B /sys/src/9/port/sdaoe.c
diff --git a/sys/man/4/hgfs b/sys/man/4/hgfs
index 94ab79b7a..1684f7c5d 100644
--- a/sys/man/4/hgfs
+++ b/sys/man/4/hgfs
@@ -122,5 +122,10 @@ and \fB.\fI0\fR yields the same file as when omitting the appendix.
 Same as
 .B files,
 but contains only the changed files of the changeset.
+.SH SOURCE
+.B /sys/src/cmd/hgfs
 .SH SEE ALSO
 .IR hg (1)
+.SH HISTORY
+.I Hgfs
+first appeared in 9front (June, 2011).
diff --git a/sys/man/8/vblade b/sys/man/8/vblade
new file mode 100644
index 000000000..a180a8bc2
--- /dev/null
+++ b/sys/man/8/vblade
@@ -0,0 +1,85 @@
+.TH VBLADE 8
+.SH NAME
+vblade \- virtual AoE target
+.SH SYNOPSIS
+.B disk/vblade
+[
+.B -ir
+] [
+.B -s
+.I size
+] [
+.B -a
+.I shelf.slot
+] [
+.B -c
+.I config
+]
+.B file
+[
+.B -e
+ether
+]
+.SH DESCRIPTION
+For each
+.I file
+specified,
+.I vblade
+serves it as an AoE (ATA-over-Ethernet) target via
+the specified interfaces.  The default interface is
+.BR /net/ether0 .
+Since AoE uses raw Ethernet frames, the target is
+only visible on the local ethernet segment.
+.PP
+All target-related options are reset for each
+.IR file .
+.SS Options
+.TP \w'\fL-e\ \fIetherXX'u
+.B -i
+Initialize the configuration header in 
+.IR file .
+All previous configuration information is lost.  Without this option,
+configuration is read from
+.I file
+and command like options override previous settings.
+.TP
+.B -r
+Raw.  Do not use a configuration header.  This is useful when
+exporting a device or file not generally exported by
+.IR vblade .
+.TP
+.BI -s " n"
+The exported target will have size
+.IR n ,
+rather than the available space in the target.  A size may end in
+.LR p ,
+.LR t ,
+.LR g ,
+.LR m ,
+or
+.LR k
+to specify a customary
+.I binary
+multiplier.
+.TP
+.BI -a " m.n"
+Specify the shelf and slot (or major and minor) address of the target.
+Valid shelf numbers are between 0 and 65534.  Valid slots are 0-255.
+.TP
+.BI -c " s"
+Set the AoE config string to
+.IR s .
+.TP
+.BI -e " ether"
+Listen to the network port
+.IR ether.
+Multiple ports may be specified.
+.SH SEE ALSO
+.IR aoe (3),
+.IR sdaoe (3),
+.IR http://www.coraid.com/documents/AoEr11.txt .
+.SH SOURCE
+.B /sys/src/cmd/disk/vblade
+.SH BUGS
+Security depends on control of the local Ethernet segment.  It may be
+unwise to serve AoE on a segment bridged to a wireless network.