diff --git a/infrastructure/man/man1/check-conflicts.1 b/infrastructure/man/man1/check-conflicts.1
index 0bedf83b0a6..61e58a2c81e 100644
--- a/infrastructure/man/man1/check-conflicts.1
+++ b/infrastructure/man/man1/check-conflicts.1
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: check-conflicts.1,v 1.2 2010/09/03 18:51:19 schwarze Exp $
+.\"	$OpenBSD: check-conflicts.1,v 1.3 2010/09/09 19:17:06 jasper Exp $
 .\"
 .\" Copyright (c) 2010 Marc Espie <espie@openbsd.org>
 .\"
@@ -14,7 +14,7 @@
 .\" ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
 .\" OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 .\"
-.Dd $Mdocdate: September 3 2010 $
+.Dd $Mdocdate: September 9 2010 $
 .Dt CHECK-CONFLICTS 1
 .Os
 .Sh NAME
@@ -47,8 +47,8 @@ see
 .Xr package-create 1
 .Pc .
 .Pp
-Conflicts between packages means a user can't install both packages at
-once.
+Conflicts between packages mean that a user can't have both packages installed
+at the same time.
 In some cases (same software, different version), this is expected, but
 the packages should be marked as conflicting, so that
 .Xr pkg_add 1
diff --git a/infrastructure/man/man1/check-lib-depends.1 b/infrastructure/man/man1/check-lib-depends.1
index eb2f3086111..061bb727d95 100644
--- a/infrastructure/man/man1/check-lib-depends.1
+++ b/infrastructure/man/man1/check-lib-depends.1
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: check-lib-depends.1,v 1.3 2010/09/03 18:51:19 schwarze Exp $
+.\"	$OpenBSD: check-lib-depends.1,v 1.4 2010/09/09 19:17:06 jasper Exp $
 .\"
 .\" Copyright (c) 2010 Marc Espie <espie@openbsd.org>
 .\"
@@ -14,7 +14,7 @@
 .\" ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
 .\" OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 .\"
-.Dd $Mdocdate: September 3 2010 $
+.Dd $Mdocdate: September 9 2010 $
 .Dt CHECK-LIB-DEPENDS 1
 .Os
 .Sh NAME
@@ -61,30 +61,33 @@ and report problems.
 The options are as follows:
 .Bl -tag -width keyword
 .It Fl B Ar destdir
-scan files under
+Scan files under
 .Ar destdir .
 .It Fl d Ar pkgrepo
-look for all needed packages under directory
+Look for all needed packages under directory
 .Ar pkgrepo .
 .It Fl f
-give full reports of every file that requires a missing library.
+Give full reports of every file that requires a missing library.
 .It Fl m
-always show progress-meter, even if not run from terminal.
+Always show progress-meter, even if not run from terminal.
 .It Fl o
-scan binaries using
+Scan binaries using
 .Xr ldd 1 ,
-which also works for old a.out binaries,
-instead of
+which also works for old
+.Xr a.out 5
+binaries, instead of
 .Xr objdump 1 ,
-which only works for ELF.
+which only works for
+.Xr elf 5
+binaries.
 .It Fl O Ar dest
-save result of first stage in file
+Save result of first stage in file
 .Ar dest .
 .It Fl s Ar src
-do not scan, directly read result of first stage from file
+Don't scan, directly read result of first stage from file
 .Ar src .
 .It Fl x
-don't show progress-meter, even if run from terminal.
+Don't show progress-meter, even if run from terminal.
 .El
 .Pp
 If no
@@ -96,4 +99,6 @@ to other options.
 .Sh SEE ALSO
 .Xr ldd 1 ,
 .Xr objdump 1 ,
-.Xr bsd.port.mk 5
+.Xr a.out 5 ,
+.Xr bsd.port.mk 5 ,
+.Xr elf 5
diff --git a/infrastructure/man/man1/pkg_subst.1 b/infrastructure/man/man1/pkg_subst.1
index 6a3599c9a16..ff2615183ac 100644
--- a/infrastructure/man/man1/pkg_subst.1
+++ b/infrastructure/man/man1/pkg_subst.1
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: pkg_subst.1,v 1.3 2010/09/03 18:51:19 schwarze Exp $
+.\"	$OpenBSD: pkg_subst.1,v 1.4 2010/09/09 19:17:06 jasper Exp $
 .\"
 .\" Copyright (c) 2010 Marc Espie <espie@openbsd.org>
 .\"
@@ -14,7 +14,7 @@
 .\" ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
 .\" OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 .\"
-.Dd $Mdocdate: September 3 2010 $
+.Dd $Mdocdate: September 9 2010 $
 .Dt PKG_SUBST 1
 .Os
 .Sh NAME
@@ -44,7 +44,7 @@ options.
 The options are as follows
 .Bl -tag -width Dname=valuexxx
 .It Fl c
-copy and substitute.
+Copy and substitute.
 Number of
 .Ar file
 arguments must be even.
@@ -67,10 +67,10 @@ Define
 to
 .Ar value .
 .It Fl g Ar group
-change group of destination file to
+Change group of destination file to
 .Ar group .
 .It Fl u Ar owner
-change owner of destination file to
+Change owner of destination file to
 .Ar owner .
 .El
 .Pp
diff --git a/infrastructure/man/man1/register-plist.1 b/infrastructure/man/man1/register-plist.1
index 6abf88a6a2e..c3efd3581f3 100644
--- a/infrastructure/man/man1/register-plist.1
+++ b/infrastructure/man/man1/register-plist.1
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: register-plist.1,v 1.1 2010/08/20 14:22:00 espie Exp $
+.\"	$OpenBSD: register-plist.1,v 1.2 2010/09/09 19:17:06 jasper Exp $
 .\"
 .\" Copyright (c) 2010 Marc Espie <espie@openbsd.org>
 .\"
@@ -14,7 +14,7 @@
 .\" ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
 .\" OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 .\"
-.Dd $Mdocdate: August 20 2010 $
+.Dd $Mdocdate: September 9 2010 $
 .Dt REGISTER-PLIST 1
 .Os
 .Sh NAME
@@ -34,7 +34,7 @@ is used to check that a packing-list for a given package name doesn't change.
 Package names (package stem plus version) are used to uniquely identify
 packages.
 When something in the package changes, the package name should change,
-usually by advancing
+usually by increasing
 .Ev REVISION .
 .Pp
 .Nm
@@ -55,7 +55,7 @@ Some items in the packing-list may change without actual problems.
 For instance, dependencies are allowed to go forward.
 On the other hand, some items like the package DESCR can't change at all.
 Since this is a generated file, porters often overlook that items such as
-the HOMEPAGE or the MAINTAINER's email address are embedded in that file,
+the HOMEPAGE or the MAINTAINER's email address are embedded into that file,
 and thus that changing these requires a REVISION bump.
 .Pp
 .Nm
diff --git a/infrastructure/man/man1/resolve-lib.1 b/infrastructure/man/man1/resolve-lib.1
index 33ab2acaa63..38f3cc9fa05 100644
--- a/infrastructure/man/man1/resolve-lib.1
+++ b/infrastructure/man/man1/resolve-lib.1
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: resolve-lib.1,v 1.2 2010/09/08 19:23:56 schwarze Exp $
+.\"	$OpenBSD: resolve-lib.1,v 1.3 2010/09/09 19:17:06 jasper Exp $
 .\"
 .\" Copyright (c) 2010 Marc Espie <espie@openbsd.org>
 .\"
@@ -14,7 +14,7 @@
 .\" ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
 .\" OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 .\"
-.Dd $Mdocdate: September 8 2010 $
+.Dd $Mdocdate: September 9 2010 $
 .Dt RESOLVE-LIB 1
 .Os
 .Sh NAME
@@ -52,7 +52,7 @@ see
 .Pp
 Each
 .Ar spec
-not found will result in an error message and exit.
+not found will result in an error message and exit code.
 .Pp
 If the option
 .Fl noshared