# HG changeset patch
# User David du Colombier <0intro@gmail.com>
# Date 1332270007 -3600
# Node ID 0c7cafcb782cc440054733aff4126200d0ea0b2f
# Parent  a23adee6c6a70c367b48d6824d9a4e3757287fc6
nix: sync with plan 9

R=nixiedev, nemo
CC=nix-dev
http://codereview.appspot.com/5845063

Committer: Francisco J Ballesteros <nemo.mbox@gmail.com>

diff -r a23adee6c6a7 -r 0c7cafcb782c sys/man/6/venti
--- a/sys/man/6/venti	Fri Mar 16 16:01:01 2012 +0100
+++ b/sys/man/6/venti	Tue Mar 20 20:00:07 2012 +0100
@@ -42,13 +42,7 @@
 .IR vac (1)
 uses a
 .B vac:
-prefix, while
-.IR vbackup (8)
-uses prefixes corresponding to the file system
-types: 
-.BR ext2: ,
-.BR ffs: ,
-and so on.
+prefix.
 .SS "Files and Directories
 Venti accepts blocks up to 56 kilobytes in size.  
 By convention, Venti clients use hash trees of blocks to
@@ -292,7 +286,7 @@
 .IR pad [1]
 .IR count [2]
 .br
-.B VtRead
+.B VtRread
 .IR tag [1]
 .IR data []
 .IP
diff -r a23adee6c6a7 -r 0c7cafcb782c sys/src/libc/port/profile.c
--- a/sys/src/libc/port/profile.c	Fri Mar 16 16:01:01 2012 +0100
+++ b/sys/src/libc/port/profile.c	Tue Mar 20 20:00:07 2012 +0100
@@ -268,7 +268,8 @@
 	_tos->clock = 1;
 }
 
-void prof(void (*fn)(void*), void *arg, int entries, int what)
+void
+prof(void (*fn)(void*), void *arg, int entries, int what)
 {
 	_profinit(entries, what);
 	_tos->prof.pp = _tos->prof.next;