docs: Move images out of the dist tarball

This puts all images in doc/images/ and references them via
http://nodejs.org/images/.

Any complaints about copyright usage etc. can thus be node/joyent's
problem, rather than the problem of a downstream distribution channel.

Conflicts:

	Makefile

Makefile

@@ -80,10 +80,12 @@ out/Release/node: all
 apidoc_sources = $(wildcard doc/api/*.markdown)
 apidocs = $(addprefix out/,$(apidoc_sources:.markdown=.html))
 
-apidoc_dirs = out/doc out/doc/api/ out/doc/api/assets out/doc/about out/doc/community out/doc/logos
+apidoc_dirs = out/doc out/doc/api/ out/doc/api/assets out/doc/about out/doc/community out/doc/logos out/doc/images
 
 apiassets = $(subst api_assets,api/assets,$(addprefix out/,$(wildcard doc/api_assets/*)))
 
+doc_images = $(addprefix out/,$(wildcard doc/images/* doc/*.jpg doc/*.png))
+
 website_files = \
 	out/doc/index.html    \
 	out/doc/v0.4_announcement.html   \
@@ -92,33 +94,12 @@ website_files = \
 	out/doc/sh_javascript.min.js \
 	out/doc/sh_vim-dark.css \
 	out/doc/sh.css \
-	out/doc/logo.png      \
 	out/doc/favicon.ico   \
 	out/doc/pipe.css \
 	out/doc/about/index.html \
-	out/doc/close-downloads.png \
 	out/doc/community/index.html \
-	out/doc/community/not-invented-here.png \
 	out/doc/logos/index.html \
-	out/doc/microsoft-logo.png \
-	out/doc/ryan-speaker.jpg \
-	out/doc/download-logo.png \
-	out/doc/ebay-logo.png \
-	out/doc/footer-logo-alt.png \
-	out/doc/footer-logo.png \
-	out/doc/icons-interior.png \
-	out/doc/icons.png \
-	out/doc/home-icons.png \
-	out/doc/joyent-logo_orange_nodeorg-01.png \
-	out/doc/linkedin-logo.png \
-	out/doc/logo-light.png \
-	out/doc/mac_osx_nodejs_installer_logo.png \
-	out/doc/microsoft-logo.png \
-	out/doc/platform-icons.png \
-	out/doc/sponsored.png \
-	out/doc/twitter-bird.png \
-	out/doc/community-icons.png \
-	out/doc/yahoo-logo.png
+	$(doc_images)
 
 doc docs: out/Release/node $(apidoc_dirs) $(website_files) $(apiassets) $(apidocs)
 
@@ -129,7 +110,7 @@ out/doc/api/assets/%: doc/api_assets/% out/doc/api/assets/
 	cp $< $@
 
 out/doc/%: doc/%
-	cp $< $@
+	cp -r $< $@
 
 out/doc/api/%.html: doc/api/%.markdown out/Release/node $(apidoc_dirs) $(apiassets) tools/doctool/doctool.js
 	out/Release/node tools/doctool/doctool.js doc/template.html $< > $@
@@ -197,7 +178,7 @@ $(TARBALL): out/doc
 	cp doc/node.1 $(TARNAME)/doc/node.1
 	cp -r out/doc/api $(TARNAME)/doc/api
 	rm -rf $(TARNAME)/deps/v8/test # too big
-	rm -rf $(TARNAME)/doc/logos/*.{png,eps} # too big
+	rm -rf $(TARNAME)/doc/images # too big
 	tar -cf $(TARNAME).tar $(TARNAME)
 	rm -rf $(TARNAME)
 	gzip -f -9 $(TARNAME).tar

doc/about/index.html

@@ -21,7 +21,7 @@
   <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-light.png" alt="node.js">
+            <img id="logo" src="http://nodejs.org/images/logo-light.png" alt="node.js">
         </a>
     </div>
     <div id="content" class="clearfix">

doc/api_assets/style.css

@@ -242,7 +242,7 @@ code.pre {
 	color: #d2d8ba;
 
   /* preload platform-icons.png */
-  background-image: url(platform-icons.png);
+  background-image: url(http://nodejs.org/images/platform-icons.png);
   background-repeat: no-repeat;
   background-position: -999em -999em;
 }
@@ -341,15 +341,15 @@ p tt, p code {
     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 { background: url(http://nodejs.org/images/icons-interior.png) no-repeat -156px 3px; }
+#column2.interior li a.download { background: url(http://nodejs.org/images/icons-interior.png) no-repeat -156px -21px; }
+#column2.interior li a.about { background: url(http://nodejs.org/images/icons-interior.png) no-repeat -156px -45px; }
+#column2.interior li a.npm { background: url(http://nodejs.org/images/icons-interior.png) no-repeat -156px -69px; }
+#column2.interior li a.docs { background: url(http://nodejs.org/images/icons-interior.png) no-repeat -156px -93px; }
+#column2.interior li a.blog { background: url(http://nodejs.org/images/icons-interior.png) no-repeat -156px -117px; }
+#column2.interior li a.community { background: url(http://nodejs.org/images/icons-interior.png) no-repeat -156px -141px; }
+#column2.interior li a.logos { background: url(http://nodejs.org/images/icons-interior.png) no-repeat -156px -165px; }
+#column2.interior li a.jobs { background: url(http://nodejs.org/images/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; }
@@ -381,7 +381,7 @@ p tt, p code {
 }
 
 #column2.interior p.twitter a {
-    background: url(twitter-bird.png) no-repeat 0 4px;
+    background: url(http://nodejs.org/images/twitter-bird.png) no-repeat 0 4px;
     padding-left: 37px;
     text-decoration: none;
 }
@@ -394,7 +394,7 @@ 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;
+  background: url(http://nodejs.org/images/anchor.png) no-repeat top left;
   margin-right: 7px;
   display: block;
   width: 13px;
@@ -405,7 +405,7 @@ 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;
+  background: url(http://nodejs.org/images/anchor.png) no-repeat top right;
   display: block;
   width: 13px;
   border-bottom: 1px solid #cccccc;
@@ -439,7 +439,7 @@ a.anchor {
 }
 
 #footer ul {
-    background: url(footer-logo-alt.png) left 17px no-repeat;
+    background: url(http://nodejs.org/images/footer-logo-alt.png) left 17px no-repeat;
     padding: 23px 0 0 195px;
     height: 26px;
     margin-left: -1px;
@@ -473,7 +473,7 @@ a.anchor {
 }
 
 #footer ul li a.twitter  {
-    background: url(twitter-bird.png) no-repeat 5px 0px;
+    background: url(http://nodejs.org/images/twitter-bird.png) no-repeat 5px 0px;
     padding-left: 25px;
 }
 

doc/community/index.html

@@ -23,7 +23,7 @@
   <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">
+            <img id="logo" src="http://nodejs.org/images/logo.png" alt="node.js">
         </a>
     </div>
     <div id="content" class="clearfix">
@@ -163,7 +163,7 @@
               </div>
         
                   <p><a href="http://notinventedhe.re/on/2011-7-26"><img
-                  src="not-invented-here.png" width="100%"></a></p>
+                  src="http://nodejs.org/images/not-invented-here.png" width="100%"></a></p>
         </div>
 </div>
     <div id="footer">

doc/index.html

@@ -20,7 +20,7 @@
   </head>
   <body id="front">
     <div id="intro">
-        <img id="logo" src="logo.png" alt="node.js">
+        <img id="logo" src="http://nodejs.org/images/logo.png" alt="node.js">
 
         <p>Node.js is a platform built on <a
         href="http://code.google.com/p/v8/">Chrome's JavaScript runtime</a>
@@ -36,7 +36,7 @@
     <div id="quotes" class="clearfix">
         <h2>Node.js in the Industry</h2>
         <ul>
-            <li class="microsoft"><img src="microsoft-logo.png">
+            <li class="microsoft"><img src="http://nodejs.org/images/microsoft-logo.png">
             <p>Node gives Azure users the first end-to-end JavaScript
             experience for the development of a whole new class of real-time
             applications.
@@ -45,7 +45,7 @@
             <br>
             <span>Principal Program Manager, Interoperability Strategy</span></p></li>
 
-            <li class="ebay"><img src="ebay-logo.png">
+            <li class="ebay"><img src="http://nodejs.org/images/ebay-logo.png">
             <p>Node’s evented I/O model freed us from worrying about locking
             and concurrency issues that are common with multithreaded async
             I/O.
@@ -54,7 +54,7 @@
             <br>
             <span>Principal Member, Technical Staff</span></p></li>
 
-            <li class="linkedin"><img src="linkedin-logo.png">
+            <li class="linkedin"><img src="http://nodejs.org/images/linkedin-logo.png">
             <p>On the server side, our entire mobile software stack is
             completely built in Node. One reason was scale. The second is
             Node showed us huge performance gains.
@@ -63,7 +63,7 @@
             <br>
             <span>Director of Engineering, Mobile</span></p></li>
 
-            <li class="yahoo"><img src="yahoo-logo.png">
+            <li class="yahoo"><img src="http://nodejs.org/images/yahoo-logo.png">
             <p>Node.js is the execution core of Manhattan. Allowing
             developers to build one code base using one language – that is
             the nirvana for developers.
@@ -76,7 +76,7 @@
 
     <div id="download">
         <a href="#" id="download-close">X</a>
-        <img id="download-logo" src="download-logo.png" alt="node.js">
+        <img id="download-logo" src="http://nodejs.org/images/download-logo.png" alt="node.js">
         <ul id="installers" class="clearfix">
             <li><a href="http://nodejs.org/dist/v0.6.11/node-v0.6.11.msi">Windows Installer</a><br>node-v0.6.11.msi</li>
             <li><a href="http://nodejs.org/dist/v0.6.11/node-v0.6.11.pkg">Macintosh Installer</a><br>node-v0.6.11.pkg</li>
@@ -181,7 +181,7 @@ server.listen(1337, '127.0.0.1');</pre>
         </div>
         <div id="column2">
             <h2>Featured</h2>
-            <a href="http://www.youtube.com/watch?v=jo_B4LTHi3I"><img src="ryan-speaker.jpg"></a>
+            <a href="http://www.youtube.com/watch?v=jo_B4LTHi3I"><img src="http://nodejs.org/images/ryan-speaker.jpg"></a>
             A guided introduction to Node
 
             <h2>Explore Node.js</h2>

doc/logos/index.html

@@ -21,7 +21,7 @@
   <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">
+            <img id="logo" src="http://nodejs.org/logo.png" alt="node.js">
         </a>
     </div>
     <div id="content" class="clearfix">
@@ -45,26 +45,26 @@
           <h2>Logo Downloads</h2>
           <table border="0" cellspacing="0" cellpadding="10">
             <tr>
-              <td bgcolor="#FFFFFF"><a href="nodejs-light.eps"><img src="nodejs.png" alt="Node.js dark" width="212" height="114" border="0"></a></td>
-              <td bgcolor="#46483E"><a href="nodejs-dark.eps"><img src="nodejs-dark.png" alt="Node.js dark" width="212" height="114" border="0"></a></td>
+              <td bgcolor="#FFFFFF"><a href="http://nodejs.org/images/logos/nodejs-light.eps"><img src="http://nodejs.org/images/logos/nodejs.png" alt="Node.js dark" width="212" height="114" border="0"></a></td>
+              <td bgcolor="#46483E"><a href="http://nodejs.org/images/logos/nodejs-dark.eps"><img src="http://nodejs.org/images/logos/nodejs-dark.png" alt="Node.js dark" width="212" height="114" border="0"></a></td>
             </tr>
             <tr>
-              <td><a href="nodejs-light.eps">Node.js standard EPS</a></td>
-              <td><a href="nodejs-dark.eps">Node.js reversed EPS</a></td>
+              <td><a href="http://nodejs.org/images/logos/nodejs-light.eps">Node.js standard EPS</a></td>
+              <td><a href="http://nodejs.org/images/logos/nodejs-dark.eps">Node.js reversed EPS</a></td>
             </tr>
             <tr>
-              <td bgcolor="#8BC84B"><a href="nodejs-green.eps"><img src="nodejs-green.png" alt="Node.js dark" width="212" height="114" border="0"></a><a href="nodejs-dark.eps"></a></td>
-              <td bgcolor="#ffffff"><a href="nodejs-black.eps"><img src="nodejs-black.png" alt="Node.js dark" width="212" height="114" border="0"></a></td>
+              <td bgcolor="#8BC84B"><a href="http://nodejs.org/images/logos/nodejs-green.eps"><img src="http://nodejs.org/images/logos/nodejs-green.png" alt="Node.js dark" width="212" height="114" border="0"></a><a href="http://nodejs.org/images/logos/nodejs-dark.eps"></a></td>
+              <td bgcolor="#ffffff"><a href="http://nodejs.org/images/logos/nodejs-black.eps"><img src="http://nodejs.org/images/logos/nodejs-black.png" alt="Node.js dark" width="212" height="114" border="0"></a></td>
             </tr>
             <tr>
-              <td><a href="nodejs-green.eps">Node.js bright EPS</a></td>
-              <td><a href="nodejs-black.eps">Node.js 1 color EPS</a></td>
+              <td><a href="http://nodejs.org/images/logos/nodejs-green.eps">Node.js bright EPS</a></td>
+              <td><a href="http://nodejs.org/images/logos/nodejs-black.eps">Node.js 1 color EPS</a></td>
             </tr>
           </table>
           <h2>Desktop Background</h2>
-          <p><img src="monitor.png" width="525" height="398" alt="Screensavers"></p>
-          <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><img src="http://nodejs.org/images/logos/monitor.png" width="525" height="398" alt="Screensavers"></p>
+          <p>Select your screen resolution:<a href="http://nodejs.org/images/logos/nodejs-1024x768.png"><br>
+          <span class="desktops">1024 x 768</span></a><span class="desktops">  | <a href="http://nodejs.org/images/logos/nodejs-1280x1024.png">1280 x 1024</a> | <a href="http://nodejs.org/images/logos/nodejs-1440x900.png">1440 x 900</a> | <a href="http://nodejs.org/images/logos/nodejs-1920x1200.png">1920 x 1200</a> | <a href="http://nodejs.org/images/logos/nodejs-2560x1440.png">2560 x 1440</a></span></p>
 
         </div>
 </div>

doc/pipe.css

@@ -67,7 +67,7 @@ h1 a, h2 a, h3 a, h4 a
 	color: #d2d8ba;
 
   /* preload platform-icons.png */
-  background-image: url(platform-icons.png);
+  background-image: url(http://nodejs.org/images/platform-icons.png);
   background-repeat: no-repeat;
   background-position: -999em -999em;
 }
@@ -240,15 +240,15 @@ h1 a, h2 a, h3 a, h4 a
     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 { background: url(http://nodejs.org/images/icons-interior.png) no-repeat -156px 3px; }
+#column2.interior li a.download { background: url(http://nodejs.org/images/icons-interior.png) no-repeat -156px -21px; }
+#column2.interior li a.about { background: url(http://nodejs.org/images/icons-interior.png) no-repeat -156px -44px; }
+#column2.interior li a.npm { background: url(http://nodejs.org/images/icons-interior.png) no-repeat -156px -69px; }
+#column2.interior li a.docs { background: url(http://nodejs.org/images/icons-interior.png) no-repeat -156px -93px; }
+#column2.interior li a.blog { background: url(http://nodejs.org/images/icons-interior.png) no-repeat -156px -117px; }
+#column2.interior li a.community { background: url(http://nodejs.org/images/icons-interior.png) no-repeat -156px -141px; }
+#column2.interior li a.logos { background: url(http://nodejs.org/images/icons-interior.png) no-repeat -156px -165px; }
+#column2.interior li a.jobs { background: url(http://nodejs.org/images/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; }
@@ -285,7 +285,7 @@ h1 a, h2 a, h3 a, h4 a
 }
 
 #column2.interior p.twitter a {
-    background: url(twitter-bird.png) no-repeat 0 4px;
+    background: url(http://nodejs.org/images/twitter-bird.png) no-repeat 0 4px;
     padding-left: 37px;
 }
 
@@ -303,7 +303,7 @@ h1 a, h2 a, h3 a, h4 a
     color: white;
     text-transform: none;
     font-family: Georgia, FreeSerif, Times, serif;
-    background: url(community-icons.png) no-repeat;
+    background: url(http://nodejs.org/images/community-icons.png) no-repeat;
     padding-left: 45px;
     padding-top: 6px;
     padding-bottom: 10px;
@@ -333,7 +333,7 @@ h1 a, h2 a, h3 a, h4 a
 }
 
 #explore {
-    background: url(home-icons.png) no-repeat left 17px;
+    background: url(http://nodejs.org/images/home-icons.png) no-repeat left 17px;
 }
 
 #explore li {
@@ -412,7 +412,7 @@ h1 a, h2 a, h3 a, h4 a
 }
 
 #footer ul {
-    background: url(footer-logo.png) left 17px no-repeat;
+    background: url(http://nodejs.org/images/footer-logo.png) left 17px no-repeat;
     border-top: 1px solid #626557;
     border-color:#90918b;
     padding-top:23px;
@@ -421,7 +421,7 @@ h1 a, h2 a, h3 a, h4 a
     margin-right:137px;
 }
 .alt #footer ul {
-    background-image: url(footer-logo-alt.png);
+    background-image: url(http://nodejs.org/images/footer-logo-alt.png);
 }
 
 #footer ul li {
@@ -450,7 +450,7 @@ h1 a, h2 a, h3 a, h4 a
 }
 
 #footer ul li a.twitter  {
-    background: url(twitter-bird.png) no-repeat 5px 0px;
+    background: url(http://nodejs.org/images/twitter-bird.png) no-repeat 5px 0px;
     padding-left: 25px;
 }
 
@@ -482,7 +482,7 @@ div#download:target {
 }
 
 #download-close {
-    background: url(close-downloads.png) no-repeat top right;
+    background: url(http://nodejs.org/images/close-downloads.png) no-repeat top right;
     width: 64px;
     height: 64px;
     position: absolute;
@@ -496,7 +496,7 @@ div#download ul#installers {
     width: 550px;
     text-align: center;
     margin: 0 auto;
-    background: url(platform-icons.png) no-repeat top center;
+    background: url(http://nodejs.org/images/platform-icons.png) no-repeat top center;
     padding-top: 65px;
     padding-bottom: 50px;
 }

doc/template.html

@@ -10,7 +10,7 @@
 <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">
+            <img id="logo" src="http://nodejs.org/images/logo-light.png" alt="node.js">
         </a>
     </div>
     <div id="content" class="clearfix">