summaryrefslogtreecommitdiff
path: root/.html/media
diff options
context:
space:
mode:
Diffstat (limited to '.html/media')
-rw-r--r--.html/media/_list.html92
-rw-r--r--.html/media/css/_list.html94
-rw-r--r--.html/media/css/grimoire.css135
-rw-r--r--.html/media/css/index.html94
-rw-r--r--.html/media/css/reset.css48
-rw-r--r--.html/media/dev/_list.html96
-rw-r--r--.html/media/dev/builds/_list.html98
-rw-r--r--.html/media/dev/builds/buildifesto-pyramid.pngbin0 -> 88857 bytes
-rw-r--r--.html/media/dev/builds/index.html98
-rw-r--r--.html/media/dev/index.html96
-rw-r--r--.html/media/dev/merging-structural-changes/_list.html102
-rw-r--r--.html/media/dev/merging-structural-changes/ideal-merge-results.pngbin0 -> 87122 bytes
-rw-r--r--.html/media/dev/merging-structural-changes/index.html102
-rw-r--r--.html/media/dev/merging-structural-changes/mercurial-merge-results.pngbin0 -> 99313 bytes
-rw-r--r--.html/media/dev/merging-structural-changes/subversion-merge-results.pngbin0 -> 114985 bytes
-rw-r--r--.html/media/email/_list.html92
-rw-r--r--.html/media/email/flowchart.pngbin0 -> 46297 bytes
-rw-r--r--.html/media/email/index.html92
-rw-r--r--.html/media/index.html92
19 files changed, 1331 insertions, 0 deletions
diff --git a/.html/media/_list.html b/.html/media/_list.html
new file mode 100644
index 0000000..14d4f1f
--- /dev/null
+++ b/.html/media/_list.html
@@ -0,0 +1,92 @@
+<!DOCTYPE html>
+<html>
+<head>
+ <title>
+ The Codex »
+ ls /media
+ </title>
+
+ <link
+ rel='stylesheet'
+ type='text/css'
+ href='http://fonts.googleapis.com/css?family=Buenard:400,700&amp;subset=latin,latin-ext'>
+ <link
+ rel="stylesheet"
+ type="text/css"
+ href="css/reset.css">
+ <link
+ rel="stylesheet"
+ type="text/css"
+ href="css/grimoire.css">
+</head>
+<body>
+
+<div id="shell">
+
+ <ol id="breadcrumbs">
+
+ <li class="crumb-0 not-last">
+
+ <a href="../">index</a>
+
+ </li>
+
+ <li class="crumb-1 not-last">
+
+ <a href="./">media</a>
+
+ </li>
+
+ <li class="crumb-2 last">
+
+ <span class="list-crumb">list</span>
+
+ </li>
+
+ </ol>
+
+
+
+ <div id="listing">
+ <h1><code>ls /media</code></h1>
+
+
+ <div id="directories">
+ <h2>Directories</h2>
+ <ul>
+
+ <li><a href="css/">css/</a></li>
+
+ <li><a href="dev/">dev/</a></li>
+
+ <li><a href="email/">email/</a></li>
+
+ </ul>
+ </div>
+
+
+
+
+
+ </div>
+
+
+
+
+
+
+ <div id="footer">
+ <p>
+
+ The Codex —
+
+ Powered by <a href="http://markdoc.org/">Markdoc</a>.
+
+<a href="https://bitbucket.org/ojacobson/grimoire.ca/src/master/wiki/media">See this directory on Bitbucket</a>.
+
+ </p>
+ </div>
+
+</div>
+</body>
+</html> \ No newline at end of file
diff --git a/.html/media/css/_list.html b/.html/media/css/_list.html
new file mode 100644
index 0000000..b17b4d1
--- /dev/null
+++ b/.html/media/css/_list.html
@@ -0,0 +1,94 @@
+<!DOCTYPE html>
+<html>
+<head>
+ <title>
+ The Codex »
+ ls /media/css
+ </title>
+
+ <link
+ rel='stylesheet'
+ type='text/css'
+ href='http://fonts.googleapis.com/css?family=Buenard:400,700&amp;subset=latin,latin-ext'>
+ <link
+ rel="stylesheet"
+ type="text/css"
+ href="reset.css">
+ <link
+ rel="stylesheet"
+ type="text/css"
+ href="grimoire.css">
+</head>
+<body>
+
+<div id="shell">
+
+ <ol id="breadcrumbs">
+
+ <li class="crumb-0 not-last">
+
+ <a href="../../">index</a>
+
+ </li>
+
+ <li class="crumb-1 not-last">
+
+ <a href="../">media</a>
+
+ </li>
+
+ <li class="crumb-2 not-last">
+
+ <a href="./">css</a>
+
+ </li>
+
+ <li class="crumb-3 last">
+
+ <span class="list-crumb">list</span>
+
+ </li>
+
+ </ol>
+
+
+
+ <div id="listing">
+ <h1><code>ls /media/css</code></h1>
+
+
+
+
+
+
+ <div id="files">
+ <h2>Files</h2>
+
+ <li><a href="grimoire.css">grimoire.css</a></li>
+
+ <li><a href="reset.css">reset.css</a></li>
+
+ </div>
+
+ </div>
+
+
+
+
+
+
+ <div id="footer">
+ <p>
+
+ The Codex —
+
+ Powered by <a href="http://markdoc.org/">Markdoc</a>.
+
+<a href="https://bitbucket.org/ojacobson/grimoire.ca/src/master/wiki/media/css">See this directory on Bitbucket</a>.
+
+ </p>
+ </div>
+
+</div>
+</body>
+</html> \ No newline at end of file
diff --git a/.html/media/css/grimoire.css b/.html/media/css/grimoire.css
new file mode 100644
index 0000000..e817dd4
--- /dev/null
+++ b/.html/media/css/grimoire.css
@@ -0,0 +1,135 @@
+/* typography */
+body {
+ font-family: 'Baskerville', 'Buenard', serif;
+ font-size: 20px;
+ line-height: 30px;
+}
+
+code {
+ font-family: 'Menlo', monospace;
+ font-size: 80%;
+}
+
+em {
+ font-style: italic;
+}
+
+strong {
+ font-weight: bold;
+}
+
+blockquote {
+ margin-left: 40px;
+ color: #555;
+}
+
+:link {
+ text-decoration: none;
+}
+
+hr {
+ border: none;
+ border-top: 1px solid #AAA;
+ margin-left: 80px;
+ margin-right: 80px;
+}
+
+h1, h2, h3, h4, h5, h6 {
+ font-weight: bold;
+}
+
+h1 {
+ font-size: 40px;
+ line-height: 60px;
+ margin-bottom: 15px;
+}
+h2 {
+ font-size: 30px;
+ line-height: 45px;
+ margin-bottom: 15px;
+}
+h3 {
+ font-size: 20px;
+ line-height: 30px;
+ margin-bottom: 15px;
+}
+
+/* layout */
+#shell {
+ margin-left: auto;
+ margin-right: auto;
+ width: 840px;
+}
+
+#shell > * {
+ margin-top: 15px;
+ margin-bottom: 15px;
+ padding: 0 10px;
+}
+
+#article,
+#listing {
+ padding-left: 50px;
+}
+h1, h2, h3, h4, h5, h6 {
+ margin-left: -40px;
+}
+
+#article p,
+#article pre,
+#article ul,
+#article ol,
+#article dl,
+#listing ul {
+ margin-bottom: 15px;
+}
+
+#article pre {
+ margin-left: 40px;
+}
+
+#article > p > img {
+ margin-left: auto;
+ margin-right: auto;
+ display: block;
+}
+
+#article ul {
+ list-style-type: disc;
+}
+#article ol {
+ list-style-type: decimal;
+}
+
+#article ul,
+#article ol,
+#article dl {
+ padding-left: 40px;
+}
+
+#article dd {
+ padding-left: 40px;
+}
+
+#breadcrumbs li {
+ display: inline-block;
+}
+#breadcrumbs li.not-last:after {
+ content: '•';
+}
+
+@media print {
+ #breadcrumbs,
+ #comments,
+ #footer {
+ display: none;
+ }
+
+ a:link {
+ color: black;
+ }
+ :link:after {
+ content: " (" attr(href) ")";
+ font-size: 16px;
+ }
+} \ No newline at end of file
diff --git a/.html/media/css/index.html b/.html/media/css/index.html
new file mode 100644
index 0000000..b17b4d1
--- /dev/null
+++ b/.html/media/css/index.html
@@ -0,0 +1,94 @@
+<!DOCTYPE html>
+<html>
+<head>
+ <title>
+ The Codex »
+ ls /media/css
+ </title>
+
+ <link
+ rel='stylesheet'
+ type='text/css'
+ href='http://fonts.googleapis.com/css?family=Buenard:400,700&amp;subset=latin,latin-ext'>
+ <link
+ rel="stylesheet"
+ type="text/css"
+ href="reset.css">
+ <link
+ rel="stylesheet"
+ type="text/css"
+ href="grimoire.css">
+</head>
+<body>
+
+<div id="shell">
+
+ <ol id="breadcrumbs">
+
+ <li class="crumb-0 not-last">
+
+ <a href="../../">index</a>
+
+ </li>
+
+ <li class="crumb-1 not-last">
+
+ <a href="../">media</a>
+
+ </li>
+
+ <li class="crumb-2 not-last">
+
+ <a href="./">css</a>
+
+ </li>
+
+ <li class="crumb-3 last">
+
+ <span class="list-crumb">list</span>
+
+ </li>
+
+ </ol>
+
+
+
+ <div id="listing">
+ <h1><code>ls /media/css</code></h1>
+
+
+
+
+
+
+ <div id="files">
+ <h2>Files</h2>
+
+ <li><a href="grimoire.css">grimoire.css</a></li>
+
+ <li><a href="reset.css">reset.css</a></li>
+
+ </div>
+
+ </div>
+
+
+
+
+
+
+ <div id="footer">
+ <p>
+
+ The Codex —
+
+ Powered by <a href="http://markdoc.org/">Markdoc</a>.
+
+<a href="https://bitbucket.org/ojacobson/grimoire.ca/src/master/wiki/media/css">See this directory on Bitbucket</a>.
+
+ </p>
+ </div>
+
+</div>
+</body>
+</html> \ No newline at end of file
diff --git a/.html/media/css/reset.css b/.html/media/css/reset.css
new file mode 100644
index 0000000..e29c0f5
--- /dev/null
+++ b/.html/media/css/reset.css
@@ -0,0 +1,48 @@
+/* http://meyerweb.com/eric/tools/css/reset/
+ v2.0 | 20110126
+ License: none (public domain)
+*/
+
+html, body, div, span, applet, object, iframe,
+h1, h2, h3, h4, h5, h6, p, blockquote, pre,
+a, abbr, acronym, address, big, cite, code,
+del, dfn, em, img, ins, kbd, q, s, samp,
+small, strike, strong, sub, sup, tt, var,
+b, u, i, center,
+dl, dt, dd, ol, ul, li,
+fieldset, form, label, legend,
+table, caption, tbody, tfoot, thead, tr, th, td,
+article, aside, canvas, details, embed,
+figure, figcaption, footer, header, hgroup,
+menu, nav, output, ruby, section, summary,
+time, mark, audio, video {
+ margin: 0;
+ padding: 0;
+ border: 0;
+ font-size: 100%;
+ font: inherit;
+ vertical-align: baseline;
+}
+/* HTML5 display-role reset for older browsers */
+article, aside, details, figcaption, figure,
+footer, header, hgroup, menu, nav, section {
+ display: block;
+}
+body {
+ line-height: 1;
+}
+ol, ul {
+ list-style: none;
+}
+blockquote, q {
+ quotes: none;
+}
+blockquote:before, blockquote:after,
+q:before, q:after {
+ content: '';
+ content: none;
+}
+table {
+ border-collapse: collapse;
+ border-spacing: 0;
+}
diff --git a/.html/media/dev/_list.html b/.html/media/dev/_list.html
new file mode 100644
index 0000000..28020c6
--- /dev/null
+++ b/.html/media/dev/_list.html
@@ -0,0 +1,96 @@
+<!DOCTYPE html>
+<html>
+<head>
+ <title>
+ The Codex »
+ ls /media/dev
+ </title>
+
+ <link
+ rel='stylesheet'
+ type='text/css'
+ href='http://fonts.googleapis.com/css?family=Buenard:400,700&amp;subset=latin,latin-ext'>
+ <link
+ rel="stylesheet"
+ type="text/css"
+ href="../css/reset.css">
+ <link
+ rel="stylesheet"
+ type="text/css"
+ href="../css/grimoire.css">
+</head>
+<body>
+
+<div id="shell">
+
+ <ol id="breadcrumbs">
+
+ <li class="crumb-0 not-last">
+
+ <a href="../../">index</a>
+
+ </li>
+
+ <li class="crumb-1 not-last">
+
+ <a href="../">media</a>
+
+ </li>
+
+ <li class="crumb-2 not-last">
+
+ <a href="./">dev</a>
+
+ </li>
+
+ <li class="crumb-3 last">
+
+ <span class="list-crumb">list</span>
+
+ </li>
+
+ </ol>
+
+
+
+ <div id="listing">
+ <h1><code>ls /media/dev</code></h1>
+
+
+ <div id="directories">
+ <h2>Directories</h2>
+ <ul>
+
+ <li><a href="builds/">builds/</a></li>
+
+ <li><a href="merging-structural-changes/">merging-structural-changes/</a></li>
+
+ </ul>
+ </div>
+
+
+
+
+
+ </div>
+
+
+
+
+
+
+ <div id="footer">
+ <p>
+
+ The Codex —
+
+ Powered by <a href="http://markdoc.org/">Markdoc</a>.
+
+<a href="https://bitbucket.org/ojacobson/grimoire.ca/src/master/wiki/media/dev">See this directory on Bitbucket</a>.
+
+ </p>
+ </div>
+
+</div>
+</body>
+</html> \ No newline at end of file
diff --git a/.html/media/dev/builds/_list.html b/.html/media/dev/builds/_list.html
new file mode 100644
index 0000000..8af9c54
--- /dev/null
+++ b/.html/media/dev/builds/_list.html
@@ -0,0 +1,98 @@
+<!DOCTYPE html>
+<html>
+<head>
+ <title>
+ The Codex »
+ ls /media/dev/builds
+ </title>
+
+ <link
+ rel='stylesheet'
+ type='text/css'
+ href='http://fonts.googleapis.com/css?family=Buenard:400,700&amp;subset=latin,latin-ext'>
+ <link
+ rel="stylesheet"
+ type="text/css"
+ href="../../css/reset.css">
+ <link
+ rel="stylesheet"
+ type="text/css"
+ href="../../css/grimoire.css">
+</head>
+<body>
+
+<div id="shell">
+
+ <ol id="breadcrumbs">
+
+ <li class="crumb-0 not-last">
+
+ <a href="../../../">index</a>
+
+ </li>
+
+ <li class="crumb-1 not-last">
+
+ <a href="../../">media</a>
+
+ </li>
+
+ <li class="crumb-2 not-last">
+
+ <a href="../">dev</a>
+
+ </li>
+
+ <li class="crumb-3 not-last">
+
+ <a href="./">builds</a>
+
+ </li>
+
+ <li class="crumb-4 last">
+
+ <span class="list-crumb">list</span>
+
+ </li>
+
+ </ol>
+
+
+
+ <div id="listing">
+ <h1><code>ls /media/dev/builds</code></h1>
+
+
+
+
+
+
+ <div id="files">
+ <h2>Files</h2>
+
+ <li><a href="buildifesto-pyramid.png">buildifesto-pyramid.png</a></li>
+
+ </div>
+
+ </div>
+
+
+
+
+
+
+ <div id="footer">
+ <p>
+
+ The Codex —
+
+ Powered by <a href="http://markdoc.org/">Markdoc</a>.
+
+<a href="https://bitbucket.org/ojacobson/grimoire.ca/src/master/wiki/media/dev/builds">See this directory on Bitbucket</a>.
+
+ </p>
+ </div>
+
+</div>
+</body>
+</html> \ No newline at end of file
diff --git a/.html/media/dev/builds/buildifesto-pyramid.png b/.html/media/dev/builds/buildifesto-pyramid.png
new file mode 100644
index 0000000..a06148e
--- /dev/null
+++ b/.html/media/dev/builds/buildifesto-pyramid.png
Binary files differ
diff --git a/.html/media/dev/builds/index.html b/.html/media/dev/builds/index.html
new file mode 100644
index 0000000..8af9c54
--- /dev/null
+++ b/.html/media/dev/builds/index.html
@@ -0,0 +1,98 @@
+<!DOCTYPE html>
+<html>
+<head>
+ <title>
+ The Codex »
+ ls /media/dev/builds
+ </title>
+
+ <link
+ rel='stylesheet'
+ type='text/css'
+ href='http://fonts.googleapis.com/css?family=Buenard:400,700&amp;subset=latin,latin-ext'>
+ <link
+ rel="stylesheet"
+ type="text/css"
+ href="../../css/reset.css">
+ <link
+ rel="stylesheet"
+ type="text/css"
+ href="../../css/grimoire.css">
+</head>
+<body>
+
+<div id="shell">
+
+ <ol id="breadcrumbs">
+
+ <li class="crumb-0 not-last">
+
+ <a href="../../../">index</a>
+
+ </li>
+
+ <li class="crumb-1 not-last">
+
+ <a href="../../">media</a>
+
+ </li>
+
+ <li class="crumb-2 not-last">
+
+ <a href="../">dev</a>
+
+ </li>
+
+ <li class="crumb-3 not-last">
+
+ <a href="./">builds</a>
+
+ </li>
+
+ <li class="crumb-4 last">
+
+ <span class="list-crumb">list</span>
+
+ </li>
+
+ </ol>
+
+
+
+ <div id="listing">
+ <h1><code>ls /media/dev/builds</code></h1>
+
+
+
+
+
+
+ <div id="files">
+ <h2>Files</h2>
+
+ <li><a href="buildifesto-pyramid.png">buildifesto-pyramid.png</a></li>
+
+ </div>
+
+ </div>
+
+
+
+
+
+
+ <div id="footer">
+ <p>
+
+ The Codex —
+
+ Powered by <a href="http://markdoc.org/">Markdoc</a>.
+
+<a href="https://bitbucket.org/ojacobson/grimoire.ca/src/master/wiki/media/dev/builds">See this directory on Bitbucket</a>.
+
+ </p>
+ </div>
+
+</div>
+</body>
+</html> \ No newline at end of file
diff --git a/.html/media/dev/index.html b/.html/media/dev/index.html
new file mode 100644
index 0000000..28020c6
--- /dev/null
+++ b/.html/media/dev/index.html
@@ -0,0 +1,96 @@
+<!DOCTYPE html>
+<html>
+<head>
+ <title>
+ The Codex »
+ ls /media/dev
+ </title>
+
+ <link
+ rel='stylesheet'
+ type='text/css'
+ href='http://fonts.googleapis.com/css?family=Buenard:400,700&amp;subset=latin,latin-ext'>
+ <link
+ rel="stylesheet"
+ type="text/css"
+ href="../css/reset.css">
+ <link
+ rel="stylesheet"
+ type="text/css"
+ href="../css/grimoire.css">
+</head>
+<body>
+
+<div id="shell">
+
+ <ol id="breadcrumbs">
+
+ <li class="crumb-0 not-last">
+
+ <a href="../../">index</a>
+
+ </li>
+
+ <li class="crumb-1 not-last">
+
+ <a href="../">media</a>
+
+ </li>
+
+ <li class="crumb-2 not-last">
+
+ <a href="./">dev</a>
+
+ </li>
+
+ <li class="crumb-3 last">
+
+ <span class="list-crumb">list</span>
+
+ </li>
+
+ </ol>
+
+
+
+ <div id="listing">
+ <h1><code>ls /media/dev</code></h1>
+
+
+ <div id="directories">
+ <h2>Directories</h2>
+ <ul>
+
+ <li><a href="builds/">builds/</a></li>
+
+ <li><a href="merging-structural-changes/">merging-structural-changes/</a></li>
+
+ </ul>
+ </div>
+
+
+
+
+
+ </div>
+
+
+
+
+
+
+ <div id="footer">
+ <p>
+
+ The Codex —
+
+ Powered by <a href="http://markdoc.org/">Markdoc</a>.
+
+<a href="https://bitbucket.org/ojacobson/grimoire.ca/src/master/wiki/media/dev">See this directory on Bitbucket</a>.
+
+ </p>
+ </div>
+
+</div>
+</body>
+</html> \ No newline at end of file
diff --git a/.html/media/dev/merging-structural-changes/_list.html b/.html/media/dev/merging-structural-changes/_list.html
new file mode 100644
index 0000000..bbdf659
--- /dev/null
+++ b/.html/media/dev/merging-structural-changes/_list.html
@@ -0,0 +1,102 @@
+<!DOCTYPE html>
+<html>
+<head>
+ <title>
+ The Codex »
+ ls /media/dev/merging-structural-changes
+ </title>
+
+ <link
+ rel='stylesheet'
+ type='text/css'
+ href='http://fonts.googleapis.com/css?family=Buenard:400,700&amp;subset=latin,latin-ext'>
+ <link
+ rel="stylesheet"
+ type="text/css"
+ href="../../css/reset.css">
+ <link
+ rel="stylesheet"
+ type="text/css"
+ href="../../css/grimoire.css">
+</head>
+<body>
+
+<div id="shell">
+
+ <ol id="breadcrumbs">
+
+ <li class="crumb-0 not-last">
+
+ <a href="../../../">index</a>
+
+ </li>
+
+ <li class="crumb-1 not-last">
+
+ <a href="../../">media</a>
+
+ </li>
+
+ <li class="crumb-2 not-last">
+
+ <a href="../">dev</a>
+
+ </li>
+
+ <li class="crumb-3 not-last">
+
+ <a href="./">merging-structural-changes</a>
+
+ </li>
+
+ <li class="crumb-4 last">
+
+ <span class="list-crumb">list</span>
+
+ </li>
+
+ </ol>
+
+
+
+ <div id="listing">
+ <h1><code>ls /media/dev/merging-structural-changes</code></h1>
+
+
+
+
+
+
+ <div id="files">
+ <h2>Files</h2>
+
+ <li><a href="ideal-merge-results.png">ideal-merge-results.png</a></li>
+
+ <li><a href="mercurial-merge-results.png">mercurial-merge-results.png</a></li>
+
+ <li><a href="subversion-merge-results.png">subversion-merge-results.png</a></li>
+
+ </div>
+
+ </div>
+
+
+
+
+
+
+ <div id="footer">
+ <p>
+
+ The Codex —
+
+ Powered by <a href="http://markdoc.org/">Markdoc</a>.
+
+<a href="https://bitbucket.org/ojacobson/grimoire.ca/src/master/wiki/media/dev/merging-structural-changes">See this directory on Bitbucket</a>.
+
+ </p>
+ </div>
+
+</div>
+</body>
+</html> \ No newline at end of file
diff --git a/.html/media/dev/merging-structural-changes/ideal-merge-results.png b/.html/media/dev/merging-structural-changes/ideal-merge-results.png
new file mode 100644
index 0000000..cb78110
--- /dev/null
+++ b/.html/media/dev/merging-structural-changes/ideal-merge-results.png
Binary files differ
diff --git a/.html/media/dev/merging-structural-changes/index.html b/.html/media/dev/merging-structural-changes/index.html
new file mode 100644
index 0000000..bbdf659
--- /dev/null
+++ b/.html/media/dev/merging-structural-changes/index.html
@@ -0,0 +1,102 @@
+<!DOCTYPE html>
+<html>
+<head>
+ <title>
+ The Codex »
+ ls /media/dev/merging-structural-changes
+ </title>
+
+ <link
+ rel='stylesheet'
+ type='text/css'
+ href='http://fonts.googleapis.com/css?family=Buenard:400,700&amp;subset=latin,latin-ext'>
+ <link
+ rel="stylesheet"
+ type="text/css"
+ href="../../css/reset.css">
+ <link
+ rel="stylesheet"
+ type="text/css"
+ href="../../css/grimoire.css">
+</head>
+<body>
+
+<div id="shell">
+
+ <ol id="breadcrumbs">
+
+ <li class="crumb-0 not-last">
+
+ <a href="../../../">index</a>
+
+ </li>
+
+ <li class="crumb-1 not-last">
+
+ <a href="../../">media</a>
+
+ </li>
+
+ <li class="crumb-2 not-last">
+
+ <a href="../">dev</a>
+
+ </li>
+
+ <li class="crumb-3 not-last">
+
+ <a href="./">merging-structural-changes</a>
+
+ </li>
+
+ <li class="crumb-4 last">
+
+ <span class="list-crumb">list</span>
+
+ </li>
+
+ </ol>
+
+
+
+ <div id="listing">
+ <h1><code>ls /media/dev/merging-structural-changes</code></h1>
+
+
+
+
+
+
+ <div id="files">
+ <h2>Files</h2>
+
+ <li><a href="ideal-merge-results.png">ideal-merge-results.png</a></li>
+
+ <li><a href="mercurial-merge-results.png">mercurial-merge-results.png</a></li>
+
+ <li><a href="subversion-merge-results.png">subversion-merge-results.png</a></li>
+
+ </div>
+
+ </div>
+
+
+
+
+
+
+ <div id="footer">
+ <p>
+
+ The Codex —
+
+ Powered by <a href="http://markdoc.org/">Markdoc</a>.
+
+<a href="https://bitbucket.org/ojacobson/grimoire.ca/src/master/wiki/media/dev/merging-structural-changes">See this directory on Bitbucket</a>.
+
+ </p>
+ </div>
+
+</div>
+</body>
+</html> \ No newline at end of file
diff --git a/.html/media/dev/merging-structural-changes/mercurial-merge-results.png b/.html/media/dev/merging-structural-changes/mercurial-merge-results.png
new file mode 100644
index 0000000..d20f360
--- /dev/null
+++ b/.html/media/dev/merging-structural-changes/mercurial-merge-results.png
Binary files differ
diff --git a/.html/media/dev/merging-structural-changes/subversion-merge-results.png b/.html/media/dev/merging-structural-changes/subversion-merge-results.png
new file mode 100644
index 0000000..5ef2570
--- /dev/null
+++ b/.html/media/dev/merging-structural-changes/subversion-merge-results.png
Binary files differ
diff --git a/.html/media/email/_list.html b/.html/media/email/_list.html
new file mode 100644
index 0000000..f5205d6
--- /dev/null
+++ b/.html/media/email/_list.html
@@ -0,0 +1,92 @@
+<!DOCTYPE html>
+<html>
+<head>
+ <title>
+ The Codex »
+ ls /media/email
+ </title>
+
+ <link
+ rel='stylesheet'
+ type='text/css'
+ href='http://fonts.googleapis.com/css?family=Buenard:400,700&amp;subset=latin,latin-ext'>
+ <link
+ rel="stylesheet"
+ type="text/css"
+ href="../css/reset.css">
+ <link
+ rel="stylesheet"
+ type="text/css"
+ href="../css/grimoire.css">
+</head>
+<body>
+
+<div id="shell">
+
+ <ol id="breadcrumbs">
+
+ <li class="crumb-0 not-last">
+
+ <a href="../../">index</a>
+
+ </li>
+
+ <li class="crumb-1 not-last">
+
+ <a href="../">media</a>
+
+ </li>
+
+ <li class="crumb-2 not-last">
+
+ <a href="./">email</a>
+
+ </li>
+
+ <li class="crumb-3 last">
+
+ <span class="list-crumb">list</span>
+
+ </li>
+
+ </ol>
+
+
+
+ <div id="listing">
+ <h1><code>ls /media/email</code></h1>
+
+
+
+
+
+
+ <div id="files">
+ <h2>Files</h2>
+
+ <li><a href="flowchart.png">flowchart.png</a></li>
+
+ </div>
+
+ </div>
+
+
+
+
+
+
+ <div id="footer">
+ <p>
+
+ The Codex —
+
+ Powered by <a href="http://markdoc.org/">Markdoc</a>.
+
+<a href="https://bitbucket.org/ojacobson/grimoire.ca/src/master/wiki/media/email">See this directory on Bitbucket</a>.
+
+ </p>
+ </div>
+
+</div>
+</body>
+</html> \ No newline at end of file
diff --git a/.html/media/email/flowchart.png b/.html/media/email/flowchart.png
new file mode 100644
index 0000000..a3f5ef0
--- /dev/null
+++ b/.html/media/email/flowchart.png
Binary files differ
diff --git a/.html/media/email/index.html b/.html/media/email/index.html
new file mode 100644
index 0000000..f5205d6
--- /dev/null
+++ b/.html/media/email/index.html
@@ -0,0 +1,92 @@
+<!DOCTYPE html>
+<html>
+<head>
+ <title>
+ The Codex »
+ ls /media/email
+ </title>
+
+ <link
+ rel='stylesheet'
+ type='text/css'
+ href='http://fonts.googleapis.com/css?family=Buenard:400,700&amp;subset=latin,latin-ext'>
+ <link
+ rel="stylesheet"
+ type="text/css"
+ href="../css/reset.css">
+ <link
+ rel="stylesheet"
+ type="text/css"
+ href="../css/grimoire.css">
+</head>
+<body>
+
+<div id="shell">
+
+ <ol id="breadcrumbs">
+
+ <li class="crumb-0 not-last">
+
+ <a href="../../">index</a>
+
+ </li>
+
+ <li class="crumb-1 not-last">
+
+ <a href="../">media</a>
+
+ </li>
+
+ <li class="crumb-2 not-last">
+
+ <a href="./">email</a>
+
+ </li>
+
+ <li class="crumb-3 last">
+
+ <span class="list-crumb">list</span>
+
+ </li>
+
+ </ol>
+
+
+
+ <div id="listing">
+ <h1><code>ls /media/email</code></h1>
+
+
+
+
+
+
+ <div id="files">
+ <h2>Files</h2>
+
+ <li><a href="flowchart.png">flowchart.png</a></li>
+
+ </div>
+
+ </div>
+
+
+
+
+
+
+ <div id="footer">
+ <p>
+
+ The Codex —
+
+ Powered by <a href="http://markdoc.org/">Markdoc</a>.
+
+<a href="https://bitbucket.org/ojacobson/grimoire.ca/src/master/wiki/media/email">See this directory on Bitbucket</a>.
+
+ </p>
+ </div>
+
+</div>
+</body>
+</html> \ No newline at end of file
diff --git a/.html/media/index.html b/.html/media/index.html
new file mode 100644
index 0000000..14d4f1f
--- /dev/null
+++ b/.html/media/index.html
@@ -0,0 +1,92 @@
+<!DOCTYPE html>
+<html>
+<head>
+ <title>
+ The Codex »
+ ls /media
+ </title>
+
+ <link
+ rel='stylesheet'
+ type='text/css'
+ href='http://fonts.googleapis.com/css?family=Buenard:400,700&amp;subset=latin,latin-ext'>
+ <link
+ rel="stylesheet"
+ type="text/css"
+ href="css/reset.css">
+ <link
+ rel="stylesheet"
+ type="text/css"
+ href="css/grimoire.css">
+</head>
+<body>
+
+<div id="shell">
+
+ <ol id="breadcrumbs">
+
+ <li class="crumb-0 not-last">
+
+ <a href="../">index</a>
+
+ </li>
+
+ <li class="crumb-1 not-last">
+
+ <a href="./">media</a>
+
+ </li>
+
+ <li class="crumb-2 last">
+
+ <span class="list-crumb">list</span>
+
+ </li>
+
+ </ol>
+
+
+
+ <div id="listing">
+ <h1><code>ls /media</code></h1>
+
+
+ <div id="directories">
+ <h2>Directories</h2>
+ <ul>
+
+ <li><a href="css/">css/</a></li>
+
+ <li><a href="dev/">dev/</a></li>
+
+ <li><a href="email/">email/</a></li>
+
+ </ul>
+ </div>
+
+
+
+
+
+ </div>
+
+
+
+
+
+
+ <div id="footer">
+ <p>
+
+ The Codex —
+
+ Powered by <a href="http://markdoc.org/">Markdoc</a>.
+
+<a href="https://bitbucket.org/ojacobson/grimoire.ca/src/master/wiki/media">See this directory on Bitbucket</a>.
+
+ </p>
+ </div>
+
+</div>
+</body>
+</html> \ No newline at end of file