--- annozilla/www/installation.html	2001/04/25 19:10:10	1.4
+++ annozilla/www/installation.html	2004/04/19 19:51:17	1.32
@@ -1,39 +1,51 @@
 <script language="javascript">
 <!--
-
 function triggerURL(url) {
-
-        if (!InstallTrigger.updateEnabled())
-          return false; 
-
-        else
-          InstallTrigger.startSoftwareUpdate(url); 
+   if (!InstallTrigger.updateEnabled())
+     return false; 
+   else
+     InstallTrigger.startSoftwareUpdate(url); 
 }
-
 //-->
 </script>
+<script type="application/x-javascript" src="installer.js"></script>
 
-
-<!-- MAIN CONTENT -->
-<p><b>Installation</b></p>
-<p>Here's the procedure for installation. <b>Please note</b> that the syntax
-for XUL (Mozilla's user interface language) has changed recently, and the
-preferences window here will only work for the old syntax - so 0.8.1 builds
-will be OK, but more recent nightly builds will not work.  <a
-href="mailto:matthew@mjwilson.demon.co.uk">Mail me</a> if this is a
-problem.</p>
-
-<ul>
-<li>Firstly <a href="#" onclick="triggerURL('http://annozilla.mozdev.org/annozilla.xpi');">install the package</a>.
-<li>Next you will have to restart your browser.
-<li>Now go to this URL:
+<h2 id="experimental">Annozilla 0.5 beta installation</h2>
+<p>For installation of the latest experimental beta packages, <a
+href="/installation/">see the new installation guide</a>.</p>
+<p>Version 0.5 beta is experimental. It should be installed instead of version
+0.3.5, not alongside it. It seems to work with Mozilla 1.6 and there is
+read-only annotation support for Mozilla Firefox.</p>
+
+<h2 id="stable">Annozilla 0.3.5 Installation</h2>
+<p>Or, if you want to install the older, and slightly rusty, version 0.3.5:</p>
+<ul class="spaced">
+<li>Firstly <a href="javascript:triggerURL('http://downloads.mozdev.org/annozilla/annozilla-0-3-5.xpi');">install the package</a>, now at version 0.3.5.
+<li>Please then <b>restart your browser</b> and return to this page to continue
+installation.
+<li>If this is the first time you have installed Annozilla, make sure your
+sidebar is visible, and go to this URL:
 <pre>chrome://annozilla/content/addpanel.xul</pre>
 This will add Annozilla to your sidebar panel.
-<li>Finally go to the preferences window (Edit -&gt; Preferences -&gt; Annozilla) and set the server, user name and password. Please note:
+<li>Now go to the preferences window (Edit -&gt; Preferences -&gt; Annozilla) and set the server, user name and password. Please note:
 <ul>
 <li>You will need to have an account with an annotation server.
 To try the W3C test server, get an account at <a href="http://annotest.w3.org/access">http://annotest.w3.org/access</a>.
-<li>There is currently <a href="http://mozdev.org/bugs/show_bug.cgi?id=260">a bug</a> which means that user names containing a + character (and presumably other characters requiring URL-escaping) will NOT work.
+<li>The "Server" preference should be set to the URL of the annotation server. (For example, the W3C test server is at http://annotest.w3.org/annotations.)
 <li><b>NB</b> when you request the body of an annotation, you will be asked for your user name and password again, this is because the body of the annotation is retrieved by a different mechanism. You can use Password Manager to remember the values here though.
+<li>If you are using the W3C test server, then you can probably find some annotations attached to <a href="http://www.w3.org/2001/Annotea/">the Annotea page</a>.
+</ul>
+<li>You can also configure:
+<ul>
+<li>whether the annotations, when you select them, appear in an area in the sidebar, or in a new browser window
+<li>whether to (a) try to determine the text that the annotation applies to, and (b) insert an icon in the main browser window to indicate the annotation.
+<li>whether to load annotation bodies in an area of the sidebar, or in a new window
+</ul>
+<li>For languages, the options are these:
+<ul>
+<li>You can specify "only view annotations in my preferred language". This only
+affects annotations which have a language specified.
+<li>You can decide whether or not to view annotations without any language
+information specified. (At the moment, I think that Annozilla is the only Annotea client which can specify the language of annotations).
 </ul>
 </ul>