#
#
# add_file "res/getitdistro.png"
#  content [5d1a1fdf69fb12d9e6e80cc2bcba2f86cc91c9a6]
# 
# patch "index.html"
#  from [bb809dee29388d72f080d2f3dd16a50e2b76bb8a]
#    to [0b38e4ac3c13ce49ea2932cff2aff2b48f4ff95e]
# 
# patch "res/merging-fest-transparent.png"
#  from [02ce6b6531c15dafa4d1db24c37c7dec455f5707]
#    to [dbb22c4031c5510c8e8659209eaee22b0f757cbe]
# 
# patch "res/styles.css"
#  from [a13da09732d8f74540dd9cf36451261c4916dc52]
#    to [5fe09379587b80eb210eac2a038850df3014ec4c]
# 
#   set "res/getitdistro.png"
#  attr "mtn:manual_merge"
# value "true"
#
============================================================
# res/getitdistro.png is binary
============================================================
--- index.html	bb809dee29388d72f080d2f3dd16a50e2b76bb8a
+++ index.html	0b38e4ac3c13ce49ea2932cff2aff2b48f4ff95e
@@ -51,57 +51,35 @@
     <div class="clearfloat"></div>
 
     <div class="boxes">
-        <div class="box getit">
-            <h1>Get it</h1>
+        <div class="box">
+            <h1 class="getit">Get it here</h1>
             <ul>
-                <li><a href="http://monotone.ca/downloads/0.44/monotone-0.44.tar.gz">Source</a></li>
+                <li><a href="http://monotone.ca/downloads/0.44/monotone-0.44.tar.gz"><b>Source</b></a></li>
                 <li><a href="downloads/0.44/mtn-0.44-linux-x86.bz2">Linux x86/glibc 2.3</a></li>
                 <!-- <li><a href="downloads/0.44/mtn-0.44-linux_2.6-static.bz2">static, linux 2.6/glibc</a>(read the <a href="downloads/0.41/mtn-0.41-linux_2.6-static.README1ST">README</a>!) (<a href="downloads/0.44/mtn-0.44-linux_2.6-static.bz2.sig">PGP sig</a>)</li> -->
                 <!-- <li>Windows
                     <a href="downloads/0.44/monotone-0.44-setup.exe">native</a>
                 </li> -->
-                <li>Mac OS X <a href="http://www.macports.org/ports.php?by=name&amp;substr=monotone">from MacPorts</a>, <a href="downloads/0.44/mtn-0.44-osx.bz2">standalone</a>,
+                <li>Mac OS X <a href="downloads/0.44/mtn-0.44-osx.bz2">standalone</a>,
                     <a href="downloads/0.44/monotone-0.44.dmg">packaged</a></li>
-                <li>FreeBSD <a href="http://freshports.org/devel/monotone/">from Ports</a></li>
                 <!-- <li>Fedora 7 <a href="downloads/0.44/monotone-0.44-0.mtn.1fc7.i386.rpm">x86</a>
                     <a href="downloads/0.44/monotone-0.44-0.mtn.1.x86_64.rpm">x86-64</a>
                     (<a class="lesser" href="downloads/0.44/monotone-0.44-0.mtn.1.fc5.src.rpm">srpm</a>)</li> -->
-                <!-- <li><a href="http://software.opensuse.org/search?p=1&amp;q=monotone&amp;baseproject=openSUSE%3A11.0">openSuSE 11.0</a> and
-                    <a href="http://software.opensuse.org/search?p=1&amp;q=monotone&amp;baseproject=openSUSE%3A11.1">openSuSE 11.1</a>
-                    for i586 and x86_64<br />
-                    <small>(<a href="http://software.opensuse.org/search?baseproject=ALL&amp;q=monotone">all available versions</a>)</small>
-                </li> -->
-                <!-- <li>deb <a href="downloads/0.44/monotone_0.44-0.1_i386.deb">x86 sid</a>,
-                    <a href="downloads/0.44/monotone_0.44-0.1_amd64.deb">amd64 sid</a>,
-                    (<a class="lesser" href="downloads/0.44/monotone-server_0.44-0.1_all.deb">server setup sid</a>),
-                    <a href="downloads/0.44/monotone_0.44-etch0.1_i386.deb">x86 etch</a>
-                    <a href="downloads/0.44/monotone_0.44-etch0.1_amd64.deb">amd64 etch</a>
-                    (<a class="lesser" href="downloads/0.44/monotone-server_0.44-etch0.1_all.deb">server setup etch</a>)
-                    <a href="downloads/0.44/monotone_0.44-sarge0.1_i386.deb">x86 sarge</a>
-                    (<a class="lesser" href="downloads/0.44/monotone-server_0.44-sarge0.1_all.deb">server setup sarge</a>),
-                    <a href="downloads/0.44/monotone_0.44-dapper0.1_i386.deb">x86 dapper</a>
-                    (<a class="lesser" href="downloads/0.44/monotone-server_0.44-dapper0.1_all.deb">server setup dapper</a>),
-                    <a href="downloads/0.44/monotone-doc_0.44-etch0.1_all.deb">docs all</a>
-                (<a class="lesser" href="downloads/0.44/monotone_0.44-0.1.dsc">dsc</a>,
-                    <a class="lesser" href="downloads/0.44/monotone_0.44-0.1.tar.gz">orig</a>,
-                    <a class="lesser" href="downloads/0.44/monotone_0.44-0.1_i386.changes">changes</a>)
-                </li> -->
                 <!-- <li>Solaris 10 <a href="downloads/0.44/PMmonotone-0.44.i386.pkg">x86</a>, <a href="downloads/0.44/PMmonotone-0.44.sparc.pkg">sparc</a></li> -->
-                <li><i class="lesser">(more <a href="downloads/0.44/">0.44 packages</a> coming soon, or try <a href="downloads/0.43/">0.43 binaries</a>)</i></li>
             </ul>
-            <p>also an usually recent release is available in the following systems:</p>
+            <h1 class="getitdistro">...or from your distro</h1>
             <ul>
-                <li><a href="http://packages.debian.org/stable/devel/monotone">Debian</a></li>
-                <li><a href="http://cygwin.com/">cygwin</a> <i class="lesser">(more recent on <a href="http://cygwin.com/#beta-test">cygwin 1.7</a>)</i></li>
+                <li><a href="http://cygwin.com/cgi-bin2/package-grep.cgi?grep=monotone/monotone">Cygwin</a></li>
+                <li><a href="http://packages.debian.org/stable/devel/monotone">Debian Linux</a></li>
                 <li><a href="http://www.freshports.org/devel/monotone/">FreeBSD Ports</a></li>
-                <li>NetBSD <a href="http://pkgsrc.se/devel/monotone">pkgsrc</a></li>
-                <li>Mac OS X <a href="http://www.macports.org/ports.php?by=name&amp;substr=monotone">MacPorts</a></li>
-                <li><a href="http://software.opensuse.org/search?p=1&amp;q=monotone&amp;baseproject=ALL">openSuSE</a></li>
+                <li><a href="http://www.macports.org/ports.php?by=name&amp;substr=monotone">Mac OS X MacPorts</a></li>
+                <li><a href="http://pkgsrc.se/devel/monotone">NetBSD pkgsrc</a></li>
+                <li><a href="http://software.opensuse.org/search?p=1&amp;q=monotone&amp;baseproject=ALL">openSuSE Linux</a></li>
             </ul>
         </div>
 
-        <div class="box useit">
-            <h1>Use it</h1>
+        <div class="box">
+            <h1 class="useit">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>
@@ -116,8 +94,8 @@
             </ul>
         </div>
 
-        <div class="box improveit">
-            <h1>Improve it</h1>
+        <div class="box">
+            <h1 class="improveit">Improve it</h1>
             <ul>
                 <li><a href="https://savannah.nongnu.org/bugs/?group=monotone"><strong>bugs</strong></a></li>
                 <li><a href="http://mail.nongnu.org/mailman/listinfo/monotone-devel">mailing list</a></li>
============================================================
# res/merging-fest-transparent.png is binary
============================================================
--- res/styles.css	a13da09732d8f74540dd9cf36451261c4916dc52
+++ res/styles.css	5fe09379587b80eb210eac2a038850df3014ec4c
@@ -122,8 +122,8 @@ ul {
 .box h1 {
     font-size: 1em;
     padding-top: 0.7em;
+    padding-bottom: 0.2em;
     padding-left: 2.5em;
-    height: 2em;
 }
 
 .box ul {
@@ -131,15 +131,19 @@ ul {
     margin-bottom: 1em;
 }
 
-.getit h1 {
+h1.getit {
     background: url(getit.png) no-repeat;
 }
 
-.useit h1 {
+h1.getitdistro {
+    background: url(getitdistro.png) no-repeat;
+}
+
+h1.useit {
     background: url(useit.png) no-repeat;
 }
 
-.improveit h1 {
+h1.improveit {
     background: url(improveit.png) no-repeat;
 }