Introduction
Introduction Statistics Contact Development Disclaimer Help
tmerge - plan9port - [fork] Plan 9 from user space
git clone git://src.adamsgaard.dk/plan9port
Log
Files
Refs
README
LICENSE
---
commit 7351eea28ed2d396ca524bb0164501aaca857e8f
parent bf486dfc1622cc8b62326bfa72631617f6edb050
Author: Russ Cox <[email protected]>
Date: Sun, 27 Dec 2009 09:19:39 -0800
merge
Diffstat:
M bin/g | 2 +-
M bin/web | 3 +++
M dist/main.html | 4 ----
M man/man1/INDEX | 16 +++++++++++++---
D man/man1/cvs.1 | 257 -----------------------------…
M man/man1/hg.1 | 13 ++++---------
M man/man3/INDEX | 57 +++++++++++++++++++++++++++++…
M man/man4/INDEX | 12 ++++++++++++
M man/man7/INDEX | 2 ++
M man/man8/INDEX | 4 +++-
10 files changed, 92 insertions(+), 278 deletions(-)
---
diff --git a/bin/g b/bin/g
t@@ -30,7 +30,7 @@ case $# in
;;
1)
pattern="$1"
- files=`/bin/ls *.[bcChlmy] *.asm *.cc *.cs *.lx *.cgi *.pl *.py *.tex …
+ files=`/bin/ls *.[bcChlmy] *.asm *.cc *.cs *.lx *.cgi *.pl *.py *.tex …
9 grep -v '\.tab?\.[ch]$'`
;;
*)
diff --git a/bin/web b/bin/web
t@@ -90,6 +90,9 @@ plumbunix()
$BROWSER -remote 'openURL('"$@"',new-tab)' ||
$BROWSER "$@"
;;
+ *google-chrome*)
+ $BROWSER "$@"
+ ;;
esac
}
diff --git a/dist/main.html b/dist/main.html
t@@ -32,10 +32,6 @@ Edit ./^$/,s/<Table/<table border=0 cellspacing=0 cellpaddi…
|
<a href="/usr/local/plan9/">browse</a>
|
- <a href="man/man1/cvs.html">cvs</a>
- |
- <a href="http://cvs.pdos.csail.mit.edu/cvs/plan9">cvsweb</a>
- |
<a href="man/man1/hg.html">hg</a>
|
<a href="http://code.swtch.com/plan9port">hgweb</a>
diff --git a/man/man1/INDEX b/man/man1/INDEX
t@@ -20,6 +20,7 @@ acmeevent acmeevent.1
ascii ascii.1
unicode ascii.1
astro astro.1
+awk awk.1
basename basename.1
bc bc.1
bundle bundle.1
t@@ -32,19 +33,20 @@ cleanname cleanname.1
auxclog clog.1
clog clog.1
cmp cmp.1
+codereview codereview.1
cmapcube colors.1
colors colors.1
comm comm.1
core core.1
crop crop.1
iconv crop.1
-cvs cvs.1
date date.1
db db.1
stack db.1
dc dc.1
delatex deroff.1
deroff deroff.1
+devdraw devdraw.1
dial dial.1
adict dict.1
dict dict.1
t@@ -73,9 +75,13 @@ gunzip gzip.1
gzip gzip.1
unzip gzip.1
zip gzip.1
+cvs hg.1
+hg hg.1
hget hget.1
hist hist.1
+history hist.1
hoc hoc.1
+htmlroff htmlroff.1
idiff idiff.1
install install.1
join join.1
t@@ -111,6 +117,8 @@ mk mk.1
dump9660 mk9660.1
mk9660 mk9660.1
mkdir mkdir.1
+mount mount.1
+unmount mount.1
namespace namespace.1
ndb ndb.1
ndbipquery ndb.1
t@@ -125,9 +133,7 @@ netfiles netfiles.1
netfilestat netfiles.1
news news.1
p p.1
-img page.1
page page.1
-psv page.1
netkey passwd.1
passwd passwd.1
pem pem.1
t@@ -158,6 +164,7 @@ wait rc.1
whatis rc.1
~ rc.1
readcons readcons.1
+resample resample.1
rio rio.1
rm rm.1
asn12dsa rsa.1
t@@ -188,11 +195,13 @@ sed sed.1
seq seq.1
sftpcache sftpcache.1
sleep sleep.1
+snarfer snarfer.1
sort sort.1
spell spell.1
sprog spell.1
split split.1
src src.1
+ssam ssam.1
ssh-agent ssh-agent.1
auxstats stats.1
stats stats.1
t@@ -216,6 +225,7 @@ troff2html troff2html.1
tweak tweak.1
uniq uniq.1
units units.1
+unvac vac.1
vac vac.1
copy venti.1
read venti.1
diff --git a/man/man1/cvs.1 b/man/man1/cvs.1
t@@ -1,257 +0,0 @@
-.TH CVS 1
-.SH NAME
-cvs \- introduction using plan9port CVS repository
-.SH SYNOPSIS
-.B cvs
-.B -d
-.B :pserver:[email protected]:/cvs login
-.PP
-.B cvs
-.B -d
-.B :pserver:[email protected]:/cvs checkout plan9
-.PP
-.B cvs
-.B update
-[
-.B -dP
-]
-[
-.I path ...
-]
-.PP
-.B cvs
-.B status
-[
-.I path ...
-]
-.PP
-.B cvs
-.B diff
-[
-.B -D
-.I date
-]
-[
-.B -r
-.I revision
-]
-[
-.B -cu
-]
-[
-.I path ...
-]
-.PP
-.B web
-.B http://cvs.pdos.csail.mit.edu/cvs/plan9/
-.SH DESCRIPTION
-The master source tree for Plan 9 from User Space is maintained
-using the source control system CVS
-as a poor substitute for Plan 9's
-\fIreplica\fR(8) and dump file system.
-(It is maintained simultaneously using Mercurial; see
-.IR hg (1).)
-.PP
-The first argument to
-.I cvs
-is a command, which determines the form of the rest of the command line.
-.PP
-The
-.B login
-command authenticates to the remote server and records your password in
-.BR $HOME/.cvspass .
-Use an empty password: when prompted, type a newline.
-.PP
-The
-.B checkout
-command downloads a copy of the tree into the directory
-.BR plan9 ,
-which it will create.
-The argument
-.B plan9
-is both the name of the created directory and the name used to
-tell the server which tree you want.
-If you want to use a different name locally, rename the directory
-after running the command.
-.PP
-From directories within the
-.B plan9
-tree, the awkward
-.B -d
-is no longer necessary.
-.PP
-.I Cvs
-.I update
-incorporates recent changes from the CVS tree
-into the local copy.
-If the changes cannot be merged because of locally-made changes
-that are in the way,
-.I cvs
-will leave a note in the file showing the differences between the local
-and remote file.
-.PP
-The
-.B -d
-flag to
-.I cvs
-.I update
-causes
-it to update subdirectories as well.
-The
-.B -P
-flag causes
-.I cvs
-.I update
-to remove directories that have been emptied.
-.PP
-.I Cvs
-.I status
-displays the version number (also called a revision number)
-for the local copy of the named files,
-as well as the number of the most recent version on the server.
-Version numbers are of the form
-.RI 1. n \fR,
-where
-.I n
-is a sequence number starting at 1.
-.PP
-.I Cvs
-.I diff
-runs Unix's
-.IR diff (1)
-to compare files in the local tree with the corresponding files in
-the CVS tree.
-By default it compares against the version that was most recently
-incorporated into the local tree.
-The
-.B -r
-flag specifies an alternate version to compare against.
-The special revision
-.B HEAD
-refers to the most recent version on the server.
-The
-.B -D
-flag instructs
-.I cvs
-.I diff
-to use the version as of the given date.
-Almost any imaginable date format is acceptable:
-.BR 20050110 ,
-.BR 1/10/2005 ,
-.B 'Jan
-.BR 10' ,
-.BR yesterday ,
-.B 'last
-.BR week ',
-.B 'two
-.B days
-.BR ago' ,
-.B 'a
-.B fortnight
-.BR ago' ,
-and so on.
-If two
-.B -r
-or
-.B -D
-options are given,
-those two versions are compared, and the local copy is ignored.
-.PP
-.I Cvs
-.I diff
-passes the
-.B -u
-or
-.B -c
-options to the Unix
-.IR diff .
-.PP
-If you download a tar file from the web
-instead of checking out the tree with CVS,
-you can still use the
-.I update
-and
-.I diff
-commands to stay up-to-date and to see what has changed.
-You will need to run the
-.I cvs
-.I login
-command first to create your
-.B .cvspass
-file.
-.PP
-The CVS tree can be inspected on the web at
-.HR http://cvs.pdos.csail.mit.edu/cvs/plan9/ "" .
-.SH EXAMPLES
-Incorporate any changes made to the CVS tree since
-the last check out or update:
-.IP
-.EX
-cd $PLAN9
-cvs up -dP
-.EE
-.PP
-Compare
-.I libdraw
-against its source from January 1, 2005:
-.IP
-.EX
-cd $PLAN9/src/libdraw
-cvs diff -D20050101
-.EE
-.PP
-Check the entire tree for changes made locally:
-.IP
-.EX
-cd $PLAN9
-cvs diff
-.EE
-.PP
-Check the entire tree for changes between the local version and
-the most recent in the CVS tree.
-This does not indicate which changes are local ones
-and which are changes to the CVS tree that have not yet been
-incorporated into the local tree.
-.IP
-.EX
-cd $PLAN9
-cvs diff -r HEAD
-.EE
-.PP
-Make
-.I cvs
-less chatty by setting the global
-.B -q
-flag implicitly on every CVS command:
-.EX
-cd $HOME
-echo 'cvs -q' > .cvsrc
-.EE
-.SH FILES
-.TP
-.B CVS
-directory containing CVS metadata for parent
-.TP
-.B .cvsignore
-list of files and wildcards to exclude from CVS operations in this directory
-.SH SEE ALSO
-.IR hg (1)
-.PP
-Unix's
-\fIcvs\fR(1),
-.HR http://www.cvshome.org/
-.PP
-.HR http://cvs.pdos.csail.mit.edu/cvs/plan9/
-.SH BUGS
-The CVS server is a read-only public copy of a private tree.
-The dates on versions reflect the date the changes were made in the
-private tree, not the date the change was made public.
-.PP
-On Mac OS X,
-.I cvs
-will complain during a checkout that some files in
-.B $PLAN9/troff/font/devutf
-are ``in the way.''
-This is due to the Mac case-insensitive file system
-and the fact that troff has some (rarely used)
-files whose names differ only in case.
diff --git a/man/man1/hg.1 b/man/man1/hg.1
t@@ -1,6 +1,6 @@
.TH HG 1
.SH NAME
-hg \- introduction to using plan9port Mercurial repository
+hg, cvs \- introduction to using plan9port Mercurial repository
.SH SYNOPSIS
.B hg
.B clone
t@@ -34,8 +34,6 @@ The master source tree for Plan 9 from User Space is maintai…
using the source control system Mercurial
as a substitute for Plan 9's
\fIreplica\fR(8) and dump file system.
-(It is maintained simultaneously using CVS; see
-.IR cvs (1).)
.PP
The first argument to
.I hg
t@@ -101,8 +99,7 @@ directory containing Mercurial local repository
.B .hgignore
list of files and wildcards to exclude from Mercurial operations
.SH SEE ALSO
-.IR codereview (1),
-.IR cvs (1)
+.IR codereview (1)
.PP
Unix's
\fIhg\fR(1),
t@@ -110,7 +107,5 @@ Unix's
.PP
.HR http://code.swtch.com/plan9port/
.SH BUGS
-The use of Mercurial for accessing Plan 9 from User Space
-should be considered experimental.
-People uncomfortable with Mercurial should continue to use
-.IR cvs (1).
+Plan 9 from User Space is no longer accessible using CVS;
+you must use Mercurial.
diff --git a/man/man3/INDEX b/man/man3/INDEX
t@@ -60,6 +60,7 @@ walkandclone 9p.3
9pclient 9pclient.3
CFid 9pclient.3
CFsys 9pclient.3
+fsaccess 9pclient.3
fsattach 9pclient.3
fsauth 9pclient.3
fsclose 9pclient.3
t@@ -70,23 +71,56 @@ fsdirread 9pclient.3
fsdirreadall 9pclient.3
fsdirstat 9pclient.3
fsdirwstat 9pclient.3
+fsfcreate 9pclient.3
+fsfopen 9pclient.3
+fsfremove 9pclient.3
fsinit 9pclient.3
fsmount 9pclient.3
fsopen 9pclient.3
fsopenfd 9pclient.3
fspread 9pclient.3
+fsprint 9pclient.3
fspwrite 9pclient.3
fsread 9pclient.3
fsreadn 9pclient.3
+fsremove 9pclient.3
fsroot 9pclient.3
fsseek 9pclient.3
fssetroot 9pclient.3
fsunmount 9pclient.3
fsversion 9pclient.3
+fsvprint 9pclient.3
fswrite 9pclient.3
nsinit 9pclient.3
nsmount 9pclient.3
nsopen 9pclient.3
+Event acme.3
+Win acme.3
+acme acme.3
+eventfmt acme.3
+newwin acme.3
+pipetowin acme.3
+pipewinto acme.3
+sysrun acme.3
+winaddr acme.3
+winclosefiles acme.3
+winctl acme.3
+windel acme.3
+windeleteall acme.3
+windows acme.3
+wineventchan acme.3
+winfd acme.3
+winfree acme.3
+winmread acme.3
+winname acme.3
+winopenfd acme.3
+winprint acme.3
+winread acme.3
+winreadaddr acme.3
+winreadevent acme.3
+winseek acme.3
+winwrite acme.3
+winwriteevent acme.3
Dx addpt.3
Dy addpt.3
Pt addpt.3
t@@ -204,6 +238,15 @@ convTR2M authsrv.3
nvcsum authsrv.3
passtokey authsrv.3
readnvram authsrv.3
+avl avl.3
+avlnext avl.3
+avlprev avl.3
+avlwalk avl.3
+deleteavl avl.3
+endwalk avl.3
+insertavl avl.3
+lookupavl avl.3
+mkavltree avl.3
bin bin.3
binalloc bin.3
binfree bin.3
t@@ -300,6 +343,7 @@ bezspline draw.3
bezsplineop draw.3
bezsplinepts draw.3
border draw.3
+borderop draw.3
draw draw.3
drawop draw.3
drawrepl draw.3
t@@ -342,6 +386,12 @@ stringnbg draw.3
stringnbgop draw.3
stringnop draw.3
stringop draw.3
+convM2W drawfcall.3
+convW2M drawfcall.3
+drawfcall drawfcall.3
+drawfcallfmt drawfcall.3
+readwsysmsg drawfcall.3
+sizeW2M drawfcall.3
asn1toDSApriv dsa.3
dsa dsa.3
dsagen dsa.3
t@@ -409,8 +459,8 @@ execl exec.3
_exits exits.3
atexit exits.3
atexitdont exits.3
+exitcode exits.3
exits exits.3
-terminate exits.3
Fcall fcall.3
convD2M fcall.3
convM2D fcall.3
t@@ -909,6 +959,7 @@ plumbrecvfid plumb.3
plumbsend plumb.3
plumbsendtext plumb.3
plumbsendtofid plumb.3
+plumbunmount plumb.3
plumbunpack plumb.3
plumbunpackattr plumb.3
plumbunpackpartial plumb.3
t@@ -1148,7 +1199,6 @@ syslog sysfatal.3
alt thread.3
chancreate thread.3
chanfree thread.3
-chaninit thread.3
chanprint thread.3
chansetname thread.3
mainstacksize thread.3
t@@ -1183,11 +1233,13 @@ threadkillgrp thread.3
threadmain thread.3
threadnotify thread.3
threadpid thread.3
+threadpin thread.3
threadsetgrp thread.3
threadsetname thread.3
threadsetstate thread.3
threadspawn thread.3
threadspawnl thread.3
+threadunpin thread.3
threadwaitchan thread.3
yield thread.3
nsec time.3
t@@ -1198,7 +1250,6 @@ VtBlock venti-cache.3
VtCache venti-cache.3
venti-cache venti-cache.3
vtblockcopy venti-cache.3
-vtblockdirty venti-cache.3
vtblockduplock venti-cache.3
vtblockput venti-cache.3
vtblockwrite venti-cache.3
diff --git a/man/man4/INDEX b/man/man4/INDEX
t@@ -1,11 +1,23 @@
0intro 0intro.4
intro 0intro.4
+9pfuse 9pfuse.4
9pserve 9pserve.4
acme acme.4
factotum factotum.4
+fontsrv fontsrv.4
import import.4
plumber plumber.4
ramfs ramfs.4
+smugfs smugfs.4
9fs srv.4
srv srv.4
+32vfs tapefs.4
+cpiofs tapefs.4
+tapefs tapefs.4
+tapfs tapefs.4
+tarfs tapefs.4
+tpfs tapefs.4
+v10fs tapefs.4
+v6fs tapefs.4
+zipfs tapefs.4
vacfs vacfs.4
diff --git a/man/man7/INDEX b/man/man7/INDEX
t@@ -4,10 +4,12 @@ color color.7
face face.7
font font.7
subfont font.7
+htmlroff htmlroff.7
image image.7
keyboard keyboard.7
man man.7
map map.7
+mhtml mhtml.7
mpictures mpictures.7
ms ms.7
ndb ndb.7
diff --git a/man/man8/INDEX b/man/man8/INDEX
t@@ -1,9 +1,10 @@
+getflags getflags.8
+usage getflags.8
listen1 listen1.8
vbackup vbackup.8
vcat vbackup.8
vftp vbackup.8
vmount vbackup.8
-vmount0 vbackup.8
vnfs vbackup.8
rdarena venti-backup.8
venti-backup venti-backup.8
t@@ -13,6 +14,7 @@ checkarenas venti-fmt.8
checkindex venti-fmt.8
conf venti-fmt.8
fmtarenas venti-fmt.8
+fmtbloom venti-fmt.8
fmtindex venti-fmt.8
fmtisect venti-fmt.8
syncindex venti-fmt.8
You are viewing proxied material from mx1.adamsgaard.dk. The copyright of proxied material belongs to its original authors. Any comments or complaints in relation to proxied material should be directed to the original authors of the content concerned. Please see the disclaimer for more details.