From 79a5ee985199c7b12392ef168a042309b6fa4e29 Mon Sep 17 00:00:00 2001
From: Owen Jacobson <owen.jacobson@grimoire.ca>
Date: Fri, 17 Jul 2015 01:30:44 -0400
Subject: Fixup image links for Dokku-based version of site.

---
 .html/dev/builds.html                     | 2 +-
 .html/dev/merging-structural-changes.html | 6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

(limited to '.html/dev')

diff --git a/.html/dev/builds.html b/.html/dev/builds.html
index e909182..5626a4e 100644
--- a/.html/dev/builds.html
+++ b/.html/dev/builds.html
@@ -80,7 +80,7 @@ person—“creativity,” “morality,” “curiosity,” and so on.</p>
 Extensible. Understood. In the middle tier: Simple. Fast. Unit tests. Part of
 the project. Environment independent. At the top: Metrics. Parallel builds.
 Acceptance tests. Product caching. IDE
-integration." src="/media/dev/builds/buildifesto-pyramid"></p>
+integration." src="/media/dev/builds/buildifesto-pyramid.png"></p>
 <p>Builds, and software engineering as a whole, can be described the same way: at
 the top of the hierarchy is a working system that solves a problem, and at the
 bottom are the things you need to have software at all. If you don't meet
diff --git a/.html/dev/merging-structural-changes.html b/.html/dev/merging-structural-changes.html
index e5c8795..a019d9c 100644
--- a/.html/dev/merging-structural-changes.html
+++ b/.html/dev/merging-structural-changes.html
@@ -63,7 +63,7 @@ sadly, performed dismally: none of the merge scenarios tested retained content
 changes when merging structural changes to the same files.</p>
 <h2 id="the-preferred-outcome">The Preferred Outcome</h2>
 <p><img alt="Both changes survive the
-merge." src="/media/dev/merging-structural-changes/ideal-merge-results"></p>
+merge." src="/media/dev/merging-structural-changes/ideal-merge-results.png"></p>
 <p>The diagram above shows a very simple source tree with one directory, <code>dir-a</code>,
 containing one file with two lines in it. On one branch, the file is modified
 to have a third line; on another branch, the directory is renamed to <code>dir-b</code>.
@@ -73,7 +73,7 @@ changes: the file has three lines, and the directory has a new name.</p>
 merging.</p>
 <h2 id="subversion">Subversion</h2>
 <p><img alt="Subversion loses the content
-change." src="/media/dev/merging-structural-changes/subversion-merge-results"></p>
+change." src="/media/dev/merging-structural-changes/subversion-merge-results.png"></p>
 <p>There are two merge scenarios in this diagram, with almost the same outcome.
 On the left, a working copy of the branch where the file's content changed is
 checked out, then the changes from the branch where the structure changed are
@@ -105,7 +105,7 @@ which is not as good as automatically merging it but far better than silently
 ignoring changes.</p>
 <h2 id="mercurial">Mercurial</h2>
 <p><img alt="Mercurial preserves the content
-change." src="/media/dev/merging-structural-changes/mercurial-merge-results"></p>
+change." src="/media/dev/merging-structural-changes/mercurial-merge-results.png"></p>
 <p>Interestingly, there are tools which get this merge scenario right: the
 diagram above shows how <a href="http://www.selenic.com/mercurial/">Mercurial</a> handles
 the same two tests. Since its changeset language does include an “object
-- 
cgit v1.2.3