prepare for the release of smokeping-2.4.1

3 files changed, 36 insertions, 12 deletions

diff --git a/Makefile b/Makefile
index c4a5b38..f46597b 100644
--- a/Makefile
+++ b/Makefile
@@ -159,7 +159,7 @@ smokeping-$(VERSION).tar.gz:
 	$(PERL) -i~ -p -e 's/VERSION="\d.*?"/VERSION="$(NUMVERSION)"/' lib/Smokeping.pm 
 	$(PERL) -i~ -p -e 's/Smokeping \d.*?;/Smokeping $(NUMVERSION);/' bin/smokeping.dist htdocs/smokeping.cgi.dist bin/tSmoke.dist
 	$(PERL) -i~ -p -e 'do { my @d = localtime; my $$d = (1900+$$d[5])."/".(1+$$d[4])."/".$$d[3]; print "$$d -- released version $(VERSION)\n\n" } unless $$done++ || /version $(VERSION)/' CHANGES
-	$(PERL) -i~ -p -e "s/Atom\('SmokeTrace \S+?'/Atom('SmokeTrace "$(VERSION)"')/" qooxdoo/source/class/Tr/Application.js 
+	$(PERL) -i~ -p -e "s/Atom\('SmokeTrace \S+?'/Atom('SmokeTrace "$(VERSION)"'/" qooxdoo/source/class/Tr/Application.js 
 	svn commit -m "prepare for the release of smokeping-$(VERSION)"
 	svn export $(SVNREPO)/trunk/software smokeping-$(VERSION)
 	rm -rf  smokeping-$(VERSION)/qooxdoo/source/class/Smokeping
diff --git a/doc/smoketrace.pod b/doc/smoketrace.pod
index 6f0374b..8ff24bd 100755
--- a/doc/smoketrace.pod
+++ b/doc/smoketrace.pod
@@ -10,30 +10,48 @@ users to traceroute smokeping targets directly from the master host.
 
 =head1 SETUP
 
-To activate SmokeTrace you just have to copy a few files:
+To activate SmokeTrace you have to copy a few files to your webserver.
 
 =over
 
 =item 1.
 
-Copy C<htdocs/script/Tr.js> to your smokeping web directory.
+Make sure your webserver can execute cgi files outside the cgi-bin
+directory. Maybe it is enough to create a F<.htaccess> file with the
+following contents into the smokeping web directory ($web).
+
+ AddHandler cgi-script cgi
+ Options ExecCGI
+
+=item 2.
+
+Copy C<htdocs/script/Tr.js> to your smokeping web directory (NOT the cgi-bin
+directory!).
+
+ mkdir $web/script
+ cp $src/htdocs/script/Tr.js $web/script/
 
 =item 2.
 
-Copy and edit C<htdocs/tr.html> to your smokeping web directory. Make
-sure the path to C<Tr.js> is correct.
+Copy C<htdocs/tr.html> to your smokeping web directory (NOT cgi-bin). Make
+sure the path, pointing to C<Tr.js> is correct.
+
+ cp $src/htdocs/tr.html $web/
 
 =item 3.
 
-Copy C<htdocs/resource> into the directory where you put C<tr.html>.
+Copy C<htdocs/resource> into the directory where you put C<tr.html>
+
+ cp -r $src/htdocs/resource $web/ 
 
 =item 4.
 
-Copy F<htdocs/tr.cgi.dist> to the directory where you put
-C<tr.html>. Change its name to C<tr.cgi>. Edit C<tr.cgi> to adjust
-the C<use lib> line, to point to the smokeping perl library directory, as you did
-with C<smokeping.cgi>. Make sure the webserver actually executes the
-C<tr.cgi> script.
+Copy F<htdocs/tr.cgi.dist> to the directory where you put C<tr.html>. Change
+its name to C<tr.cgi>. Edit C<tr.cgi> to adjust the C<use lib> line, to
+point to the smokeping perl library directory, as you did with
+C<smokeping.cgi> and the smokeping daemon.
+  
+ cp $src/htdocs/tr.cgi.dist $web/tr.cgi 
 
 =item 5.
 
@@ -47,8 +65,14 @@ Edit your config file and add the line:
 to your C<*** Targets ***> section. It will make a C<*> appear next to each
 host name, and when you click on it, the SmokeTrace window will open.
 
+Note that the C<href> atribut must point to the directory where you put the
+C<tr.html> file.
+
 =back
 
+Not you should be all set. Try calling C<tr.cgi> from your webbrowser. You
+should get some error message about not having sent a JSON request.
+
 =head1 COPYRIGHT
 
 Copyright (c) 2008 by Tobias Oetiker. All rights reserverd.
diff --git a/qooxdoo/source/class/Tr/Application.js b/qooxdoo/source/class/Tr/Application.js
index 1fc29f9..68edadc 100644
--- a/qooxdoo/source/class/Tr/Application.js
+++ b/qooxdoo/source/class/Tr/Application.js
@@ -42,7 +42,7 @@ qx.Class.define('Tr.Application',
             top.set({
                 height: 'auto'
             });
-			var title = new qx.ui.basic.Atom('SmokeTrace 2.4.1'));
+			var title = new qx.ui.basic.Atom('SmokeTrace 2.4.1');
 			with(title){
             	setTextColor('#b0b0b0');
             	setFont(qx.ui.core.Font.fromString('20px bold sans-serif'));