Fix "mandoc -T lint" WARNINGS and ERRORS, add missing word
1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62 63 64 65 66 67 68 69 70 71 72 73 74 75 76 77 78 79 80 81 82 83 84 85 86 87 88 89 90 91 92 93 94 95 96 97 98 99 100 101 102 103 104 105 106 107 108 109 110 111 112 113 114 115 116 117 118 119 120 121 122 123 124 125
diff --git a/got/got.1 b/got/got.1
index 6b06d43..36ce30f 100644
--- a/got/got.1
+++ b/got/got.1
@@ -54,7 +54,7 @@ Global options must precede the command name, and are as follows:
.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 temporary branch becomes
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 repository
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.
diff --git a/got/got.conf.5 b/got/got.conf.5
index 846205a..58e0d60 100644
--- a/got/got.conf.5
+++ b/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.
-
diff --git a/tog/tog.1 b/tog/tog.1
index 54df54b..4296b08 100644
--- a/tog/tog.1
+++ b/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 as follows:
.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