subordinate clauses preceding the main clause are offset by a comma
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 126 127 128 129 130 131 132 133 134 135 136 137 138 139 140 141 142 143 144 145 146 147 148 149 150 151 152 153 154 155 156 157 158 159 160 161 162 163 164 165 166 167 168 169 170 171 172 173 174 175 176 177 178 179 180 181 182 183 184 185 186 187 188 189 190 191 192 193 194 195 196 197 198 199 200 201 202 203 204 205 206 207 208 209 210 211 212 213 214 215 216 217 218 219 220 221 222 223 224 225 226 227 228 229 230 231 232 233 234 235 236 237 238 239 240 241 242 243 244 245 246 247 248 249 250 251 252 253 254 255 256 257 258 259 260 261 262 263 264 265 266 267 268 269 270 271 272 273 274 275 276 277 278 279 280 281 282 283 284
diff --git a/got/git-repository.5 b/got/git-repository.5
index be17028..9687534 100644
--- a/got/git-repository.5
+++ b/got/git-repository.5
@@ -107,7 +107,7 @@ A reference associates a name with an object ID.
A prominent use of references is providing names to branches in the
repository by pointing at commit objects which represent the current
tip commit of a branch.
-Because references may point to arbitrary object IDs their use
+Because references may point to arbitrary object IDs, their use
is not limited to branches.
.Pp
The name is a UTF-8 string with the following disallowed characters:
diff --git a/got/got-worktree.5 b/got/got-worktree.5
index 9c86194..8c026ec 100644
--- a/got/got-worktree.5
+++ b/got/got-worktree.5
@@ -149,7 +149,7 @@ create a reference to the current base commit in the Git repository.
The presence of this reference prevents the Git garbage collector and
.Cm gotadmin cleanup
from discarding the base commit and any objects it refers to.
-When a work tree is no longer needed its reference can be deleted from
+When a work tree is no longer needed, its reference can be deleted from
the Git repository with
.Cm got ref -d .
.Sh FILES
diff --git a/got/got.1 b/got/got.1
index e45d197..dc1e00a 100644
--- a/got/got.1
+++ b/got/got.1
@@ -143,7 +143,7 @@ into the specified
.Ar directory .
If no
.Ar directory
-is specified the directory name will be derived from the name of the
+is specified, the directory name will be derived from the name of the
cloned repository.
.Cm got clone
will refuse to run if the
@@ -348,7 +348,7 @@ namespace, merging incoming changes with the changes on those branches
as necessary.
.Pp
If the repository was created as a mirror with
-.Cm got clone -m
+.Cm got clone -m ,
then all branches in the
.Dq refs/heads/
namespace will be updated directly to match the corresponding branches in
@@ -540,7 +540,7 @@ is not contained in the selected branch, a different branch which contains
this commit must be specified with the
.Fl b
option.
-If no such branch is known a new branch must be created for this
+If no such branch is known, a new branch must be created for this
commit with
.Cm got branch
before
@@ -570,7 +570,7 @@ further complications.
Such files will be updated when
.Cm got update
is run again after merge conflicts have been resolved.
-If the conflicting changes are no longer needed affected files can be
+If the conflicting changes are no longer needed, affected files can be
reverted with
.Cm got revert
before running
@@ -816,7 +816,7 @@ If specified, show only commits with a log message matched by the extended
regular expression
.Ar search-pattern .
When used together with
-.Fl P
+.Fl P ,
then the file paths changed by a commit can be matched as well.
Regular expression syntax is documented in
.Xr re_format 7 .
@@ -1071,12 +1071,12 @@ The
.Cm got branch
command creates references in this namespace only.
.Pp
-When deleting branches the specified
+When deleting branches, the specified
.Ar name
is searched in the
.Dq refs/heads
reference namespace first.
-If no corresponding branch is found the
+If no corresponding branch is found, the
.Dq refs/remotes
namespace will be searched next.
.Pp
@@ -1306,7 +1306,7 @@ argument is provided, read unified diff data from standard input instead.
.Pp
If the
.Ar patchfile
-contains multiple patches then attempt to apply each of them in sequence.
+contains multiple patches, then attempt to apply each of them in sequence.
.Pp
Show the status of each affected file, using the following status codes:
.Bl -column XYZ description
@@ -1349,7 +1349,7 @@ Do not make any modifications to the work tree.
This can be used to check whether a patch would apply without issues.
If the
.Ar patchfile
-contains diffs that affect the same file multiple times the results
+contains diffs that affect the same file multiple times, the results
displayed may be incorrect.
.El
.Tg rv
@@ -1362,10 +1362,10 @@ There is no way to bring discarded changes back after
.Cm got revert !
.Pp
If a file was added with
-.Cm got add
+.Cm got add ,
it will become an unversioned file again.
If a file was deleted with
-.Cm got remove
+.Cm got remove ,
it will be restored.
.Pp
The options for
@@ -1744,7 +1744,7 @@ or discarded again with
.Pp
.Cm got cherrypick
will refuse to run if certain preconditions are not met.
-If the work tree contains multiple base commits it must first be updated
+If the work tree contains multiple base commits, it must first be updated
to a single base commit with
.Cm got update .
If any relevant files already contain merge conflicts, these
@@ -1787,7 +1787,7 @@ or discarded again with
.Pp
.Cm got backout
will refuse to run if certain preconditions are not met.
-If the work tree contains multiple base commits it must first be updated
+If the work tree contains multiple base commits, it must first be updated
to a single base commit with
.Cm got update .
If any relevant files already contain merge conflicts, these
@@ -1860,7 +1860,7 @@ using the following status codes:
.It ? Ta changes destined for an unversioned file were not merged
.El
.Pp
-If merge conflicts occur the rebase operation is interrupted and may
+If merge conflicts occur, the rebase operation is interrupted and may
be continued once conflicts have been resolved.
If any files with destined changes are found to be missing or unversioned,
or if files could not be deleted due to differences in deleted content,
@@ -1879,7 +1879,7 @@ when the rebase operation continues.
.Cm got rebase
will refuse to run if certain preconditions are not met.
If the work tree is not yet fully updated to the tip commit of its
-branch then the work tree must first be updated with
+branch, then the work tree must first be updated with
.Cm got update .
If changes have been staged with
.Cm got stage ,
@@ -1907,7 +1907,7 @@ conflict resolution purposes.
.Pp
If the specified
.Ar branch
-is already based on the work tree's current branch then no commits
+is already based on the work tree's current branch, then no commits
need to be rebased and
.Cm got rebase
will simply switch the work tree to the specified
@@ -1989,7 +1989,7 @@ the tip commit of the work tree's current branch.
.Pp
Before starting a
.Cm histedit
-operation the work tree's current branch must be set with
+operation, the work tree's current branch must be set with
.Cm got update -b
to the branch which should be edited, unless this branch is already the
current branch of the work tree.
@@ -2073,7 +2073,7 @@ using the following status codes:
.It ? Ta changes destined for an unversioned file were not merged
.El
.Pp
-If merge conflicts occur the histedit operation is interrupted and may
+If merge conflicts occur, the histedit operation is interrupted and may
be continued once conflicts have been resolved.
If any files with destined changes are found to be missing or unversioned,
or if files could not be deleted due to differences in deleted content,
@@ -2093,7 +2093,7 @@ will refuse to run if certain preconditions are not met.
If the work tree's current branch is not in the
.Dq refs/heads/
reference namespace, the history of the branch may not be edited.
-If the work tree contains multiple base commits it must first be updated
+If the work tree contains multiple base commits, it must first be updated
to a single base commit with
.Cm got update .
If changes have been staged with
@@ -2255,7 +2255,7 @@ must have been rebased onto the work tree's current branch with
.Cm got rebase
before it can be integrated, in order to linearize commit history and
resolve merge conflicts.
-If the work tree contains multiple base commits it must first be updated
+If the work tree contains multiple base commits, it must first be updated
to a single base commit with
.Cm got update .
If changes have been staged with
@@ -2345,7 +2345,7 @@ instead.
If the work tree is not yet fully updated to the tip commit of its
branch, then the work tree must first be updated with
.Cm got update .
-If the work tree contains multiple base commits it must first be updated
+If the work tree contains multiple base commits, it must first be updated
to a single base commit with
.Cm got update .
If changes have been staged with
@@ -2446,7 +2446,7 @@ are as follows:
.It Fl l
Instead of staging new changes, list paths which are already staged,
along with the IDs of staged blob objects and stage status codes.
-If paths were provided in the command line show the staged paths
+If paths were provided on the command line, show the staged paths
among the specified paths.
Otherwise, show all staged paths.
.It Fl p
@@ -2988,7 +2988,7 @@ branch with
.Cm got integrate .
Because the rebase operation switched the work tree to the
.Dq unified-buffer-cache
-branch the work tree must be switched back to the
+branch, the work tree must be switched back to the
.Dq master
branch first:
.Pp
@@ -3004,7 +3004,7 @@ by other developers and any other important new information:
.Dl $ got update -c origin/master
.Dl $ got histedit -m
.Pp
-If the remote repository offers write access local changes on the
+If the remote repository offers write access, local changes on the
.Dq master
branch can be sent to the remote repository with
.Cm got send .
@@ -3018,7 +3018,7 @@ branch:
.Pp
.Dl $ got send -b master origin
.Pp
-If the remote repository requires the HTTPS protocol the
+If the remote repository requires the HTTPS protocol, the
.Xr git-push 1
command must be used instead:
.Pp
diff --git a/gotadmin/gotadmin.1 b/gotadmin/gotadmin.1
index 2d141d7..997a10f 100644
--- a/gotadmin/gotadmin.1
+++ b/gotadmin/gotadmin.1
@@ -160,7 +160,7 @@ Each object contained in the pack file will be displayed on a single line.
The information shown includes the object ID, object type, object offset,
and object size.
.Pp
-If a packed object is deltified against another object the delta base
+If a packed object is deltified against another object, the delta base
will be shown as well.
For offset deltas, the delta base is identified via an offset into the
pack file.
@@ -251,8 +251,8 @@ pack file, which is an inconsistent repository state.
In such cases,
.Cm gotadmin cleanup -p -n
will display a list of affected pack index files.
-Whenever possible the missing pack files should be restored.
-If restoring missing pack files is not possible then affected pack index
+Whenever possible, the missing pack files should be restored.
+If restoring missing pack files is not possible, then affected pack index
files can be removed with
.Cm gotadmin cleanup -p .
.Pp
diff --git a/tog/tog.1 b/tog/tog.1
index 7891dc0..9ffaae3 100644
--- a/tog/tog.1
+++ b/tog/tog.1
@@ -114,7 +114,7 @@ Move the cursor to the newest commit.
Move the cursor to the oldest commit.
This will traverse all commits on the current branch which may take
a long time depending on the number of commits in branch history.
-If needed this operation can be cancelled with
+If needed, this operation can be cancelled with
.Cm Backspace .
.It Cm Enter, Space
Open a