commit d8e62599d7ab8b61cb516a9b833f276d7ed7c358
from: Stefan Sperling <stsp@stsp.name>
date: Mon Oct 21 11:32:18 2019 UTC

sync man pages

commit - 2b499410fbde242112d21b4b4f36174e997ef67f
commit + d8e62599d7ab8b61cb516a9b833f276d7ed7c358
blob - ea419e41f960be4631147495cbd2f8c31338e510
blob + be478ca88f2813163f659b1ad60fe5bdcf905c35
--- git-repository.5.html
+++ git-repository.5.html
@@ -21,13 +21,12 @@
     table.head, table.foot { width: 100%; }
     td.head-rtitle, td.foot-os { text-align: right; }
     td.head-vol { text-align: center; }
-    div.Pp { margin: 1ex 0ex; }
-    div.Nd, div.Bf, div.Op { display: inline; }
-    span.Pa, span.Ad { font-style: italic; }
-    span.Ms { font-weight: bold; }
-    dl.Bl-diag > dt { font-weight: bold; }
-    code.Nm, code.Fl, code.Cm, code.Ic, code.In, code.Fd, code.Fn,
-    code.Cd { font-weight: bold; font-family: inherit; }
+    .Nd, .Bf, .Op { display: inline; }
+    .Pa, .Ad { font-style: italic; }
+    .Ms { font-weight: bold; }
+    .Bl-diag > dt { font-weight: bold; }
+    code.Nm, .Fl, .Cm, .Ic, code.In, .Fd, .Fn, .Cd { font-weight: bold;
+      font-family: inherit; }
   </style>
   <title>GIT-REPOSITORY(5)</title>
 </head>
@@ -42,14 +41,14 @@
 <div class="manual-text">
 <section class="Sh">
 <h1 class="Sh" id="NAME"><a class="permalink" href="#NAME">NAME</a></h1>
-<code class="Nm">git-repository</code> &#x2014;
-<div class="Nd">Git repository format</div>
+<p class="Pp"><code class="Nm">git-repository</code> &#x2014;
+    <span class="Nd">Git repository format</span></p>
 </section>
 <section class="Sh">
 <h1 class="Sh" id="DESCRIPTION"><a class="permalink" href="#DESCRIPTION">DESCRIPTION</a></h1>
-A Git repository stores a series of versioned snapshots of a file hierarchy.
-  Conceptually, the repository's data model is a directed acyclic graph which
-  contains three types of objects as nodes:
+<p class="Pp">A Git repository stores a series of versioned snapshots of a file
+    hierarchy. Conceptually, the repository's data model is a directed acyclic
+    graph which contains three types of objects as nodes:</p>
 <dl class="Bl-tag">
   <dt>Blobs</dt>
   <dd>The content of tracked files is stored in objects of type
@@ -80,11 +79,11 @@ A Git repository stores a series of versioned snapshot
 <section class="Sh">
 <h1 class="Sh" id="OBJECT_STORAGE"><a class="permalink" href="#OBJECT_STORAGE">OBJECT
   STORAGE</a></h1>
-Loose objects are stored as individual files beneath the directory
-  <span class="Pa">objects</span>, spread across 256 sub-directories named after
-  the 256 possible hexadecimal values of the first byte of an object identifier.
-  The name of the loose object file corresponds to the remaining hexadecimal
-  byte values of the object's identifier.
+<p class="Pp">Loose objects are stored as individual files beneath the directory
+    <span class="Pa">objects</span>, spread across 256 sub-directories named
+    after the 256 possible hexadecimal values of the first byte of an object
+    identifier. The name of the loose object file corresponds to the remaining
+    hexadecimal byte values of the object's identifier.</p>
 <p class="Pp">A loose object file begins with a header which specifies the type
     of object as an ASCII string, followed by an ASCII space character, followed
     by the object data's size encoded as an ASCII number string. The header is
@@ -116,10 +115,11 @@ Loose objects are stored as individual files beneath t
 </section>
 <section class="Sh">
 <h1 class="Sh" id="REFERENCES"><a class="permalink" href="#REFERENCES">REFERENCES</a></h1>
-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 is not limited to branches.
+<p class="Pp">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 is not
+    limited to branches.</p>
 <p class="Pp">The name is a UTF-8 string with the following disallowed
     characters: &#x2018;&#x00A0;&#x2019; (space), ~ (tilde), ^ (caret), :
     (colon), ? (question mark), * (asterisk), [ (opening square bracket), \
@@ -187,29 +187,29 @@ A reference associates a name with an object ID. A pro
 <section class="Sh">
 <h1 class="Sh" id="SEE_ALSO"><a class="permalink" href="#SEE_ALSO">SEE
   ALSO</a></h1>
-<a class="Xr">got(1)</a>, <a class="Xr">deflate(3)</a>,
-  <a class="Xr">SHA1(3)</a>, <a class="Xr">got-worktree(5)</a>
+<p class="Pp"><a class="Xr">got(1)</a>, <a class="Xr">deflate(3)</a>,
+    <a class="Xr">SHA1(3)</a>, <a class="Xr">got-worktree(5)</a></p>
 </section>
 <section class="Sh">
 <h1 class="Sh" id="HISTORY"><a class="permalink" href="#HISTORY">HISTORY</a></h1>
-The Git repository format was initially designed by Linus Torvalds in 2005 and
-  has since been extended by various people involved in the development of the
-  Git version control system.
+<p class="Pp">The Git repository format was initially designed by Linus Torvalds
+    in 2005 and has since been extended by various people involved in the
+    development of the Git version control system.</p>
 </section>
 <section class="Sh">
 <h1 class="Sh" id="CAVEATS"><a class="permalink" href="#CAVEATS">CAVEATS</a></h1>
-The particular set of disallowed characters in reference names is a consequence
-  of design choices made for the command-line interface of
-  <a class="Xr">git(1)</a>. The same characters are disallowed by Got for
-  compatibility purposes. Got additionally prevents users from creating
-  reference names with a leading - (dash) character, because this is rarely
-  intended and not considered useful.
+<p class="Pp">The particular set of disallowed characters in reference names is
+    a consequence of design choices made for the command-line interface of
+    <a class="Xr">git(1)</a>. The same characters are disallowed by Got for
+    compatibility purposes. Got additionally prevents users from creating
+    reference names with a leading - (dash) character, because this is rarely
+    intended and not considered useful.</p>
 </section>
 </div>
 <table class="foot">
   <tr>
-    <td class="foot-date">October 6, 2019</td>
-    <td class="foot-os">OpenBSD 6.5</td>
+    <td class="foot-date">October 21, 2019</td>
+    <td class="foot-os">OpenBSD 6.6</td>
   </tr>
 </table>
 </body>
blob - 02014968e0ad74fa243af47acc00ccd93e8802c1
blob + 246d05b5fa9703a29568fdd11cb9358fef94f448
--- got-worktree.5.html
+++ got-worktree.5.html
@@ -21,13 +21,12 @@
     table.head, table.foot { width: 100%; }
     td.head-rtitle, td.foot-os { text-align: right; }
     td.head-vol { text-align: center; }
-    div.Pp { margin: 1ex 0ex; }
-    div.Nd, div.Bf, div.Op { display: inline; }
-    span.Pa, span.Ad { font-style: italic; }
-    span.Ms { font-weight: bold; }
-    dl.Bl-diag > dt { font-weight: bold; }
-    code.Nm, code.Fl, code.Cm, code.Ic, code.In, code.Fd, code.Fn,
-    code.Cd { font-weight: bold; font-family: inherit; }
+    .Nd, .Bf, .Op { display: inline; }
+    .Pa, .Ad { font-style: italic; }
+    .Ms { font-weight: bold; }
+    .Bl-diag > dt { font-weight: bold; }
+    code.Nm, .Fl, .Cm, .Ic, code.In, .Fd, .Fn, .Cd { font-weight: bold;
+      font-family: inherit; }
   </style>
   <title>GOT-WORKTREE(5)</title>
 </head>
@@ -42,16 +41,17 @@
 <div class="manual-text">
 <section class="Sh">
 <h1 class="Sh" id="NAME"><a class="permalink" href="#NAME">NAME</a></h1>
-<code class="Nm">got-worktree</code> &#x2014;
-<div class="Nd">Got worktree format</div>
+<p class="Pp"><code class="Nm">got-worktree</code> &#x2014; <span class="Nd">Got
+    worktree format</span></p>
 </section>
 <section class="Sh">
 <h1 class="Sh" id="DESCRIPTION"><a class="permalink" href="#DESCRIPTION">DESCRIPTION</a></h1>
-A Got <i class="Em">work tree</i> stores a file hierarchy which corresponds to a
-  versioned snapshot stored in a Git repository. The work tree's meta data is
-  stored in the <span class="Pa">.got</span> directory. A work tree is created
-  with <code class="Cm">got checkout</code> and is required to make changes to a
-  Git repository with <a class="Xr">got(1)</a>.
+<p class="Pp">A Got <i class="Em">work tree</i> stores a file hierarchy which
+    corresponds to a versioned snapshot stored in a Git repository. The work
+    tree's meta data is stored in the <span class="Pa">.got</span> directory. A
+    work tree is created with <code class="Cm">got checkout</code> and is
+    required to make changes to a Git repository with
+  <a class="Xr">got(1)</a>.</p>
 <p class="Pp">A work tree stores the path to its Git repository, the name of a
     reference to the branch which files were checked out from, and the ID of a
     commit on this branch known as the <i class="Em">base commit</i>.</p>
@@ -167,15 +167,15 @@ A Got <i class="Em">work tree</i> stores a file hierar
 <section class="Sh">
 <h1 class="Sh" id="SEE_ALSO"><a class="permalink" href="#SEE_ALSO">SEE
   ALSO</a></h1>
-<a class="Xr">got(1)</a>, <a class="Xr">rename(2)</a>,
-  <a class="Xr">stat(2)</a>, <a class="Xr">umask(2)</a>,
-  <a class="Xr">lockf(3)</a>, <a class="Xr">git-repository(5)</a>
+<p class="Pp"><a class="Xr">got(1)</a>, <a class="Xr">rename(2)</a>,
+    <a class="Xr">stat(2)</a>, <a class="Xr">umask(2)</a>,
+    <a class="Xr">lockf(3)</a>, <a class="Xr">git-repository(5)</a></p>
 </section>
 </div>
 <table class="foot">
   <tr>
-    <td class="foot-date">October 6, 2019</td>
-    <td class="foot-os">OpenBSD 6.5</td>
+    <td class="foot-date">October 21, 2019</td>
+    <td class="foot-os">OpenBSD 6.6</td>
   </tr>
 </table>
 </body>
blob - fdd7a5ae2f5a036da0b28d9fff1dcc68ce5fab91
blob + d45bc51f501abcb7cb86e0a99517b8a961e34f31
--- got.1.html
+++ got.1.html
@@ -22,13 +22,12 @@
     table.head, table.foot { width: 100%; }
     td.head-rtitle, td.foot-os { text-align: right; }
     td.head-vol { text-align: center; }
-    div.Pp { margin: 1ex 0ex; }
-    div.Nd, div.Bf, div.Op { display: inline; }
-    span.Pa, span.Ad { font-style: italic; }
-    span.Ms { font-weight: bold; }
-    dl.Bl-diag > dt { font-weight: bold; }
-    code.Nm, code.Fl, code.Cm, code.Ic, code.In, code.Fd, code.Fn,
-    code.Cd { font-weight: bold; font-family: inherit; }
+    .Nd, .Bf, .Op { display: inline; }
+    .Pa, .Ad { font-style: italic; }
+    .Ms { font-weight: bold; }
+    .Bl-diag > dt { font-weight: bold; }
+    code.Nm, .Fl, .Cm, .Ic, code.In, .Fd, .Fn, .Cd { font-weight: bold;
+      font-family: inherit; }
   </style>
   <title>GOT(1)</title>
 </head>
@@ -43,8 +42,8 @@
 <div class="manual-text">
 <section class="Sh">
 <h1 class="Sh" id="NAME"><a class="permalink" href="#NAME">NAME</a></h1>
-<code class="Nm">got</code> &#x2014;
-<div class="Nd">Game of Trees</div>
+<p class="Pp"><code class="Nm">got</code> &#x2014; <span class="Nd">Game of
+    Trees</span></p>
 </section>
 <section class="Sh">
 <h1 class="Sh" id="SYNOPSIS"><a class="permalink" href="#SYNOPSIS">SYNOPSIS</a></h1>
@@ -58,10 +57,10 @@
 </section>
 <section class="Sh">
 <h1 class="Sh" id="DESCRIPTION"><a class="permalink" href="#DESCRIPTION">DESCRIPTION</a></h1>
-<code class="Nm">got</code> is a version control system which stores the history
-  of tracked files in a Git repository, as used by the Git version control
-  system. This repository format is described in
-  <a class="Xr">git-repository(5)</a>.
+<p class="Pp"><code class="Nm">got</code> is a version control system which
+    stores the history of tracked files in a Git repository, as used by the Git
+    version control system. This repository format is described in
+    <a class="Xr">git-repository(5)</a>.</p>
 <p class="Pp"><code class="Nm">got</code> is a &#x201C;distributed&#x201D;
     version control system because every copy of a repository is writeable.
     Modifications made to files can be synchronized between repositories at any
@@ -284,6 +283,10 @@
         <td>unversioned item not tracked by <code class="Nm">got</code></td>
       </tr>
       <tr>
+        <td>m</td>
+        <td>modified file modes (executable bit only)</td>
+      </tr>
+      <tr>
         <td>N</td>
         <td>non-existent <var class="Ar">path</var> specified on the command
           line</td>
@@ -393,8 +396,9 @@
   <dt><a class="permalink" href="#diff"><code class="Cm" id="diff">diff</code></a>
     [<code class="Fl">-C</code> <var class="Ar">number</var>]
     [<code class="Fl">-r</code> <var class="Ar">repository-path</var>]
-    [<code class="Fl">-s</code>] [<var class="Ar">object1</var>
-    <var class="Ar">object2</var> | <var class="Ar">path</var>]</dt>
+    [<code class="Fl">-s</code>] [<code class="Fl">-w</code>]
+    [<var class="Ar">object1</var> <var class="Ar">object2</var> |
+    <var class="Ar">path</var>]</dt>
   <dd>When invoked within a work tree with less than two arguments, display
       uncommitted changes in the work tree. If a <var class="Ar">path</var> is
       specified, only show changes within this path.
@@ -421,6 +425,8 @@
       <dd>Show changes staged with <code class="Cm">got stage</code> instead of
           showing local changes. This option is only valid when
           <code class="Cm">got diff</code> is invoked in a work tree.</dd>
+      <dt><a class="permalink" href="#w"><code class="Fl" id="w">-w</code></a></dt>
+      <dd>Ignore whitespace-only changes.</dd>
     </dl>
   </dd>
   <dt><a class="permalink" href="#di"><code class="Cm" id="di">di</code></a></dt>
@@ -515,10 +521,11 @@
     <p class="Pp">If no options are passed, expect two arguments and attempt to
         create, or update, the reference with the given
         <var class="Ar">name</var>, and make it point at the given
-        <var class="Ar">target</var>. The target may be an object ID SHA1 hash
-        or an existing reference which will be resolved to an object ID. An
-        abbreviated hash argument will be expanded to a full SHA1 hash
-        automatically, provided the abbreviation is unique.</p>
+        <var class="Ar">target</var>. The name must be an absolute reference
+        name, i.e. it must begin with &#x201C;refs/&#x201D;. The target may be
+        an object ID SHA1 hash or an existing reference which will be resolved
+        to an object ID. An abbreviated hash argument will be expanded to a full
+        SHA1 hash automatically, provided the abbreviation is unique.</p>
     <p class="Pp">The options for <code class="Cm">got ref</code> are as
         follows:</p>
     <dl class="Bl-tag">
@@ -719,6 +726,10 @@
       <tr>
         <td>A</td>
         <td>new file was added</td>
+      </tr>
+      <tr>
+        <td>m</td>
+        <td>modified file modes (executable bit only)</td>
       </tr>
     </table>
     <p class="Pp">Files which are not part of the new commit will retain their
@@ -1067,6 +1078,58 @@
   </dd>
   <dt><a class="permalink" href="#he"><code class="Cm" id="he">he</code></a></dt>
   <dd>Short alias for <code class="Cm">histedit</code>.</dd>
+  <dt><a class="permalink" href="#integrate"><code class="Cm" id="integrate">integrate</code></a>
+    <var class="Ar">branch</var></dt>
+  <dd>Integrate the specified <var class="Ar">branch</var> into the work tree's
+      current branch. Files in the work tree are updated to match the contents
+      on the integrated <var class="Ar">branch</var>, and the reference of the
+      work tree's branch is changed to point at the head commit of the
+      integrated <var class="Ar">branch</var>.
+    <p class="Pp">Both branches can be considered equivalent after integration
+        since they will be pointing at the same commit. Both branches remain
+        available for future work, if desired. In case the integrated
+        <var class="Ar">branch</var> is no longer needed it may be deleted with
+        <code class="Cm">got branch -d</code>.</p>
+    <p class="Pp">Show the status of each affected file, using the following
+        status codes:</p>
+    <table class="Bl-column">
+      <tr>
+        <td>U</td>
+        <td>file was updated</td>
+      </tr>
+      <tr>
+        <td>D</td>
+        <td>file was deleted</td>
+      </tr>
+      <tr>
+        <td>A</td>
+        <td>new file was added</td>
+      </tr>
+      <tr>
+        <td>~</td>
+        <td>versioned file is obstructed by a non-regular file</td>
+      </tr>
+      <tr>
+        <td>!</td>
+        <td>a missing versioned file was restored</td>
+      </tr>
+    </table>
+    <p class="Pp"><code class="Cm">got integrate</code> will refuse to run if
+        certain preconditions are not met. Most importantly, the
+        <var class="Ar">branch</var> must have been rebased onto the work tree's
+        current branch with <code class="Cm">got rebase</code> 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 to a single base commit with <code class="Cm">got
+        update</code>. If changes have been staged with <code class="Cm">got
+        stage</code>, these changes must first be committed with
+        <code class="Cm">got commit</code> or unstaged with <code class="Cm">got
+        unstage</code>. If the work tree contains local changes, these changes
+        must first be committed with <code class="Cm">got commit</code> or
+        reverted with <code class="Cm">got revert</code>.</p>
+  </dd>
+  <dt><a class="permalink" href="#ig"><code class="Cm" id="ig">ig</code></a></dt>
+  <dd>Short alias for <code class="Cm">integrate</code>.</dd>
   <dt><a class="permalink" href="#stage"><code class="Cm" id="stage">stage</code></a>
     [<code class="Fl">-l</code>] [<code class="Fl">-p</code>]
     [<code class="Fl">-F</code> <var class="Ar">response-script</var>]
@@ -1283,13 +1346,14 @@
 <section class="Sh">
 <h1 class="Sh" id="EXIT_STATUS"><a class="permalink" href="#EXIT_STATUS">EXIT
   STATUS</a></h1>
-The <code class="Nm">got</code> utility exits&#x00A0;0 on success,
-  and&#x00A0;&gt;0 if an error occurs.
+<p class="Pp">The <code class="Nm">got</code> utility exits&#x00A0;0 on success,
+    and&#x00A0;&gt;0 if an error occurs.</p>
 </section>
 <section class="Sh">
 <h1 class="Sh" id="EXAMPLES"><a class="permalink" href="#EXAMPLES">EXAMPLES</a></h1>
-Clone an existing Git repository for use with <code class="Nm">got</code>. This
-  step currently requires <a class="Xr">git(1)</a>:
+<p class="Pp">Clone an existing Git repository for use with
+    <code class="Nm">got</code>. This step currently requires
+    <a class="Xr">git(1)</a>:</p>
 <p class="Pp"></p>
 <div class="Bd Bd-indent"><code class="Li">$ cd /var/git/</code></div>
 <div class="Bd Bd-indent"><code class="Li">$ git clone --bare
@@ -1440,36 +1504,56 @@ Clone an existing Git repository for use with <code cl
 <p class="Pp"></p>
 <div class="Bd Bd-indent"><code class="Li">$ cd /var/git/repo</code></div>
 <div class="Bd Bd-indent"><code class="Li">$ git push origin master</code></div>
+<p class="Pp">In order to merge changes committed to the
+    &#x201C;unified-buffer-cache&#x201D; branch back into the
+    &#x201C;master&#x201D; branch, the &#x201C;unified-buffer-cache&#x201D;
+    branch must first be rebased onto the &#x201C;master&#x201D; branch:</p>
+<p class="Pp"></p>
+<div class="Bd Bd-indent"><code class="Li">$ got update -b master</code></div>
+<div class="Bd Bd-indent"><code class="Li">$ got rebase
+  unified-buffer-cache</code></div>
+<p class="Pp">Changes on the &#x201C;unified-buffer-cache&#x201D; branch can now
+    be made visible on the &#x201C;master&#x201D; branch with
+    <code class="Cm">got integrate</code>. Because the rebase operation switched
+    the work tree to the &#x201C;unified-buffer-cache&#x201D; branch, the work
+    tree must be switched back to the &#x201C;master&#x201D; branch before the
+    &#x201C;unified-buffer-cache&#x201D; branch can be integrated into
+    &#x201C;master&#x201D;:</p>
+<p class="Pp"></p>
+<div class="Bd Bd-indent"><code class="Li">$ got update -b master</code></div>
+<div class="Bd Bd-indent"><code class="Li">$ got integrate
+  unified-buffer-cache</code></div>
 </section>
 <section class="Sh">
 <h1 class="Sh" id="SEE_ALSO"><a class="permalink" href="#SEE_ALSO">SEE
   ALSO</a></h1>
-<a class="Xr">tog(1)</a>, <a class="Xr">git-repository(5)</a>,
-  <a class="Xr">got-worktree(5)</a>
+<p class="Pp"><a class="Xr">tog(1)</a>, <a class="Xr">git-repository(5)</a>,
+    <a class="Xr">got-worktree(5)</a></p>
 </section>
 <section class="Sh">
 <h1 class="Sh" id="AUTHORS"><a class="permalink" href="#AUTHORS">AUTHORS</a></h1>
-<span class="An">Stefan Sperling</span>
-  &lt;<a class="Mt" href="mailto:stsp@openbsd.org">stsp@openbsd.org</a>&gt;
-<br/>
-<span class="An">Martin Pieuchot</span>
-  &lt;<a class="Mt" href="mailto:mpi@openbsd.org">mpi@openbsd.org</a>&gt;
-<br/>
-<span class="An">Joshua Stein</span>
-  &lt;<a class="Mt" href="mailto:jcs@openbsd.org">jcs@openbsd.org</a>&gt;
+<p class="Pp"><span class="An">Stefan Sperling</span>
+    &lt;<a class="Mt" href="mailto:stsp@openbsd.org">stsp@openbsd.org</a>&gt;
+  <br/>
+  <span class="An">Martin Pieuchot</span>
+    &lt;<a class="Mt" href="mailto:mpi@openbsd.org">mpi@openbsd.org</a>&gt;
+  <br/>
+  <span class="An">Joshua Stein</span>
+    &lt;<a class="Mt" href="mailto:jcs@openbsd.org">jcs@openbsd.org</a>&gt;</p>
 </section>
 <section class="Sh">
 <h1 class="Sh" id="CAVEATS"><a class="permalink" href="#CAVEATS">CAVEATS</a></h1>
-<code class="Nm">got</code> is a work-in-progress and many commands remain to be
-  implemented. At present, the user has to fall back on <a class="Xr">git(1)</a>
-  to perform many tasks, in particular tasks related to repository
-  administration and tasks which require a network connection.
+<p class="Pp"><code class="Nm">got</code> is a work-in-progress and many
+    commands remain to be implemented. At present, the user has to fall back on
+    <a class="Xr">git(1)</a> to perform many tasks, in particular tasks related
+    to repository administration and tasks which require a network
+  connection.</p>
 </section>
 </div>
 <table class="foot">
   <tr>
-    <td class="foot-date">October 6, 2019</td>
-    <td class="foot-os">OpenBSD 6.5</td>
+    <td class="foot-date">October 21, 2019</td>
+    <td class="foot-os">OpenBSD 6.6</td>
   </tr>
 </table>
 </body>
blob - cca37bf0851a20070c400345449d4db9fb1a2b8b
blob + 219b56b401d8442414a26afe15f4bb4535f3e7c3
--- tog.1.html
+++ tog.1.html
@@ -21,13 +21,12 @@
     table.head, table.foot { width: 100%; }
     td.head-rtitle, td.foot-os { text-align: right; }
     td.head-vol { text-align: center; }
-    div.Pp { margin: 1ex 0ex; }
-    div.Nd, div.Bf, div.Op { display: inline; }
-    span.Pa, span.Ad { font-style: italic; }
-    span.Ms { font-weight: bold; }
-    dl.Bl-diag > dt { font-weight: bold; }
-    code.Nm, code.Fl, code.Cm, code.Ic, code.In, code.Fd, code.Fn,
-    code.Cd { font-weight: bold; font-family: inherit; }
+    .Nd, .Bf, .Op { display: inline; }
+    .Pa, .Ad { font-style: italic; }
+    .Ms { font-weight: bold; }
+    .Bl-diag > dt { font-weight: bold; }
+    code.Nm, .Fl, .Cm, .Ic, code.In, .Fd, .Fn, .Cd { font-weight: bold;
+      font-family: inherit; }
   </style>
   <title>TOG(1)</title>
 </head>
@@ -42,8 +41,8 @@
 <div class="manual-text">
 <section class="Sh">
 <h1 class="Sh" id="NAME"><a class="permalink" href="#NAME">NAME</a></h1>
-<code class="Nm">tog</code> &#x2014;
-<div class="Nd">Git repository browser</div>
+<p class="Pp"><code class="Nm">tog</code> &#x2014; <span class="Nd">Git
+    repository browser</span></p>
 </section>
 <section class="Sh">
 <h1 class="Sh" id="SYNOPSIS"><a class="permalink" href="#SYNOPSIS">SYNOPSIS</a></h1>
@@ -57,9 +56,9 @@
 </section>
 <section class="Sh">
 <h1 class="Sh" id="DESCRIPTION"><a class="permalink" href="#DESCRIPTION">DESCRIPTION</a></h1>
-<code class="Nm">tog</code> is an interactive read-only browser for Git
-  repositories. This repository format is described in
-  <a class="Xr">git-repository(5)</a>.
+<p class="Pp"><code class="Nm">tog</code> is an interactive read-only browser
+    for Git repositories. This repository format is described in
+    <a class="Xr">git-repository(5)</a>.</p>
 <p class="Pp"><code class="Nm">tog</code> supports several types of views which
     display repository data:</p>
 <dl class="Bl-tag">
@@ -333,28 +332,28 @@
 <section class="Sh">
 <h1 class="Sh" id="EXIT_STATUS"><a class="permalink" href="#EXIT_STATUS">EXIT
   STATUS</a></h1>
-The <code class="Nm">tog</code> utility exits&#x00A0;0 on success,
-  and&#x00A0;&gt;0 if an error occurs.
+<p class="Pp">The <code class="Nm">tog</code> utility exits&#x00A0;0 on success,
+    and&#x00A0;&gt;0 if an error occurs.</p>
 </section>
 <section class="Sh">
 <h1 class="Sh" id="SEE_ALSO"><a class="permalink" href="#SEE_ALSO">SEE
   ALSO</a></h1>
-<a class="Xr">got(1)</a>, <a class="Xr">git-repository(5)</a>,
-  <a class="Xr">re_format(7)</a>
+<p class="Pp"><a class="Xr">got(1)</a>, <a class="Xr">git-repository(5)</a>,
+    <a class="Xr">re_format(7)</a></p>
 </section>
 <section class="Sh">
 <h1 class="Sh" id="AUTHORS"><a class="permalink" href="#AUTHORS">AUTHORS</a></h1>
-<span class="An">Stefan Sperling</span>
-  &lt;<a class="Mt" href="mailto:stsp@openbsd.org">stsp@openbsd.org</a>&gt;
-<br/>
-<span class="An">Joshua Stein</span>
-  &lt;<a class="Mt" href="mailto:jcs@openbsd.org">jcs@openbsd.org</a>&gt;
+<p class="Pp"><span class="An">Stefan Sperling</span>
+    &lt;<a class="Mt" href="mailto:stsp@openbsd.org">stsp@openbsd.org</a>&gt;
+  <br/>
+  <span class="An">Joshua Stein</span>
+    &lt;<a class="Mt" href="mailto:jcs@openbsd.org">jcs@openbsd.org</a>&gt;</p>
 </section>
 </div>
 <table class="foot">
   <tr>
-    <td class="foot-date">October 6, 2019</td>
-    <td class="foot-os">OpenBSD 6.5</td>
+    <td class="foot-date">October 21, 2019</td>
+    <td class="foot-os">OpenBSD 6.6</td>
   </tr>
 </table>
 </body>