From 9b1b305a1677443fc6f627d10f597331d29f08e7 Mon Sep 17 00:00:00 2001
From: Tobi Oetiker <tobi@oetiker.ch>
Date: Tue, 29 Aug 2006 09:17:36 +0000
Subject: fixed merge in upgrade docs again ... selfreferencing links were
 earlier

---
 doc/smokeping_upgrade.pod | 17 ++++++++---------
 1 file changed, 8 insertions(+), 9 deletions(-)

(limited to 'doc')

diff --git a/doc/smokeping_upgrade.pod b/doc/smokeping_upgrade.pod
index 550a941..5f59fdd 100644
--- a/doc/smokeping_upgrade.pod
+++ b/doc/smokeping_upgrade.pod
@@ -32,15 +32,6 @@ It is used to give the C<fping> command the C<-t> parameter,
 which apparently affects the timeout of the last ping in the
 counting (C<-C>) mode used by Smokeping.
 
-=head2 CGI self-referring links
-
-The way Smokeping creates the self-referring links was changed. The old
-behaviour used the script name but not the host part, resulting in links
-like S<<a href="/path/smokeping.cgi?foo=bar">>. The new behaviour uses the
-C<cgiurl> variable: the links are always absolute like 
-S<<a href="http://some.host/path/smokeping.cgi?foo=bar">>.
-
-
 =head1 2.0.5 to 2.0.6
 
 =head2 CGI self-referring links (again)
@@ -64,6 +55,14 @@ but as this parameter is only effective in C<fping>'s I<default> mode,
 while Smokeping uses the I<counting> mode (C<-c>), it never actually
 did anything.
 
+=head2 CGI self-referring links
+
+The way Smokeping creates the self-referring links was changed. The old
+behaviour used the script name but not the host part, resulting in links
+like S<<a href="/path/smokeping.cgi?foo=bar">>. The new behaviour uses the
+C<cgiurl> variable: the links are always absolute like 
+S<<a href="http://some.host/path/smokeping.cgi?foo=bar">>.
+
 =head1 2.0.1 to 2.0.2
 
 =head2 Edge-triggered alerts
-- 
cgit v1.2.3-24-g4f1b