10 files changed, 22 insertions, 172 deletions
diff --git a/man/man1/.cvsignore b/man/man1/.cvsignore
deleted file mode 100644
index 2d19fc76..00000000
--- a/man/man1/.cvsignore
+++ /dev/null
@@ -1 +0,0 @@
-*.html
diff --git a/man/man1/9.1 b/man/man1/9.1
index e003eb31..a115260d 100644
--- a/man/man1/9.1
+++ b/man/man1/9.1
@@ -125,3 +125,18 @@ $ 9 rc
 .B \*9/bin/u.rc
 .SH SEE ALSO
 .IR intro (1)
+.SH BUGS
+Some shell configurations
+(notably, oh-my-zsh)
+define
+.B 9
+as an alias for
+.B cd
+.BR \-9 ,
+which makes the
+.I 9
+command described here inaccessible.
+In such shells, it is necessary to
+.B unalias
+.B 9
+in your initialization scripts.
diff --git a/man/man1/codereview.1 b/man/man1/codereview.1
deleted file mode 100644
index ec528b22..00000000
--- a/man/man1/codereview.1
+++ /dev/null
@@ -1,155 +0,0 @@
-.TH CODEREVIEW 1
-.SH NAME
-codereview \- review of submitted changes (experimental)
-.SH SYNOPSIS
-.B git
-.B diff
-.B HEAD
-.I path ...
-.PP
-.B codereview
-[
-.B -v
-]
-.B create
-.I name
-.PP
-.B codereview
-[
-.B -v
-]
-.B commit
-.PP
-.B codereview
-[
-.B -v
-]
-.B upload
-.PP
-.B codereview
-[
-.B -v
-]
-.B pending
-.PP
-.B codereview
-[
-.B -v
-]
-.B sync
-.SH DESCRIPTION
-.I Codereview
-manages the review and submission of changes to the Plan 9 from User Space project.
-It must be used from within a Plan 9 from User Space tree
-checked out via Git
-(see
-.IR git (1)).
-.PP
-A developer makes changes to a local copy of the tree,
-reviews them by using
-.I git
-.I diff
-.IR HEAD 
-and then commits them to a ``feature branch''
-using
-.I codereview
-.IR create .
-Once a feature branch is created, files can still be edited, but they must then be
-incorporated into the change by using
-.I codereview
-.IR commit .
-.I Git
-requires that changes be added to a ``staging area'' before the initial commit,
-using commands such as
-.I git
-.I add
-and
-.I git
-.IR rm .
-The 
-.I codereview
-.I create
-and
-.I codereview
-.I commit
-commands
-automatically move all local modifications to the staging area
-as part of the commit,
-using
-.I git
-.I commit
-.IR -a .
-.PP
-If other changes have been committed since the feature branch was created,
-.I codereview
-.I sync
-will update it to be based on the most recent copy of the repository.
-.PP
-When the code is ready for review,
-.I codereview
-.I upload
-uploads the change to 
-.HR https://plan9port-review.googlesource.com/
-for review.
-In order to upload, 
-.I git
-must have access to a 
-.I $HOME/.netrc
-that contains a password obtained from
-.HR https://plan9port-review.googlesource.com/#/settings/http-password .
-.PP
-The most likely initial result of a code review is suggestions for
-improving the code.
-After making those changes, repeat the
-.I codereview
-.I commit
-and 
-.I codereview
-.I upload
-steps.
-.PP
-Once the code is ready, it will be submitted by the reviewer using the web interface.
-At that point,
-.I codereview
-.I sync
-.PP
-The
-.I codereview
-.I pending
-command lists the active feature branches.
-.PP
-All the
-.I codereview
-commands take a leading
-.B -v
-option, which causes them to print
-.I git
-commands being executed.
-This can be useful for debugging
-.IR codereview .
-.PP
-The
-.I codereview
-command depends on a 
-.I git
-``commit hook''
-script being in place to add
-.L Change-Id
-lines to the commit messages.
-.I Codereview
-installs the hook at startup, if necessary,
-by adding a symbolic link from
-.B $PLAN9/.git/hooks/commit-msg
-to
-.BR $PLAN9/lib/git/commit-msg.hook .
-.SH SEE ALSO
-.IR git (1),
-.HR http://plan9port-review.googlesource.com/
-.SH BUGS
-.I Git
-is too complicated to use.
-The 
-.I codereview
-script helps, but a working understanding of
-.I git
-is still required.
diff --git a/man/man1/git.1 b/man/man1/git.1
index b7e111f5..9b29b512 100644
--- a/man/man1/git.1
+++ b/man/man1/git.1
@@ -1,10 +1,10 @@
 .TH GIT 1
 .SH NAME 
-git, hg, cvs \- introduction to using plan9port Git repository
+git, hg, cvs, codereview \- introduction to using plan9port Git repository
 .SH SYNOPSIS
 .B git
 .B clone
-.B http://code.swtch.com/plan9port
+.B https://9fans.github.io/plan9port
 .B plan9
 .PP
 .B git
@@ -20,12 +20,10 @@ git, hg, cvs \- introduction to using plan9port Git repository
 .B gitk 
 .PP
 .B web
-.B http://code.swtch.com/plan9port
+.B https://9fans.github.io/plan9port
 .SH DESCRIPTION
 The master source tree for Plan 9 from User Space is maintained
-using the source control system Git
-as a substitute for Plan 9's
-\fIreplica\fR(8) and dump file system.
+using the source control system Git.
 .PP
 The first argument to
 .I git
@@ -68,7 +66,7 @@ refers to the most recent version in the version history.
 starts an interactive history viewer.
 .PP
 The Git tree can be inspected on the web at
-.HR http://code.swtch.com/plan9port/ "" .
+.HR https://github.com/9fans/plan9port "" .
 .SH FILES
 .TP
 .B \*9/.git
@@ -77,13 +75,11 @@ directory containing Git local repository
 .B .gitignore
 list of files and wildcards to exclude from Git operations
 .SH SEE ALSO
-.IR codereview (1)
-.PP
 Unix's
 \fIgit\fR(1),
 .HR http://git-scm.com/doc
 .PP
-.HR http://code.swtch.com/plan9port/
+.HR https://9fans.github.io/plan9port/
 .SH BUGS
 Plan 9 from User Space is no longer accessible using CVS or Mercurial;
 you must use Git.
diff --git a/man/man1/install.1 b/man/man1/install.1
index 574bdc5c..be35bd35 100644
--- a/man/man1/install.1
+++ b/man/man1/install.1
@@ -17,7 +17,7 @@ To obtain the Plan 9 tree, use Git
 (see
 .IR git (1))
 or download a tar file from
-.HR http://swtch.com/plan9port "" .
+.HR https://9fans.github.io/plan9port "" .
 .PP
 The tree can be unpacked anywhere, but the
 usual place is
diff --git a/man/man3/.cvsignore b/man/man3/.cvsignore
deleted file mode 100644
index 2d19fc76..00000000
--- a/man/man3/.cvsignore
+++ /dev/null
@@ -1 +0,0 @@
-*.html
diff --git a/man/man4/.cvsignore b/man/man4/.cvsignore
deleted file mode 100644
index 2d19fc76..00000000
--- a/man/man4/.cvsignore
+++ /dev/null
@@ -1 +0,0 @@
-*.html
diff --git a/man/man7/.cvsignore b/man/man7/.cvsignore
deleted file mode 100644
index 2d19fc76..00000000
--- a/man/man7/.cvsignore
+++ /dev/null
@@ -1 +0,0 @@
-*.html
diff --git a/man/man8/.cvsignore b/man/man8/.cvsignore
deleted file mode 100644
index 2d19fc76..00000000
--- a/man/man8/.cvsignore
+++ /dev/null
@@ -1 +0,0 @@
-*.html
diff --git a/man/man9/.cvsignore b/man/man9/.cvsignore
deleted file mode 100644
index 2d19fc76..00000000
--- a/man/man9/.cvsignore
+++ /dev/null
@@ -1 +0,0 @@
-*.html