#
#
# patch "index.html"
#  from [afb67bb14afbefe9674cc67064fcdc5124d133c4]
#    to [97881d7c50cba4026d5437e88cb1895c494570b5]
# 
# patch "res/styles.css"
#  from [0f7fecb8eeb5baadcc562d24bac55ca098ac6136]
#    to [a13da09732d8f74540dd9cf36451261c4916dc52]
#
============================================================
--- index.html	afb67bb14afbefe9674cc67064fcdc5124d133c4
+++ index.html	97881d7c50cba4026d5437e88cb1895c494570b5
@@ -30,108 +30,115 @@
 </div>
 
 <div id="body">
-    <img align="right" src="res/merging-fest-transparent.png" alt="merging fest"/>
-    <div class="entry newversion">
-        <a href="NEWS"><b>NEWS: Fri Apr 11 2008, 0.40 release</b></a>
-        <ul>
-            <li>see <b><a href="NEWS">NEWS</a></b> for release notes, <b><a href="UPGRADE">UPGRADE</a></b> for upgrading <small>(<a href="README.changesets">still on 0.14? README.changesets</a>)</small></li>
-            <li>older versions are still <a href="downloads/">available</a></li>
-        </ul>
+    <div class="other">
+        <img src="res/merging-fest-transparent.png" alt="merging fest" title="merging fest" />
     </div>
 
-    <div class="entry important">
-        <a href="http://venge.net/mtn-wiki/MtnSummit2008"><b>Attend the European monotone summit from April 28th to May 4th 2008 in Germany!</b></a>
-    </div>
+    <div class="main">
+        <div class="entry newversion">
+            <a href="NEWS"><b>NEWS: Fri Apr 11 2008, 0.40 release</b></a>
+            <ul>
+                <li>see <b><a href="NEWS">NEWS</a></b> for release notes, <b><a href="UPGRADE">UPGRADE</a></b> for upgrading<br/>
+                    <small>(<a href="README.changesets">still on 0.14? README.changesets</a>)</small></li>
+                <li>older versions are still <a href="downloads/">available</a></li>
+            </ul>
+        </div>
 
-    <div class="entry">
-        Want to help?  <a href="irc://irc.oftc.net/monotone">join irc</a>, <a href="http://www.venge.net/mtn-wiki/QuickieTasks">pick a quickie</a> or <a href="https://savannah.nongnu.org/bugs/?group=monotone">claim a bug, write a missing test case</a>... we're friendly
+        <div class="entry important">
+            <a href="http://venge.net/mtn-wiki/MtnSummit2008"><b>Attend the European monotone summit<br/>from April 28th to May 4th 2008 in Germany!</b></a>
+        </div>
+
+        <div class="entry">
+            Want to help?  <a href="irc://irc.oftc.net/monotone">join irc</a>, <a href="http://www.venge.net/mtn-wiki/QuickieTasks">pick a quickie</a> or <a href="https://savannah.nongnu.org/bugs/?group=monotone">claim a bug,<br/>write a missing test case</a>... we're friendly
+        </div>
     </div>
 
     <div class="clearfloat"></div>
 
-    <div class="box getit">
-        <h1>Get it</h1>
-        <ul>
-            <li><a href="downloads/0.40/monotone-0.40.tar.gz">Source</a></li>
-	    <li><a href="downloads/0.40/mtn-0.40-linux-x86.bz2">Linux x86/glibc 2.3</a></li>
-            <!-- <li><a href="downloads/0.40/mtn-0.40-linux_2.6-static.bz2">static, linux 2.6/glibc</a>(read the <a href="downloads/0.40/mtn-0.40-linux_2.6-static.README1ST">README</a>!) (<a href="downloads/0.40/mtn-0.40-linux_2.6-static.bz2.sig">PGP sig</a>)</li> --> 
-            <li>Windows
-                <a href="downloads/0.40/monotone-0.40-setup.exe">native</a>
-                <a href="http://cygwin.com/">cygwin</a>
-            </li>
-            <li>Mac OS X <a href="downloads/0.40/mtn-0.40-osx.bz2">standalone</a>,
-            <a href="downloads/0.40/monotone-0.40.dmg">packaged</a></li>
-            <!-- <li>Fedora 7 <a href="downloads/0.40/monotone-0.40-0.mtn.1fc7.i386.rpm">x86</a>
-                <a href="downloads/0.40/monotone-0.40-0.mtn.1.x86_64.rpm">x86-64</a>
-                (<a class="lesser" href="downloads/0.40/monotone-0.40-0.mtn.1.fc5.src.rpm">srpm</a>)</li> -->
-            <li>SuSE / openSUSE
-                <a href="http://software.opensuse.org/search?p=1&amp;q=monotone&amp;baseproject=SUSE%3ASLE-10">SLE 10.0</a>,
-                <a href="http://software.opensuse.org/search?p=1&amp;q=monotone&amp;baseproject=openSUSE%3A10.2">openSUSE 10.2</a> and 
-                <a href="http://software.opensuse.org/search?p=1&amp;q=monotone&amp;baseproject=openSUSE%3A10.3">openSUSE 10.3</a>
-                for i586 and x86_64
-            </li>
-            <!-- <li>deb <a href="downloads/0.40/monotone_0.40-0.1_i386.deb">x86 sid</a>,
-                <a href="downloads/0.40/monotone_0.40-0.1_amd64.deb">amd64 sid</a>,
-                (<a class="lesser" href="downloads/0.40/monotone-server_0.40-0.1_all.deb">server setup sid</a>),
-                <a href="downloads/0.40/monotone_0.40-etch0.1_i386.deb">x86 etch</a>
-                <a href="downloads/0.40/monotone_0.40-etch0.1_amd64.deb">amd64 etch</a>
-                (<a class="lesser" href="downloads/0.40/monotone-server_0.40-etch0.1_all.deb">server setup etch</a>)
-                <a href="downloads/0.40/monotone_0.40-sarge0.1_i386.deb">x86 sarge</a>
-                (<a class="lesser" href="downloads/0.40/monotone-server_0.40-sarge0.1_all.deb">server setup sarge</a>),
-                <a href="downloads/0.40/monotone_0.40-dapper0.1_i386.deb">x86 dapper</a>
-                (<a class="lesser" href="downloads/0.40/monotone-server_0.40-dapper0.1_all.deb">server setup dapper</a>),
-                <a href="downloads/0.40/monotone-doc_0.40-etch0.1_all.deb">docs all</a>
-            (<a class="lesser" href="downloads/0.40/monotone_0.40-0.1.dsc">dsc</a>, 
-                <a class="lesser" href="downloads/0.40/monotone_0.40-0.1.tar.gz">orig</a>, 
-                <a class="lesser" href="downloads/0.40/monotone_0.40-0.1_i386.changes">changes</a>)
-            </li> -->
-            <!-- <li>sol10 <a href="downloads/0.40/PMmonotone-0.40.i386.pkg">x86</a>, <a href="downloads/0.40/PMmonotone-0.40.sparc.pkg">sparc</a></li> -->
-            <li><i class="lesser">(more 0.40 packages coming soon, or try <a href="downloads/0.39/">0.39 binaries</a>)</i></li>
-            <!-- <li><i class="lesser"><a href="downloads/">older downloads...</a></i></li> -->
-            <!-- <li><a class="lesser" href="downloads.html">less common downloads...</a></li> -->
-        </ul>
-    </div>
+    <div class="boxes">
+        <div class="box getit">
+            <h1>Get it</h1>
+            <ul>
+                <li><a href="downloads/0.40/monotone-0.40.tar.gz">Source</a></li>
+            <li><a href="downloads/0.40/mtn-0.40-linux-x86.bz2">Linux x86/glibc 2.3</a></li>
+                <!-- <li><a href="downloads/0.40/mtn-0.40-linux_2.6-static.bz2">static, linux 2.6/glibc</a>(read the <a href="downloads/0.40/mtn-0.40-linux_2.6-static.README1ST">README</a>!) (<a href="downloads/0.40/mtn-0.40-linux_2.6-static.bz2.sig">PGP sig</a>)</li> -->
+                <li>Windows
+                    <a href="downloads/0.40/monotone-0.40-setup.exe">native</a>
+                    <a href="http://cygwin.com/">cygwin</a>
+                </li>
+                <li>Mac OS X <a href="downloads/0.40/mtn-0.40-osx.bz2">standalone</a>,
+                <a href="downloads/0.40/monotone-0.40.dmg">packaged</a></li>
+                <!-- <li>Fedora 7 <a href="downloads/0.40/monotone-0.40-0.mtn.1fc7.i386.rpm">x86</a>
+                    <a href="downloads/0.40/monotone-0.40-0.mtn.1.x86_64.rpm">x86-64</a>
+                    (<a class="lesser" href="downloads/0.40/monotone-0.40-0.mtn.1.fc5.src.rpm">srpm</a>)</li> -->
+                <li>SuSE / openSUSE
+                    <a href="http://software.opensuse.org/search?p=1&amp;q=monotone&amp;baseproject=SUSE%3ASLE-10">SLE 10.0</a>,
+                    <a href="http://software.opensuse.org/search?p=1&amp;q=monotone&amp;baseproject=openSUSE%3A10.2">openSUSE 10.2</a> and
+                    <a href="http://software.opensuse.org/search?p=1&amp;q=monotone&amp;baseproject=openSUSE%3A10.3">openSUSE 10.3</a>
+                    for i586 and x86_64
+                </li>
+                <!-- <li>deb <a href="downloads/0.40/monotone_0.40-0.1_i386.deb">x86 sid</a>,
+                    <a href="downloads/0.40/monotone_0.40-0.1_amd64.deb">amd64 sid</a>,
+                    (<a class="lesser" href="downloads/0.40/monotone-server_0.40-0.1_all.deb">server setup sid</a>),
+                    <a href="downloads/0.40/monotone_0.40-etch0.1_i386.deb">x86 etch</a>
+                    <a href="downloads/0.40/monotone_0.40-etch0.1_amd64.deb">amd64 etch</a>
+                    (<a class="lesser" href="downloads/0.40/monotone-server_0.40-etch0.1_all.deb">server setup etch</a>)
+                    <a href="downloads/0.40/monotone_0.40-sarge0.1_i386.deb">x86 sarge</a>
+                    (<a class="lesser" href="downloads/0.40/monotone-server_0.40-sarge0.1_all.deb">server setup sarge</a>),
+                    <a href="downloads/0.40/monotone_0.40-dapper0.1_i386.deb">x86 dapper</a>
+                    (<a class="lesser" href="downloads/0.40/monotone-server_0.40-dapper0.1_all.deb">server setup dapper</a>),
+                    <a href="downloads/0.40/monotone-doc_0.40-etch0.1_all.deb">docs all</a>
+                (<a class="lesser" href="downloads/0.40/monotone_0.40-0.1.dsc">dsc</a>,
+                    <a class="lesser" href="downloads/0.40/monotone_0.40-0.1.tar.gz">orig</a>,
+                    <a class="lesser" href="downloads/0.40/monotone_0.40-0.1_i386.changes">changes</a>)
+                </li> -->
+                <!-- <li>sol10 <a href="downloads/0.40/PMmonotone-0.40.i386.pkg">x86</a>, <a href="downloads/0.40/PMmonotone-0.40.sparc.pkg">sparc</a></li> -->
+                <li><i class="lesser">(more 0.40 packages coming soon, or try <a href="downloads/0.39/">0.39 binaries</a>)</i></li>
+                <!-- <li><i class="lesser"><a href="downloads/">older downloads...</a></i></li> -->
+                <!-- <li><a class="lesser" href="downloads.html">less common downloads...</a></li> -->
+            </ul>
+        </div>
 
-    <div class="box useit">
-        <h1>Use it</h1>
-        <ul>
-            <li><a href="docs/index.html"><b>manual</b> (with tutorial)</a><br/>(<a class="lesser" href="monotone.html">one page</a>, <a class="lesser" href="monotone.pdf">PDF</a>)</li>
-            <li><a href="INSTALL">INSTALL</a></li>
-            <li><a href="http://www.venge.net/mtn-wiki/FAQ">FAQ</a></li>
-            <li><a href="http://www.venge.net/mtn-wiki/InterfacesFrontendsAndTools">GUIs/other tools</a></li>
-            <li><a href="http://mail.nongnu.org/mailman/listinfo/monotone-devel">mailing list</a></li>
-            <li><a href="irc://irc.oftc.net/#monotone">IRC</a> (<a class="lesser" href="http://colabti.org/irclogger/irclogger_logs/monotone">logs</a>)</li>
-            <li><a href="http://www.venge.net/mtn-wiki/">wiki</a></li>
-            <li><a href="others.html">other systems</a></li>
-            <li><a href="http://www.cafepress.com/monotone_vcs">swag</a></li>
-            <li><a href="http://www.frappr.com/monotone">frappr</a></li>
-        </ul>
-    </div>
+        <div class="box useit">
+            <h1>Use it</h1>
+            <ul>
+                <li><a href="docs/index.html"><b>manual</b> (with tutorial)</a><br/>(<a class="lesser" href="monotone.html">one page</a>, <a class="lesser" href="monotone.pdf">PDF</a>)</li>
+                <li><a href="INSTALL">INSTALL</a></li>
+                <li><a href="http://www.venge.net/mtn-wiki/FAQ">FAQ</a></li>
+                <li><a href="http://www.venge.net/mtn-wiki/InterfacesFrontendsAndTools">GUIs/other tools</a></li>
+                <li><a href="http://mail.nongnu.org/mailman/listinfo/monotone-devel">mailing list</a></li>
+                <li><a href="irc://irc.oftc.net/#monotone">IRC</a> (<a class="lesser" href="http://colabti.org/irclogger/irclogger_logs/monotone">logs</a>)</li>
+                <li><a href="http://www.venge.net/mtn-wiki/">wiki</a></li>
+                <li><a href="others.html">other systems</a></li>
+                <li><a href="http://www.cafepress.com/monotone_vcs">swag</a></li>
+                <li><a href="http://www.frappr.com/monotone">frappr</a></li>
+            </ul>
+        </div>
 
-    <div class="box improveit">
-        <h1>Improve it</h1>
-        <ul>
-            <li><a href="https://savannah.nongnu.org/bugs/?group=monotone">bugs / todo list</a></li>    
-            <li><a href="http://mail.nongnu.org/mailman/listinfo/monotone-devel">mailing list</a></li>
-            <li><a href="irc://irc.oftc.net/#monotone">IRC</a> (<a class="lesser" href="http://colabti.org/irclogger/irclogger_logs/monotone">logs</a>)</li>
-            <li><a href="http://www.venge.net/mtn-wiki/">wiki</a></li>
-            <li><a href="http://www.venge.net/mtn-wiki/SelfHostingInfo">self-hosting info</a></li>
-            <li><a href="http://savannah.nongnu.org/projects/monotone">savannah</a></li>
-            <li><a href="http://viewmtn.angrygoats.net/branch/changes/net.venge.monotone">browse source</a></li>
-            <li><a href="http://cia.navi.cx/stats/project/monotone">latest work</a> (<a class="lesser" href="https://cia.navi.cx/stats/project/monotone/.rss">RSS</a>)</li>
-            <li>commit mailing list:<br />
-              <a href="http://lists.nongnu.org/mailman/listinfo/monotone-commits-diffs">with</a> / 
-              <a href="http://lists.nongnu.org/mailman/listinfo/monotone-commits-nodiffs">without</a> diffs</li>
-            <li><a href="buildbot/">build status</a></li>   
-            <li><a href="http://frances.vorpus.org/~monotone-cov/net.venge.monotone">test coverage</a></li>
-        </ul>
+        <div class="box improveit">
+            <h1>Improve it</h1>
+            <ul>
+                <li><a href="https://savannah.nongnu.org/bugs/?group=monotone">bugs / todo list</a></li>
+                <li><a href="http://mail.nongnu.org/mailman/listinfo/monotone-devel">mailing list</a></li>
+                <li><a href="irc://irc.oftc.net/#monotone">IRC</a> (<a class="lesser" href="http://colabti.org/irclogger/irclogger_logs/monotone">logs</a>)</li>
+                <li><a href="http://www.venge.net/mtn-wiki/">wiki</a></li>
+                <li><a href="http://www.venge.net/mtn-wiki/SelfHostingInfo">self-hosting info</a></li>
+                <li><a href="http://savannah.nongnu.org/projects/monotone">savannah</a></li>
+                <li><a href="http://viewmtn.angrygoats.net/branch/changes/net.venge.monotone">browse source</a></li>
+                <li><a href="http://cia.navi.cx/stats/project/monotone">latest work</a> (<a class="lesser" href="https://cia.navi.cx/stats/project/monotone/.rss">RSS</a>)</li>
+                <li>commit mailing list:<br />
+                  <a href="http://lists.nongnu.org/mailman/listinfo/monotone-commits-diffs">with</a> /
+                  <a href="http://lists.nongnu.org/mailman/listinfo/monotone-commits-nodiffs">without</a> diffs</li>
+                <li><a href="buildbot/">build status</a></li>
+                <li><a href="http://frances.vorpus.org/~monotone-cov/net.venge.monotone">test coverage</a></li>
+            </ul>
+        </div>
+        <div class="clearfloat"></div>
     </div>
 
-    <div class="clearfloat"></div>
-
     <div id="footer">
         <a href="_analog.html">website statistics</a> | <a href="http://tango.freedesktop.org/Tango_Icon_Library">icons stolen from the Tango Project</a>
-    </div> 
+    </div>
 </div>
 
 </body>
============================================================
--- res/styles.css	0f7fecb8eeb5baadcc562d24bac55ca098ac6136
+++ res/styles.css	a13da09732d8f74540dd9cf36451261c4916dc52
@@ -27,19 +27,19 @@ ul {
 }
 
 #header, #body {
-    width: 46em;
     margin-left: auto;
     margin-right: auto;
     background: white;
     border-left: 0.0625em solid #474747;
     border-right: 0.0625em solid #474747;
-    padding: 1em;
 }
 
 #header {
     margin-bottom: 0.5em;
     border-bottom: 0.0625em solid #474747;
     text-align: justify;
+    width: 46em;
+    padding: 1em;
 }
 
 #header p {
@@ -56,34 +56,61 @@ ul {
 
 #body {
     border: 0.0625em solid #474747;
+    width: 44em;
+    padding: 2em;
 }
 
+.other {
+    float: right;
+    width: 250px;
+    margin-top: 1em;
+    text-align: center;
+}
+
+.other + .main {
+    margin-right: 250px;
+}
+
+.main:after {
+    clear: both;
+}
+
 .entry {
-    border-bottom: 0.0625em dotted #CCCCCC;
-    margin-bottom: 1em;
-    padding-bottom: 1em;
-    margin-top: 1em;
+    border-top: 0.0625em dotted #CCCCCC;
+    margin-top: 2em;
+    padding-top: 2em;
 }
 
+.entry:first-child {
+    border-top: 0;
+    margin-top: -1em;
+}
+
 .important {
     padding-left: 2.5em;
-    padding-top: 0.3em;
-    background: url(important.png) no-repeat;
+    background: url(important.png) no-repeat 0 1.5em;
 }
 
 .newversion {
     padding-left: 2.5em;
-    padding-top: 0.4em;
-    background: url(newversion.png) no-repeat;
+    background: url(newversion.png) no-repeat 0 1.5em;
 }
 
+.boxes {
+    margin-top: 2em;
+    padding-top: 1em;
+    border-top: 0.0625em dotted #CCCCCC;
+    border-bottom: 0.0625em dotted #CCCCCC;
+    margin-bottom: 1em;
+}
+
 .box {
     float: left;
     margin-top: -1em;
     padding-right: 0.5em;
     margin-right: 0.5em;
     border-right: 0.0625em dotted #CCCCCC;
-    width: 14.5em;
+    width: 13.5em;
 }
 
 .box + .box + .box {
@@ -116,10 +143,8 @@ ul {
     background: url(improveit.png) no-repeat;
 }
 
-
 #footer {
-    border-top: 0.0625em dotted #CCCCCC;
-    padding-top: 1em;
+    margin-top: 1em;
     font-size: 0.7em;
     text-align: center;
 }