diff --git a/software.mdwn b/software.mdwn
index 0e4e705..5634747 100644
--- a/software.mdwn
+++ b/software.mdwn
@@ -24,6 +24,14 @@ the VCS is used as the transport.
     <th>UI, integration</th>
   <tr>
 
+  <tr>
+    <td><a href="https://github.com/dspinellis/git-issue">git-issue</a></td>
+    <td class="active-project"><a href="https://github.com/dspinellis/git-issue/commits/master">2020</a></td>
+    <td>independent of your code's VCS</td>
+    <td>files stored in its own separate git repo</td>
+    <td>CLI, import/export with gitlab/github</td>
+  </tr>
+
   <tr>
     <td><a href="https://github.com/MichaelMure/git-bug/">git-bug</a></td>
     <td class="active-project">

diff --git a/software.mdwn b/software.mdwn
index e3a604a..0e4e705 100644
--- a/software.mdwn
+++ b/software.mdwn
@@ -43,20 +43,6 @@ the VCS is used as the transport.
     <td>CLI, terminal UI, web UI, push/pull bridge to gitlab/launchpad/JIRA/github</td>
   </tr>
 
-  <tr>
-    <td><a href="https://github.com/sit-fyi/sit">sit</a></td>
-    <td class="active-project">
-      <a href="https://github.com/sit-fyi/sit/commits/master">
-        2018
-      </a>
-    </td>
-    <td>git, (vcs agnostic others TBD)</td>
-    <td>
-      Items (issue and other artifacts) are file(s) under .sit dir. File format(s) and user-editability TBD.
-    </td>
-    <td>CLI, web UI</td>
-  </tr>
-
   <tr>
     <td><a href="https://github.com/neithernut/git-dit/">git-dit</a></td>
     <td class="active-project">
@@ -76,27 +62,6 @@ the VCS is used as the transport.
     <td>CLI</td>
   </tr>
 
-  <tr>
-    <td><a href="https://pythonhosted.org/pyditz/">PyDitz</a></td>
-    <td><a href="https://bitbucket.org/zondo/pyditz/commits/">2019</a></td>
-    <td>git</td>
-    <td>PyDitz maintains an <a href="https://pythonhosted.org/pyditz/intro.html#the-pd-data-model">issue database directory</a> on disk, with files written in a line-based and human-editable format. This directory can be:
-     <ul>
-     <li>under version control in-branch alongside project code</li>
-     <li>under version control on a separate branch</li>
-     <li>optionally excluded from version control</li>
-     </ul>
-    </td>
-    <td>CLI, html export</td>
-  </tr>
-
-  <tr>
-    <td><a href="https://gitlab.com/monnier/bugit">BuGit</a></td>
-    <td><a href="https://gitlab.com/monnier/bugit/-/commits/master">2016</a></td>
-    <td>git</td>
-    <td>Each issue is a Git branch.  Git takes care of 99% the merging job</td>
-    <td>CLI, web view (CGI, read-only)</td>
-  </tr>
 
   <tr>
     <td><a href="http://www.fossil-scm.org/">Fossil</a></td>
@@ -129,6 +94,58 @@ the VCS is used as the transport.
     </td>
   </tr>
 
+  <tr>
+    <td><a href="https://pythonhosted.org/pyditz/">PyDitz</a></td>
+    <td><a href="https://bitbucket.org/zondo/pyditz/commits/">2019</a></td>
+    <td>git</td>
+    <td>PyDitz maintains an <a href="https://pythonhosted.org/pyditz/intro.html#the-pd-data-model">issue database directory</a> on disk, with files written in a line-based and human-editable format. This directory can be:
+     <ul>
+     <li>under version control in-branch alongside project code</li>
+     <li>under version control on a separate branch</li>
+     <li>optionally excluded from version control</li>
+     </ul>
+    </td>
+    <td>CLI, html export</td>
+  </tr>
+    
+  <tr>
+    <td><a href="http://www.mrzv.org/software/artemis/">Artemis</a></td>
+    <td class="active-project">
+      <a href="http://hg.mrzv.org/Artemis/rev/06875c471689">
+        2018
+      </a>
+    </td>
+    <td>Mercurial, git</td>
+    <td><ul>
+      <li>Individual issues are stored each as a Maildir in an .issues subdirectory.
+      <li>Comments and state transitions are emails chained by In-Reply-To headers.
+    </ul></td>
+    <td>CLI, issues can be viewed in a Maildir-compatible mail UI</td>
+  </tr>
+
+
+  <tr>
+    <td><a href="https://github.com/sit-fyi/sit">sit</a></td>
+    <td class="active-project">
+      <a href="https://github.com/sit-fyi/sit/commits/master">
+        2018
+      </a>
+    </td>
+    <td>git, (vcs agnostic others TBD)</td>
+    <td>
+      Items (issue and other artifacts) are file(s) under .sit dir. File format(s) and user-editability TBD.
+    </td>
+    <td>CLI, web UI</td>
+  </tr>
+
+  <tr>
+    <td><a href="https://gitlab.com/monnier/bugit">BuGit</a></td>
+    <td><a href="https://gitlab.com/monnier/bugit/-/commits/master">2016</a></td>
+    <td>git</td>
+    <td>Each issue is a Git branch.  Git takes care of 99% the merging job</td>
+    <td>CLI, web view (CGI, read-only)</td>
+  </tr>
+
   <tr>
     <td><a href="https://github.com/jeffWelling/ticgit">TicGit-ng</a></td>
     <td class="inactive-project">
@@ -162,21 +179,40 @@ the VCS is used as the transport.
   </tr>
 
   <tr>
-    <td><a href="http://www.mrzv.org/software/artemis/">Artemis</a></td>
-    <td class="active-project">
-      <a href="http://hg.mrzv.org/Artemis/rev/06875c471689">
-        2018
+    <td><a href="https://www.gitano.org.uk/ideas/git-pull-request/">git-pull-request</a></td>
+    <td class="inactive-project">
+      <a href="https://git.gitano.org.uk/git-pull-request.git/commit/?id=0e60a1538e05d331d2f544ca63c6f7cb318824de">
+        2012
       </a>
     </td>
-    <td>Mercurial, git</td>
-    <td><ul>
-      <li>Individual issues are stored each as a Maildir in an .issues subdirectory.
-      <li>Comments and state transitions are emails chained by In-Reply-To headers.
-    </ul></td>
-    <td>CLI, issues can be viewed in a Maildir-compatible mail UI</td>
+    <td>
+      Git
+    <td>
+      Take the below with a pinch of salt, it's gleaned from a brief look at the bash script:
+      <ul>
+        <li>Pull requests are pairs of branches in a special namespace.</li>
+        <li>One branch holds the actual commit to be merged, one holds metadata.</li>
+        <li>Metadata can include attachments.</li>
+        <li>Comments are commit messages on the metadata branch.</li>
+      </ul>
+    </td>
   </tr>
 
   <tr>
+    <td><a href="http://www.digitalgemstones.com/projects/b/">b</a></td>
+
+    <!-- The table is roughly sorted by this field, this should represent
+    active use, more than development, but this is harder to judge. In any
+    case, link to source when modifying -->
+    <td><a href="https://bitbucket.org/dimo414/b/src/default/src/">2012</a></td>
+
+    <!-- Consistant popularity sorting -->
+    <td>Mercurial</td>
+    <td>Bugs stored with code. Index in <tt>.bugs/bugs</tt>, each bug is a file in <tt>.bugs/details/<em>SHA1-id</em>.txt</tt><br>
+        <tt>.bugs/bugs</tt> has timestamps on each line; Can Mercurial use this to automatically resolve conflicts, like git-annex does in its metadata branch?</td>
+  <tr>
+  
+    <tr>
     <td><a href="http://kapiti.geek.nz/software/cil.html">cli</a>
     <!-- Link broken as of 03/2015) -->
     </td>
@@ -219,39 +255,6 @@ the VCS is used as the transport.
     <td></td>
   </tr>
 
-  <tr>
-    <td><a href="https://www.gitano.org.uk/ideas/git-pull-request/">git-pull-request</a></td>
-    <td class="inactive-project">
-      <a href="https://git.gitano.org.uk/git-pull-request.git/commit/?id=0e60a1538e05d331d2f544ca63c6f7cb318824de">
-        2012
-      </a>
-    </td>
-    <td>
-      Git
-    <td>
-      Take the below with a pinch of salt, it's gleaned from a brief look at the bash script:
-      <ul>
-        <li>Pull requests are pairs of branches in a special namespace.</li>
-        <li>One branch holds the actual commit to be merged, one holds metadata.</li>
-        <li>Metadata can include attachments.</li>
-        <li>Comments are commit messages on the metadata branch.</li>
-      </ul>
-    </td>
-  </tr>
-
-  <tr>
-    <td><a href="http://www.digitalgemstones.com/projects/b/">b</a></td>
-
-    <!-- The table is roughly sorted by this field, this should represent
-    active use, more than development, but this is harder to judge. In any
-    case, link to source when modifying -->
-    <td><a href="https://bitbucket.org/dimo414/b/src/default/src/">2012</a></td>
-
-    <!-- Consistant popularity sorting -->
-    <td>Mercurial</td>
-    <td>Bugs stored with code. Index in <tt>.bugs/bugs</tt>, each bug is a file in <tt>.bugs/details/<em>SHA1-id</em>.txt</tt><br>
-        <tt>.bugs/bugs</tt> has timestamps on each line; Can Mercurial use this to automatically resolve conflicts, like git-annex does in its metadata branch?</td>
-  <tr>

(Diff truncated)

diff --git a/software.mdwn b/software.mdwn
index 1a7c90c..e3a604a 100644
--- a/software.mdwn
+++ b/software.mdwn
@@ -149,7 +149,7 @@ the VCS is used as the transport.
   <tr>
     <td><a href="http://bugseverywhere.org/">Bugs Everywhere</a></td>
     <td class="inactive-project">
-      <a href="https://gitorious.org/be/be/commit/49808306c939de24acabc423024970a76055e52b">
+      <a href="https://web.archive.org/web/20170227175726/https://gitorious.org/be/be/commit/49808306c939de24acabc423024970a76055e52b">
         2013
       </a>
     </td>

diff --git a/software.mdwn b/software.mdwn
index 8f3b9f9..1a7c90c 100644
--- a/software.mdwn
+++ b/software.mdwn
@@ -163,22 +163,17 @@ the VCS is used as the transport.
 
   <tr>
     <td><a href="http://www.mrzv.org/software/artemis/">Artemis</a></td>
-    <td class="inactive-project">
+    <td class="active-project">
       <a href="http://hg.mrzv.org/Artemis/rev/06875c471689">
-        2012
+        2018
       </a>
     </td>
-    <td>
-      Mercurial
-    </td>
-    <td>
-      <ul>
-        <li>
-          Individual issues are stored in directories in an .issues
-          subdirectory (overridable in a config file
-        </li>
-      </ul>
-    </td>
+    <td>Mercurial, git</td>
+    <td><ul>
+      <li>Individual issues are stored each as a Maildir in an .issues subdirectory.
+      <li>Comments and state transitions are emails chained by In-Reply-To headers.
+    </ul></td>
+    <td>CLI, issues can be viewed in a Maildir-compatible mail UI</td>
   </tr>
 
   <tr>

diff --git a/software.mdwn b/software.mdwn
index 918340d..8f3b9f9 100644
--- a/software.mdwn
+++ b/software.mdwn
@@ -153,15 +153,12 @@ the VCS is used as the transport.
         2013
       </a>
     </td>
-    <td>Git, Bazaar, Mercurial, RCS, Arch</td>
+    <td>git, bzr, Mercurial, RCS, tla</td>
     <td>
-      <ul>
-        <li>
-          Issues stored in the relevant branch in the repository, supports
-          merging issues.
-        </li>
-      </ul>
+      Issues stored in the relevant branch in the repository, supports
+      merging issues.
     </td>
+    <td>CLI, web UI, email, <a href="https://www.nedprod.com/programs/Win32/BEurtle/">TortoiseGit/Svn/etc</a></td>
   </tr>
 
   <tr>

diff --git a/software.mdwn b/software.mdwn
index cfdac87..918340d 100644
--- a/software.mdwn
+++ b/software.mdwn
@@ -132,11 +132,18 @@ the VCS is used as the transport.
   <tr>
     <td><a href="https://github.com/jeffWelling/ticgit">TicGit-ng</a></td>
     <td class="inactive-project">
-      <a href="https://github.com/jeffWelling/ticgit/commit/b9b1db477d26b8063a67d761aaadf80abfb6d4ae">
+      <a href="https://github.com/jeffWelling/ticgit/commits/master">
         2014
       </a>
     </td>
-    <td></td>
+    <td>git</td>
+    <td><ul>
+      <li>git branch with tree of files
+      <li>one directory per status
+      <li>one directory per bug
+      <li>one text file per metadata attribute, one text file per comment
+    </ul></td>
+    <td>CLI, web view (read-only)</td>
   </tr>
 
   <tr>

diff --git a/software.mdwn b/software.mdwn
index 5fc68d6..cfdac87 100644
--- a/software.mdwn
+++ b/software.mdwn
@@ -113,20 +113,19 @@ the VCS is used as the transport.
   <tr>
     <td><a href="http://ikiwiki.info/">ikiwiki</a></td>
     <td class="active-project">
-      <a href="http://source.ikiwiki.branchable.com/?p=source.git;a=commit;h=729991564ec7e1116fc023c51e73b47af8b6fce7">
-        2015
+      <a href="http://source.ikiwiki.branchable.com/?p=source.git">
+        2020
       </a>
     </td>
     <td>
-      Git, Mercurial, Darcs, svn, bzr, monotone, tla, cvs
+      git, Mercurial, Darcs, svn, bzr, monotone, tla, cvs
     <td>
-      <ul>
-        <li>
-          The wiki can be used as an issue tracker (see
-          <a href="http://ikiwiki.info/bugs/">ikiwiki</a> or
-          <a href="https://git-annex.branchable.com/bugs/">git-annex</a>
-        </li>
-      </ul>
+      The wiki can be used as an issue tracker (see
+      <a href="http://ikiwiki.info/bugs/">ikiwiki</a> or
+      <a href="https://git-annex.branchable.com/bugs/">git-annex</a>)
+    </td>
+    <td>
+      web UI, markdown files
     </td>
   </tr>
 

diff --git a/software.mdwn b/software.mdwn
index 8c3a97a..5fc68d6 100644
--- a/software.mdwn
+++ b/software.mdwn
@@ -92,9 +92,10 @@ the VCS is used as the transport.
 
   <tr>
     <td><a href="https://gitlab.com/monnier/bugit">BuGit</a></td>
-    <td><a href="https://gitlab.com/monnier/bugit/commit/381a3e816b93895fb10ae861243ad26e37d060d2">2016</a></td>
-    <td>Git</td>
+    <td><a href="https://gitlab.com/monnier/bugit/-/commits/master">2016</a></td>
+    <td>git</td>
     <td>Each issue is a Git branch.  Git takes care of 99% the merging job</td>
+    <td>CLI, web view (CGI, read-only)</td>
   </tr>
 
   <tr>

diff --git a/software.mdwn b/software.mdwn
index a9dcbee..8c3a97a 100644
--- a/software.mdwn
+++ b/software.mdwn
@@ -78,15 +78,16 @@ the VCS is used as the transport.
 
   <tr>
     <td><a href="https://pythonhosted.org/pyditz/">PyDitz</a></td>
-    <td><a href="https://bitbucket.org/zondo/pyditz/commits/all">2017</a></td>
-    <td>Git</td>
+    <td><a href="https://bitbucket.org/zondo/pyditz/commits/">2019</a></td>
+    <td>git</td>
     <td>PyDitz maintains an <a href="https://pythonhosted.org/pyditz/intro.html#the-pd-data-model">issue database directory</a> on disk, with files written in a line-based and human-editable format. This directory can be:
      <ul>
      <li>under version control in-branch alongside project code</li>
      <li>under version control on a separate branch</li>
      <li>optionally excluded from version control</li>
      </ul>
-  </td>
+    </td>
+    <td>CLI, html export</td>
   </tr>
 
   <tr>

diff --git a/software.mdwn b/software.mdwn
index 44713d5..a9dcbee 100644
--- a/software.mdwn
+++ b/software.mdwn
@@ -60,8 +60,8 @@ the VCS is used as the transport.
   <tr>
     <td><a href="https://github.com/neithernut/git-dit/">git-dit</a></td>
     <td class="active-project">
-      <a href="https://github.com/neithernut/git-dit/releases/tag/v0.4.0">
-        2017
+      <a href="https://github.com/neithernut/git-dit/commits/master">
+        2020
       </a>
     </td>
     <td>git</td>
@@ -73,6 +73,7 @@ the VCS is used as the transport.
         <li>The tree is hung by references in a namespace.</li>
       </ul>
     </td>
+    <td>CLI</td>
   </tr>
 
   <tr>

diff --git a/software.mdwn b/software.mdwn
index afffeb6..44713d5 100644
--- a/software.mdwn
+++ b/software.mdwn
@@ -54,6 +54,7 @@ the VCS is used as the transport.
     <td>
       Items (issue and other artifacts) are file(s) under .sit dir. File format(s) and user-editability TBD.
     </td>
+    <td>CLI, web UI</td>
   </tr>
 
   <tr>

diff --git a/software.mdwn b/software.mdwn
index bf91b95..afffeb6 100644
--- a/software.mdwn
+++ b/software.mdwn
@@ -97,12 +97,13 @@ the VCS is used as the transport.
   <tr>
     <td><a href="http://www.fossil-scm.org/">Fossil</a></td>
     <td class="active-project">
-      <a href="http://www.fossil-scm.org/index.html/info/259e3a0fd6c7ac69">
-        2015
+      <a href="https://fossil-scm.org/home/fileage">
+        2020
       </a>
     </td>
-    <td>N/A Fossil is a VCS</td>
-    <td></td>
+    <td>Fossil is a VCS, bug tracker and wiki integrated</td>
+    <td>SQLite</td>
+    <td>CLI, web UI</td>
   </tr>
 
   <tr>

diff --git a/software.mdwn b/software.mdwn
index 5ae4bd0..bf91b95 100644
--- a/software.mdwn
+++ b/software.mdwn
@@ -21,8 +21,28 @@ the VCS is used as the transport.
     <!-- Consistant popularity sorting -->
     <th>Supported VCS's</th>
     <th>Data Format</th>
+    <th>UI, integration</th>
   <tr>
 
+  <tr>
+    <td><a href="https://github.com/MichaelMure/git-bug/">git-bug</a></td>
+    <td class="active-project">
+      <a href="https://github.com/MichaelMure/git-bug/commits/master">
+        2020
+      </a>
+    </td>
+    <td>git</td>
+    <td>
+      <ul>
+        <li><a href="https://github.com/MichaelMure/git-bug/blob/master/doc/model.md">reference</a>
+        <li>A bug is a branch.
+        <li>A state transition is a commit.
+        <li>A commit contains JSON files, and metadata stored in filenames of empty files.
+      </ul>
+    </td>
+    <td>CLI, terminal UI, web UI, push/pull bridge to gitlab/launchpad/JIRA/github</td>
+  </tr>
+
   <tr>
     <td><a href="https://github.com/sit-fyi/sit">sit</a></td>
     <td class="active-project">

diff --git a/software.mdwn b/software.mdwn
index 4b859a3..5ae4bd0 100644
--- a/software.mdwn
+++ b/software.mdwn
@@ -24,6 +24,19 @@ the VCS is used as the transport.
   <tr>
 
   <tr>
+    <td><a href="https://github.com/sit-fyi/sit">sit</a></td>
+    <td class="active-project">
+      <a href="https://github.com/sit-fyi/sit/commits/master">
+        2018
+      </a>
+    </td>
+    <td>git, (vcs agnostic others TBD)</td>
+    <td>
+      Items (issue and other artifacts) are file(s) under .sit dir. File format(s) and user-editability TBD.
+    </td>
+  </tr>
+
+  <tr>
     <td><a href="https://github.com/neithernut/git-dit/">git-dit</a></td>
     <td class="active-project">
       <a href="https://github.com/neithernut/git-dit/releases/tag/v0.4.0">

diff --git a/software.mdwn b/software.mdwn
index 29d4328..4b859a3 100644
--- a/software.mdwn
+++ b/software.mdwn
@@ -42,6 +42,19 @@ the VCS is used as the transport.
   </tr>
 
   <tr>
+    <td><a href="https://pythonhosted.org/pyditz/">PyDitz</a></td>
+    <td><a href="https://bitbucket.org/zondo/pyditz/commits/all">2017</a></td>
+    <td>Git</td>
+    <td>PyDitz maintains an <a href="https://pythonhosted.org/pyditz/intro.html#the-pd-data-model">issue database directory</a> on disk, with files written in a line-based and human-editable format. This directory can be:
+     <ul>
+     <li>under version control in-branch alongside project code</li>
+     <li>under version control on a separate branch</li>
+     <li>optionally excluded from version control</li>
+     </ul>
+  </td>
+  </tr>
+
+  <tr>
     <td><a href="https://gitlab.com/monnier/bugit">BuGit</a></td>
     <td><a href="https://gitlab.com/monnier/bugit/commit/381a3e816b93895fb10ae861243ad26e37d060d2">2016</a></td>
     <td>Git</td>

diff --git a/software.mdwn b/software.mdwn
index 54a8fa3..29d4328 100644
--- a/software.mdwn
+++ b/software.mdwn
@@ -205,6 +205,38 @@ the VCS is used as the transport.
   <tr>
 </table>
 
+### Using distributed publishing / messaging networks
+
+<table>
+  <tr>
+    <th>Name</th>
+
+    <!-- The table is roughly sorted by this field, this should represent
+    active use, more than development, but this is harder to judge. In any
+    case, link to source when modifying -->
+    <th>Active (last active)</th>
+
+    <!-- Consistant popularity sorting -->
+    <th>Supported VCS's</th>
+    <th>Data Format</th>
+  <tr>
+
+  <tr>
+    <td><a href="https://www.npmjs.com/package/git-ssb-web">git-ssb-web</a> / <br>
+        <a href="https://www.npmjs.com/package/git-ssb">git-ssb</a> / <br>
+        <a href="https://www.npmjs.com/package/ssb-issues">ssb-issues</a>
+    </td>
+    <td>2017</td>
+    <td>git</td>
+    <td>
+      <ul>
+        <li><a href="https://www.npmjs.com/package/ssb-issues">ssb-issues</a> structured messages on the <a href="https://www.scuttlebutt.nz/">Secure Scuttlebutt</a> (SSB) distributed social network</li>
+        <li>open/closed status</li>
+        <li>rich text messages (a markdown) that can refer to and be referred to from git pushes and normal SSB messages</li>
+      </ul>
+  </tr>
+</table>
+
 ### Multi-BTS (data replicating) Systems
 
 These systems allow bugs to be tracked in multiple (non-distributed) BTSs,

diff --git a/software.mdwn b/software.mdwn
index 18c2d1f..54a8fa3 100644
--- a/software.mdwn
+++ b/software.mdwn
@@ -26,7 +26,7 @@ the VCS is used as the transport.
   <tr>
     <td><a href="https://github.com/neithernut/git-dit/">git-dit</a></td>
     <td class="active-project">
-      <a href="https://github.com/neithernut/git-dit/releases/tag/v0.3.0">
+      <a href="https://github.com/neithernut/git-dit/releases/tag/v0.4.0">
         2017
       </a>
     </td>

diff --git a/software.mdwn b/software.mdwn
index ba66e8c..18c2d1f 100644
--- a/software.mdwn
+++ b/software.mdwn
@@ -26,7 +26,7 @@ the VCS is used as the transport.
   <tr>
     <td><a href="https://github.com/neithernut/git-dit/">git-dit</a></td>
     <td class="active-project">
-      <a href="https://github.com/neithernut/git-dit/releases/tag/v0.2.0">
+      <a href="https://github.com/neithernut/git-dit/releases/tag/v0.3.0">
         2017
       </a>
     </td>

diff --git a/software.mdwn b/software.mdwn
index 466a928..ba66e8c 100644
--- a/software.mdwn
+++ b/software.mdwn
@@ -42,6 +42,13 @@ the VCS is used as the transport.
   </tr>
 
   <tr>
+    <td><a href="https://gitlab.com/monnier/bugit">BuGit</a></td>
+    <td><a href="https://gitlab.com/monnier/bugit/commit/381a3e816b93895fb10ae861243ad26e37d060d2">2016</a></td>
+    <td>Git</td>
+    <td>Each issue is a Git branch.  Git takes care of 99% the merging job</td>
+  </tr>
+
+  <tr>
     <td><a href="http://www.fossil-scm.org/">Fossil</a></td>
     <td class="active-project">
       <a href="http://www.fossil-scm.org/index.html/info/259e3a0fd6c7ac69">

diff --git a/software.mdwn b/software.mdwn
index a1a4512..466a928 100644
--- a/software.mdwn
+++ b/software.mdwn
@@ -35,8 +35,8 @@ the VCS is used as the transport.
       <ul>
         <li>An issue is a tree of messages.</li>
         <li>Each message is stored as the message of an empty commit.</li>
-        <li>Metadata is stores as trailers/git-tags in the message.</tl>
-        <li>The tree is hung by references in a namespace.</tl>
+        <li>Metadata is stores as trailers/git-tags in the message.</li>
+        <li>The tree is hung by references in a namespace.</li>
       </ul>
     </td>
   </tr>

diff --git a/software.mdwn b/software.mdwn
index 5bff512..a1a4512 100644
--- a/software.mdwn
+++ b/software.mdwn
@@ -35,8 +35,8 @@ the VCS is used as the transport.
       <ul>
         <li>An issue is a tree of messages.</li>
         <li>Each message is stored as the message of an empty commit.</li>
-        <li>Metadata is stores as trailers/git-tags in the message.</td>
-        <li>The tree is hung by references in a namespace.</td>
+        <li>Metadata is stores as trailers/git-tags in the message.</tl>
+        <li>The tree is hung by references in a namespace.</tl>
       </ul>
     </td>
   </tr>

diff --git a/software.mdwn b/software.mdwn
index 111329f..5bff512 100644
--- a/software.mdwn
+++ b/software.mdwn
@@ -24,6 +24,24 @@ the VCS is used as the transport.
   <tr>
 
   <tr>
+    <td><a href="https://github.com/neithernut/git-dit/">git-dit</a></td>
+    <td class="active-project">
+      <a href="https://github.com/neithernut/git-dit/releases/tag/v0.2.0">
+        2017
+      </a>
+    </td>
+    <td>git</td>
+    <td>
+      <ul>
+        <li>An issue is a tree of messages.</li>
+        <li>Each message is stored as the message of an empty commit.</li>
+        <li>Metadata is stores as trailers/git-tags in the message.</td>
+        <li>The tree is hung by references in a namespace.</td>
+      </ul>
+    </td>
+  </tr>
+
+  <tr>
     <td><a href="http://www.fossil-scm.org/">Fossil</a></td>
     <td class="active-project">
       <a href="http://www.fossil-scm.org/index.html/info/259e3a0fd6c7ac69">

diff --git a/software.mdwn b/software.mdwn
index 74a0877..111329f 100644
--- a/software.mdwn
+++ b/software.mdwn
@@ -165,6 +165,19 @@ the VCS is used as the transport.
     </td>
   </tr>
 
+  <tr>
+    <td><a href="http://www.digitalgemstones.com/projects/b/">b</a></td>
+
+    <!-- The table is roughly sorted by this field, this should represent
+    active use, more than development, but this is harder to judge. In any
+    case, link to source when modifying -->
+    <td><a href="https://bitbucket.org/dimo414/b/src/default/src/">2012</a></td>
+
+    <!-- Consistant popularity sorting -->
+    <td>Mercurial</td>
+    <td>Bugs stored with code. Index in <tt>.bugs/bugs</tt>, each bug is a file in <tt>.bugs/details/<em>SHA1-id</em>.txt</tt><br>
+        <tt>.bugs/bugs</tt> has timestamps on each line; Can Mercurial use this to automatically resolve conflicts, like git-annex does in its metadata branch?</td>
+  <tr>
 </table>
 
 ### Multi-BTS (data replicating) Systems

diff --git a/software.mdwn b/software.mdwn
index 84d00fd..74a0877 100644
--- a/software.mdwn
+++ b/software.mdwn
@@ -144,6 +144,27 @@ the VCS is used as the transport.
     <td class="inactive-project"></td>
     <td></td>
   </tr>
+
+  <tr>
+    <td><a href="https://www.gitano.org.uk/ideas/git-pull-request/">git-pull-request</a></td>
+    <td class="inactive-project">
+      <a href="https://git.gitano.org.uk/git-pull-request.git/commit/?id=0e60a1538e05d331d2f544ca63c6f7cb318824de">
+        2012
+      </a>
+    </td>
+    <td>
+      Git
+    <td>
+      Take the below with a pinch of salt, it's gleaned from a brief look at the bash script:
+      <ul>
+        <li>Pull requests are pairs of branches in a special namespace.</li>
+        <li>One branch holds the actual commit to be merged, one holds metadata.</li>
+        <li>Metadata can include attachments.</li>
+        <li>Comments are commit messages on the metadata branch.</li>
+      </ul>
+    </td>
+  </tr>
+
 </table>
 
 ### Multi-BTS (data replicating) Systems

diff --git a/software.mdwn b/software.mdwn
index 8cf85ef..84d00fd 100644
--- a/software.mdwn
+++ b/software.mdwn
@@ -24,7 +24,7 @@ the VCS is used as the transport.
   <tr>
 
   <tr>
-    <td>Fossil</td>
+    <td><a href="http://www.fossil-scm.org/">Fossil</a></td>
     <td class="active-project">
       <a href="http://www.fossil-scm.org/index.html/info/259e3a0fd6c7ac69">
         2015

diff --git a/software.mdwn b/software.mdwn
index 8fc0421..8cf85ef 100644
--- a/software.mdwn
+++ b/software.mdwn
@@ -9,32 +9,142 @@ and in some cases allows bug status to follow branches and merges.
 These are distributed in the sense that the VCS is often a distributed VCS;
 the VCS is used as the transport.
 
-* [Artemis](http://www.mrzv.org/software/artemis/) (Mercurial extension)
-* [Yodiz Bug Tracker](http://issuetracker.yodiz.com/) (Subversion , Visual Board , GIT , Mercurial , Uservoice , Zendesk , Happy Fox , Fresh Desk ,Firefox plugin to report bugs )
-* [Artifacts for Web](http://www.versioned.com/artifacts/web/) (Subversion, web UI in pure javascript)
-* [Bugs Everywhere](http://bugseverywhere.org/be/show/HomePage) (Git,
-  Bazaar, Mercurial, RCS, Arch)
-* [BugClipper](http://www.bugclipper.com) (Bug tracker for mobile apps.)
-* [cil](http://kapiti.geek.nz/software/cil.html) (Command-line issue tracker with some git integration for closing bugs on commit)
-* [dbug](http://www.stackfoundry.com/dbug/)
-* [DisTract](http://www.distract.wellquite.org/) (Monotone)
-* [DITrack](http://www.ditrack.org/) (Subversion; mentions that it should be possible to port it to a distributed version control system, but their use of numbers does not allow it without some redesign.)
-* [Ditz](http://ditz.rubyforge.org/) (VCS agnostic)
-* [Fossil](http://www.fossil-scm.org/) (a version control system with
-  integrated bug tracker)
-* [Git Issues](http://github.com/ktf/git-issues/tree/master) (Git)
-* [[people/bartman/git-case]] (Git) by [[people/bartman]]
-* [ikiwiki](http://ikiwiki.info/) (wiki uses VCS; bugs are plain pages)
-* [milli](http://www.steve.org.uk/Software/milli/) (VCS agnostic)
-* [Nitpick](http://travisbrown.ca/projects/nitpick/docs/nitpick.html) (VCS Agnostic)
-* [Scmbug](http://www.mkgnu.net/?q=scmbug) (glues together
-  VCS and other bug tracking software, such as Bugzilla)
-* [Stick](http://www.eharning.us/wiki/stick/) (git)
-* [TicGit](https://github.com/schacon/ticgit/wikis) / [TicGit-NG](https://github.com/jeffWelling/ticgit/) / [TicGit.net](https://github.com/henon/TicGit.net) (Git)
-* [Zoho BugTracker](http://www.zoho.com/bugtracker/)
+<table>
+  <tr>
+    <th>Name</th>
+
+    <!-- The table is roughly sorted by this field, this should represent
+    active use, more than development, but this is harder to judge. In any
+    case, link to source when modifying -->
+    <th>Active (last active)</th>
+
+    <!-- Consistant popularity sorting -->
+    <th>Supported VCS's</th>
+    <th>Data Format</th>
+  <tr>
+
+  <tr>
+    <td>Fossil</td>
+    <td class="active-project">
+      <a href="http://www.fossil-scm.org/index.html/info/259e3a0fd6c7ac69">
+        2015
+      </a>
+    </td>
+    <td>N/A Fossil is a VCS</td>
+    <td></td>
+  </tr>
+
+  <tr>
+    <td><a href="http://ikiwiki.info/">ikiwiki</a></td>
+    <td class="active-project">
+      <a href="http://source.ikiwiki.branchable.com/?p=source.git;a=commit;h=729991564ec7e1116fc023c51e73b47af8b6fce7">
+        2015
+      </a>
+    </td>
+    <td>
+      Git, Mercurial, Darcs, svn, bzr, monotone, tla, cvs
+    <td>
+      <ul>
+        <li>
+          The wiki can be used as an issue tracker (see
+          <a href="http://ikiwiki.info/bugs/">ikiwiki</a> or
+          <a href="https://git-annex.branchable.com/bugs/">git-annex</a>
+        </li>
+      </ul>
+    </td>
+  </tr>
+
+  <tr>
+    <td><a href="https://github.com/jeffWelling/ticgit">TicGit-ng</a></td>
+    <td class="inactive-project">
+      <a href="https://github.com/jeffWelling/ticgit/commit/b9b1db477d26b8063a67d761aaadf80abfb6d4ae">
+        2014
+      </a>
+    </td>
+    <td></td>
+  </tr>
+
+  <tr>
+    <td><a href="http://bugseverywhere.org/">Bugs Everywhere</a></td>
+    <td class="inactive-project">
+      <a href="https://gitorious.org/be/be/commit/49808306c939de24acabc423024970a76055e52b">
+        2013
+      </a>
+    </td>
+    <td>Git, Bazaar, Mercurial, RCS, Arch</td>
+    <td>
+      <ul>
+        <li>
+          Issues stored in the relevant branch in the repository, supports
+          merging issues.
+        </li>
+      </ul>
+    </td>
+  </tr>
 
-TODO: Compare and contrast how the data is stored in version control,
-how bug states are merged, etc.
+  <tr>
+    <td><a href="http://www.mrzv.org/software/artemis/">Artemis</a></td>
+    <td class="inactive-project">
+      <a href="http://hg.mrzv.org/Artemis/rev/06875c471689">
+        2012
+      </a>
+    </td>
+    <td>
+      Mercurial
+    </td>
+    <td>
+      <ul>
+        <li>
+          Individual issues are stored in directories in an .issues
+          subdirectory (overridable in a config file
+        </li>
+      </ul>
+    </td>
+  </tr>
+
+  <tr>
+    <td><a href="http://kapiti.geek.nz/software/cil.html">cli</a>
+    <!-- Link broken as of 03/2015) -->
+    </td>
+    <td class="inactive-project"></td>
+    <td></td>
+  </tr>
+
+  <tr>
+    <td><a href="http://ditz.rubyforge.org/">Ditz</a></td>
+    <td class="inactive-project"></td>
+    <td></td>
+  </tr>
+
+  <tr>
+    <td><a href="https://github.com/ktf/git-issues">Git Issues</a></td>
+    <td class="inactive-project">
+      <a href="https://github.com/ktf/git-issues/commit/57281f8b346cffd8f2574fe1f5c17fe1916afb80">
+        2008
+      </a>
+    </td>
+    <td></td>
+  </tr>
+
+  <tr>
+    <td><a href="../people/bartman/git-case">git-case</a></td>
+    <td class="inactive-project"></td>
+    <td></td>
+  </tr>
+
+  <tr>
+    <td><a
+    href="http://travisbrown.ca/projects/nitpick/docs/nitpick.html">Nitpick</a></td>
+    <td class="inactive-project"></td>
+    <td></td>
+  </tr>
+
+  <tr>
+    <td><a href="http://www.eharning.us/wiki/stick/">Stick</a></td>
+    <td class="inactive-project"></td>
+    <td></td>
+  </tr>
+</table>
 
 ### Multi-BTS (data replicating) Systems
 
@@ -65,6 +175,10 @@ Systems in this list don't actually replicate state and history between differen
 
 * [Artifacts](http://www.versioned.com/artifacts/) (Integrated with Visual Studio, VCS agnostic)
 * [Bontq](http://bontq.com) (Subversion)
+* [Yodiz Bug Tracker](http://issuetracker.yodiz.com/) (Subversion , Visual Board , GIT , Mercurial , Uservoice , Zendesk , Happy Fox , Fresh Desk ,Firefox plugin to report bugs )
+* [Artifacts for Web](http://www.versioned.com/artifacts/web/) (Subversion, web UI in pure javascript)
+* [BugClipper](http://www.bugclipper.com) (Bug tracker for mobile apps.)
+* [Zoho BugTracker](http://www.zoho.com/bugtracker/)
 
 ### Uncategorized
 

diff --git a/software.mdwn b/software.mdwn
index 3f95dbf..8fc0421 100644
--- a/software.mdwn
+++ b/software.mdwn
@@ -14,6 +14,7 @@ the VCS is used as the transport.
 * [Artifacts for Web](http://www.versioned.com/artifacts/web/) (Subversion, web UI in pure javascript)
 * [Bugs Everywhere](http://bugseverywhere.org/be/show/HomePage) (Git,
   Bazaar, Mercurial, RCS, Arch)
+* [BugClipper](http://www.bugclipper.com) (Bug tracker for mobile apps.)
 * [cil](http://kapiti.geek.nz/software/cil.html) (Command-line issue tracker with some git integration for closing bugs on commit)
 * [dbug](http://www.stackfoundry.com/dbug/)
 * [DisTract](http://www.distract.wellquite.org/) (Monotone)

diff --git a/software.mdwn b/software.mdwn
index 2eccbf5..3f95dbf 100644
--- a/software.mdwn
+++ b/software.mdwn
@@ -10,7 +10,7 @@ These are distributed in the sense that the VCS is often a distributed VCS;
 the VCS is used as the transport.
 
 * [Artemis](http://www.mrzv.org/software/artemis/) (Mercurial extension)
-* [Yodiz BugTracker](http://issuetracker.yodiz.com/) (Subversion , Visual Board , GIT , Mercurial , Uservoice , Zendesk , Happy Fox , Fresh Desk ,Firefox plugin to report bugs )
+* [Yodiz Bug Tracker](http://issuetracker.yodiz.com/) (Subversion , Visual Board , GIT , Mercurial , Uservoice , Zendesk , Happy Fox , Fresh Desk ,Firefox plugin to report bugs )
 * [Artifacts for Web](http://www.versioned.com/artifacts/web/) (Subversion, web UI in pure javascript)
 * [Bugs Everywhere](http://bugseverywhere.org/be/show/HomePage) (Git,
   Bazaar, Mercurial, RCS, Arch)

diff --git a/software.mdwn b/software.mdwn
index 3f95dbf..2eccbf5 100644
--- a/software.mdwn
+++ b/software.mdwn
@@ -10,7 +10,7 @@ These are distributed in the sense that the VCS is often a distributed VCS;
 the VCS is used as the transport.
 
 * [Artemis](http://www.mrzv.org/software/artemis/) (Mercurial extension)
-* [Yodiz Bug Tracker](http://issuetracker.yodiz.com/) (Subversion , Visual Board , GIT , Mercurial , Uservoice , Zendesk , Happy Fox , Fresh Desk ,Firefox plugin to report bugs )
+* [Yodiz BugTracker](http://issuetracker.yodiz.com/) (Subversion , Visual Board , GIT , Mercurial , Uservoice , Zendesk , Happy Fox , Fresh Desk ,Firefox plugin to report bugs )
 * [Artifacts for Web](http://www.versioned.com/artifacts/web/) (Subversion, web UI in pure javascript)
 * [Bugs Everywhere](http://bugseverywhere.org/be/show/HomePage) (Git,
   Bazaar, Mercurial, RCS, Arch)

diff --git a/software.mdwn b/software.mdwn
index 10bf69e..3f95dbf 100644
--- a/software.mdwn
+++ b/software.mdwn
@@ -10,7 +10,7 @@ These are distributed in the sense that the VCS is often a distributed VCS;
 the VCS is used as the transport.
 
 * [Artemis](http://www.mrzv.org/software/artemis/) (Mercurial extension)
-* [Yodiz](http://issuetracker.yodiz.com/) (Subversion , Visual Board , GIT , Mercurial , Uservoice , Zendesk , Happy Fox , Fresh Desk ,Firefox plugin to report bugs )
+* [Yodiz Bug Tracker](http://issuetracker.yodiz.com/) (Subversion , Visual Board , GIT , Mercurial , Uservoice , Zendesk , Happy Fox , Fresh Desk ,Firefox plugin to report bugs )
 * [Artifacts for Web](http://www.versioned.com/artifacts/web/) (Subversion, web UI in pure javascript)
 * [Bugs Everywhere](http://bugseverywhere.org/be/show/HomePage) (Git,
   Bazaar, Mercurial, RCS, Arch)

diff --git a/software.mdwn b/software.mdwn
index d043e15..10bf69e 100644
--- a/software.mdwn
+++ b/software.mdwn
@@ -10,6 +10,7 @@ These are distributed in the sense that the VCS is often a distributed VCS;
 the VCS is used as the transport.
 
 * [Artemis](http://www.mrzv.org/software/artemis/) (Mercurial extension)
+* [Yodiz](http://issuetracker.yodiz.com/) (Subversion , Visual Board , GIT , Mercurial , Uservoice , Zendesk , Happy Fox , Fresh Desk ,Firefox plugin to report bugs )
 * [Artifacts for Web](http://www.versioned.com/artifacts/web/) (Subversion, web UI in pure javascript)
 * [Bugs Everywhere](http://bugseverywhere.org/be/show/HomePage) (Git,
   Bazaar, Mercurial, RCS, Arch)

diff --git a/software.mdwn b/software.mdwn
index 6888450..d043e15 100644
--- a/software.mdwn
+++ b/software.mdwn
@@ -24,6 +24,7 @@ the VCS is used as the transport.
 * [[people/bartman/git-case]] (Git) by [[people/bartman]]
 * [ikiwiki](http://ikiwiki.info/) (wiki uses VCS; bugs are plain pages)
 * [milli](http://www.steve.org.uk/Software/milli/) (VCS agnostic)
+* [Nitpick](http://travisbrown.ca/projects/nitpick/docs/nitpick.html) (VCS Agnostic)
 * [Scmbug](http://www.mkgnu.net/?q=scmbug) (glues together
   VCS and other bug tracking software, such as Bugzilla)
 * [Stick](http://www.eharning.us/wiki/stick/) (git)

diff --git a/software.mdwn b/software.mdwn
index 3b68f86..6888450 100644
--- a/software.mdwn
+++ b/software.mdwn
@@ -64,3 +64,5 @@ Systems in this list don't actually replicate state and history between differen
 * [Bontq](http://bontq.com) (Subversion)
 
 ### Uncategorized
+
+* [App::SD](http://search.cpan.org/dist/App-SD/)

diff --git a/software.mdwn b/software.mdwn
index 7cb7ad6..3b68f86 100644
--- a/software.mdwn
+++ b/software.mdwn
@@ -28,7 +28,7 @@ the VCS is used as the transport.
   VCS and other bug tracking software, such as Bugzilla)
 * [Stick](http://www.eharning.us/wiki/stick/) (git)
 * [TicGit](https://github.com/schacon/ticgit/wikis) / [TicGit-NG](https://github.com/jeffWelling/ticgit/) / [TicGit.net](https://github.com/henon/TicGit.net) (Git)
-* [ZohoBugTracker](http://www.zoho.com/bugtracker/)
+* [Zoho BugTracker](http://www.zoho.com/bugtracker/)
 
 TODO: Compare and contrast how the data is stored in version control,
 how bug states are merged, etc.

diff --git a/software.mdwn b/software.mdwn
index 6e3bfe2..7cb7ad6 100644
--- a/software.mdwn
+++ b/software.mdwn
@@ -28,6 +28,7 @@ the VCS is used as the transport.
   VCS and other bug tracking software, such as Bugzilla)
 * [Stick](http://www.eharning.us/wiki/stick/) (git)
 * [TicGit](https://github.com/schacon/ticgit/wikis) / [TicGit-NG](https://github.com/jeffWelling/ticgit/) / [TicGit.net](https://github.com/henon/TicGit.net) (Git)
+* [ZohoBugTracker](http://www.zoho.com/bugtracker/)
 
 TODO: Compare and contrast how the data is stored in version control,
 how bug states are merged, etc.

diff --git a/index.mdwn b/index.mdwn
index 6066baf..9332ce2 100644
--- a/index.mdwn
+++ b/index.mdwn
@@ -1,7 +1,7 @@
 The aim of the dist-bugs project is to investigate and develop distributed
 bug tracking systems. We bring together [[people]] interested in breaking
 bugs out of their centralised data silos.
-\\
+
 We want it to be possible to manipulate bug reports offline, just as DVCS
 allows committing to code while offline. We want forks of a project to
 automatically also fork -- and share back -- their bugs. We want bugs

diff --git a/index.mdwn b/index.mdwn
index 7780837..6066baf 100644
--- a/index.mdwn
+++ b/index.mdwn
@@ -21,7 +21,6 @@ project.
 * [[dist-bugs_people|people]]
 * [[software]]
 * [[use-cases]]
-* browse this web site’s [Git repository](http://git.kitenet.net/?p=dist-bugs.git;a=summary)
 
 ## Links
 

diff --git a/.gitignore b/.gitignore
new file mode 100644
index 0000000..b84c806
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1,2 @@
+/.ikiwiki
+/recentchanges

diff --git a/index.mdwn b/index.mdwn
index 63f92f5..7780837 100644
--- a/index.mdwn
+++ b/index.mdwn
@@ -1,7 +1,7 @@
 The aim of the dist-bugs project is to investigate and develop distributed
 bug tracking systems. We bring together [[people]] interested in breaking
 bugs out of their centralised data silos.
-
+\\
 We want it to be possible to manipulate bug reports offline, just as DVCS
 allows committing to code while offline. We want forks of a project to
 automatically also fork -- and share back -- their bugs. We want bugs

diff --git a/use-cases.mdwn b/use-cases.mdwn
index 34bec60..a146c66 100644
--- a/use-cases.mdwn
+++ b/use-cases.mdwn
@@ -20,8 +20,8 @@ Users, use-cases, and other tools for discussing how distributed bug tracking sh
   access during these time slots, or indeed all day.
 
 * **Cecil** is a user of Amanda's software. He has no computer
-  expertese at all: he's a Mac user and the one time he saw a
-  command line, he paniced and ran out of the room. He's smart,
+  expertise at all: he's a Mac user and the one time he saw a
+  command line, he panicked and ran out of the room. He's smart,
   though, and is perfectly able to follow instructions and
   generally his bug reports are of high quality, after the
   developer's ask him to provide the exact data they require, and

diff --git a/software.mdwn b/software.mdwn
index 99c7348..6e3bfe2 100644
--- a/software.mdwn
+++ b/software.mdwn
@@ -27,7 +27,7 @@ the VCS is used as the transport.
 * [Scmbug](http://www.mkgnu.net/?q=scmbug) (glues together
   VCS and other bug tracking software, such as Bugzilla)
 * [Stick](http://www.eharning.us/wiki/stick/) (git)
-* [TicGit](http://github.com/schacon/ticgit/wikis) / [TicGit-NG](http://github.com/jeffWelling/ticgit/) (Git)
+* [TicGit](https://github.com/schacon/ticgit/wikis) / [TicGit-NG](https://github.com/jeffWelling/ticgit/) / [TicGit.net](https://github.com/henon/TicGit.net) (Git)
 
 TODO: Compare and contrast how the data is stored in version control,
 how bug states are merged, etc.

diff --git a/people/Jeff_Welling.mdwn b/people/Jeff_Welling.mdwn
new file mode 100644
index 0000000..fe65aa3
--- /dev/null
+++ b/people/Jeff_Welling.mdwn
@@ -0,0 +1,3 @@
+Developer of TicGit-ng.  
+TicGit-ng          [[https://github.com/jeffWelling/ticgit]]  
+My Github Page     [[https://github.com/jeffWelling]]  

diff --git a/software.mdwn b/software.mdwn
index 8359b2f..99c7348 100644
--- a/software.mdwn
+++ b/software.mdwn
@@ -16,7 +16,7 @@ the VCS is used as the transport.
 * [cil](http://kapiti.geek.nz/software/cil.html) (Command-line issue tracker with some git integration for closing bugs on commit)
 * [dbug](http://www.stackfoundry.com/dbug/)
 * [DisTract](http://www.distract.wellquite.org/) (Monotone)
-* [DITrack](http://www.ditrack.org/) (Subversion)
+* [DITrack](http://www.ditrack.org/) (Subversion; mentions that it should be possible to port it to a distributed version control system, but their use of numbers does not allow it without some redesign.)
 * [Ditz](http://ditz.rubyforge.org/) (VCS agnostic)
 * [Fossil](http://www.fossil-scm.org/) (a version control system with
   integrated bug tracker)
@@ -32,10 +32,6 @@ the VCS is used as the transport.
 TODO: Compare and contrast how the data is stored in version control,
 how bug states are merged, etc.
 
-#### Notes:
-
-* [DITrack](http://www.ditrack.org/) mentions that it should be possible to port it to a distributed version control system, but their use of numbers does not allow it without some redesign.
-
 ### Multi-BTS (data replicating) Systems
 
 These systems allow bugs to be tracked in multiple (non-distributed) BTSs,

diff --git a/software.mdwn b/software.mdwn
index 3ee734b..8359b2f 100644
--- a/software.mdwn
+++ b/software.mdwn
@@ -64,6 +64,6 @@ Systems in this list don't actually replicate state and history between differen
 ### Hosted and Commercial Solutions
 
 * [Artifacts](http://www.versioned.com/artifacts/) (Integrated with Visual Studio, VCS agnostic)
-* [Bontq](http://bontq.com) (subversion)
+* [Bontq](http://bontq.com) (Subversion)
 
 ### Uncategorized

diff --git a/software.mdwn b/software.mdwn
index 1d82b04..3ee734b 100644
--- a/software.mdwn
+++ b/software.mdwn
@@ -10,7 +10,6 @@ These are distributed in the sense that the VCS is often a distributed VCS;
 the VCS is used as the transport.
 
 * [Artemis](http://www.mrzv.org/software/artemis/) (Mercurial extension)
-* [Artifacts](http://www.versioned.com/artifacts/) (Integrated with Visual Studio, VCS agnostic)
 * [Artifacts for Web](http://www.versioned.com/artifacts/web/) (Subversion, web UI in pure javascript)
 * [Bugs Everywhere](http://bugseverywhere.org/be/show/HomePage) (Git,
   Bazaar, Mercurial, RCS, Arch)
@@ -64,6 +63,7 @@ Systems in this list don't actually replicate state and history between differen
 
 ### Hosted and Commercial Solutions
 
+* [Artifacts](http://www.versioned.com/artifacts/) (Integrated with Visual Studio, VCS agnostic)
 * [Bontq](http://bontq.com) (subversion)
 
 ### Uncategorized

diff --git a/software.mdwn b/software.mdwn
index dcfc4e6..1d82b04 100644
--- a/software.mdwn
+++ b/software.mdwn
@@ -28,7 +28,7 @@ the VCS is used as the transport.
 * [Scmbug](http://www.mkgnu.net/?q=scmbug) (glues together
   VCS and other bug tracking software, such as Bugzilla)
 * [Stick](http://www.eharning.us/wiki/stick/) (git)
-* [TicGit](http://github.com/schacon/ticgit/wikis) (Git)
+* [TicGit](http://github.com/schacon/ticgit/wikis) / [TicGit-NG](http://github.com/jeffWelling/ticgit/) (Git)
 
 TODO: Compare and contrast how the data is stored in version control,
 how bug states are merged, etc.

diff --git a/software.mdwn b/software.mdwn
index ebcd3b0..dcfc4e6 100644
--- a/software.mdwn
+++ b/software.mdwn
@@ -1,6 +1,6 @@
 A probably incomplete list of distributed BTS software.
 
-### using version control
+### Using Version Control
 
 These store the bugs in a version control system (VCS), along with the software
 that has the bugs. This allows bugs to be closed when a commit is made,
@@ -9,45 +9,45 @@ and in some cases allows bug status to follow branches and merges.
 These are distributed in the sense that the VCS is often a distributed VCS;
 the VCS is used as the transport.
 
-* [Bugs Everywhere](http://bugseverywhere.org/be/show/HomePage) (git,
-  bazaar, mercurial, rcs, arch)
-* [Git Issues](http://github.com/ktf/git-issues/tree/master) (git)
-* [Scmbug](http://www.mkgnu.net/?q=scmbug) (glues together
-  VCS and other bug tracking software, such as bugzilla)
-* [DITrack](http://www.ditrack.org/) (subversion)
+* [Artemis](http://www.mrzv.org/software/artemis/) (Mercurial extension)
+* [Artifacts](http://www.versioned.com/artifacts/) (Integrated with Visual Studio, VCS agnostic)
+* [Artifacts for Web](http://www.versioned.com/artifacts/web/) (Subversion, web UI in pure javascript)
+* [Bugs Everywhere](http://bugseverywhere.org/be/show/HomePage) (Git,
+  Bazaar, Mercurial, RCS, Arch)
+* [cil](http://kapiti.geek.nz/software/cil.html) (Command-line issue tracker with some git integration for closing bugs on commit)
+* [dbug](http://www.stackfoundry.com/dbug/)
+* [DisTract](http://www.distract.wellquite.org/) (Monotone)
+* [DITrack](http://www.ditrack.org/) (Subversion)
+* [Ditz](http://ditz.rubyforge.org/) (VCS agnostic)
 * [Fossil](http://www.fossil-scm.org/) (a version control system with
   integrated bug tracker)
-* [TicGit](http://github.com/schacon/ticgit/wikis) (git)
-* [Ditz](http://ditz.rubyforge.org/) (VCS agnostic)
+* [Git Issues](http://github.com/ktf/git-issues/tree/master) (Git)
+* [[people/bartman/git-case]] (Git) by [[people/bartman]]
 * [ikiwiki](http://ikiwiki.info/) (wiki uses VCS; bugs are plain pages)
-* [[people/bartman]]'s [[people/bartman/git-case]] (git)
-* [DisTract](http://www.distract.wellquite.org/) (monotone)
-* [Stick](http://www.eharning.us/wiki/stick/) (git)
-* [cil](http://kapiti.geek.nz/software/cil.html) (Command-line issue tracker with some git integration for closing bugs on commit)
-* [dbug](http://www.stackfoundry.com/dbug/)
-* [Artifacts](http://www.versioned.com/artifacts/) (Integrated with Visual Studio, VCS agnostic)
-* [Artifacts for Web](http://www.versioned.com/artifacts/web/) (Subversion, web UI in pure javascript)
-* [Artemis](http://www.mrzv.org/software/artemis/) (Mercurial extension)
 * [milli](http://www.steve.org.uk/Software/milli/) (VCS agnostic)
+* [Scmbug](http://www.mkgnu.net/?q=scmbug) (glues together
+  VCS and other bug tracking software, such as Bugzilla)
+* [Stick](http://www.eharning.us/wiki/stick/) (git)
+* [TicGit](http://github.com/schacon/ticgit/wikis) (Git)
 
 TODO: Compare and contrast how the data is stored in version control,
 how bug states are merged, etc.
 
-#### notes:
+#### Notes:
 
 * [DITrack](http://www.ditrack.org/) mentions that it should be possible to port it to a distributed version control system, but their use of numbers does not allow it without some redesign.
 
-### multi-bts (data replicating) systems
+### Multi-BTS (data replicating) Systems
 
 These systems allow bugs to be tracked in multiple (non-distributed) BTSs,
 synchronising state between them.
 
-* [SD](http://github.com/bestpractical/SD) (built on top of the
+* [Simple Defects (SD)](http://github.com/bestpractical/SD) (built on top of the
   [Prophet](http://code.bestpractical.com/project/Prophet) disconnected
   replicated database; can pull/push to RT, Hiveminder, Trac, GitHub,
   and Google Code issue trackers)
 
-### multi-bts (non-replicating) systems
+### Multi-BTS (non-replicating) Systems
 
 Systems in this list don't actually replicate state and history between different systems, they just provide linkage between systems.
 
@@ -62,8 +62,8 @@ Systems in this list don't actually replicate state and history between differen
   ontologies. URI of bugs are then their IDs and eventually resolve to
   canonical URLs of these in a master bugtracker. Bugs can become part of LinkedOpenData.
 
-### hosted and commercial solutions
+### Hosted and Commercial Solutions
 
 * [Bontq](http://bontq.com) (subversion)
 
-### uncategorized
+### Uncategorized

diff --git a/software.mdwn b/software.mdwn
index 9262a13..ebcd3b0 100644
--- a/software.mdwn
+++ b/software.mdwn
@@ -9,7 +9,6 @@ and in some cases allows bug status to follow branches and merges.
 These are distributed in the sense that the VCS is often a distributed VCS;
 the VCS is used as the transport.
 
-* [Bontq](http://bontq.com) (subversion)
 * [Bugs Everywhere](http://bugseverywhere.org/be/show/HomePage) (git,
   bazaar, mercurial, rcs, arch)
 * [Git Issues](http://github.com/ktf/git-issues/tree/master) (git)
@@ -63,4 +62,8 @@ Systems in this list don't actually replicate state and history between differen
   ontologies. URI of bugs are then their IDs and eventually resolve to
   canonical URLs of these in a master bugtracker. Bugs can become part of LinkedOpenData.
 
+### hosted and commercial solutions
+
+* [Bontq](http://bontq.com) (subversion)
+
 ### uncategorized

diff --git a/software.mdwn b/software.mdwn
index 124a6b7..9262a13 100644
--- a/software.mdwn
+++ b/software.mdwn
@@ -9,7 +9,7 @@ and in some cases allows bug status to follow branches and merges.
 These are distributed in the sense that the VCS is often a distributed VCS;
 the VCS is used as the transport.
 
-* [Bontq](http://bontq.com) (svn)
+* [Bontq](http://bontq.com) (subversion)
 * [Bugs Everywhere](http://bugseverywhere.org/be/show/HomePage) (git,
   bazaar, mercurial, rcs, arch)
 * [Git Issues](http://github.com/ktf/git-issues/tree/master) (git)

diff --git a/software.mdwn b/software.mdwn
index 3dc20c7..124a6b7 100644
--- a/software.mdwn
+++ b/software.mdwn
@@ -9,6 +9,7 @@ and in some cases allows bug status to follow branches and merges.
 These are distributed in the sense that the VCS is often a distributed VCS;
 the VCS is used as the transport.
 
+* [Bontq](http://bontq.com) (svn)
 * [Bugs Everywhere](http://bugseverywhere.org/be/show/HomePage) (git,
   bazaar, mercurial, rcs, arch)
 * [Git Issues](http://github.com/ktf/git-issues/tree/master) (git)

diff --git a/index.mdwn b/index.mdwn
index afda185..63f92f5 100644
--- a/index.mdwn
+++ b/index.mdwn
@@ -25,7 +25,8 @@ project.
 
 ## Links
 
-* [Distributed bug tracking article at LWN](http://lwn.net/Articles/281849/)
+* [Distributed bug tracking article at LWN](https://lwn.net/Articles/281849/)
+ * [LWN.net on the SD bug tracker](https://lwn.net/Articles/434922/), [on the Fossil scm with bug tracker](https://lwn.net/Articles/433843/)
 * [Overview](http://community.livejournal.com/evan_tech/248736.html) of
   some existing distributed [bug tracking tools](http://en.wikipedia.org/wiki/Bug_tracking_system).
 * [Bug exchange format](http://blog.liw.fi/posts/bug-exchange-format/)

diff --git a/recentchanges.mdwn b/recentchanges.mdwn
new file mode 100644
index 0000000..3383fc7
--- /dev/null
+++ b/recentchanges.mdwn
@@ -0,0 +1,7 @@
+[[!if test="enabled(meta)" then="""
+[[!meta title="RecentChanges"]]
+"""]]
+Recent changes to this wiki:
+
+[[!inline pages="internal(recentchanges/change_*) and !*/Discussion" 
+template=recentchanges show=0]]

diff --git a/index.mdwn b/index.mdwn
index 2e56083..afda185 100644
--- a/index.mdwn
+++ b/index.mdwn
@@ -27,7 +27,7 @@ project.
 
 * [Distributed bug tracking article at LWN](http://lwn.net/Articles/281849/)
 * [Overview](http://community.livejournal.com/evan_tech/248736.html) of
-  some existing distributed [bug tracking tools](http://www.bontq.com)
+  some existing distributed [bug tracking tools](http://en.wikipedia.org/wiki/Bug_tracking_system).
 * [Bug exchange format](http://blog.liw.fi/posts/bug-exchange-format/)
   draft specification by Lars Wirzenius and Don Armstrong.
 

diff --git a/index.mdwn b/index.mdwn
index e8c2493..2e56083 100644
--- a/index.mdwn
+++ b/index.mdwn
@@ -27,7 +27,7 @@ project.
 
 * [Distributed bug tracking article at LWN](http://lwn.net/Articles/281849/)
 * [Overview](http://community.livejournal.com/evan_tech/248736.html) of
-  some existing distributed bug tracking tools
+  some existing distributed [bug tracking tools](http://www.bontq.com)
 * [Bug exchange format](http://blog.liw.fi/posts/bug-exchange-format/)
   draft specification by Lars Wirzenius and Don Armstrong.
 

diff --git a/news/bof.mdwn b/news/bof.mdwn
index d158fdd..2b37894 100644
--- a/news/bof.mdwn
+++ b/news/bof.mdwn
@@ -2,3 +2,5 @@ There will be a BoF on distributed bug tracking during DebConf10 at
 Colombia University, NYC. August 6th at 4 pm.
 
 <http://penta.debconf.org/dc10_schedule/events/659.en.html>
+
+> See my report at <http://www-public.it-sudparis.eu/~berger_o/weblog/2010/08/12/my-report-after-the-bof-on-distributed-bugtrackers-at-debconf/> -- OlivierBerger

diff --git a/software.mdwn b/software.mdwn
index 700da12..3dc20c7 100644
--- a/software.mdwn
+++ b/software.mdwn
@@ -56,5 +56,10 @@ Systems in this list don't actually replicate state and history between differen
   problem definition, which in turn links to other affected systems that
   use the same CVE ID. It is limited to security holes, and an essential
   difficulty is ensuring that CVEs are both unique and well-specified.
+* RDF profiles of bugs integrated into the BTS (either by content
+  negociation or by inclusion like with RDFa) can help "tag" bugs at
+  different places with same standard properties from compatible
+  ontologies. URI of bugs are then their IDs and eventually resolve to
+  canonical URLs of these in a master bugtracker. Bugs can become part of LinkedOpenData.
 
 ### uncategorized

diff --git a/news/bof.mdwn b/news/bof.mdwn
new file mode 100644
index 0000000..d158fdd
--- /dev/null
+++ b/news/bof.mdwn
@@ -0,0 +1,4 @@
+There will be a BoF on distributed bug tracking during DebConf10 at
+Colombia University, NYC. August 6th at 4 pm.
+
+<http://penta.debconf.org/dc10_schedule/events/659.en.html>

diff --git a/software.mdwn b/software.mdwn
index 4777443..700da12 100644
--- a/software.mdwn
+++ b/software.mdwn
@@ -26,6 +26,7 @@ the VCS is used as the transport.
 * [cil](http://kapiti.geek.nz/software/cil.html) (Command-line issue tracker with some git integration for closing bugs on commit)
 * [dbug](http://www.stackfoundry.com/dbug/)
 * [Artifacts](http://www.versioned.com/artifacts/) (Integrated with Visual Studio, VCS agnostic)
+* [Artifacts for Web](http://www.versioned.com/artifacts/web/) (Subversion, web UI in pure javascript)
 * [Artemis](http://www.mrzv.org/software/artemis/) (Mercurial extension)
 * [milli](http://www.steve.org.uk/Software/milli/) (VCS agnostic)
 

diff --git a/software.mdwn b/software.mdwn
index 478766a..4777443 100644
--- a/software.mdwn
+++ b/software.mdwn
@@ -41,7 +41,7 @@ how bug states are merged, etc.
 These systems allow bugs to be tracked in multiple (non-distributed) BTSs,
 synchronising state between them.
 
-* [SD](http://code.bestpractical.com/project/SD) (built on top of the
+* [SD](http://github.com/bestpractical/SD) (built on top of the
   [Prophet](http://code.bestpractical.com/project/Prophet) disconnected
   replicated database; can pull/push to RT, Hiveminder, Trac, GitHub,
   and Google Code issue trackers)

diff --git a/software.mdwn b/software.mdwn
index 50ed4b5..478766a 100644
--- a/software.mdwn
+++ b/software.mdwn
@@ -27,6 +27,7 @@ the VCS is used as the transport.
 * [dbug](http://www.stackfoundry.com/dbug/)
 * [Artifacts](http://www.versioned.com/artifacts/) (Integrated with Visual Studio, VCS agnostic)
 * [Artemis](http://www.mrzv.org/software/artemis/) (Mercurial extension)
+* [milli](http://www.steve.org.uk/Software/milli/) (VCS agnostic)
 
 TODO: Compare and contrast how the data is stored in version control,
 how bug states are merged, etc.

diff --git a/.gitattributes b/.gitattributes
new file mode 100644
index 0000000..5d42584
--- /dev/null
+++ b/.gitattributes
@@ -0,0 +1 @@
+debian/changelog merge=dpkg-mergechangelogs

diff --git a/software.mdwn b/software.mdwn
index b94a456..50ed4b5 100644
--- a/software.mdwn
+++ b/software.mdwn
@@ -26,6 +26,7 @@ the VCS is used as the transport.
 * [cil](http://kapiti.geek.nz/software/cil.html) (Command-line issue tracker with some git integration for closing bugs on commit)
 * [dbug](http://www.stackfoundry.com/dbug/)
 * [Artifacts](http://www.versioned.com/artifacts/) (Integrated with Visual Studio, VCS agnostic)
+* [Artemis](http://www.mrzv.org/software/artemis/) (Mercurial extension)
 
 TODO: Compare and contrast how the data is stored in version control,
 how bug states are merged, etc.

diff --git a/software.mdwn b/software.mdwn
index 8a00ad7..b94a456 100644
--- a/software.mdwn
+++ b/software.mdwn
@@ -25,6 +25,7 @@ the VCS is used as the transport.
 * [Stick](http://www.eharning.us/wiki/stick/) (git)
 * [cil](http://kapiti.geek.nz/software/cil.html) (Command-line issue tracker with some git integration for closing bugs on commit)
 * [dbug](http://www.stackfoundry.com/dbug/)
+* [Artifacts](http://www.versioned.com/artifacts/) (Integrated with Visual Studio, VCS agnostic)
 
 TODO: Compare and contrast how the data is stored in version control,
 how bug states are merged, etc.

diff --git a/software.mdwn b/software.mdwn
index 5969334..8a00ad7 100644
--- a/software.mdwn
+++ b/software.mdwn
@@ -40,7 +40,8 @@ synchronising state between them.
 
 * [SD](http://code.bestpractical.com/project/SD) (built on top of the
   [Prophet](http://code.bestpractical.com/project/Prophet) disconnected
-  replicated database; can pull/push to RT and other BTSs)
+  replicated database; can pull/push to RT, Hiveminder, Trac, GitHub,
+  and Google Code issue trackers)
 
 ### multi-bts (non-replicating) systems
 

diff --git a/index.mdwn b/index.mdwn
index ae490eb..e8c2493 100644
--- a/index.mdwn
+++ b/index.mdwn
@@ -28,6 +28,8 @@ project.
 * [Distributed bug tracking article at LWN](http://lwn.net/Articles/281849/)
 * [Overview](http://community.livejournal.com/evan_tech/248736.html) of
   some existing distributed bug tracking tools
+* [Bug exchange format](http://blog.liw.fi/posts/bug-exchange-format/)
+  draft specification by Lars Wirzenius and Don Armstrong.
 
 This website is is powered by [[ikiwiki]], and has a sister project,
 [vcs-pkg](http://vcs-pkg.org/).

diff --git a/software.mdwn b/software.mdwn
index b8b2bf1..5969334 100644
--- a/software.mdwn
+++ b/software.mdwn
@@ -24,6 +24,7 @@ the VCS is used as the transport.
 * [DisTract](http://www.distract.wellquite.org/) (monotone)
 * [Stick](http://www.eharning.us/wiki/stick/) (git)
 * [cil](http://kapiti.geek.nz/software/cil.html) (Command-line issue tracker with some git integration for closing bugs on commit)
+* [dbug](http://www.stackfoundry.com/dbug/)
 
 TODO: Compare and contrast how the data is stored in version control,
 how bug states are merged, etc.

diff --git a/people/Jesper_Noehr.mdwn b/people/Jesper_Noehr.mdwn
new file mode 100644
index 0000000..85816c4
--- /dev/null
+++ b/people/Jesper_Noehr.mdwn
@@ -0,0 +1 @@
+Author of Bitbucket.org and its issue tracker.

diff --git a/index.mdwn b/index.mdwn
index f7ab47d..ae490eb 100644
--- a/index.mdwn
+++ b/index.mdwn
@@ -13,7 +13,7 @@ project.
 
 ## News
 
-[[inline pages="news/* and !news/*/*" archive=yes show=4]]
+[[!inline pages="news/* and !news/*/*" archive=yes show=4]]
 
 ## Resources
 
diff --git a/people.mdwn b/people.mdwn
index 5d9a746..34653b8 100644
--- a/people.mdwn
+++ b/people.mdwn
@@ -5,5 +5,5 @@ Feel free to add a page for yourself, and if you need a place to post
 dist-bugs related stuff, you can put it in a [[ikiwiki/SubPage]] of your
 page.
 
-[[inline pages="people/* and !people/*/*" archive=no rootpage=people
+[[!inline pages="people/* and !people/*/*" archive=no rootpage=people
 postformtext="Create a new user page:" show=0]]
diff --git a/people/bartman.mdwn b/people/bartman.mdwn
index 0afe1ba..b48ae38 100644
--- a/people/bartman.mdwn
+++ b/people/bartman.mdwn
@@ -1,4 +1,4 @@
-[[meta title="Bart Trojanowski"]] <http://www.jukie.net/~bart/>
+[[!meta title="Bart Trojanowski"]] <http://www.jukie.net/~bart/>
 
 "bartman" on oftc and freenode.
 
diff --git a/people/jesse.mdwn b/people/jesse.mdwn
index 392c1b7..4b009f5 100644
--- a/people/jesse.mdwn
+++ b/people/jesse.mdwn
@@ -1,3 +1,3 @@
-[[meta title="Jesse Vincent"]]
+[[!meta title="Jesse Vincent"]]
 
 Coauthor of Prophet and SD
diff --git a/people/joey.mdwn b/people/joey.mdwn
index 6c9b504..739d81e 100644
--- a/people/joey.mdwn
+++ b/people/joey.mdwn
@@ -1,4 +1,4 @@
-[[meta title="Joey Hess"]] <http://kitenet.net/~joey>
+[[!meta title="Joey Hess"]] <http://kitenet.net/~joey>
 
 I am interested in everything mentioned on the [[index]].
 
diff --git a/people/madduck.mdwn b/people/madduck.mdwn
index 22e6b8b..c423703 100644
--- a/people/madduck.mdwn
+++ b/people/madduck.mdwn
@@ -5,5 +5,5 @@ My sites:
 
 I track this site with the following feed:
 
-[[inline pages="internal(recentchanges/change_*) and !author(http://madduck.net/)" 
+[[!inline pages="internal(recentchanges/change_*) and !author(http://madduck.net/)" 
 feedonly=yes atom=no]]

diff --git a/people/bartman/git-case.mdwn b/people/bartman/git-case.mdwn
index 87a5d67..f9553a2 100644
--- a/people/bartman/git-case.mdwn
+++ b/people/bartman/git-case.mdwn
@@ -1,9 +1,10 @@
 git-case is a bug tracker that lives inside a git repo.
 
 The working prototype is here:
-* [[http://github.com/bartman/git-case/tree/master github page]]
-* [[http://github.com/bartman/git-case/wikis github wiki]]
-* [[http://git.jukie.net/git-case.git alternate location]]
+
+ - <http://github.com/bartman/git-case/tree/master> github page
+ - <http://github.com/bartman/git-case/wikis> github wiki
+ - <http://git.jukie.net/git-case.git> alternate location
 
 Some commands are slow, but we intended to port those to C and link against git object files, much the way that cgit works.
 

diff --git a/people/bartman/git-case.mdwn b/people/bartman/git-case.mdwn
index dbb79f5..87a5d67 100644
--- a/people/bartman/git-case.mdwn
+++ b/people/bartman/git-case.mdwn
@@ -1,9 +1,9 @@
 git-case is a bug tracker that lives inside a git repo.
 
 The working prototype is here:
-* [http://github.com/bartman/git-case/tree/master]
-* [http://github.com/bartman/git-case/wikis]
-* [http://git.jukie.net/git-case.git]
+* [[http://github.com/bartman/git-case/tree/master github page]]
+* [[http://github.com/bartman/git-case/wikis github wiki]]
+* [[http://git.jukie.net/git-case.git alternate location]]
 
 Some commands are slow, but we intended to port those to C and link against git object files, much the way that cgit works.
 

diff --git a/people/bartman/git-case.mdwn b/people/bartman/git-case.mdwn
index 752df87..dbb79f5 100644
--- a/people/bartman/git-case.mdwn
+++ b/people/bartman/git-case.mdwn
@@ -1,9 +1,9 @@
 git-case is a bug tracker that lives inside a git repo.
 
 The working prototype is here:
-    http://github.com/bartman/git-case/tree/master
-    http://github.com/bartman/git-case/wikis
-    http://git.jukie.net/git-case.git
+* [http://github.com/bartman/git-case/tree/master]
+* [http://github.com/bartman/git-case/wikis]
+* [http://git.jukie.net/git-case.git]
 
 Some commands are slow, but we intended to port those to C and link against git object files, much the way that cgit works.
 

diff --git a/people/bartman/git-case.mdwn b/people/bartman/git-case.mdwn
index f75209d..752df87 100644
--- a/people/bartman/git-case.mdwn
+++ b/people/bartman/git-case.mdwn
@@ -1,6 +1,9 @@
 git-case is a bug tracker that lives inside a git repo.
 
-The working prototype is here: git://tachyon.jukie.net/git-case.git
+The working prototype is here:
+    http://github.com/bartman/git-case/tree/master
+    http://github.com/bartman/git-case/wikis
+    http://git.jukie.net/git-case.git
 
 Some commands are slow, but we intended to port those to C and link against git object files, much the way that cgit works.
 

diff --git a/people/bartman/git-case/discussion.mdwn b/people/bartman/git-case/discussion.mdwn
new file mode 100644
index 0000000..a3c18dd
--- /dev/null
+++ b/people/bartman/git-case/discussion.mdwn
@@ -0,0 +1,9 @@
+Awesome work on this!  Sounds like you are quite a bit further than I am w/ 'Stick'.  I'll have to give this a try some time.
+
+Perhaps extra features such as flagging commits as related to the task at hand (rather than just good/bad).
+
+Just wondering, have you figured out what would happen if something like a rebase happened and references changed?
+
+I didn't gather it from the function docs... but is 'state' managed where you are in the tree... or is it completely disconnected from the commit-list?  For example:  Bug A exists at 1, Bug A is fixed at 2, user is in branch based off of 1 (or at 1), user checks status of bug A... would it know that it hasn't seen the fix at 2, or would it see that Bug A has a state of 'fixed' in a global sense?
+
+~ [[harningt]]

diff --git a/software.mdwn b/software.mdwn
index ec358f6..b8b2bf1 100644
--- a/software.mdwn
+++ b/software.mdwn
@@ -23,6 +23,7 @@ the VCS is used as the transport.
 * [[people/bartman]]'s [[people/bartman/git-case]] (git)
 * [DisTract](http://www.distract.wellquite.org/) (monotone)
 * [Stick](http://www.eharning.us/wiki/stick/) (git)
+* [cil](http://kapiti.geek.nz/software/cil.html) (Command-line issue tracker with some git integration for closing bugs on commit)
 
 TODO: Compare and contrast how the data is stored in version control,
 how bug states are merged, etc.

diff --git a/people.mdwn b/people.mdwn
index 5780b9b..5d9a746 100644
--- a/people.mdwn
+++ b/people.mdwn
@@ -1,6 +1,5 @@
-The following people are involved with dist-bugs. Click on their names
-for their individual pages, where you can read more about what they're
-working on. This isn't everybody, others lurk on the mailing list. :-)
+The following people are involved with dist-bugs.
+This isn't everybody, others lurk on the mailing list. :-)
 
 Feel free to add a page for yourself, and if you need a place to post
 dist-bugs related stuff, you can put it in a [[ikiwiki/SubPage]] of your

diff --git a/people/Ben_Finney.mdwn b/people/Ben_Finney.mdwn
index c3bb3b1..2db60b1 100644
--- a/people/Ben_Finney.mdwn
+++ b/people/Ben_Finney.mdwn
@@ -1 +1,3 @@
 Ben Finney <ben@benfinney.id.au>
+
+Intending to package Bugs Everywhere for Debian.

diff --git a/software.mdwn b/software.mdwn
index 3de9706..ec358f6 100644
--- a/software.mdwn
+++ b/software.mdwn
@@ -1,8 +1,8 @@
 A probably incomplete list of distributed BTS software.
 
-### using revision control
+### using version control
 
-These store the bugs in revision control, along with the software
+These store the bugs in a version control system (VCS), along with the software
 that has the bugs. This allows bugs to be closed when a commit is made,
 and in some cases allows bug status to follow branches and merges.
 

diff --git a/people/Ben_Finney.mdwn b/people/Ben_Finney.mdwn
new file mode 100644
index 0000000..c3bb3b1
--- /dev/null
+++ b/people/Ben_Finney.mdwn
@@ -0,0 +1 @@
+Ben Finney <ben@benfinney.id.au>

diff --git a/software.mdwn b/software.mdwn
index 5f01f9c..3de9706 100644
--- a/software.mdwn
+++ b/software.mdwn
@@ -27,6 +27,10 @@ the VCS is used as the transport.
 TODO: Compare and contrast how the data is stored in version control,
 how bug states are merged, etc.
 
+#### notes:
+
+* [DITrack](http://www.ditrack.org/) mentions that it should be possible to port it to a distributed version control system, but their use of numbers does not allow it without some redesign.
+
 ### multi-bts (data replicating) systems
 
 These systems allow bugs to be tracked in multiple (non-distributed) BTSs,

diff --git a/software.mdwn b/software.mdwn
index 5b0b9cd..5f01f9c 100644
--- a/software.mdwn
+++ b/software.mdwn
@@ -22,6 +22,7 @@ the VCS is used as the transport.
 * [ikiwiki](http://ikiwiki.info/) (wiki uses VCS; bugs are plain pages)
 * [[people/bartman]]'s [[people/bartman/git-case]] (git)
 * [DisTract](http://www.distract.wellquite.org/) (monotone)
+* [Stick](http://www.eharning.us/wiki/stick/) (git)
 
 TODO: Compare and contrast how the data is stored in version control,
 how bug states are merged, etc.
@@ -46,4 +47,3 @@ Systems in this list don't actually replicate state and history between differen
   difficulty is ensuring that CVEs are both unique and well-specified.
 
 ### uncategorized
-

diff --git a/software.mdwn b/software.mdwn
index 266b553..5b0b9cd 100644
--- a/software.mdwn
+++ b/software.mdwn
@@ -26,7 +26,7 @@ the VCS is used as the transport.
 TODO: Compare and contrast how the data is stored in version control,
 how bug states are merged, etc.
 
-### multi-bts systems
+### multi-bts (data replicating) systems
 
 These systems allow bugs to be tracked in multiple (non-distributed) BTSs,
 synchronising state between them.
@@ -34,6 +34,11 @@ synchronising state between them.
 * [SD](http://code.bestpractical.com/project/SD) (built on top of the
   [Prophet](http://code.bestpractical.com/project/Prophet) disconnected
   replicated database; can pull/push to RT and other BTSs)
+
+### multi-bts (non-replicating) systems
+
+Systems in this list don't actually replicate state and history between different systems, they just provide linkage between systems.
+
 * The [CVE ID](http://cve.mitre.org/) system creates essentially a distributed
   BTS, with each vendor's BTS using CVE IDs to link back to the central
   problem definition, which in turn links to other affected systems that

diff --git a/people.mdwn b/people.mdwn
index ffc0767..5780b9b 100644
--- a/people.mdwn
+++ b/people.mdwn
@@ -6,5 +6,5 @@ Feel free to add a page for yourself, and if you need a place to post
 dist-bugs related stuff, you can put it in a [[ikiwiki/SubPage]] of your
 page.
 
-[[inline pages="people/* and !people/*/*" archive=yes rootpage=people
+[[inline pages="people/* and !people/*/*" archive=no rootpage=people
 postformtext="Create a new user page:" show=0]]

diff --git a/people/Don_Armstrong.mdwn b/people/Don_Armstrong.mdwn
new file mode 100644
index 0000000..24f5199
--- /dev/null
+++ b/people/Don_Armstrong.mdwn
@@ -0,0 +1 @@
+Developer of Debbugs, Debian's bug tracking system

diff --git a/use-cases.mdwn b/use-cases.mdwn
index 9f2685c..34bec60 100644
--- a/use-cases.mdwn
+++ b/use-cases.mdwn
@@ -27,6 +27,10 @@ Users, use-cases, and other tools for discussing how distributed bug tracking sh
   developer's ask him to provide the exact data they require, and
   explain how to get it.
 
+* **Dan** is a Debian user. He's not really technical, but he's
+  really happy about the reportbug tool. In fact, he uses it several
+  times every day.
+
 
 # Use cases/scenarios
 

diff --git a/use-cases.mdwn b/use-cases.mdwn
new file mode 100644
index 0000000..9f2685c
--- /dev/null
+++ b/use-cases.mdwn
@@ -0,0 +1,49 @@
+Users, use-cases, and other tools for discussing how distributed bug tracking should work.
+
+
+# Users
+
+* **Amanda** is a software developer, one of the main authors of a
+  wildly successful free software package. She hacks mainly at
+  home, with fast network access, multiple fast computers, and
+  oodles of time to spend on the project. Being an old-timer in
+  the computing industry, she has a tendency to prefer the command
+  line. Indeed, she only uses X11 to display xterms (16 per
+  screen, with 7 screens total, not counting virtual desktops).
+
+* **Brenda** is a college student majoring in theoretical physics.
+  As a hobby, she helps maintain Debian, and is one of the team
+  that maintains the Debian package of Amanda's software. Brenda
+  has a very busy life, but often has fifteen or thirty minute
+  time slots to do stuff on her laptop, e.g., between lectures,
+  labs, on the train, and so on. Often she does not have network
+  access during these time slots, or indeed all day.
+
+* **Cecil** is a user of Amanda's software. He has no computer
+  expertese at all: he's a Mac user and the one time he saw a
+  command line, he paniced and ran out of the room. He's smart,
+  though, and is perfectly able to follow instructions and
+  generally his bug reports are of high quality, after the
+  developer's ask him to provide the exact data they require, and
+  explain how to get it.
+
+
+# Use cases/scenarios
+
+* Report a new bug, either against the Debian package, or the
+  upstream package, and have the information be shared to the
+  other.
+        
+* Ask for additional information related to a bug.
+        
+* Add a comment to a bug, with more information to help the
+  developer find and fix the cause.
+        
+* Mark a bug as fixed, and include the fix or reference to it.
+        
+How would Amanda, Brenda, and Cecil act in these
+cases? What would they do, how would the distributed system act, what
+data needs to go where, and how is stuff communicated between instances
+of the distributed tracker ("branches" in dvcs)?
+
+For now, discussion of these should go to the mailing list.

diff --git a/index.mdwn b/index.mdwn
index aa5ad67..f7ab47d 100644
--- a/index.mdwn
+++ b/index.mdwn
@@ -20,6 +20,7 @@ project.
 * [mailing list](http://kitenet.net/cgi-bin/mailman/listinfo/dist-bugs) ([archives](http://kitenet.net/pipermail/dist-bugs/))
 * [[dist-bugs_people|people]]
 * [[software]]
+* [[use-cases]]
 * browse this web site’s [Git repository](http://git.kitenet.net/?p=dist-bugs.git;a=summary)
 
 ## Links

diff --git a/people/madduck.mdwn b/people/madduck.mdwn
index 0545bae..22e6b8b 100644
--- a/people/madduck.mdwn
+++ b/people/madduck.mdwn
@@ -1,3 +1,9 @@
-[[!meta title="Martin F. Krafft"]]
+My sites:
 
-<http://madduck.net>
+- [Homepage](http://madduck.net)
+- [Debian stuff](http://people.debian.org/~madduck)
+
+I track this site with the following feed:
+
+[[inline pages="internal(recentchanges/change_*) and !author(http://madduck.net/)" 
+feedonly=yes atom=no]]

diff --git a/software.mdwn b/software.mdwn
index f2513de..266b553 100644
--- a/software.mdwn
+++ b/software.mdwn
@@ -21,6 +21,7 @@ the VCS is used as the transport.
 * [Ditz](http://ditz.rubyforge.org/) (VCS agnostic)
 * [ikiwiki](http://ikiwiki.info/) (wiki uses VCS; bugs are plain pages)
 * [[people/bartman]]'s [[people/bartman/git-case]] (git)
+* [DisTract](http://www.distract.wellquite.org/) (monotone)
 
 TODO: Compare and contrast how the data is stored in version control,
 how bug states are merged, etc.
@@ -41,4 +42,3 @@ synchronising state between them.
 
 ### uncategorized
 
-* [DisTract](http://www.distract.wellquite.org/)

diff --git a/software.mdwn b/software.mdwn
index 87aec75..f2513de 100644
--- a/software.mdwn
+++ b/software.mdwn
@@ -35,9 +35,9 @@ synchronising state between them.
   replicated database; can pull/push to RT and other BTSs)
 * The [CVE ID](http://cve.mitre.org/) system creates essentially a distributed
   BTS, with each vendor's BTS using CVE IDs to link back to the central
-  problem report, which in turn links to other affected systems. It is limited
-  to security holes, and an essential difficulty is ensuring that CVEs are both
-  unique and well-specified. Matching vendor bugs with CVEs is done by hand.
+  problem definition, which in turn links to other affected systems that
+  use the same CVE ID. It is limited to security holes, and an essential
+  difficulty is ensuring that CVEs are both unique and well-specified.
 
 ### uncategorized
 

diff --git a/software.mdwn b/software.mdwn
index 36e7b2d..87aec75 100644
--- a/software.mdwn
+++ b/software.mdwn
@@ -25,17 +25,20 @@ the VCS is used as the transport.
 TODO: Compare and contrast how the data is stored in version control,
 how bug states are merged, etc.
 
-### uncategorized
+### multi-bts systems
+
+These systems allow bugs to be tracked in multiple (non-distributed) BTSs,
+synchronising state between them.
 
 * [SD](http://code.bestpractical.com/project/SD) (built on top of the
   [Prophet](http://code.bestpractical.com/project/Prophet) disconnected
   replicated database; can pull/push to RT and other BTSs)
-* [DisTract](http://www.distract.wellquite.org/)
-
-### other
-
 * The [CVE ID](http://cve.mitre.org/) system creates essentially a distributed
   BTS, with each vendor's BTS using CVE IDs to link back to the central
   problem report, which in turn links to other affected systems. It is limited
   to security holes, and an essential difficulty is ensuring that CVEs are both
   unique and well-specified. Matching vendor bugs with CVEs is done by hand.
+
+### uncategorized
+
+* [DisTract](http://www.distract.wellquite.org/)

diff --git a/software.mdwn b/software.mdwn
index 3257759..36e7b2d 100644
--- a/software.mdwn
+++ b/software.mdwn
@@ -31,3 +31,11 @@ how bug states are merged, etc.
   [Prophet](http://code.bestpractical.com/project/Prophet) disconnected
   replicated database; can pull/push to RT and other BTSs)
 * [DisTract](http://www.distract.wellquite.org/)
+
+### other
+
+* The [CVE ID](http://cve.mitre.org/) system creates essentially a distributed
+  BTS, with each vendor's BTS using CVE IDs to link back to the central
+  problem report, which in turn links to other affected systems. It is limited
+  to security holes, and an essential difficulty is ensuring that CVEs are both
+  unique and well-specified. Matching vendor bugs with CVEs is done by hand.

diff --git a/people/jesse.mdwn b/people/jesse.mdwn
index df16ee6..392c1b7 100644
--- a/people/jesse.mdwn
+++ b/people/jesse.mdwn
@@ -1,3 +1,3 @@
-Jesse Vincent
+[[meta title="Jesse Vincent"]]
 
 Coauthor of Prophet and SD

diff --git a/people/bartman/git-case.mdwn b/people/bartman/git-case.mdwn
index 0720c64..f75209d 100644
--- a/people/bartman/git-case.mdwn
+++ b/people/bartman/git-case.mdwn
@@ -72,7 +72,7 @@ Here is what the data store looks like for a case...
     100644 blob 1ac208286a54bf10746bac5466010b15663a0a6e	5a3624c08f8606c87107aa1828f1c81cf0aaf453/state
     100644 blob a7453f07505c42ea8d6fdda75fa91710c81c53d6	5a3624c08f8606c87107aa1828f1c81cf0aaf453/type
 
-== Repository layout ==
+## == Repository layout ==
 
     <id>/               # directory per case
     |-- description     # 1st line title, then free form description
@@ -91,3 +91,8 @@ Here is what the data store looks like for a case...
     |   `-- <sha1>      # file contains either 'good' or 'bad'
     `-- fields/         # additional field
         `-- <name>      # contains one line of text
+
+### Attachments
+* can be referenced by comments (in the text)
+* same filename can be used from multiple attachments, but could actually be a different sha1
+* file contents can be obtained with git plumbing, or by following files/<name>/<hash> because the <hash> is the same that is computed by git

diff --git a/people/bartman/git-case.mdwn b/people/bartman/git-case.mdwn
index d409032..0720c64 100644
--- a/people/bartman/git-case.mdwn
+++ b/people/bartman/git-case.mdwn
@@ -72,3 +72,22 @@ Here is what the data store looks like for a case...
     100644 blob 1ac208286a54bf10746bac5466010b15663a0a6e	5a3624c08f8606c87107aa1828f1c81cf0aaf453/state
     100644 blob a7453f07505c42ea8d6fdda75fa91710c81c53d6	5a3624c08f8606c87107aa1828f1c81cf0aaf453/type
 
+== Repository layout ==
+
+    <id>/               # directory per case
+    |-- description     # 1st line title, then free form description
+    |-- type            # bug/feature/question/...
+    |-- found           # git commit worktree was in when case created RO
+    |-- state           # new/open/invalid/etc
+    |-- assigned        # name <email>
+    |-- marks/          # list of marks - tags in most tracker talk
+    |   `-- <name>      # empty file
+    |-- comments/       # comments, one per file
+    |   `-- <sha1>      # contains arbitrary text
+    |-- files/          # attachements to the case/comment
+    |   `-- <filename>/ # the name of the dir is actually the name of the file
+    |       `-- <sha1>  # hash of the file, contais the file
+    |-- ids/            # commits for which the state of thsi bug is known
+    |   `-- <sha1>      # file contains either 'good' or 'bad'
+    `-- fields/         # additional field
+        `-- <name>      # contains one line of text

diff --git a/people/jesse.mdwn b/people/jesse.mdwn
new file mode 100644
index 0000000..df16ee6
--- /dev/null
+++ b/people/jesse.mdwn
@@ -0,0 +1,3 @@
+Jesse Vincent
+
+Coauthor of Prophet and SD

diff --git a/people/madduck.mdwn b/people/madduck.mdwn
index cb61a7c..0545bae 100644
--- a/people/madduck.mdwn
+++ b/people/madduck.mdwn
@@ -1 +1,3 @@
+[[!meta title="Martin F. Krafft"]]
+
 <http://madduck.net>

diff --git a/people/madduck.mdwn b/people/madduck.mdwn
new file mode 100644
index 0000000..cb61a7c
--- /dev/null
+++ b/people/madduck.mdwn
@@ -0,0 +1 @@
+<http://madduck.net>