merge

[plan9front.git] / sys / man / 8 / mkfs

diff --git a/sys/man/8/mkfs b/sys/man/8/mkfs
index 99c37b6ddd36b788f224ab70912314f94fed965d..b7d80d3d599af7212c9e9ef6d28716606796fdd4 100644 (file)
--- a/sys/man/8/mkfs
+++ b/sys/man/8/mkfs
@@ -6,12 +6,8 @@ mkfs, mkext \- archive or update a file system
 .RB [ -aprvoxU ]
 .RB [ -d
 .IR root ]
-.RB [ -n
-.IR name ]
 .RB [ -s
 .IR source ]
-.RB [ -u
-.IR users ]
 .RB [ -z
 .IR n ]
 .I proto ...
@@ -31,35 +27,24 @@ copies files from the file tree
 .I source
 (default
 .BR / )
-to a
-.B kfs
-file system (see
-.IR kfs (4)).
-The kfs service is mounted on
+to a new file system
 .I root
 (default
-.BR /n/kfs ),
-and
-.B /adm/users
-is copied to
-.IB root /adm/users\f1.
+.BR /n/newfs ).
 The
 .I proto
 files are read
 (see
 .IR proto (2)
 for their format)
-and any files specified in them that are out of date are copied to
-.BR /n/kfs .
+and any files specified in them that are out of date are copied.
 .PP
 .I Mkfs
 copies only those files that are out of date.
 Such a file is first copied into a temporary
 file in the appropriate destination directory
 and then moved to the destination file.
-Files in the
-.I kfs
-file system that are not specified in the
+Files that are not specified in the
 .I proto
 file
 are not updated and not removed.
@@ -70,9 +55,8 @@ are:
 .TF "s source"
 .TP
 .B a
-Instead of writing to a
-.B kfs
-file system, write an archive file to standard output, suitable for
+Instead of writing to new file system,
+write an archive file to standard output, suitable for
 .IR mkext .
 All files in
 .IR proto ,
@@ -94,7 +78,7 @@ rather than producing an archive file.
 Copy files into the tree rooted at
 .I root 
 (default
-.BR /n/kfs ).
+.BR /n/newfs ).
 This option suppresses setting the
 .B uid
 and
@@ -104,12 +88,6 @@ Use
 .B -U
 to reenable it. 
 .TP
-.BI "n " name
-Use
-.RI kfs. name
-as the name of the kfs service (default
-.BR kfs ).
-.TP
 .B p
 Update the permissions of a file even if it is up to date.
 .TP
@@ -123,18 +101,11 @@ Copy all files.
 Copy from files rooted at the tree
 .IR source .
 .TP
-.BI "u " users
-Copy file
-.I users
-into
-.B /adm/users
-in the new system.
-.TP
 .B v
 Print the names of all of the files as they are copied.
 .TP
 .BI "z " n
-Copy files assuming kfs block
+Copy files assuming block size
 .I n
 (default 1024)
 bytes long.
@@ -179,7 +150,7 @@ instead of unpacking the files.
 Make an archive to establish a new file system:
 .IP
 .EX
-disk/mkfs -a -u files/adm.users -s dist proto > arch
+disk/mkfs -a -s dist proto > arch
 .EE
 .PP
 Unpack that archive onto a new file system:
@@ -195,6 +166,5 @@ disk/mkext -u -d /n/newfs < arch
 .B /sys/src/cmd/disk/mkext.c
 .SH "SEE ALSO"
 .IR prep (8),
-.IR kfscmd (8),
 .IR sd (3),
 .IR tar (1)