Merge remote-tracking branch 'ry/v0.6' into master

Conflicts: ChangeLog deps/uv/src/unix/udp.c deps/uv/src/win/fs.c deps/uv/src/win/udp.c deps/uv/test/test-fs.c doc/index.html doc/logos/index.html doc/template.html src/node_version.h
author: isaacs <i@izs.me> 2012-01-31 18:18:00 -0800
committer: isaacs <i@izs.me> 2012-01-31 18:18:00 -0800
commit: 18d179c2d8f916c07a763ea8e99ed6dc77751bfa (patch)
tree: d2066d272d5e81f21c355e0ab9b6432dcebd3c5f /doc
parent: 33b7fc250f061af42b595decf6c0edf360c5aae9 (diff)
parent: 7e0bf7d57de318f45a097e05644efa49beb65209 (diff)
download: node-new-18d179c2d8f916c07a763ea8e99ed6dc77751bfa.tar.gz
23 files changed, 938 insertions, 259 deletions
diff --git a/doc/about/index.html b/doc/about/index.html
index f3a33554f4..f209769a5b 100644
--- a/doc/about/index.html
+++ b/doc/about/index.html
@@ -11,34 +11,42 @@
     <link type="image/x-icon" rel="icon" href="../favicon.ico">
     <link type="image/x-icon" rel="shortcut icon" href="../favicon.ico">
     <link rel="stylesheet" href="../pipe.css">
-    <link rel="stylesheet" href="../sh_vim-dark.css">
+    <link rel="stylesheet" href="../sh.css">
     <link rel="alternate"
           type="application/rss+xml"
           title="node blog"
           href="http://feeds.feedburner.com/nodejs/123123123">
     <title>node.js</title>
   </head>
-  <body>
-    <div id="intro">
+  <body class="alt int" id="about">
+    <div id="intro" class="interior">
         <a href="/" title="Go back to the home page">
-            <img id="logo" src="../logo.png" alt="node.js">
+            <img id="logo" src="../logo-light.png" alt="node.js">
         </a>
     </div>
     <div id="content" class="clearfix">
+            <div id="column2" class="interior">
+                <ul>
+                    <li><a href="/" class="home">Home</a></li>
+                    <li><a href="/#download" class="download">Download</a></li>
+                    <li><a href="/about/" class="about current">About</a></li>
+                    <li><a href="http://search.npmjs.org/" class="npm">npm Registry</a></li>
+                    <li><a href="http://nodejs.org/docs/latest/api/index.html" class="docs">Docs</a></li>
+                    <li><a href="http://blog.nodejs.org" class="blog">Blog</a></li>
+                    <li><a href="/community/" class="community">Community</a></li>
+                    <li><a href="/logos/" class="logos">Logos</a></li>
+                    <li><a href="http://jobs.nodejs.org/" class="jobs">Jobs</a></li>
+                </ul>
+                <p class="twitter"><a href="http://twitter.com/nodejs">@nodejs</a></p>
+            </div>
+
             <div id="column1" class="interior">
-                <h2>About</h2>
+                <h1>Node's goal is to provide an easy way to build scalable
+              network programs</h1>
 
-              <pre>
-var http = require('http');
-http.createServer(function (req, res) {
-  res.writeHead(200, {'Content-Type': 'text/plain'});
-  res.end('Hello World\n');
-}).listen(1337, "127.0.0.1");
-console.log('Server running at http://127.0.0.1:1337/');</pre>
 
-              <p>Node's goal is to provide an easy way to build scalable
-              network programs. In the "hello world" web server example
-              above, many client connections can be handled concurrently.
+              <p>In the "hello world" web server example
+              below, many client connections can be handled concurrently.
               Node tells the operating system (through <code>epoll</code>,
               <code>kqueue</code>, <code>/dev/poll</code>, or
               <code>select</code>) that it should be notified when a new
@@ -46,6 +54,13 @@ console.log('Server running at http://127.0.0.1:1337/');</pre>
               connects, then it executes the callback. Each connection is
               only a small heap allocation.</p>
 
+              <pre>
+var http = require('http');
+http.createServer(function (req, res) {
+  res.writeHead(200, {'Content-Type': 'text/plain'});
+  res.end('Hello World\n');
+}).listen(1337, "127.0.0.1");
+console.log('Server running at http://127.0.0.1:1337/');</pre>
               <p>This is in contrast to today's more common concurrency
               model where OS threads are employed. Thread-based networking
               is relatively inefficient and very difficult to use. See: <a
@@ -99,16 +114,26 @@ console.log('Server running at http://127.0.0.1:1337/');</pre>
                 <li><a href="http://nodejs.org/jsconf2010.pdf">Slides from JSConf 2010</a></li>
                 <li><a href="http://www.yuiblog.com/blog/2010/05/20/video-dahl/">Video from a talk at Yahoo in May 2010</a></li>
             </ul>
-            <p><a href="/">Go back to the home page</a></p>
         </div>
-        <div id="column2" class="interior">
-    </div>
 </div>
     <div id="footer">
-      <p>Copyright <a href="http://joyent.com">Joyent, Inc</a>, Node.js
-      is a <a href="trademark-policy.pdf">trademark of Joyent, Inc</a>.
+        <ul class="clearfix">
+            <li><a href="/">Node.js</a></li>
+            <li><a href="/#download">Download</a></li>
+            <li><a href="/about/">About</a></li>
+            <li><a href="http://search.npmjs.org/">npm Registry</a></li>
+            <li><a href="http://nodejs.org/docs/latest/api/index.html">Docs</a></li>
+            <li><a href="http://blog.nodejs.org">Blog</a></li>
+            <li><a href="/community/">Community</a></li>
+            <li><a href="/logos/">Logos</a></li>
+            <li><a href="http://jobs.nodejs.org/">Jobs</a></li>
+            <li><a href="http://twitter.com/nodejs" class="twitter">@nodejs</a></li>
+        </ul>
+
+        <p>Copyright 2010 <a href="http://joyent.com">Joyent, Inc</a>, Node.js is a <a href="/trademark-policy.pdf">trademark</a> of Joyent, Inc. View <a href="https://raw.github.com/joyent/node/v0.6.9/LICENSE">license</a>.</p>
     </div>
 
+
     <script src="../sh_main.js"></script>
     <script src="../sh_javascript.min.js"></script>
     <script>highlight(undefined, undefined, 'pre');</script>
diff --git a/doc/anchor.png b/doc/anchor.png
new file mode 100644
index 0000000000..1ed163ee1a
--- /dev/null
+++ b/doc/anchor.png
diff --git a/doc/api_assets/anchor.png b/doc/api_assets/anchor.png
new file mode 100644
index 0000000000..1ed163ee1a
--- /dev/null
+++ b/doc/api_assets/anchor.png
diff --git a/doc/api_assets/footer-logo-alt.png b/doc/api_assets/footer-logo-alt.png
new file mode 100644
index 0000000000..e6d9c2390e
--- /dev/null
+++ b/doc/api_assets/footer-logo-alt.png
diff --git a/doc/api_assets/icons-interior.png b/doc/api_assets/icons-interior.png
new file mode 100644
index 0000000000..6b3d483dc0
--- /dev/null
+++ b/doc/api_assets/icons-interior.png
diff --git a/doc/api_assets/logo-light.png b/doc/api_assets/logo-light.png
new file mode 100644
index 0000000000..898fcecc96
--- /dev/null
+++ b/doc/api_assets/logo-light.png
diff --git a/doc/api_assets/platform-icons.png b/doc/api_assets/platform-icons.png
new file mode 100644
index 0000000000..d6624a5a64
--- /dev/null
+++ b/doc/api_assets/platform-icons.png
diff --git a/doc/api_assets/style.css b/doc/api_assets/style.css
index c47f3812b8..0ade5b2231 100644
--- a/doc/api_assets/style.css
+++ b/doc/api_assets/style.css
@@ -1,24 +1,28 @@
 /*--------------------- Layout and Typography ----------------------------*/
+html {
+	-webkit-font-smoothing: antialiased;
+}
+
 body {
-//  font-family: "Helvetica Neue", Helvetica, FreeSans, Arial, sans-serif;
-  font-family: Georgia, FreeSerif, Times, serif;
-  font-size: 0.9375em;
-  line-height: 1.4667em;
-  color: #222;
-  margin: 0; padding: 0;
+  font-family: "Lucida Grande", "Lucida Sans Unicode", "Lucida Sans", Verdana, Tahoma, sans-serif;
+	font-size: 14px;
+  line-height: 180%;
+  color: black;
+  margin: 0; padding: 49px 0 0 0;
+  border-top: 6px #8CC84B solid;
 }
 a {
-  color: #0050c0;
+  color: #690;
   text-decoration: underline;
 }
   a:visited {
-    color: #b950b7;
+    color: #46483e;
     text-decoration: underline;
   }
   a:hover, a:focus {
     text-decoration: none;
   }
-  
+
     code a:hover {
       background: none;
       color: #b950b7;
@@ -28,6 +32,23 @@ a {
   display: none;
 }
 
+#gtoc p {
+  margin:0;
+  font-size:18px;
+  line-height: 30px;
+}
+
+#gtoc a {
+  font-family: Georgia, FreeSerif, Times, serif;
+  text-decoration: none;
+  color: #46483e;
+}
+
+#gtoc a:hover {
+    color: #669900;
+    text-decoration: underline;
+}
+
 .notice {
   display: block;
   padding: 1em;
@@ -54,6 +75,13 @@ p {
   text-rendering: optimizeLegibility;
 }
 
+.apidoc p {
+  font-size: 15px;
+  line-height: 22px;
+  color: #000;
+  font-family: Georgia, FreeSerif, Times, serif;
+}
+
 ol, ul, dl {
   margin: 0 0 1em 0;
   padding: 0;
@@ -89,25 +117,34 @@ dd + dt.pre {
 }
 
 h1, h2, h3, h4, h5, h6 {
-  font-family: Georgia, FreeSerif, Times, serif;
+  font-family: Helvetica, Arial, sans-serif;
   color: #000;
   text-rendering: optimizeLegibility;
   position: relative;
 }
 
 h1 {
-  font-size: 2.55em;
-  line-height: 1.375em;
+  font-family: Georgia, FreeSerif, Times, serif;
+  font-size: 30px;
+  font-weight: normal;
+  line-height: 36px;
+  color: #690;
+  margin: 15px 0 11px;
 }
 
 h2 {
-  font-size: 1.9em;
-  line-height: 1.227em;
-  margin: 0 0 0.5em;
+  font-size: 29px;
+  line-height: 33px;
+  margin: 2em 0 15px;
+}
+
+#toc + h2 {
+  margin-top:1em;
+  padding-top:0;
 }
 
 h3 {
-  font-size: 1.5em;
+  font-size: 1.4em;
   line-height: 1.0909em;
   margin: 1.5em 0 0.5em;
 }
@@ -126,13 +163,35 @@ h4 + h4 {
   margin: 0 0 0.5em;
 }
 
-  h3 a,
-  h4 a {
+  h3, h4 {
+    position:relative;
+    padding-right:40px;
+  }
+  h2 span, h3 span, h4 span {
+    position:absolute;
+    display:block;
+    top:0;
+    right:0;
+    opacity: 0.3;
+  }
+  h2 span:hover, h3 span:hover, h4 span:hover {
+    opacity: 1;
+  }
+  h2 span a, h3 span a, h4 span a {
     font-size: 0.8em;
-    float: right;
     color: #000;
     text-decoration: none;
-    opacity: 0.3;
+    font-family: Helvetica, Arial, sans-serif;
+    font-weight:bold;
+  }
+
+  h2 span a.top, h3 span a.top, h4 span a.top {
+    /* XXX Get an image and clean up these two links
+     * so that they look nice next to one another.
+     * http://www.chrisglass.com/work/nodejs/website/v05/docs.html
+     * -isaacs
+     */
+    display:none;
   }
 
 h5 {
@@ -146,7 +205,7 @@ h6 {
 }
 
   pre, tt, code {
-    font-size: 0.95em;
+    font-size: 14px;
     line-height: 1.5438em;
     font-family: Monaco, Consolas, "Lucida Console", monospace;
     margin: 0; padding: 0;
@@ -159,12 +218,13 @@ h6 {
   }
 
   pre {
-    padding: 2em 1.6em 2em 1.2em;
+    padding: 1em 1.6em 1em 1.2em;
     vertical-align: top;
     background: #f8f8f8;
     border: 1px solid #e8e8e8;
     border-width: 1px 1px 1px 6px;
     margin: -0.5em 0 1.1em;
+    overflow-x:auto;
   }
   
   pre + h3 {
@@ -175,37 +235,41 @@ code.pre {
   white-space: pre;
 }
 
-#container {
-  position: relative;
-  padding: 6em;
-  max-width: 50em;
-  text-align: left;
+#intro {
+    width: 775px;
+    margin: 0 auto;
+    text-align: center;
+	color: #d2d8ba;
+
+  /* preload platform-icons.png */
+  background-image: url(platform-icons.png);
+  background-repeat: no-repeat;
+  background-position: -999em -999em;
 }
 
-#container header {
-  margin: 1.25em -0.5em 1.3em;
-  padding: 0 0.5em 0.225em;
+#intro.interior #logo {
+    margin-left: -298px;
+    border:0;
 }
 
 hr {
   background: none;
   border: medium none;
   border-bottom: 1px solid #ccc;
-  margin: 5em 0 2em;
-}
-
-#container header hr {
-  margin: 0;
-  padding: 0;
+  margin: 1em 0;
 }
 
 #toc {
-  
+  font-size:15px;
+  line-height:1.5em;
+  line-height: 22px;
+  padding-top:4px;
 }
 
   #toc h2 {
-    font-size: 1em;
-    line-height: 1.4em;
+    font-size: 15px;
+    line-height: 21px;
+    margin: 0 0 0.5em;
   }
   
   #toc h2 a {
@@ -216,29 +280,209 @@ hr {
     margin: 1em 0 2em;
   }
 
+  #toc ul {
+    font-family: Georgia, FreeSerif, Times, serif;
+  }
+
+  #toc ul a {
+    text-decoration:none;
+    border-bottom:1px dotted #690;
+  }
+  #toc ul a:hover, #toc ul a:focus {
+    border-bottom:1px dotted #fff;
+    color:#000;
+  }
+
+
 p tt, p code {
   background: #f8f8ff;
   border: 1px solid #dedede;
   padding: 0 0.2em;
 }
 
-a.octothorpe {
-  text-decoration: none;
-  color: #777;
-  position: absolute;
-  top: 0; left: -1.4em;
-  padding: 1px 2px;
-  opacity: 0;
-  -webkit-transition: opacity 0.2s linear;
-}
-    p:hover  > a.octothorpe, 
-    dt:hover > a.octothorpe,
-    dd:hover > a.octothorpe,
-    h1:hover > a.octothorpe,
-    h2:hover > a.octothorpe,
-    h3:hover > a.octothorpe,
-    h4:hover > a.octothorpe,
-    h5:hover > a.octothorpe,
-    h6:hover > a.octothorpe {
-      opacity: 1;
-    }
+#content {
+    width: 953px;
+    margin: 0 auto;
+    overflow: visible;
+    clear: both;
+    display: block;
+}
+
+#column1.interior {
+    width: 749px;
+    float: right;
+    padding-top: 7px;
+    padding-top: 11px;
+    font-size:18px;
+}
+
+#column2.interior {
+    width: 140px;
+    float: left;
+    margin-top: -55px;
+    overflow: visible;
+}
+
+#column2.interior ul {
+    margin-left: 0;
+}
+
+#column2.interior li {
+    list-style-type: none;
+}
+
+#column2.interior li a {
+    display: block;
+    padding: 0 0 0 35px;
+    color: #878b78;
+    text-transform: uppercase;
+    text-decoration: none;
+    font-size: 11px;
+    line-height: 23px;
+}
+
+#column2.interior li a.home { background: url(icons-interior.png) no-repeat -156px 3px; }
+#column2.interior li a.download { background: url(icons-interior.png) no-repeat -156px -21px; }
+#column2.interior li a.about { background: url(icons-interior.png) no-repeat -156px -45px; }
+#column2.interior li a.npm { background: url(icons-interior.png) no-repeat -156px -69px; }
+#column2.interior li a.docs { background: url(icons-interior.png) no-repeat -156px -93px; }
+#column2.interior li a.blog { background: url(icons-interior.png) no-repeat -156px -117px; }
+#column2.interior li a.community { background: url(icons-interior.png) no-repeat -156px -141px; }
+#column2.interior li a.logos { background: url(icons-interior.png) no-repeat -156px -165px; }
+#column2.interior li a.jobs { background: url(icons-interior.png) no-repeat -156px -189px; } 
+
+#column2.interior li a.home.current { background-position: 2px 3px; }
+#column2.interior li a.download.current { background-position: 2px -21px; }
+#column2.interior li a.about.current { background-position: 2px -45px; }
+#column2.interior li a.npm.current { background-position: 2px -69px; }
+#column2.interior li a.docs.current { background-position: 2px -93px; }
+#column2.interior li a.blog.current { background-position: 2px -117px; }
+#column2.interior li a.community.current { background-position: 2px -141px; }
+#column2.interior li a.logos.current { background-position: 2px -165px; }
+#column2.interior li a.jobs.current { background-position: 2px -189px; }
+#column2.interior li a.current { color: #8cc84b; font-weight: bold; }
+
+#column2.interior li a.home:hover { background-position: -331px 3px; }
+#column2.interior li a.download:hover { background-position: -331px -21px; }
+#column2.interior li a.about:hover { background-position: -331px -45px; }
+#column2.interior li a.npm:hover { background-position: -331px -69px; }
+#column2.interior li a.docs:hover { background-position: -331px -93px; }
+#column2.interior li a.blog:hover { background-position: -331px -117px; }
+#column2.interior li a.community:hover { background-position: -331px -141px; }
+#column2.interior li a.logos:hover { background-position: -331px -165px; }
+#column2.interior li a.jobs:hover { background-position: -331px -189px; }
+#column2.interior li a:hover { color: #000000; text-decoration: none; }
+
+#column2.interior li + li {
+    border-top: 1px solid #c1c7ac;
+}
+#column2.interior p.twitter {
+    padding-top: 20px;
+}
+
+#column2.interior p.twitter a {
+    background: url(twitter-bird.png) no-repeat 0 4px;
+    padding-left: 37px;
+    text-decoration: none;
+}
+
+#column2.interior p.twitter a:hover {
+    text-decoration: underline;
+}
+
+a.totop {
+  font-family: "Lucida Grande", "Lucida Sans Unicode", "Lucida Sans", Verdana, Tahoma, sans-serif;
+  font-weight: bold;
+  text-indent: -9999999px;
+  background: url(anchor.png) no-repeat top left;
+  margin-right: 7px;
+  display: block;
+  width: 13px;
+  border-bottom: 1px solid #cccccc;
+}
+
+a.anchor {
+  font-family: "Lucida Grande", "Lucida Sans Unicode", "Lucida Sans", Verdana, Tahoma, sans-serif;
+  font-weight: bold;
+  text-indent: -9999999px;
+  background: url(anchor.png) no-repeat top right;
+  display: block;
+  width: 13px;
+  border-bottom: 1px solid #cccccc;
+}
+#footer {
+    width: 942px;
+    margin: 150px auto 55px auto;
+    padding:0;
+}
+
+#footer p {
+    font-size: 11px;
+    line-height:1em;
+    padding: 0 0 0 195px;
+    color: #666;
+    font-family: "Lucida Grande", "Lucida Sans Unicode", "Lucida Sans", Verdana, Tahoma, sans-serif;
+}
+
+#footer a {
+  text-decoration:none;
+  border:none;
+  color: #690;
+}
+#footer a:hover {
+  color:#000;
+}
+
+#footer p a {
+    border-bottom:1px dotted #690;
+    color: #878b78;
+}
+
+#footer ul {
+    background: url(footer-logo-alt.png) left 17px no-repeat;
+    padding: 23px 0 0 195px;
+    height: 26px;
+    margin-left: -1px;
+    border-top: 1px solid #626557;
+}
+
+#footer ul li {
+    list-style-type: none;
+    float: left;
+    font-size: 12px;
+    margin:0!important;
+    padding:0;
+    height: 12px;
+}
+
+#footer ul li a {
+    margin: 0;
+    padding: 0 6px 0 0;
+    display: block;
+    height:12px;
+    line-height:12px;
+}
+
+#footer ul li + li {
+    margin-left: 3px;
+}
+
+#footer ul li + li a {
+    padding: 0 6px 0 6px;
+    border-left: 1px solid #878b78;
+}
+
+#footer ul li a.twitter  {
+    background: url(twitter-bird.png) no-repeat 5px 0px;
+    padding-left: 25px;
+}
+
+/* simpler clearfix */
+.clearfix:after {
+    content: ".";
+    display: block;
+    height: 0;
+    clear: both;
+    visibility: hidden;
+}
+
diff --git a/doc/api_assets/twitter-bird.png b/doc/api_assets/twitter-bird.png
new file mode 100644
index 0000000000..b619b2a0d3
--- /dev/null
+++ b/doc/api_assets/twitter-bird.png
diff --git a/doc/community-icons.png b/doc/community-icons.png
new file mode 100644
index 0000000000..b3d58f0f1e
--- /dev/null
+++ b/doc/community-icons.png
diff --git a/doc/community/index.html b/doc/community/index.html
index 3219f7bf84..ef9bac5ae1 100644
--- a/doc/community/index.html
+++ b/doc/community/index.html
@@ -20,135 +20,167 @@
           href="http://feeds.feedburner.com/nodejs/123123123">
     <title>node.js</title>
   </head>
-  <body>
-    <div id="intro">
+  <body class="int" id="community">
+    <div id="intro" class="interior">
         <a href="/" title="Go back to the home page">
             <img id="logo" src="../logo.png" alt="node.js">
         </a>
     </div>
     <div id="content" class="clearfix">
-            <div id="column1" class="interior">
-                  <p>Node's most valuable feature is the friendly and <a
-                    href="http://blip.tv/jsconf/nodeconf-2011-marak-squires-5729610">colorful
-                    community</a> of developers. There are many places where
-                  this group congregates on the internet. This page attempts
-                  to highlight the best forums.</p>
-        
-                  <h2>Periodicals</h2>
-
-                  <p> <a
-                  href="http://planetnodejs.com">Planet Node</a> is an
-                  aggregator of Node developer blogs. <a
-                  href="http://nodeup.com/">NodeUp</a>
-                  is a podcast covering the latest Node news in the
-                  community. </p>
-
-                  <h2>Docs</h2>
-
-                  <p>
-                  Besides the <a href="http://nodejs.org/docs/latest/api">official API
-                  docs</a> there are a number of sites new users should be
-                  aware of. <A href="http://docs.nodejitsu.com/">docs.nodejitsu.com</A>
-                  answers many of the common problems people come across.
-                  <a href="http://howtonode.org/">How To Node</a> has a
-                  growing number of useful tutorials. 
-                  The <a href="http://stackoverflow.com/questions/tagged/node.js">Stack
-                  Overflow node.js tag</a> is collecting new information
-                  every day.
+            <div id="column2" class="interior">
+                <ul>
+                    <li><a href="/" class="home">Home</a></li>
+                    <li><a href="/#download" class="download">Download</a></li>
+                    <li><a href="/about/" class="about">About</a></li>
+                    <li><a href="http://search.npmjs.org/" class="npm">npm Registry</a></li>
+                    <li><a href="http://nodejs.org/docs/latest/api/index.html" class="docs">Docs</a></li>
+                    <li><a href="http://blog.nodejs.org" class="blog">Blog</a></li>
+                    <li><a href="/community/" class="community current">Community</a></li>
+                    <li><a href="/logos/" class="logos">Logos</a></li>
+                    <li><a href="http://jobs.nodejs.org/" class="jobs">Jobs</a></li>
+                </ul>
+                <p class="twitter"><a href="http://twitter.com/nodejs">@nodejs</a></p>
+
+            </div>
         
+            <div id="column1" class="interior">
+                <p>Node's most valuable feature is the friendly and <a href="http://blip.tv/jsconf/nodeconf-2011-marak-squires-5729610">colorful community</a> of developers. There are many places where this group congregates on the internet. This page attempts to highlight the best forums.</p>
         
-                  <h2>GitHub</h2>
-                  <p>All development takes place at <a
-                  href="http://github.com/joyent/node">http://github.com/joyent/node</a>.
-                  The comments on commit messages are often source of heated
-                  discussion regarding core development.  The <a
-                  href="http://github.com/joyent/node/wiki">GitHub Node
-                  wiki</a> is full of useful links for newcomers.  Don't
-                  miss <a
-                  href="https://github.com/joyent/node/wiki/Projects,-Applications,-and-Companies-Using-Node">Projects,
-                  Applications, and Companies Using Node</a> or the <a
-                  href="https://github.com/joyent/node/wiki/modules">very
-                  long list of Node modules</a>, many of which are
-                  published in the <a href="http://search.npmjs.org/">npm
-                  registry</a>.</p>
+              <div class="row clearfix">
+                  <div class="block">
+                      <h2 class="documentation">Documentation</h2>
+
+                          <p><a href="http://nodejs.org/docs/latest/api">Official API docs</a> detail the node API.</p>
+                          <p><a href="http://docs.nodejitsu.com/">docs.nodejitsu.com</a> answers many of the common problems people come across.</p>
+                          <p><a href="http://howtonode.org/">How To Node</a> has a growing number of useful tutorials.</p> 
+                          <p><a href="http://stackoverflow.com/questions/tagged/node.js">Stack Overflow node.js tag</a> collects new information every day.</p>
+                      </div>
+
+
+                      <div class="block">
+                          <h2 class="github">GitHub</h2>
+                          <p>All development takes place at <a
+                                  href="http://github.com/joyent/node">http://github.com/joyent/node</a>.
+                              The comments on commit messages are often source of heated
+                              discussion regarding core development.</p><p>The <a
+                                  href="http://github.com/joyent/node/wiki">GitHub Node
+                                  wiki</a> is full of useful links for newcomers.  Don't
+                              miss <a
+                                  href="https://github.com/joyent/node/wiki/Projects,-Applications,-and-Companies-Using-Node">Projects,
+                                  Applications, and Companies Using Node</a> or the <a
+                                  href="https://github.com/joyent/node/wiki/modules">very
+                                  long list of Node modules</a>, many of which are
+                              published in the <a href="http://search.npmjs.org/">npm
+                                  registry</a>.</p>
+                      </div>
+                  </div>
 
-                  <p><a href="http://notinventedhe.re/on/2011-7-26"><img
-                  src="not-invented-here.png" width="100%"></a> Bugs
-                  should be reported to <a
-                  href="https://github.com/joyent/node/issues">https://github.com/joyent/node/issues</a>.
-                  Fixes to the code are welcome! Please see our <a
-                  href="https://github.com/joyent/node/wiki/Contributing">contributing
-                  guidelines</a> for information on how to submit a
-                  patch.</p>
-        
-                  <h2>Mailing Lists</h2>
-
-                  <p>The <a
-                  href="http://groups.google.com/group/nodejs">user
-                  mailing list</a> is used for announcements, discussion,
-                  and flame wars about Node.  The <a
-                  href="http://groups.google.com/group/nodejs-dev">internal
-                  development mailing list</a> is used for discussion of
-                  internal design and feature proposals.</p>
-          
-                  <h2>IRC</h2>
-
-                  <p>For real-time chat about Node development go to
-                  <code>irc.freenode.net</code> in the <code>#node.js</code>
-                  channel with an <a href="http://www.mirc.com">IRC</a> <a
-                  href="http://colloquy.info/">client</a> or connect in
-                  your web browser to the channel using <a
-                  href="http://webchat.freenode.net/?channels=node.js">freenode's
-                  WebChat</a>. Felix Geisendörfer keeps <a
-                  href="http://nodejs.debuggable.com/">logs of the
-                  channel</a> for those who miss a day.</p>
         
-                  <h2>Conferences</h2>
-
-                  <p><a href="http://www.nodeconf.com/">NodeConf</a>
-                  conferences are the main event in the United States; they
-                  are organized by <a href="http://www.mikealrogers.com/">Mikeal Rogers</a>.
-                  <a href="http://nodefest.jp/">NodeFest (東京Node学園祭)</a>
-                  is organized by the <a href="http://nodejs.jp">Node.js
-                  Japan user group</a>.  <a
-                  href="http://nodecamp.de/">NodeCamp.de</a> in Cologne,
-                  Germany is organized by <a href="railslove.de">Rails
-                  Love</a>.  An <a href="http://nodejsconf.it/">Italian
-                  Node.js Conference</a> exists as well.  <a
-                  href="http://nodesummit.com/">Node Summit</a> is a
-                  conference in San Francisco focusing on the adoption of
-                  Node in larger companies.  <a
-                  href="http://jsconf.com/">JSConf</a> organizes the main
-                  JavaScript conferences.</p>
+              <div class="row clearfix">
+                  <div class="block">
+                      <h2 class="mailing">Mailing Lists</h2>
+
+                      <p>The <a
+                              href="http://groups.google.com/group/nodejs">user
+                              mailing list</a> is used for announcements, discussion,
+                          and flame wars about Node.  The <a
+                              href="http://groups.google.com/group/nodejs-dev">internal
+                              development mailing list</a> is used for discussion of
+                          internal design and feature proposals.</p>
+                  </div>
+
+                  <div class="block">
+                      <h2 class="periodicals">Periodicals</h2>
+
+                      <p> <a
+                              href="http://planetnodejs.com">Planet Node</a> is an
+                          aggregator of Node developer blogs.</p><p><a
+                              href="http://nodeup.com/">NodeUp</a>
+                          is a podcast covering the latest Node news in the
+                          community. </p>
+                  </div>
+              </div>
+
+              <div class="row clearfix">
+                  <div class="block">
+                      <h2 class="conferences">Conferences</h2>
+
+                      <p><a href="http://www.nodeconf.com/">NodeConf</a>
+                          conferences are the main event in the United States; they
+                          are organized by <a href="http://www.mikealrogers.com/">Mikeal Rogers</a>.</p>
+                      <p><a href="http://nodefest.jp/">NodeFest (東京Node学園祭)</a>
+                          is organized by the <a href="http://nodejs.jp">Node.js
+                              Japan user group</a>.</p>
+                      <p><a href="http://nodecamp.de/">NodeCamp.de</a> in Cologne,
+                          Germany is organized by <a href="railslove.de">Rails Love</a>.</p>
+                      <p>An <a href="http://nodejsconf.it/">Italian
+                              Node.js Conference</a> exists as well.</p>
+                      <p><a href="http://nodesummit.com/">Node Summit</a> is a
+                          conference in San Francisco focusing on the adoption of
+                          Node in larger companies.</p>
+                      <p><a href="http://jsconf.com/">JSConf</a> organizes the main
+                          JavaScript conferences.</p>
+                  </div>
+
+                  <div class="block">
+                      <h2 class="localized">Localized Sites</h2>
+
+                      <p><code>nodejs.org</code> does not maintain any
+                          translations into other languages. However there are
+                          community websites in various languages with mailing lists
+                          and translations of the website.</p>
+
+                      <p><a href="http://nodejs.ru/">nodejs.ru</a> Russian blog.
+                          <br>
+                          <a href="http://nodejs.ir">nodejs.ir</a> Iran group in Persian
+                          <br>
+                          <a href="http://nodejs.jp/">nodejs.jp</a> Japan user group 
+                          <br>
+                          <a href="http://cnodejs.org">CNodeJS.org</a> Chinese community
+                          <br>
+                          <a href="http://nodejs.co.il">nodejs.co.il</a> Israeli wiki
+                          <br>
+                          <a href="http://nodejs.hk">HKNoJ</a> Hong Kong community
+                          <br>
+                          <a href="http://nodejs.tw">nodejs.tw</a> Taiwan community</p>
+                  </div>
+              </div>
+
+              <div class="row clearfix">
+                  <div class="block">
+                      <h2 class="irc">IRC</h2>
+
+                      <p>For real-time chat about Node development go to
+                          <code>irc.freenode.net</code> in the <code>#node.js</code>
+                          channel with an <a href="http://www.mirc.com">IRC</a> <a
+                              href="http://colloquy.info/">client</a> or connect in
+                          your web browser to the channel using <a
+                              href="http://webchat.freenode.net/?channels=node.js">freenode's
+                              WebChat</a>. Felix Geisendörfer keeps <a
+                              href="http://nodejs.debuggable.com/">logs of the
+                              channel</a> for those who miss a day.</p>
+                  </div>
+              </div>
         
-                  <h2>Localized Sites</h2>
-
-                  <p><code>nodejs.org</code> does not maintain any
-                  translations into other languages. However there are
-                  community websites in various languages with mailing lists
-                  and translations of the website.</p>
-
-                  <p><a href="http://nodejs.ru/">nodejs.ru</a> Russian blog.
-                  <br>
-                  <a href="http://nodejs.ir">nodejs.ir</a> Iran group in Persian
-                  <br>
-                  <a href="http://nodejs.jp/">nodejs.jp</a> Japan user group 
-                  <br>
-                  <a href="http://cnodejs.org">CNodeJS.org</a> Chinese community
-                  <br>
-                  <a href="http://nodejs.co.il">nodejs.co.il</a> Israeli wiki
-                  <br>
-                  <a href="http://nodejs.hk">HKNoJ</a> Hong Kong community
-                  <br>
-                  <a href="http://nodejs.tw">nodejs.tw</a> Taiwan community</p>
-            <p><a href="/">Go back to the home page</a></p>
+                  <p><a href="http://notinventedhe.re/on/2011-7-26"><img
+                  src="not-invented-here.png" width="100%"></a></p>
         </div>
-        <div id="column2" class="interior">
-    </div>
 </div>
     <div id="footer">
-      <p>Copyright <a href="http://joyent.com">Joyent, Inc</a>, Node.js
-      is a <a href="trademark-policy.pdf">trademark of Joyent, Inc</a>.
+        <ul class="clearfix">
+            <li><a href="/">Node.js</a></li>
+            <li><a href="/#download">Download</a></li>
+            <li><a href="/about/">About</a></li>
+            <li><a href="http://search.npmjs.org/">npm Registry</a></li>
+            <li><a href="http://nodejs.org/docs/latest/api/index.html">Docs</a></li>
+            <li><a href="http://blog.nodejs.org">Blog</a></li>
+            <li><a href="/community/">Community</a></li>
+            <li><a href="/logos/">Logos</a></li>
+            <li><a href="http://jobs.nodejs.org/">Jobs</a></li>
+            <li><a href="http://twitter.com/nodejs" class="twitter">@nodejs</a></li>
+        </ul>
+
+        <p>Copyright 2010 <a href="http://joyent.com">Joyent, Inc</a>, Node.js is a <a href="/trademark-policy.pdf">trademark</a> of Joyent, Inc. View <a href="https://raw.github.com/joyent/node/v0.6.9/LICENSE">license</a>.</p>
     </div>
 
     <script>
diff --git a/doc/ebay-logo.png b/doc/ebay-logo.png
index 8cb3db006d..8a51935dd9 100644
--- a/doc/ebay-logo.png
+++ b/doc/ebay-logo.png
diff --git a/doc/footer-logo-alt.png b/doc/footer-logo-alt.png
new file mode 100644
index 0000000000..e6d9c2390e
--- /dev/null
+++ b/doc/footer-logo-alt.png
diff --git a/doc/home-icons.png b/doc/home-icons.png
new file mode 100644
index 0000000000..421dfdaf11
--- /dev/null
+++ b/doc/home-icons.png
diff --git a/doc/icons-interior.png b/doc/icons-interior.png
new file mode 100644
index 0000000000..6b3d483dc0
--- /dev/null
+++ b/doc/icons-interior.png
diff --git a/doc/index.html b/doc/index.html
index c7526beff7..2f0456ff45 100644
--- a/doc/index.html
+++ b/doc/index.html
@@ -18,7 +18,7 @@
           href="http://feeds.feedburner.com/nodejs/123123123">
     <title>node.js</title>
   </head>
-  <body>
+  <body id="front">
     <div id="intro">
         <img id="logo" src="logo.png" alt="node.js">
 
@@ -31,6 +31,7 @@
 
         <a href="#download" class="button" id="downloadbutton">Download</a>
         <a href="http://nodejs.org/docs/latest/api/index.html" class="button" id="docsbutton">Docs</a>
+        <p class="version">v0.6.9</p> 
     </div>
     <div id="quotes" class="clearfix">
         <h2>Node.js in the Industry</h2>
@@ -77,15 +78,15 @@
         <a href="#" id="download-close">X</a>
         <img id="download-logo" src="download-logo.png" alt="node.js">
         <ul id="installers" class="clearfix">
-            <li><a href="http://nodejs.org/dist/v0.7.1/node-v0.7.1.msi">Windows Installer</a><br>node-v0.7.1.msi</li>
-            <li><a href="http://nodejs.org/dist/v0.7.1/node-v0.7.1.pkg">Macintosh Installer</a><br>node-v0.7.1.pkg</li>
-            <li id="source"><a href="http://nodejs.org/dist/v0.7.1/node-v0.7.1.tar.gz">Source Code</a><br>node-v0.7.1.tar.gz</li>
+            <li><a href="http://nodejs.org/dist/v0.6.9/node-v0.6.9.msi">Windows Installer</a><br>node-v0.6.9.msi</li>
+            <li><a href="http://nodejs.org/dist/v0.6.9/node-v0.6.9.pkg">Macintosh Installer</a><br>node-v0.6.9.pkg</li>
+            <li id="source"><a href="http://nodejs.org/dist/v0.6.9/node-v0.6.9.tar.gz">Source Code</a><br>node-v0.6.9.tar.gz</li>
         </ul>
         <ul id="documentation">
-            <li><a href="https://raw.github.com/joyent/node/v0.7.1/ChangeLog">Change Log</a></li>
-            <li><a href="http://nodejs.org/docs/v0.7.1/api/index.html">Documentation</a></li>
-            <li><a href="http://nodejs.org/dist/v0.7.1">Other release files</a></li>
-            <li><a href="https://raw.github.com/joyent/node/v0.7.1/LICENSE">License</a></li>
+            <li><a href="https://raw.github.com/joyent/node/v0.6.9/ChangeLog">Change Log</a></li>
+            <li><a href="http://nodejs.org/docs/v0.6.9/api/index.html">Documentation</a></li>
+            <li><a href="http://nodejs.org/dist/v0.6.9">Other release files</a></li>
+            <li><a href="https://raw.github.com/joyent/node/v0.6.9/LICENSE">License</a></li>
             <li><a href="https://github.com/joyent/node">Git Repository</a></li>
             <li><a href="https://github.com/joyent/node/wiki/Installing-Node.js-via-package-manager">Installing
             with a Package Manager</a>
@@ -197,10 +198,23 @@ server.listen(1337, "127.0.0.1");</pre>
 </div>
 
     <div id="footer">
-      <p>Copyright <a href="http://joyent.com">Joyent, Inc</a>, Node.js
-      is a <a href="trademark-policy.pdf">trademark of Joyent, Inc</a>.
+        <ul class="clearfix">
+            <li><a href="/">Node.js</a></li>
+            <li><a href="/#download">Download</a></li>
+            <li><a href="/about/">About</a></li>
+            <li><a href="http://search.npmjs.org/">npm Registry</a></li>
+            <li><a href="http://nodejs.org/docs/latest/api/index.html">Docs</a></li>
+            <li><a href="http://blog.nodejs.org">Blog</a></li>
+            <li><a href="/community/">Community</a></li>
+            <li><a href="/logos/">Logos</a></li>
+            <li><a href="http://jobs.nodejs.org/">Jobs</a></li>
+            <!-- <li><a hrfe="http://twitter.com/nodejs" class="twitter">@nodejs</a></li> -->
+        </ul>
+
+        <p>Copyright 2010 <a href="http://joyent.com">Joyent, Inc</a>, Node.js is a <a href="/trademark-policy.pdf">trademark</a> of Joyent, Inc. View <a href="https://raw.github.com/joyent/node/v0.6.9/LICENSE">license</a>.</p>
     </div>
 
+
     <script src="sh_main.js"></script>
     <script src="sh_javascript.min.js"></script>
     <script>highlight(undefined, undefined, 'pre');</script>
diff --git a/doc/logo-light.png b/doc/logo-light.png
new file mode 100644
index 0000000000..898fcecc96
--- /dev/null
+++ b/doc/logo-light.png
diff --git a/doc/logos/index.html b/doc/logos/index.html
index 1ff27b3859..8a84aebacd 100644
--- a/doc/logos/index.html
+++ b/doc/logos/index.html
@@ -21,15 +21,30 @@
     <meta http-equiv="content-type" content="text/html; charset=utf-8">
     <title>node.js</title>
   </head>
-  <body>
-    <div id="intro">
+  <body class="int" id="logos">
+    <div id="intro" class="interior">
         <a href="/" title="Go back to the home page">
             <img id="logo" src="../logo.png" alt="node.js">
         </a>
     </div>
     <div id="content" class="clearfix">
+            <div id="column2" class="interior">
+                <ul>
+                    <li><a href="/" class="home">Home</a></li>
+                    <li><a href="/#download" class="download">Download</a></li>
+                    <li><a href="/about/" class="about">About</a></li>
+                    <li><a href="http://search.npmjs.org/" class="npm">npm Registry</a></li>
+                    <li><a href="http://nodejs.org/docs/latest/api/index.html" class="docs">Docs</a></li>
+                    <li><a href="http://blog.nodejs.org" class="blog">Blog</a></li>
+                    <li><a href="/community/" class="community">Community</a></li>
+                    <li><a href="/logos/" class="logos current">Logos</a></li>
+                    <li><a href="http://jobs.nodejs.org/" class="jobs">Jobs</a></li>
+                </ul>
+                <p class="twitter"><a href="http://twitter.com/nodejs">@nodejs</a></p>
+
+            </div>
+        
             <div id="column1" class="interior">
-            <p>To echo the evolutionary nature of Node, we've added some punch and playfulness to its identity. All it needs now is a good home with you, download and have fun!</p>
           <h2>Logo Downloads</h2>
           <table border="0" cellspacing="0" cellpadding="10">
             <tr>
@@ -54,17 +69,28 @@
           <p>Select your screen resolution:<a href="nodejs-1024x768.png"><br>
           <span class="desktops">1024 x 768</span></a><span class="desktops">  | <a href="nodejs-1280x1024.png">1280 x 1024</a> | <a href="nodejs-1440x900.png">1440 x 900</a> | <a href="nodejs-1920x1200.png">1920 x 1200</a> | <a href="nodejs-2560x1440.png">2560 x 1440</a></span></p>
 
-            <p><a href="/">Go back to the home page</a></p>
         </div>
-        <div id="column2" class="interior">
-    </div>
 </div>
     <div id="footer">
-        <p>Copyright <a href="http://joyent.com">Joyent, Inc</a>., Node.js is a <a href="trademark-policy.pdf">trademark of Joyent, Inc</a>., <a href="https://raw.github.com/joyent/node/v0.7.1/LICENSE">View License</a></p>
+        <ul class="clearfix">
+            <li><a href="/">Node.js</a></li>
+            <li><a href="/#download">Download</a></li>
+            <li><a href="/about/">About</a></li>
+            <li><a href="http://search.npmjs.org/">npm Registry</a></li>
+            <li><a href="http://nodejs.org/docs/latest/api/index.html">Docs</a></li>
+            <li><a href="http://blog.nodejs.org">Blog</a></li>
+            <li><a href="/community/">Community</a></li>
+            <li><a href="/logos/">Logos</a></li>
+            <li><a href="http://jobs.nodejs.org/">Jobs</a></li>
+            <li><a href="http://twitter.com/nodejs" class="twitter">@nodejs</a></li>
+        </ul>
+
+        <p>Copyright <a href="http://joyent.com">Joyent, Inc</a>., Node.js is a <a href="/trademark-policy.pdf">trademark of Joyent, Inc</a>., <a href="https://raw.github.com/joyent/node/v0.6.9/LICENSE">View License</a></p>
     </div>
 
 
 
+
     <script type="text/javascript">
       var gaJsHost = (("https:" == document.location.protocol) ?
       "https://ssl." : "http://www.");
diff --git a/doc/pipe.css b/doc/pipe.css
index 3da6d120a9..999161b77b 100644
--- a/doc/pipe.css
+++ b/doc/pipe.css
@@ -13,6 +13,15 @@ body {
     border-top: 6px #8cc84b solid;
 }
 
+body.alt {
+    background: white;
+    color: #46483e;
+}
+
+body.int {
+  padding-top:49px;
+}
+
 img {
 	border: 0;
 }
@@ -29,6 +38,15 @@ h1, h2, h3, h4 {
 	margin-left: 0;
     text-transform: uppercase;
 }
+h1 {
+    font-family: Georgia, FreeSerif, Times, serif;
+    font-size: 30px;
+    line-height: 36px;
+    text-transform: none;
+    color: #669900;
+    font-weight: normal;
+    margin: 15px 0 11px;
+}
 
 h2 {
     font-size: 12px;
@@ -51,7 +69,7 @@ h1 a, h2 a, h3 a, h4 a
   /* preload platform-icons.png */
   background-image: url(platform-icons.png);
   background-repeat: no-repeat;
-  background-position: -1000px -1000px;
+  background-position: -999em -999em;
 }
 
 #intro p {
@@ -62,15 +80,24 @@ h1 a, h2 a, h3 a, h4 a
     font-size: 14px;
 }
 
+#intro.interior #logo {
+    margin-left: -298px;
+}
+
+#intro p.version {
+    padding-top: 10px;
+    font-size: 12px;
+}
+
 #intro .button {
   font-weight: bold;
   font-size: 14px;
   text-transform: uppercase;
-  padding: 7px 10px;
+  padding: 6px 12px;
   -webkit-border-radius: 4px;
   -moz-border-radius: 4px;
   border-radius: 4px;
-  margin: 0 5px;
+  margin: 0 1px;
   color: #46483e;
 }
 
@@ -87,7 +114,7 @@ h1 a, h2 a, h3 a, h4 a
 }
 
 #intro #docsbutton {
-  background-color: #d2d8ba;
+  background-color: #9a9f8b;
 }
 
 #intro #docsbutton:hover {
@@ -140,31 +167,173 @@ h1 a, h2 a, h3 a, h4 a
     font-size: 10px;
 }
 
+#quotes ul li p {
+  color: #D2D8BA
+}
+
 #content {
     width: 775px;
     margin: 0 auto;
+    overflow: visible;
+    clear: both;
+    display: block;
+}
+.int #content {
+  width: 953px;
 }
 
-#content #column1 {
-    width: 420px;
+#column1 {
+    width: 460px;
     float: left;
 }
 
-#content #column2 {
+#content p {
+    font-size: 14px;
+    line-height:24px;
+}
+#front #content p {
+  font-size:12px;
+}
+
+#content h1 + p {
+    font-size: 18px;
+    line-height: 30px;
+    color: #46483e;
+    font-family: Georgia, FreeSerif, Times, serif;
+}
+
+#column2 {
     width: 260px;
     float: right;
 }
 
-#content #column1.interior {
-    width: 510px;
+#column1.interior {
+    width: 600px;
     float: right;
+    padding-top: 11px;
+    font-size:18px;
+    padding-right:150px;
+}
+
+#column2.interior {
+    width: 140px;
+    float: left;
+    margin-top: -54px;
+    overflow: visible;
+}
+
+#column2.interior ul {
+    margin-left: 0;
+}
+
+#column2.interior li {
+    list-style-type: none;
+}
+
+#column2.interior li a {
+    display: block;
+    padding: 0 0 0 35px;
+    color: #878b78;
+    text-transform: uppercase;
+    text-decoration: none;
+    font-size: 11px;
+    line-height: 23px;
+}
+
+#column2.interior li a.home { background: url(icons-interior.png) no-repeat -156px 3px; }
+#column2.interior li a.download { background: url(icons-interior.png) no-repeat -156px -21px; }
+#column2.interior li a.about { background: url(icons-interior.png) no-repeat -156px -44px; }
+#column2.interior li a.npm { background: url(icons-interior.png) no-repeat -156px -69px; }
+#column2.interior li a.docs { background: url(icons-interior.png) no-repeat -156px -93px; }
+#column2.interior li a.blog { background: url(icons-interior.png) no-repeat -156px -117px; }
+#column2.interior li a.community { background: url(icons-interior.png) no-repeat -156px -141px; }
+#column2.interior li a.logos { background: url(icons-interior.png) no-repeat -156px -165px; }
+#column2.interior li a.jobs { background: url(icons-interior.png) no-repeat -156px -189px; } 
+
+#column2.interior li a.home.current { background-position: 2px 3px; }
+#column2.interior li a.download.current { background-position: 2px -21px; }
+#column2.interior li a.about.current { background-position: 2px -45px; }
+#column2.interior li a.npm.current { background-position: 2px -69px; }
+#column2.interior li a.docs.current { background-position: 2px -93px; }
+#column2.interior li a.blog.current { background-position: 2px -117px; }
+#column2.interior li a.community.current { background-position: 2px -141px; }
+#column2.interior li a.logos.current { background-position: 2px -165px; }
+#column2.interior li a.jobs.current { background-position: 2px -189px; }
+#column2.interior li a.current { color: #8cc84b; font-weight: bold; }
+
+#column2.interior li a.home:hover { background-position: -331px 3px; }
+#column2.interior li a.download:hover { background-position: -331px -21px; }
+#column2.interior li a.about:hover { background-position: -331px -45px; }
+#column2.interior li a.npm:hover { background-position: -331px -69px; }
+#column2.interior li a.docs:hover { background-position: -331px -93px; }
+#column2.interior li a.blog:hover { background-position: -331px -117px; }
+#column2.interior li a.community:hover { background-position: -331px -141px; }
+#column2.interior li a.logos:hover { background-position: -331px -165px; }
+#column2.interior li a.jobs:hover { background-position: -331px -189px; }
+#column2.interior li a:hover { color: #000000; text-decoration: none; }
+
+#column2.interior li + li {
+    border-top: 1px solid #c1c7ac;
+    border-top:1px solid #65675c;
+}
+.alt #column2.interior li + li {
+    border-top: 1px solid #c1c7ac;
+}
+
+#column2.interior p.twitter {
+    padding-top: 20px;
+}
+
+#column2.interior p.twitter a {
+    background: url(twitter-bird.png) no-repeat 0 4px;
+    padding-left: 37px;
+}
+
+.row {
+    padding-top: 10px;
+    padding-bottom: 10px;
+}
+
+.row + .row {
+    border-top: 1px solid #626557;
+}
+
+.row h2 {
+    font-size: 24px;
+    color: white;
+    text-transform: none;
+    font-family: Georgia, FreeSerif, Times, serif;
+    background: url(community-icons.png) no-repeat;
+    padding-left: 45px;
+    padding-top: 6px;
+    padding-bottom: 10px;
+    margin-top: 10px;
+}
+
+.row h2.github { background-position: left -92px; }
+.row h2.mailing { background-position: left -308px; }
+.row h2.periodicals { background-position: left -198px; padding-top: 9px; margin-top: 7px; }
+.row h2.conferences { background-position: left -522px; }
+.row h2.localized { background-position: left -414px; }
+.row h2.irc { background-position: left -626px; }
+
+.block {
+    width: 280px;
+    float: left;
+}
+
+.block + .block {
+    margin-left: 20px;
+    width: 300px;
 }
 
-#content #column2.interior {
+#content .block p {
+    font-size: 13px;
+    line-height:21px;
 }
 
 #explore {
-    background: url(icons.png) no-repeat left 15px;
+    background: url(home-icons.png) no-repeat left 17px;
 }
 
 #explore li {
@@ -201,24 +370,92 @@ h1 a, h2 a, h3 a, h4 a
 }
 
 #footer {
-    width: 775px;
-    border-top: 1px solid #626557;
-    margin: 50px auto 30px auto;
-    padding-top: 15px;
+    width: 942px;
+    margin: 150px auto 55px auto;
+    padding:0;
 }
 
 #footer p {
-	color: #8BC84B;
-    height: 32px;
-    padding-top: 3px;
-    background: url(footer-logo.png) left top no-repeat;
-    padding-left: 130px;
+    font-size: 11px;
+    line-height:1em;
+    padding: 0 0 0 195px;
+    color: #666;
+    font-family: "Lucida Grande", "Lucida Sans Unicode", "Lucida Sans", Verdana, Tahoma, sans-serif;
+}
+
+#front #footer {
+  width: 775px;
+  margin: 50px auto 30px auto;
+  padding-top: 15px;
+}
+#front #footer ul {
+  margin-right:0;
+  padding-right:0;
+}
+
+#footer a {
+  text-decoration:none;
+  border:none;
+  color: #690;
+}
+
+#footer a:hover {
+  color:#000;
+}
+#front #footer a:hover {
+  color:#fff;
 }
 
 #footer p a {
-    text-decoration: underline;
+    border-bottom:1px dotted #690;
+    color: #878b78;
+}
+
+#footer ul {
+    background: url(footer-logo.png) left 17px no-repeat;
+    border-top: 1px solid #626557;
+    border-color:#90918b;
+    padding-top:23px;
+    padding-left: 195px;
+    height: 26px;
+    margin-right:137px;
+}
+.alt #footer ul {
+    background-image: url(footer-logo-alt.png);
+}
+
+#footer ul li {
+    list-style-type: none;
+    float: left;
+    font-size: 12px;
+    margin:0!important;
+    height: 12px;
+}
+
+#footer ul li a {
+    margin: 0;
+    padding: 0 6px 0 0;
+    display: block;
+    height:12px;
+    line-height:12px;
 }
 
+#footer ul li + li {
+    margin-left: 3px;
+}
+
+#footer ul li + li a {
+    padding: 0 6px 0 6px;
+    border-left: 1px solid #878b78;
+}
+
+#footer ul li a.twitter  {
+    background: url(twitter-bird.png) no-repeat 5px 0px;
+    padding-left: 25px;
+}
+
+
+
 div#download {
     position: absolute;
     width: 580px;
@@ -312,11 +549,17 @@ div#download ul#documentation li a {
     margin-bottom: 37px;
 }
 
-pre, code {
-	font-family: Monaco, 'Andale Mono', 'Lucida Console', 'Bitstream Vera Sans Mono', 'Courier New', monospace, serif;
-	font-size: 12px;
-	color: #d2d8ba;
-}
+  pre, tt, code {
+	  color: #d2d8ba;
+    font-size: 14px;
+    line-height: 22px;
+    font-family: Monaco, Consolas, "Lucida Console", monospace;
+    margin: 0; padding: 0;
+  }
+  #front pre, #front tt, #front code {
+    font-size:12px;
+    line-height:22px;
+  }
 
 pre {
 	padding-left: 1em;
@@ -326,17 +569,41 @@ pre {
 	border-left-color: #626557;
 }
 
+.alt pre {
+    font-size: 14px;
+    margin-left: 0;
+    border-left: 2px solid #dadad7;
+    background-color: #f4f4f2;
+    color: #46483e;
+    padding: 1em 1.5em;
+    line-height: 2em;
+}
+
+.alt code {
+    color: #996633;
+}
+
 dd {
   margin: 1em 0;
   margin-left: 1em;
 }
 
+
 a {
-	color: #8BC84B;
+	color: #690;
 	text-decoration: none;
 }
 a:hover { text-decoration: underline; }
 
+.alt a {
+    background-color: #eff2db;
+    padding: 0 2px;
+}
+
+.alt #intro a, .alt #footer a {
+    background-color: transparent;
+}
+
 .highlight {
   background: #733;
   padding: 0.2em 0;
@@ -350,12 +617,11 @@ a:hover { text-decoration: underline; }
 }
 
 /* simpler clearfix */
-.clearfix {
-  /* be an independent layout island */
-  overflow:hidden;
-  /* but don't actually cut anything off */
-  height:auto;
-  /* trigger hasLayout in IE */
-  zoom:1;
-  /* fin. */
+.clearfix:after {
+    content: ".";
+    display: block;
+    height: 0;
+    clear: both;
+    visibility: hidden;
 }
+
diff --git a/doc/sh.css b/doc/sh.css
new file mode 100644
index 0000000000..b9ed5a3036
--- /dev/null
+++ b/doc/sh.css
@@ -0,0 +1,23 @@
+.sh_sourceCode {
+  font-weight: normal;
+  font-style: normal;
+}
+
+.sh_sourceCode .sh_symbol , .sh_sourceCode .sh_cbracket {
+  color: #333;
+}
+
+.sh_sourceCode .sh_keyword {
+  color: #c96;
+}
+
+.sh_sourceCode .sh_string, .sh_sourceCode .sh_regexp, .sh_sourceCode .sh_number,
+.sh_sourceCode .sh_specialchar
+{
+  color: #690;
+}
+
+.sh_sourceCode .sh_comment {
+  color: #666;
+}
+
diff --git a/doc/sh_vim-dark.css b/doc/sh_vim-dark.css
index 59b3021572..a915a7875d 100644
--- a/doc/sh_vim-dark.css
+++ b/doc/sh_vim-dark.css
@@ -21,3 +21,13 @@
 .sh_sourceCode .sh_comment {
   color: #777;
 }
+
+.alt .sh_sourceCode .sh_keyword {
+    font-style: normal;
+    color: #996633;
+}
+
+.alt .sh_sourceCode .sh_symbol , .alt .sh_sourceCode .sh_cbracket {
+    color: #46483e;
+}
+
diff --git a/doc/template.html b/doc/template.html
index a0e7993e89..18a9615066 100644
--- a/doc/template.html
+++ b/doc/template.html
@@ -2,22 +2,61 @@
 <html lang="en">
 <head>
   <meta charset="utf-8">
-  <title>{{section}}Node.js v0.7.1 Manual &amp; Documentation</title>
+  <title>{{section}}Node.js v0.6.9 Manual &amp; Documentation</title>
   <link rel="stylesheet" href="assets/style.css">
   <link rel="stylesheet" href="assets/sh.css">
   <link rel="canonical" href="http://nodejs.org/docs/latest/api/{{filename}}.html">
 </head>
-<body>
-  <div id="container">
-    <header>
-      <h1>Node.js v0.7.1 Manual &amp; Documentation</h1>
-      <div id="gtoc">
-        <p><a href="index.html">Index</a> | <a href="all.html">View on single page</a></p>
-      </div>
-      <hr>
-    </header>
-    {{content}}
-  </div>
+<body class="alt apidoc">
+    <div id="intro" class="interior">
+        <a href="/" title="Go back to the home page">
+            <img id="logo" src="assets/logo-light.png" alt="node.js">
+        </a>
+    </div>
+    <div id="content" class="clearfix">
+        <div id="column2" class="interior">
+            <ul>
+                <li><a href="/" class="home">Home</a></li>
+                <li><a href="/#download" class="download">Download</a></li>
+                <li><a href="/about/" class="about">About</a></li>
+                <li><a href="http://search.npmjs.org/" class="npm">npm Registry</a></li>
+                <li><a href="http://nodejs.org/docs/latest/api/index.html" class="docs current">Docs</a></li>
+                <li><a href="http://blog.nodejs.org" class="blog">Blog</a></li>
+                <li><a href="/community/" class="community">Community</a></li>
+                <li><a href="/logos/" class="logos">Logos</a></li>
+                <li><a href="http://jobs.nodejs.org/" class="jobs">Jobs</a></li>
+            </ul>
+            <p class="twitter"><a href="http://twitter.com/nodejs">@nodejs</a></p>
+        </div>
+
+        <div id="column1" class="interior">
+        <header>
+          <h1>Node.js v0.6.9 Manual &amp; Documentation</h1>
+          <div id="gtoc">
+            <p><a href="index.html" name="toc">Index</a> | <a href="all.html">View on single page</a></p>
+          </div>
+          <hr>
+        </header>
+        {{content}}
+        </div>
+    </div>
+    <div id="footer">
+        <ul class="clearfix">
+            <li><a href="/">Node.js</a></li>
+            <li><a href="/#download">Download</a></li>
+            <li><a href="/about/">About</a></li>
+            <li><a href="http://search.npmjs.org/">npm Registry</a></li>
+            <li><a href="http://nodejs.org/docs/latest/api/index.html">Docs</a></li>
+            <li><a href="http://blog.nodejs.org">Blog</a></li>
+            <li><a href="/community/">Community</a></li>
+            <li><a href="/logos/">Logos</a></li>
+            <li><a href="http://jobs.nodejs.org/">Jobs</a></li>
+            <li><a href="http://twitter.com/nodejs" class="twitter">@nodejs</a></li>
+        </ul>
+
+        <p>Copyright 2010 <a href="http://joyent.com">Joyent, Inc</a>, Node.js is a <a href="/trademark-policy.pdf">trademark</a> of Joyent, Inc. View <a href="https://raw.github.com/joyent/node/v0.6.9/LICENSE">license</a>.</p>
+    </div>
+    
   <script src="assets/sh_main.js"></script>
   <script src="assets/sh_javascript.min.js"></script>
   <script>highlight(undefined, undefined, 'pre');</script>
diff --git a/doc/twitter-bird.png b/doc/twitter-bird.png
new file mode 100644
index 0000000000..b619b2a0d3
--- /dev/null
+++ b/doc/twitter-bird.png
author	isaacs <i@izs.me>	2012-01-31 18:18:00 -0800
committer	isaacs <i@izs.me>	2012-01-31 18:18:00 -0800
commit	18d179c2d8f916c07a763ea8e99ed6dc77751bfa (patch)
tree	d2066d272d5e81f21c355e0ab9b6432dcebd3c5f /doc
parent	33b7fc250f061af42b595decf6c0edf360c5aae9 (diff)
parent	7e0bf7d57de318f45a097e05644efa49beb65209 (diff)
download	node-new-18d179c2d8f916c07a763ea8e99ed6dc77751bfa.tar.gz