commit 1795b260b54186116911b1d32d6767ea9b221b04
from: Klemens Nanni <kn@openbsd.org>
date: Fri Apr 02 23:31:08 2021 UTC

Fix "mandoc -T lint" WARNINGS and ERRORS, add missing word

commit - 1a1242a9a15f34878343aebfb28a71e0c5d9b904
commit + 1795b260b54186116911b1d32d6767ea9b221b04
blob - 6b06d43ab24d2750a66f3657513869ecb77d13f8
blob + 36ce30f6ccea3dbb0c641969eee0075e907d4300
--- got/got.1
+++ got/got.1
@@ -54,7 +54,7 @@ Global options must precede the command name, and are 
 .Bl -tag -width tenletters
 .It Fl h
 Display usage information and exit immediately.
-.It Fl V, -version
+.It Fl V , -version
 Display program version and exit immediately.
 .El
 .Pp
@@ -950,7 +950,7 @@ Create a reference or change an existing reference.
 The reference with the specified
 .Ar name
 will point at the specified
-.Ar object.
+.Ar object .
 The expected
 .Ar object
 argument is a ID SHA1 hash or an existing reference or tag name which will
@@ -1470,7 +1470,7 @@ the new version of the specified
 .Ar branch
 and the work tree is automatically switched to it.
 .Pp
-Old commits in their pre-rebase state are automatically backed up in the 
+Old commits in their pre-rebase state are automatically backed up in the
 .Dq refs/got/backup/rebase
 reference namespace.
 As long as these references are not removed older versions of rebased
@@ -1645,7 +1645,7 @@ Once history editing has completed successfully, the t
 the new version of the work tree's branch and the work tree is automatically
 switched to it.
 .Pp
-Old commits in their pre-histedit state are automatically backed up in the 
+Old commits in their pre-histedit state are automatically backed up in the
 .Dq refs/got/backup/histedit
 reference namespace.
 As long as these references are not removed older versions of edited
@@ -2129,7 +2129,7 @@ file.
 Worktree-specific configuration settings for
 .Nm .
 If present, a
-.Xr got.conf
+.Xr got.conf 5
 configuration file in the
 .Pa .got
 meta-data directory of a work tree supersedes any relevant settings in
@@ -2245,7 +2245,7 @@ with a pre-defined log message.
 .Pp
 Alternatively, create a new commit from local changes in a work tree
 directory with a log message that has been prepared in the file
-.Pa /tmp/msg:
+.Pa /tmp/msg :
 .Pp
 .Dl $ got commit -F /tmp/msg
 .Pp
@@ -2358,7 +2358,7 @@ must be configured to map all references in the remote
 into the
 .Dq refs/remotes
 namespace of the local repository.
-This can achieved by setting Git's
+This can be achieved by setting Git's
 .Pa remote.origin.fetch
 configuration variable to the value
 .Dq +refs/heads/*:refs/remotes/origin/*
@@ -2448,7 +2448,7 @@ repository with
 .Sh CAVEATS
 .Nm
 is a work-in-progress and some features remain to be implemented.
-
+.Pp
 At present, the user has to fall back on
 .Xr git 1
 to perform some tasks.
blob - 846205a43f056559a960ab6d0c0ebb5076e6ba20
blob + 58e0d602e43b9e45856efd11c355b7c86cccedbc
--- got/got.conf.5
+++ got/got.conf.5
@@ -166,6 +166,7 @@ all branches in the
 namespace will be updated directly to match the corresponding branches in
 the remote repository.
 .El
+.El
 .Sh EXAMPLES
 Configure author information:
 .Bd -literal -offset indent
@@ -182,7 +183,9 @@ remote "origin" {
 }
 .Ed
 .Pp
-Mirror the OpenBSD src repository from Github:
+Mirror the
+.Ox
+src repository from Github:
 .Bd -literal -offset indent
 remote "origin" {
 	repository "openbsd/src"
@@ -233,4 +236,3 @@ Users should set their
 or
 .Ev EDITOR
 environment variables instead.
-
blob - 54df54bea34fe6259844cce36d802c08a97569e6
blob + 4296b08451ec4307d6eff21aa6b9f6d92e753565
--- tog/tog.1
+++ tog/tog.1
@@ -27,7 +27,6 @@
 .Pp
 .Nm
 .Ar path
-.El
 .Sh DESCRIPTION
 .Nm
 is an interactive read-only browser for Git repositories.
@@ -76,7 +75,7 @@ Global options must precede the command name, and are 
 .Bl -tag -width tenletters
 .It Fl h
 Display usage information.
-.It Fl V, -version
+.It Fl V , -version
 Display program version and exit immediately.
 .El
 .Pp