summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--lib/legal/lpl4
-rwxr-xr-xrc/bin/service/startcifs14
-rw-r--r--sys/lib/man/checkman.awk1
-rwxr-xr-xsys/lib/rootstub10
-rw-r--r--sys/man/3/usb8
-rw-r--r--sys/man/4/cwfs5
6 files changed, 11 insertions, 31 deletions
diff --git a/lib/legal/lpl b/lib/legal/lpl
index 8edf8bfe1..0cf6c5307 100644
--- a/lib/legal/lpl
+++ b/lib/legal/lpl
@@ -11,11 +11,11 @@ with the following notable exceptions:
These directories contain material copyrights by B&H Inc. and Y&Y Inc.
2. The printer fonts identified in subdirectory /sys/lib/ghostscript/font
- are subject to the GNU GPL, reproduced in the file /lib/LICENSE.gpl.
+ are subject to the GNU GPL, reproduced in the file /lib/legal/gpl.
3. The ghostscript program in the subdirectory /sys/src/cmd/gs is
covered by the Aladdin Free Public License, reproduced in the file
- /lib/LICENSE.afpl.
+ /lib/legal/afpl.
Other, less notable exceptions are marked in the file tree with
COPYING, COPYRIGHT, or LICENSE files.
diff --git a/rc/bin/service/startcifs b/rc/bin/service/startcifs
deleted file mode 100755
index 34d6048cc..000000000
--- a/rc/bin/service/startcifs
+++ /dev/null
@@ -1,14 +0,0 @@
-#!/bin/rc
-# startcifs - (re)start cifs (smb) server
-echo killing old cifs server
-Kill aquarela | rc
-
-echo starting new cifs server
-@ {
- echo 'srv -A local' >>/srv/fscons
- sleep 2
- chmod 666 /srv/local
- 9fs local
- cd /sys/log
- aquarela
-} &
diff --git a/sys/lib/man/checkman.awk b/sys/lib/man/checkman.awk
index 92c64d593..cf14fbfd0 100644
--- a/sys/lib/man/checkman.awk
+++ b/sys/lib/man/checkman.awk
@@ -34,6 +34,7 @@ BEGIN {
Skipdirs["lml"] = 1
Skipdirs["type1"] = 1
Skipdirs["service.alt"] = 1
+ Skipdirs["inst"] = 1
Omitted["411"] = 1
Omitted["Kill"] = 1
diff --git a/sys/lib/rootstub b/sys/lib/rootstub
index 547acd647..61f22ed22 100755
--- a/sys/lib/rootstub
+++ b/sys/lib/rootstub
@@ -12,7 +12,6 @@ mkdir -p 386/bin/ndb
mkdir -p 386/bin/nusb
mkdir -p 386/bin/replica
mkdir -p 386/bin/upas
-mkdir -p 386/bin/usb
mkdir -p 386/bin/venti
mkdir -p 386/lib/ape
mkdir -p 68000/bin/ape
@@ -29,7 +28,6 @@ mkdir -p 68000/bin/ndb
mkdir -p 68000/bin/nusb
mkdir -p 68000/bin/replica
mkdir -p 68000/bin/upas
-mkdir -p 68000/bin/usb
mkdir -p 68000/bin/venti
mkdir -p 68000/lib/ape
mkdir -p 68020/bin/ape
@@ -46,7 +44,6 @@ mkdir -p 68020/bin/ndb
mkdir -p 68020/bin/nusb
mkdir -p 68020/bin/replica
mkdir -p 68020/bin/upas
-mkdir -p 68020/bin/usb
mkdir -p 68020/bin/venti
mkdir -p 68020/lib/ape
mkdir -p acme/bin/386
@@ -72,7 +69,6 @@ mkdir -p alpha/bin/ndb
mkdir -p alpha/bin/nusb
mkdir -p alpha/bin/replica
mkdir -p alpha/bin/upas
-mkdir -p alpha/bin/usb
mkdir -p alpha/bin/venti
mkdir -p amd64/bin/ape
mkdir -p amd64/bin/audio
@@ -88,7 +84,6 @@ mkdir -p amd64/bin/ndb
mkdir -p amd64/bin/nusb
mkdir -p amd64/bin/replica
mkdir -p amd64/bin/upas
-mkdir -p amd64/bin/usb
mkdir -p amd64/bin/venti
mkdir -p amd64/lib/ape
mkdir -p arm/bin/ape
@@ -105,7 +100,6 @@ mkdir -p arm/bin/ndb
mkdir -p arm/bin/nusb
mkdir -p arm/bin/replica
mkdir -p arm/bin/upas
-mkdir -p arm/bin/usb
mkdir -p arm/bin/venti
mkdir -p arm/lib/ape
mkdir -p cfg
@@ -182,7 +176,6 @@ mkdir -p power/bin/ndb
mkdir -p power/bin/nusb
mkdir -p power/bin/replica
mkdir -p power/bin/upas
-mkdir -p power/bin/usb
mkdir -p power/bin/venti
mkdir -p power/lib/ape
mkdir -p power64/bin/ape
@@ -199,7 +192,6 @@ mkdir -p power64/bin/ndb
mkdir -p power64/bin/nusb
mkdir -p power64/bin/replica
mkdir -p power64/bin/upas
-mkdir -p power64/bin/usb
mkdir -p power64/bin/venti
mkdir -p power64/lib/ape
mkdir -p rc/bin/aux
@@ -219,7 +211,6 @@ mkdir -p sparc/bin/ndb
mkdir -p sparc/bin/nusb
mkdir -p sparc/bin/replica
mkdir -p sparc/bin/upas
-mkdir -p sparc/bin/usb
mkdir -p sparc/bin/venti
mkdir -p sparc/lib/ape
mkdir -p sparc64/bin/ape
@@ -236,7 +227,6 @@ mkdir -p sparc64/bin/ndb
mkdir -p sparc64/bin/nusb
mkdir -p sparc64/bin/replica
mkdir -p sparc64/bin/upas
-mkdir -p sparc64/bin/usb
mkdir -p sparc64/bin/venti
mkdir -p sparc64/lib/ape
mkdir -p sys/lib/dist/usr/glenda/bin/386
diff --git a/sys/man/3/usb b/sys/man/3/usb
index c69129c1c..ea38a212c 100644
--- a/sys/man/3/usb
+++ b/sys/man/3/usb
@@ -175,7 +175,7 @@ In most cases, the correct course of action after noticing the stall
is for the device driver to issue a `clear halt' request (see
.I unstall
in
-.IR usb (2))
+.IR nusb (2))
to resume I/O.
The most common error is
.L crc/timeout
@@ -348,7 +348,7 @@ In most cases
the driver does not issue them, leaving the task to either
.IR usbd
or the usb driver library documented in
-.IR usb (2).
+.IR nusb (2).
.TF "\fLsamplehz\fI n
.TP
.B detach
@@ -515,13 +515,13 @@ Dumps data structures for inspection.
.B #u/usb
root of the USB interface
.SH SOURCE
-.B /sys/src/9/pc/usb.h
+.B /sys/src/9/port/usb.h
.br
.B /sys/src/9/pc/devusb.c
.br
.B /sys/src/9/pc/usb?hci.c
.SH "SEE ALSO"
-.IR usb (2),
+.IR nusb (2),
.IR nusb (4),
.IR plan9.ini (8)
.SH BUGS
diff --git a/sys/man/4/cwfs b/sys/man/4/cwfs
index 8a6c0dedf..6ad1d46e3 100644
--- a/sys/man/4/cwfs
+++ b/sys/man/4/cwfs
@@ -1,6 +1,9 @@
.TH CWFS 4
.SH NAME
-cwfs \- cached-worm file server, dump
+cwfs, \
+cwfs64, \
+cwfs64x, \
+fs64 - cached-worm file server, dump
.SH SYNOPSIS
.B cwfs
[