Merge remote-tracking branch 'upstream/master'

11 files changed, 55 insertions, 12 deletions

diff --git a/man/man1/9term.1 b/man/man1/9term.1
index acff6fe9..e0e5aad7 100644
--- a/man/man1/9term.1
+++ b/man/man1/9term.1
@@ -285,6 +285,17 @@ containing the selection (typing cursor).
 A typical use of this feature is to tell the editor to find the source of an error
 by plumbing the file and line information in a compiler's diagnostic.
 .PP
+For systems without a three-button mouse, the keyboard modifier
+keys can be used to modify the effect of the main mouse button.
+On Unix systems, the Control key changes the main button to button 2,
+and the Alt key changes it to button 3.
+On Mac systems, the Option key changes the main button to button 2,
+and the Command key changes it to button 3.
+Also on Mac systems, the usual keyboard shortcuts
+Command-C, -V, and -X invoke
+copy, paste, and cut,
+as in other programs.
+.PP
 Each
 .I 9term
 listens for connections on a Unix socket.
diff --git a/man/man1/INDEX b/man/man1/INDEX
index 218e5393..e3ff2f16 100644
--- a/man/man1/INDEX
+++ b/man/man1/INDEX
@@ -34,6 +34,7 @@ auxclog clog.1
 clog clog.1
 cmp cmp.1
 codereview codereview.1
+col col.1
 cmapcube colors.1
 colors colors.1
 comm comm.1
@@ -44,6 +45,7 @@ date date.1
 db db.1
 stack db.1
 dc dc.1
+dd dd.1
 delatex deroff.1
 deroff deroff.1
 devdraw devdraw.1
@@ -63,6 +65,9 @@ fortune fortune.1
 freq freq.1
 fsize fsize.1
 mtime fsize.1
+cvs git.1
+git git.1
+hg git.1
 grap grap.1
 graph graph.1
 g grep.1
@@ -75,8 +80,6 @@ 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
diff --git a/man/man1/acme.1 b/man/man1/acme.1
index aa02f770..b3266595 100644
--- a/man/man1/acme.1
+++ b/man/man1/acme.1
@@ -645,6 +645,24 @@ environment variable
 .B $acmeaddr
 is created that holds, in the form interpreted by button 3,
 the fully-qualified address of the extra argument.
+.SS "Simulated buttons
+For systems without a three-button mouse, the keyboard modifier
+keys can be used to modify the effect of the main mouse button.
+On Unix systems, the Control key changes the main button to button 2,
+and the Alt key changes it to button 3.
+On Mac systems, the Option key changes the main button to button 2,
+and the Command key changes it to button 3.
+Pressing the key after the button is held down adds the button to form
+a chord, so that for example on Macs selecting text with the trackpad
+button and then typing Option without letting go of the button will
+cause a 1-2 chord, cutting the selection.
+On Mac systems, the usual keyboard shortcuts
+Command-C, -V, -X, and -Z invoke
+copy, paste, cut, and undo, 
+and Command-Shift-Z invokes redo,
+as in other programs.
+Especially on Mac laptops, these keyboard shortcuts are
+typically much less awkward than the equivalent chords.
 .SS "Support programs
 .I Win
 creates a new
diff --git a/man/man1/awk.1 b/man/man1/awk.1
index df28f145..9a933b70 100644
--- a/man/man1/awk.1
+++ b/man/man1/awk.1
@@ -546,10 +546,10 @@ There are no explicit conversions between numbers and strings.
 To force an expression to be treated as a number add 0 to it;
 to force it to be treated as a string concatenate
 \&\fL""\fP to it.
-.br
+.PP
 The scope rules for variables in functions are a botch;
 the syntax is worse.
-.br
+.PP
 UTF is not always dealt with correctly,
 though
 .I awk
diff --git a/man/man1/col.1 b/man/man1/col.1
index 0d9513cf..1cdcbcba 100644
--- a/man/man1/col.1
+++ b/man/man1/col.1
@@ -14,9 +14,9 @@ and half line feeds (ESC-9 and ESC-8)
 as produced by
 .I nroff
 for .2C in
-.IR ms (6)
+.IR ms (7)
 or
-.IR man (6)
+.IR man (7)
 and for 
 .IR tbl (1).
 .I Col
diff --git a/man/man1/git.1 b/man/man1/git.1
index 19f2a102..b7e111f5 100644
--- a/man/man1/git.1
+++ b/man/man1/git.1
@@ -1,4 +1,4 @@
-.TH HG 1
+.TH GIT 1
 .SH NAME 
 git, hg, cvs \- introduction to using plan9port Git repository
 .SH SYNOPSIS
diff --git a/man/man1/graph.1 b/man/man1/graph.1
index e82d3126..bb6d25da 100644
--- a/man/man1/graph.1
+++ b/man/man1/graph.1
@@ -89,7 +89,7 @@ The next argument is
 Next argument is one or more of the characters
 .B bcgkmrwy,
 choosing pen colors by their initial letter, as in
-.IR plot (6).
+.IR plot (7).
 Successive curves will cycle through the colors in the given order.
 .TP
 .B  -s
diff --git a/man/man1/mount.1 b/man/man1/mount.1
index 4722a49a..ec9f016e 100644
--- a/man/man1/mount.1
+++ b/man/man1/mount.1
@@ -15,7 +15,7 @@ mounts a 9P server's files into the file system.
 is typically 
 either the name of a Unix domain socket
 (see
-.IR namespace (4))
+.IR namespace (1))
 or the name or IP address of a machine
 serving 9P over TCP port 564.
 .PP
diff --git a/man/man1/pic.1 b/man/man1/pic.1
index de443cc0..0ee526fe 100644
--- a/man/man1/pic.1
+++ b/man/man1/pic.1
@@ -12,7 +12,7 @@
 .if \\n($1>0 .sp .65
 ..
 .SH NAME
-pic, tpic \- troff and tex preprocessors for drawing pictures
+pic, tpic, svgpic \- troff and tex preprocessors for drawing pictures
 .SH SYNOPSIS
 .B pic
 [
diff --git a/man/man1/resample.1 b/man/man1/resample.1
index 87922468..f41d9e51 100755
--- a/man/man1/resample.1
+++ b/man/man1/resample.1
@@ -40,7 +40,7 @@ and
 .PP
 The input should be a Plan 9 image
 as described in 
-.IR image (6),
+.IR image (7),
 and the output will be a compressed 24-bit
 .B r8g8b8
 image.
@@ -53,6 +53,6 @@ To uncompress the image or change the pixel format, use
 .B \*9/src/cmd/resample.c
 .SH "SEE ALSO
 .IR crop (1),
-.IR image (6)
+.IR image (7)
 .SH BUGS
 Faster algorithms exist, but this implementation produces correct pictures.
diff --git a/man/man1/sam.1 b/man/man1/sam.1
index 1c9dd5f7..460fd6d6 100644
--- a/man/man1/sam.1
+++ b/man/man1/sam.1
@@ -821,6 +821,17 @@ dot is the null string, as if it were typed to the command window.
 Saves the sent text in the snarf buffer.
 (Command window only.) 
 .PD
+.SS Simulated buttons
+For systems without a three-button mouse, the keyboard modifier
+keys can be used to modify the effect of the main mouse button.
+On Unix systems, the Control key changes the main button to button 2,
+and the Alt key changes it to button 3.
+On Mac systems, the Option key changes the main button to button 2,
+and the Command key changes it to button 3.
+Also on Mac systems, the usual keyboard shortcuts
+Command-C, -V, and -X invoke
+copy, paste, and cut,
+as in other programs.
 .SS External communication
 .I Sam
 listens to the