Merge branch 'issue/33' into develop
diff --git a/weinre.doc/Building.body.html b/weinre.doc/Building.body.html
index 26f9bdc..ca19816 100644
--- a/weinre.doc/Building.body.html
+++ b/weinre.doc/Building.body.html
@@ -8,7 +8,11 @@
<p>The source repository for weinre is maintained at
<a href="https://github.com/pmuellr/weinre">GitHub</a>.
-<p>To build the current version of <span class="weinre">weinre</span>, you need to be using Eclipse.
+<p>To build the current version of <span class="weinre">weinre</span>, you will
+probably want to use Eclipse. If that's not an option, there is some
+experimental support in the main ant build script to compile the Java code
+outside of Eclipse. Explore the <tt>build.xml</tt> file to see how that's
+done.
<p>At development time, <span class="weinre">weinre</span> consists of 5 Eclipse
projects. See the file <tt>README.md</tt> in the
diff --git a/weinre.doc/Home.body.html b/weinre.doc/Home.body.html
index 20b51bc..1660429 100644
--- a/weinre.doc/Home.body.html
+++ b/weinre.doc/Home.body.html
@@ -7,7 +7,8 @@
-->
<p><span class="weinre">weinre</span> is <b>We</b>b <b>In</b>spector <b>Re</b>mote.
-Pronounced like the word "winery".
+Pronounced like the word "winery". Or maybe like the word "weiner". Who knows,
+really.
<p>It's a debugger for web pages, like
FireBug (for FireFox)
@@ -23,6 +24,7 @@
so if you've used Safari's Web Inspector or Chrome's Developer Tools,
<span class="weinre">weinre</span> will be very familiar.
+<!--
<div class="note">
<p>NOTE: Please note that <span class="weinre">weinre</span> is still under development and
is not fully operational.
@@ -35,6 +37,7 @@
</ul>
</div>
+-->
<p>Here's what you can do with it:
diff --git a/weinre.doc/License.body.html b/weinre.doc/License.body.html
index d09972d..2884bba 100644
--- a/weinre.doc/License.body.html
+++ b/weinre.doc/License.body.html
@@ -9,21 +9,27 @@
<ul class="spaced">
-<li>Files from <a href="http://webkit.org/">WebKit build r70098</a>.
+<li>Files from <a href="http://webkit.org/">WebKit</a>.
Web Inspector code. Although WebKit in general contains both BSD and
LGPL code, only BSD licensed code is used by weinre.
-<li>Files from <a href="http://www.eclipse.org/jetty/">Eclipse Jetty 7.1.6.v20100715</a>.
+<li>Files from <a href="http://www.eclipse.org/jetty/">Eclipse Jetty</a>.
HTTP server. License: ASLv2 and EPLv1
-<li>Files from <a href="https://github.com/pmuellr/scooj">Scooj</a>.
+<li>Files from <a href="http://www.eclipse.org/swt/">Eclipse SWT</a>.
+Platform UI toolkit. License: EPLv1
+
+<li>Files from <a href="https://github.com/pmuellr/scooj">scooj</a>.
JavaScript OO wrapper. License: MIT
-<li>Files from <a href="http://commons.apache.org/cli/">Apache Commons CLI 1.2</a>.
+<li>Files from <a href="https://github.com/pmuellr/modjewel">modjewel</a>.
+CommonJS runtime for the browser. License: MIT
+
+<li>Files from <a href="http://commons.apache.org/cli/">Apache Commons CLI</a>.
Command-line parser. License: ASLv2
-<li>Files from <a href="http://www.eclipse.org/swt/">Eclipse SWT 3.6</a>.
-Platform UI toolkit. License: EPLv1
+<li>Files from <a href="http://incubator.apache.org/wink/">Apache Wink</a>.
+JSON codecs. License: ASLv2
</ul>
diff --git a/weinre.doc/TestDrive.body.html b/weinre.doc/TestDrive.body.html
index df76763..76991e8 100644
--- a/weinre.doc/TestDrive.body.html
+++ b/weinre.doc/TestDrive.body.html
@@ -10,6 +10,15 @@
this walk through first, then follow along and run <span class="weinre">weinre</span> yourself
to make sure it's installed and running correctly.
+<p>You may also want to check out
+<a href="http://www.youtube.com/watch?v=gaAI29UkVCc">the movie</a>, which
+shows a walk through with the demo page.
+
+<div class="note">
+<p>NOTE: The images below are from a slightly older version of weinre and the
+demo page, but are close enough.
+</div>
+
<p>After you're done with the
walk through, if you want to learn how to debug your own web pages with
<span class="weinre">weinre</span>,
diff --git a/weinre.doc/boilerplate-header.html.txt b/weinre.doc/boilerplate-header.html.txt
index 06a966a..32adc4f 100644
--- a/weinre.doc/boilerplate-header.html.txt
+++ b/weinre.doc/boilerplate-header.html.txt
@@ -29,6 +29,8 @@
<body>
+<a href="https://github.com/pmuellr/weinre"><img style="position: absolute; top: 0; left: 0; border: 0;" src="https://assets0.github.com/img/5d21241b64dc708fcbb701f68f72f41e9f1fadd6?repo=&url=http%3A%2F%2Fs3.amazonaws.com%2Fgithub%2Fribbons%2Fforkme_left_red_aa0000.png&path=" alt="Fork me on GitHub"></a>
+
<!-- ======================================================================= -->
<h1 class="page-title">weinre - @PAGE_NAME@</h1>
